defra_ruby_mocks 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c648dae3e678030c2d132615c0d148b673bedacde6d9d0e653dd2f20710fe4f9
-  data.tar.gz: '0948298e72ee7c2adb8e5cd98ff71eaf0f72de6fe9a9faf0aa0e6ae1e3699c3b'
+  metadata.gz: daca7a21c8e025f343ee8e118ce47db24bc156f01646d747b3eb69f779f8f47e
+  data.tar.gz: 7d4d39f87f9caae3bf194ff94eb5e952d841deb2f97928177e83b739158166a5
 SHA512:
-  metadata.gz: 1cdb1d9e9b0f434ef1b7bcc58de8f5ec79c07bb10621772cd705ef33bad0a66a7767b764df299a8b506af750b296429b814a5b4575385b66d08cf8f985853778
-  data.tar.gz: 4ca9a9935239757a5af2874392c85de2df9e9a1c93ee504610a8430b6179004de218b2ef9fb06ef20ffdc4e9edcc1f0d812d9ee14ed06a024ed14c46279dd50c
+  metadata.gz: b95c89f6d29270099b4d96c5b841de3cbe2f97648a44006bfa13f442e35ea8b191b2c436db0426854efefdc9c001b89686eb3db004ab16acb6854b2036b05f7a
+  data.tar.gz: de085b31d9767d688660ee45b6530cd139d9cb3d4a2a313c5aa170494d415dc88c308f794a7c60b2891a0da6d47c84ce838318455399fc37f6fbcef783f833f0

data/app/controllers/defra_ruby_mocks/govpay_controller.rb

@@ -8,17 +8,31 @@ module DefraRubyMocks
     def create_payment
       valid_create_params
 
-      # Enqueue the payment callback to run after the controller responds
-      DefraRubyMocks::GovpayPaymentCallbackJob.perform_later(params[:return_url])
+      store_return_url(params[:return_url])
 
       render json: GovpayCreatePaymentService.new.run(
-        amount: params[:amount], description: params[:description], return_url: params[:return_url]
+        amount: params[:amount], description: params[:description]
       )
     rescue StandardError => e
       Rails.logger.error("MOCKS: Govpay payment creation error: #{e.message}")
       head 500
     end
 
+    # This mocks the Govpay route which presents the payment details page to the user.
+    # We don't mock the actual payment details and payment confirmation pages - we go
+    # straight to the application callback route.
+    def next_url
+      response_url = retrieve_return_url
+      Rails.logger.warn "Govpay mock calling response URL #{response_url}"
+      redirect_to response_url
+      # RestClient::Request.execute(method: :GET, url: response_url)
+    rescue RestClient::ExceptionWithResponse => e
+      Rails.logger.warn "Govpay mock: RestClient received response: #{e}"
+    rescue StandardError => e
+      Rails.logger.error("Govpay mock: Error sending request to govpay: #{e}")
+      Airbrake.notify(e, message: "Error on govpay request")
+    end
+
     def payment_details
       valid_payment_id
       render json: GovpayGetPaymentService.new.run(payment_id: params[:payment_id])
@@ -44,6 +58,22 @@ module DefraRubyMocks
       head 500
     end
 
+    private
+
+    # We need to persist the return_url between the initial payment creation request and the execution of next_url
+    def return_url_filepath
+      "#{Dir.tmpdir}/last_return_url"
+    end
+
+    def store_return_url(return_url)
+      Rails.logger.warn ":::::: storing return_url #{return_url}"
+      File.write(return_url_filepath, return_url)
+    end
+
+    def retrieve_return_url
+      File.read(return_url_filepath)
+    end
+
     def valid_create_params
       params.require(%i[amount description return_url])
     end

data/app/services/defra_ruby_mocks/govpay_create_payment_service.rb

@@ -5,12 +5,12 @@ require "securerandom"
 module DefraRubyMocks
   class GovpayCreatePaymentService < BaseService
 
-    def run(amount:, description:, return_url:)
+    def run(amount:, description:)
       success_response.merge(
         {
           _links: {
             self: { href: "#{base_url}/#{payment_id}", method: "GET" },
-            next_url: { href: return_url, method: "GET" }
+            next_url: { href: "#{base_url}/secure/next-url-uuid-abc123", method: "GET" }
           },
           amount: amount.to_i,
           description: description,

data/config/routes.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-DefraRubyMocks::Engine.routes.draw do
+DefraRubyMocks::Engine.routes.draw do # rubocop:disable Metrics/BlockLength
   get "/company/:id",
       to: "company#show",
       as: "company",
@@ -16,6 +16,11 @@ DefraRubyMocks::Engine.routes.draw do
        as: "govpay_create_payment",
        constraints: ->(_request) { DefraRubyMocks.configuration.enabled? }
 
+  get "/govpay/v1/payments/secure/:uuid",
+      to: "govpay#next_url",
+      as: "govpay_next_url",
+      constraints: ->(_request) { DefraRubyMocks.configuration.enabled? }
+
   get "/govpay/v1/payments/:payment_id",
       to: "govpay#payment_details",
       as: "govpay_payment_details",

data/lib/defra_ruby_mocks/version.rb

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

data/lib/defra_ruby_mocks.rb

@@ -12,12 +12,6 @@ module DefraRubyMocks
     def configuration
       @configuration ||= Configuration.new
     end
-
-    # Added for testing. Without we cannot test both a config object with and
-    # with set values in the same rspec session
-    def reset_configuration
-      @configuration = nil
-    end
   end
 
   def self.configure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: defra_ruby_mocks
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Defra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-05 00:00:00.000000000 Z
+date: 2023-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,8 +66,6 @@ files:
 - app/controllers/defra_ruby_mocks/application_controller.rb
 - app/controllers/defra_ruby_mocks/company_controller.rb
 - app/controllers/defra_ruby_mocks/govpay_controller.rb
-- app/jobs/defra_ruby_mocks/application_job.rb
-- app/jobs/defra_ruby_mocks/govpay_payment_callback_job.rb
 - app/services/defra_ruby_mocks/base_service.rb
 - app/services/defra_ruby_mocks/companies_house_service.rb
 - app/services/defra_ruby_mocks/govpay_create_payment_service.rb

data/app/jobs/defra_ruby_mocks/application_job.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module DefraRubyMocks
-  class ApplicationJob < ActiveJob::Base
-  end
-end

data/app/jobs/defra_ruby_mocks/govpay_payment_callback_job.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module DefraRubyMocks
-  class GovpayPaymentCallbackJob < DefraRubyMocks::ApplicationJob
-    queue_as :default
-
-    def perform(*response_url)
-      Rails.logger.debug "GovpayPaymentCallbackJob calling response URL #{response_url}"
-      RestClient::Request.execute(method: :GET, url: response_url[0])
-    rescue RestClient::ExceptionWithResponse => e
-      Rails.logger.debug "GovpayPaymentCallbackJob: RestClient received response: #{e}"
-    rescue StandardError => e
-      Rails.logger.error("GovpayPaymentCallbackJob: Error sending request to govpay: #{e}")
-      Airbrake.notify(e, message: "Error on govpay request")
-    end
-  end
-end