From 31738ceb494ea0fd6cf998f2780aabd0af8bb841 Mon Sep 17 00:00:00 2001
From: Andy Brett <andy@andybrett.com>
Date: Fri, 28 May 2021 12:34:44 -0700
Subject: [PATCH] rename and consolidate authorization? methods

---
 app/controllers/spree/admin/payments_controller.rb          | 2 +-
 app/models/spree/credit_card.rb                             | 4 ++--
 app/models/spree/payment.rb                                 | 2 +-
 app/models/spree/payment/processing.rb                      | 6 +-----
 app/queries/payments_requiring_action.rb                    | 2 +-
 app/serializers/api/admin/order_serializer.rb               | 2 +-
 .../order_management/order/send_authorization_emails.rb     | 2 +-
 7 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/controllers/spree/admin/payments_controller.rb b/app/controllers/spree/admin/payments_controller.rb
index 284830ecf0..cd1f3a7b38 100644
--- a/app/controllers/spree/admin/payments_controller.rb
+++ b/app/controllers/spree/admin/payments_controller.rb
@@ -177,7 +177,7 @@ module Spree
 
         raise Spree::Core::GatewayError, I18n.t('authorization_failure') unless @payment.pending?
 
-        return unless @payment.authorization_action_required?
+        return unless @payment.requires_authorization?
 
         PaymentMailer.authorize_payment(@payment).deliver_later
         raise Spree::Core::GatewayError, I18n.t('action_required')
diff --git a/app/models/spree/credit_card.rb b/app/models/spree/credit_card.rb
index 54872b0360..cd8ed315cd 100644
--- a/app/models/spree/credit_card.rb
+++ b/app/models/spree/credit_card.rb
@@ -83,12 +83,12 @@ module Spree
     end
 
     def can_resend_authorization_email?(payment)
-      payment.pending? && payment.authorization_action_required?
+      payment.pending? && payment.requires_authorization?
     end
 
     # Indicates whether its possible to capture the payment
     def can_capture?(payment)
-      return false if payment.authorization_action_required?
+      return false if payment.requires_authorization?
 
       payment.pending? || payment.checkout?
     end
diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index 7668ec3d22..fe075077f0 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -127,7 +127,7 @@ module Spree
     end
 
     def resend_authorization_email!
-      return unless authorization_action_required?
+      return unless requires_authorization?
 
       PaymentMailer.authorize_payment(self).deliver_later
     end
diff --git a/app/models/spree/payment/processing.rb b/app/models/spree/payment/processing.rb
index 2a2d976377..c66cda21b7 100644
--- a/app/models/spree/payment/processing.rb
+++ b/app/models/spree/payment/processing.rb
@@ -11,7 +11,7 @@ module Spree
 
       def process_offline!
         return unless validate!
-        return if authorization_action_required?
+        return if requires_authorization?
 
         if preauthorized?
           capture!
@@ -182,10 +182,6 @@ module Spree
         options
       end
 
-      def authorization_action_required?
-        cvv_response_message.present?
-      end
-
       private
 
       def preauthorized?
diff --git a/app/queries/payments_requiring_action.rb b/app/queries/payments_requiring_action.rb
index f8cc1bc2bc..ffe705e955 100644
--- a/app/queries/payments_requiring_action.rb
+++ b/app/queries/payments_requiring_action.rb
@@ -7,7 +7,7 @@ class PaymentsRequiringAction
 
   def query
     Spree::Payment.joins(:order).where("spree_orders.user_id = ?", user.id).
-      authorization_action_required
+      requires_authorization
   end
 
   private
diff --git a/app/serializers/api/admin/order_serializer.rb b/app/serializers/api/admin/order_serializer.rb
index d3ebe81bba..7dea1a8963 100644
--- a/app/serializers/api/admin/order_serializer.rb
+++ b/app/serializers/api/admin/order_serializer.rb
@@ -41,7 +41,7 @@ module Api
       # This methods requires to eager load the payment association (with its required WHERE
       # constraints) so as not to cause and N+1.
       def ready_to_capture
-        pending_payments = object.pending_payments.reject(&:authorization_action_required?)
+        pending_payments = object.pending_payments.reject(&:requires_authorization?)
         object.payment_required? && pending_payments.any?
       end
 
diff --git a/engines/order_management/app/services/order_management/order/send_authorization_emails.rb b/engines/order_management/app/services/order_management/order/send_authorization_emails.rb
index 8e4d78fe49..5b4fc46924 100644
--- a/engines/order_management/app/services/order_management/order/send_authorization_emails.rb
+++ b/engines/order_management/app/services/order_management/order/send_authorization_emails.rb
@@ -6,7 +6,7 @@ module OrderManagement
       def call!(redirect_url = full_order_path(@order))
         super(redirect_url)
 
-        return unless @payment.authorization_action_required?
+        return unless @payment.requires_authorization?
 
         PaymentMailer.authorize_payment(@payment).deliver_now
         PaymentMailer.authorization_required(@payment).deliver_now