From 3f47bbdf0a3070a6aaa86b043c72aa25d075f9ea Mon Sep 17 00:00:00 2001 From: PaulDoyle-DEFRA <97455399+PaulDoyle-DEFRA@users.noreply.github.com> Date: Mon, 10 Feb 2025 18:54:52 +0000 Subject: [PATCH] Lint fix --- .../govpay_webhook_job.rb | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/app/jobs/waste_carriers_engine/govpay_webhook_job.rb b/app/jobs/waste_carriers_engine/govpay_webhook_job.rb index 91bf82047..f99fe20c5 100644 --- a/app/jobs/waste_carriers_engine/govpay_webhook_job.rb +++ b/app/jobs/waste_carriers_engine/govpay_webhook_job.rb @@ -11,19 +11,7 @@ def perform(webhook_body) raise ArgumentError, "Unrecognised Govpay webhook type" end rescue StandardError => e - 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&.dig("resource", "refund_id"), - payment_id: webhook_body&.dig("resource", "payment_id"), - service_type: service_type - } - - if FeatureToggle.active?("enhanced_govpay_logging") - notification_params[:webhook_body] = sanitize_webhook_body(webhook_body) - end - - Airbrake.notify(e, notification_params) + handle_error(e, webhook_body) end private @@ -40,5 +28,21 @@ def sanitize_webhook_body(body) sanitized end + + def handle_error(error, webhook_body) + service_type = webhook_body.dig("resource", "moto") ? "back_office" : "front_office" + Rails.logger.error "Error running GovpayWebhookJob (#{service_type}): #{error}" + notification_params = { + refund_id: webhook_body&.dig("resource", "refund_id"), + payment_id: webhook_body&.dig("resource", "payment_id"), + service_type: service_type + } + + if FeatureToggle.active?("enhanced_govpay_logging") + notification_params[:webhook_body] = sanitize_webhook_body(webhook_body) + end + + Airbrake.notify(error, notification_params) + end end end