Fix payment/refund id lookup for govpay webhook error logging

DEFRA · Feb 9, 2025 · 1474ad1 · 1474ad1
1 parent 858b285
commit 1474ad1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/jobs/waste_carriers_engine/govpay_webhook_job.rb b/app/jobs/waste_carriers_engine/govpay_webhook_job.rb
@@ -14,8 +14,8 @@ def perform(webhook_body)
       service_type = webhook_body.dig("resource", "moto") ? "back_office" : "front_office"
       Rails.logger.error "Error running GovpayWebhookJob (#{service_type}): #{e}"
       notification_params = {
-        refund_id: webhook_body["refund_id"],
-        payment_id: webhook_body["payment_id"],
+        refund_id: webhook_body.dig("resource", "refund_id"),
+        payment_id: webhook_body.dig("resource", "payment_id"),
         service_type: service_type
       }
 

diff --git a/spec/jobs/waste_carriers_engine/govpay_webhook_job_spec.rb b/spec/jobs/waste_carriers_engine/govpay_webhook_job_spec.rb
@@ -82,6 +82,14 @@ module WasteCarriersEngine
                   "reference" => "12345"
                 )
               end
+
+              it "includes the payment_id outside the webhook body" do
+                captured_args = nil
+                allow(Airbrake).to receive(:notify) { |*args| captured_args = args }
+                perform_now
+
+                expect(captured_args[1][:payment_id]).to eq(webhook_body["resource"]["payment_id"])
+              end
             end
 
             it "includes webhook body in Airbrake notification" do