defra_ruby_mocks 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2050966a0416ac33fdb18d7b5e99dddb3548ef4d704792441a7a77a6c664b58e
-  data.tar.gz: 555e7313d1587a5f83108a5f3ed42de143cb5b0695ab4e11582e883e0fe0e0a3
+  metadata.gz: e5df956ffaf0644fb9dae96ae157ec7f45b8121d6bc42e5cd96164de8470342a
+  data.tar.gz: 6da12c96f050164e579932bf9ad188866198db203893ab436fc84c0a1e4ceeb8
 SHA512:
-  metadata.gz: 6a423e4730a149e0999d21e47b601b0fa83a011b3048c7eb03eebd2534f01752143b3c0f3c273dc6df37191287e6345cb32b1075c7fe745aab415034f6c8b43e
-  data.tar.gz: 1cb2bc2402d47184315227ba57d31687c1163c0eeacde31b2addd75cdf0e0d41bdbe3710f5c4853a9abbd2d4489a28ccee48f8aeaf4dcaf2beae464b8b4e1696
+  metadata.gz: df8d21f730573cdf3d97f10a6e41a4c2d7464e62ac3c5d032190fb6b5b9a21c9bc7a76cce56fadcfb757affd1cb21b1c2b5a6bc8a24c33c1a8db882543ffab14
+  data.tar.gz: bed07b31c14573ba390b13294a69f3209538616bd360379d0efb7b6dcc7b57c42406b6b4cc6e1cdc307933851e07c4537f876c0f9f8e80afdc953bdeec10a47d

data/app/controllers/defra_ruby_mocks/govpay_test_helpers_controller.rb

@@ -25,16 +25,16 @@ module DefraRubyMocks
 
     # This schedules a job to send a mock payment webhook.
     def send_payment_webhook
-      Rails.logger.warn "[DefraRubyMocks] [send_payment_webhook] " \
-                        "params: #{params[:govpay_id]}, status #{params[:payment_status]}"
+      Rails.logger.warn "[DefraRubyMocks] [send_payment_webhook] #{params.slice(:govpay_payment_id,
+                                                                                :govpay_payment_payment_status)}"
 
-      %w[govpay_id payment_status callback_url signing_secret].each do |p|
+      %w[govpay_payment_id govpay_payment_status callback_url signing_secret].each do |p|
         raise StandardError, "Missing parameter: '#{p}'" unless params[p].present?
       end
 
       SendPaymentWebhookJob.perform_later(
-        govpay_id: params[:govpay_id],
-        status: params[:payment_status],
+        govpay_payment_id: params[:govpay_payment_id],
+        govpay_payment_status: params[:govpay_payment_status],
         callback_url: params[:callback_url],
         signing_secret: params[:signing_secret]
       )
@@ -44,16 +44,17 @@ module DefraRubyMocks
 
     # This schedules a job to send a mock refund webhook.
     def send_refund_webhook
-      Rails.logger.warn "[DefraRubyMocks] [send_refund webhook] " \
-                        "params: #{params[:govpay_id]}, status #{params[:refund_status]}"
+      Rails.logger.warn "[DefraRubyMocks] [send_refund webhook] #{params.slice(:govpay_refund_id, :govpay_payment_id,
+                                                                               :govpay_refund_status)}"
 
-      %w[govpay_id refund_status callback_url signing_secret].each do |p|
+      %w[govpay_payment_id govpay_refund_id govpay_refund_status callback_url signing_secret].each do |p|
         raise StandardError, "Missing parameter: '#{p}'" unless params[p].present?
       end
 
       SendRefundWebhookJob.perform_later(
-        govpay_id: params[:govpay_id],
-        status: params[:refund_status],
+        govpay_payment_id: params[:govpay_payment_id],
+        govpay_refund_id: params[:govpay_refund_id],
+        govpay_refund_status: params[:govpay_refund_status],
         callback_url: params[:callback_url],
         signing_secret: params[:signing_secret]
       )

data/app/jobs/base_send_webhook_job.rb

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
 
 class BaseSendWebhookJob < ApplicationJob
-  def perform(govpay_id:, status:, callback_url:, signing_secret:)
-    body = webhook_body(govpay_id:, status:)
-    Rails.logger.warn "[DefraRubyMocks] [BaseSendWebhookJob] sending #{webhook_type} webhook " \
-                      "for #{govpay_id}, status \"#{status}\" to #{callback_url}"
+  attr_accessor :govpay_payment_id, :callback_url, :signing_secret
+
+  def post_callback
+    body = webhook_body
+
     RestClient::Request.execute(
       method: :post,
       url: callback_url,
-      payload: body.to_json,
-      headers: { "Pay-Signature": webhook_signature(body, signing_secret) }
+      headers: { "Pay-Signature": webhook_signature(body, signing_secret) },
+      payload: body.to_json
     )
   rescue StandardError => e
     Rails.logger.error "[DefraRubyMocks] [BaseSendWebhookJob] error sending  " \
@@ -22,7 +23,7 @@ class BaseSendWebhookJob < ApplicationJob
     raise NotImplementedError
   end
 
-  def webhook_body(govpay_id:, status:)
+  def webhook_body
     raise NotImplementedError
   end
 

data/app/jobs/send_payment_webhook_job.rb

@@ -1,6 +1,19 @@
 # frozen_string_literal: true
 
 class SendPaymentWebhookJob < BaseSendWebhookJob
+  attr_accessor :govpay_payment_status
+
+  def perform(govpay_payment_id:, govpay_payment_status:, callback_url:, signing_secret:)
+    @govpay_payment_id = govpay_payment_id
+    @govpay_payment_status = govpay_payment_status
+    @callback_url = callback_url
+    @signing_secret = signing_secret
+
+    Rails.logger.warn "[DefraRubyMocks] [SendPaymentWebhookJob] sending #{webhook_type} webhook " \
+                      "for #{govpay_payment_id}, status \"#{govpay_payment_status}\" to #{callback_url}"
+
+    post_callback
+  end
 
   private
 
@@ -8,11 +21,11 @@ class SendPaymentWebhookJob < BaseSendWebhookJob
     "payment"
   end
 
-  def webhook_body(govpay_id:, status:)
+  def webhook_body
     webhook_body ||= JSON.parse(File.read("lib/fixtures/files/govpay/webhook_payment_update_body.json"))
 
-    webhook_body["resource"]["payment_id"] = govpay_id
-    webhook_body["resource"]["state"]["status"] = status
+    webhook_body["resource"]["payment_id"] = govpay_payment_id
+    webhook_body["resource"]["state"]["status"] = govpay_payment_status
 
     webhook_body
   end

data/app/jobs/send_refund_webhook_job.rb

@@ -1,6 +1,21 @@
 # frozen_string_literal: true
 
 class SendRefundWebhookJob < BaseSendWebhookJob
+  attr_accessor :govpay_refund_id, :govpay_refund_status
+
+  def perform(govpay_payment_id:, govpay_refund_id:, govpay_refund_status:, callback_url:, signing_secret:)
+    @govpay_payment_id = govpay_payment_id
+    @govpay_refund_status = govpay_refund_status
+    @govpay_refund_id = govpay_refund_id
+    @callback_url = callback_url
+    @signing_secret = signing_secret
+
+    Rails.logger.warn "[DefraRubyMocks] [SendRefundWebhookJob] sending #{webhook_type} webhook " \
+                      "for payment #{govpay_payment_id}, refund #{govpay_refund_id}, status  " \
+                      "\"#{govpay_refund_status}\" to #{callback_url}"
+
+    post_callback
+  end
 
   private
 
@@ -8,11 +23,12 @@ class SendRefundWebhookJob < BaseSendWebhookJob
     "refund"
   end
 
-  def webhook_body(govpay_id:, status:)
+  def webhook_body
     webhook_body ||= JSON.parse(File.read("lib/fixtures/files/govpay/webhook_refund_update_body.json"))
 
-    webhook_body["refund_id"] = govpay_id
-    webhook_body["status"] = status
+    webhook_body["refund_id"] = govpay_refund_id
+    webhook_body["payment_id"] = govpay_payment_id
+    webhook_body["status"] = govpay_refund_status
 
     webhook_body
   end

data/config/routes.rb

@@ -47,12 +47,12 @@ DefraRubyMocks::Engine.routes.draw do # rubocop:disable Metrics/BlockLength
       as: "govpay_set_test_refund_response_status",
       constraints: ->(_request) { DefraRubyMocks.configuration.enabled? }
 
-  post "/govpay/v1/payments/:govpay_id/send_payment_webhook",
+  post "/govpay/v1/payments/send_payment_webhook",
        to: "govpay_test_helpers#send_payment_webhook",
        as: "send_payment_webhook",
        constraints: ->(_request) { DefraRubyMocks.configuration.enabled? }
 
-  post "/govpay/v1/payments/:govpay_id/send_refund_webhook",
+  post "/govpay/v1/payments/send_refund_webhook",
        to: "govpay_test_helpers#send_refund_webhook",
        as: "send_refund_webhook",
        constraints: ->(_request) { DefraRubyMocks.configuration.enabled? }

data/lib/defra_ruby_mocks/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DefraRubyMocks
-  VERSION = "5.2.0"
+  VERSION = "5.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: defra_ruby_mocks
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Defra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-11 00:00:00.000000000 Z
+date: 2025-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails