effective_orders 6.19.1 → 6.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe4877e8b611ca4cf5aae18c2f43d0e62a6dc333e76634c74d098efe952199b6
-  data.tar.gz: 7fdb4b4fda03ea47a941a032ee320fff2a6f432fd452e596bb2cfae40ed04569
+  metadata.gz: 73f7c7e5f31c361565954b31a82a278a0c5127829cbd24be06b4c307205c5f74
+  data.tar.gz: d7821ca6b2a5e7a9b22c9e5d67c69a6a22f49a6c7211b88961b6cb42a8f7698a
 SHA512:
-  metadata.gz: 35d1d862fc154790c9e03ab1e01cd679340ae2c6da181cb26c6206fbaa6d6e3d1788e2b98516ba204e4e575ad98b12331ce81db0c41f5883fab3ca6ce99d1c70
-  data.tar.gz: 468b756bce436cacd7e9132d126edff379f61991dc984cc1ac140dec93750459caa379aedd184c9c5f846770d2566ecf16639c0f2980baa7557acf8746e72c63
+  metadata.gz: '0967f05a59940c88a2b1ea47a8125c3501a9e1a0e1497fd5280fe4542f74b7bea94253fb72fd192adf32f6df958cfbc5179231d5c3d1351f0bf41bbc7ce49b1d'
+  data.tar.gz: 950b3b66593162a86e80a69dcea163415a0a7f1d1c0496dd3deeb886d8d1be7d9fb575fd3db334f8ab3e73662a8e9d3c3c2d8ec2d1fafd35fd49946a9dbf88ba

data/app/models/effective/deluxe_api.rb

@@ -14,6 +14,7 @@ module Effective
     attr_accessor :currency
 
     attr_accessor :purchase_response
+    attr_accessor :read_timeout
 
     def initialize(environment: nil, client_id: nil, client_secret: nil, access_token: nil, currency: nil)
       self.environment = environment || EffectiveOrders.deluxe.fetch(:environment)
@@ -125,52 +126,133 @@ module Effective
       purchase_response
     end
 
+    def payment_approved?(order)
+      payment = search_payment(order)
+      return false if payment.blank?
+
+      payment.dig('payment', 'responseCode').present? && payment.dig('payment', 'authResponse').to_s.downcase.include?('approved')
+    end
+
+    # Search for an existing Payment
+    def search_payment(order)
+      date = (order.delayed_payment_purchase_ran_at || order.purchased_at || order.created_at || Time.zone.now)
+      response = post('/payments/search', params: { orderId: order.to_param, startDate: date.strftime('%m/%d/%Y'), endDate: (date + 1.day).strftime('%m/%d/%Y') })
+
+      # Sanity check response
+      raise('expected valid search') unless response.kind_of?(Hash) && response['isSuccess'] == true
+
+      # Find the payment for this order
+      payment = Array(response.dig('data', 'payments')).find { |payment| payment.dig('payment', 'orderId') == order.to_param }
+      return unless payment.present?
+
+      # Return the payment hash
+      payment
+    end
+
+    def purchase_delayed_order!(order)
+      raise('expected a delayed order') unless order.delayed?
+      raise('expected a deferred order') unless order.deferred?
+      raise('expected delayed payment intent') unless order.delayed_payment_intent.present?
+      raise('expected a delayed_ready_to_purchase? order') unless order.delayed_ready_to_purchase?
+
+      order.update_columns(delayed_payment_purchase_ran_at: Time.zone.now, delayed_payment_purchase_result: nil)
+
+      purchased = if order.total.to_i > 0
+        purchase!(order, order.delayed_payment_intent)
+      elsif order.free?
+        purchase_free!(order)
+      else
+        raise("Unexpected order amount: #{order.total}")
+      end
+
+      provider = (order.free? ? 'free' : order.payment_provider)
+      payment = self.payment()
+      card = payment["card"] || payment[:card]
+
+      if purchased
+        order.assign_attributes(delayed_payment_purchase_result: "success")
+        order.purchase!(payment: payment, provider: provider, card: card, email: true, skip_buyer_validations: true)
+
+        puts "Successfully purchased order #{order.id}"
+      else
+        order.assign_attributes(delayed_payment_purchase_result: "failed: #{Array(payment['responseMessage']).to_sentence.presence || 'none'}")
+        order.decline!(payment: payment, provider: provider, card: card, email: true)
+
+        puts "Failed to purchase order #{order.id} #{order.delayed_payment_purchase_result}"
+      end
+
+      purchased
+    end
+
+    def retry_purchase_delayed_order!(order)
+      raise('expected a delayed order') unless order.delayed?
+      raise('expected a deferred order') unless order.deferred?
+      raise('expected delayed payment intent') unless order.delayed_payment_intent.present?
+      raise('expected an order with a positive total') unless order.total.to_i > 0
+
+      order.update_columns(delayed_payment_purchase_ran_at: Time.zone.now, delayed_payment_purchase_result: nil)
+
+      # Look up the existing payment on Deluxe API
+      existing_payment = search_payment(order)
+      existing_purchased = existing_payment.present? && existing_payment.dig('payment', 'responseCode').present? && existing_payment.dig('payment', 'authResponse').to_s.downcase.include?('approved')
+
+      # If it doesn't exist, purchase it now
+      purchased = (existing_purchased || purchase!(order, order.delayed_payment_intent))
+
+      # Payment
+      provider = order.payment_provider
+      payment = (existing_payment if existing_purchased) || self.payment()
+      card = payment.dig('payment', 'card', 'cardType') || payment.dig('payment', 'card') || payment['card'] || payment[:card]
+
+      if purchased
+        order.assign_attributes(delayed_payment_purchase_result: "success")
+        order.purchase!(payment: payment, provider: provider, card: card, email: true, skip_buyer_validations: true)
+
+        puts "Successfully purchased order #{order.id}"
+      else
+        order.assign_attributes(delayed_payment_purchase_result: "failed: #{Array(payment['responseMessage']).to_sentence.presence || 'none'}")
+        order.decline!(payment: payment, provider: provider, card: card, email: true)
+
+        puts "Failed to purchase order #{order.id} #{order.delayed_payment_purchase_result}"
+      end
+
+      purchased
+    end
+
     # Called by rake task
     def purchase_delayed_orders!(orders)
-      now = Time.zone.now
+      # Orders that failed to purchase and need to be retried
+      retry_orders = []
 
+      # First pass over all the orders
       Array(orders).each do |order|
         puts "Trying order #{order.id}"
 
         begin
-          raise('expected a delayed order') unless order.delayed?
-          raise('expected a deferred order') unless order.deferred?
-          raise('expected delayed payment intent') unless order.delayed_payment_intent.present?
-          raise('expected a delayed_ready_to_purchase? order') unless order.delayed_ready_to_purchase?
-
-          order.update_columns(delayed_payment_purchase_ran_at: now, delayed_payment_purchase_result: nil)
-
-          purchased = if order.total.to_i > 0
-            purchase!(order, order.delayed_payment_intent)
-          elsif order.free?
-            purchase_free!(order)
-          else
-            raise("Unexpected order amount: #{order.total}")
-          end
-
-          provider = (order.free? ? 'free' : order.payment_provider)
-          payment = self.payment()
-          card = payment["card"] || payment[:card]
+          purchase_delayed_order!(order)
+        rescue => e
+          order.update_columns(delayed_payment_purchase_ran_at: Time.zone.now, delayed_payment_purchase_result: "error: #{e.message}")
+          retry_orders << order
 
-          if purchased
-            order.assign_attributes(delayed_payment_purchase_result: "success")
-            order.purchase!(payment: payment, provider: provider, card: card, email: true, skip_buyer_validations: true)
+          puts "Error purchasing #{order.id}: #{e.message}"
+        end
+      end
 
-            puts "Successfully purchased order #{order.id}"
-          else
-            order.assign_attributes(delayed_payment_purchase_result: "failed with message: #{Array(payment['responseMessage']).to_sentence.presence || 'none'}")
-            order.decline!(payment: payment, provider: provider, card: card, email: true)
+      # Second pass over all the orders that raised an error on call to purchase
+      orders = Effective::Order.where(id: retry_orders.map(&:id))
 
-            puts "Failed to purchase order #{order.id} #{order.delayed_payment_purchase_result}"
-          end
+      Array(orders).each do |order|
+        puts "Retrying order #{order.id}"
 
+        begin
+          retry_purchase_delayed_order!(order)
         rescue => e
-          order.update_columns(delayed_payment_purchase_ran_at: now, delayed_payment_purchase_result: "error: #{e.message}")
+          order.update_columns(delayed_payment_purchase_ran_at: Time.zone.now, delayed_payment_purchase_result: "error: #{e.message}")
 
           EffectiveLogger.error(e.message, associated: order) if defined?(EffectiveLogger)
           ExceptionNotifier.notify_exception(e, data: { order_id: order.id }) if defined?(ExceptionNotifier)
 
-          puts "Error purchasing #{order.id}: #{e.message}"
+          puts "Error retry purchasing #{order.id}: #{e.message}"
 
           raise(e) if Rails.env.development? || Rails.env.test?
         end
@@ -260,7 +342,7 @@ module Effective
 
       orderData = {
         autoGenerateOrderId: true,
-        orderID: order.to_param,
+        orderId: order.to_param,
         orderIdIsUnique: true
       }
 
@@ -282,7 +364,7 @@ module Effective
       uri = URI.parse(api_url + endpoint + query.to_s)
 
       http = Net::HTTP.new(uri.host, uri.port)
-      http.read_timeout = 10
+      http.read_timeout = (read_timeout || 30)
       http.use_ssl = true
 
       result = with_retries do
@@ -301,19 +383,15 @@ module Effective
       uri = URI.parse(api_url + endpoint)
 
       http = Net::HTTP.new(uri.host, uri.port)
-      http.read_timeout = 10
+      http.read_timeout = (read_timeout || 30)
       http.use_ssl = true
 
-      result = with_retries do
-        puts "[POST] #{uri} #{params}" if Rails.env.development?
+      puts "[POST] #{uri} #{params}" if Rails.env.development?
 
-        response = http.post(uri.path, params.to_json, headers)
-        raise Exception.new("#{response.code} #{response.body}") unless response.code == '200'
+      response = http.post(uri.path, params.to_json, headers)
+      raise Exception.new("#{response.code} #{response.body}") unless response.code == '200'
 
-        response
-      end
-
-      JSON.parse(result.body)
+      JSON.parse(response.body)
     end
 
     private

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.19.1'.freeze
+  VERSION = '6.19.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.19.1
+  version: 6.19.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-20 00:00:00.000000000 Z
+date: 2025-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails