spree_vpago 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2271ef4085b1b2500020ecd39827f0f541aa3be1ad309c6e7c543886a96f187a
-  data.tar.gz: a27992641ba3daa6c8d2edc6f001ea44b0ee9ba02ec1f68f07a548375bf20d10
+  metadata.gz: c798525a2a23d0f61689431f2e4c630a6a947ce683339fa416f38d1a457cc403
+  data.tar.gz: 35f0e6cf960e666fcf1a25afe8afc32bf8c91e680dd35e9d5fcf2da3f4e644ef
 SHA512:
-  metadata.gz: 886dba98f702d241f54ab46992ed61881f5ecc13a2577bc780cbdd4cfc21fc8e48b683578d9596215cb1a260d070e8b55e079627964be17a9b026a8bcce80274
-  data.tar.gz: d47511e24d645ff2d71ebc24b9f784525716466956b415f72bbc494803ffde5e8edc13ae5c3cba526b79c15669cae34b31367066e2a181cab0072568f5ba06a5
+  metadata.gz: 0152b17d28c14ae4204bfafb6f80799fb1118e2354155de84de3f0f1431e61778c085a3ee378f1f55c5f30def318f5e96570d4c756a7e48e6f07616a98461e35
+  data.tar.gz: 76b6bd5ab261e6497b89288ded4fac0a9fe28e61116a139db5c67da8a960f26ccea6e1f679f199e9c168ec13cb28d45b166a723a628f7a2c0148fa24d129f629

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.2.0)
+    spree_vpago (2.2.1)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)

data/app/controllers/spree/vpago_payments_controller.rb

@@ -102,9 +102,9 @@ module Spree
     end
 
     def log_enqueue_start(payment, enqueued_at, return_params = {})
-      Rails.logger.info(
-        {
-          event: 'vpago.payment_processor_job.enqueue',
+      VpagoLogger.log(
+        event: 'vpago.payment_processor_job.enqueue',
+        data: {
           payment_number: payment.number,
           order_number: payment.order&.number,
           request_id: request.request_id,
@@ -118,9 +118,9 @@ module Spree
     end
 
     def log_enqueue_error(error)
-      Rails.logger.error(
-        {
-          event: 'vpago.payment_processor_job.enqueue.error',
+      VpagoLogger.error(
+        event: 'vpago.payment_processor_job.enqueue.error',
+        data: {
           request_id: request.request_id,
           payment_number: @payment&.number,
           error_class: error.class.name,

data/app/controllers/spree/webhook/payways_controller.rb

@@ -50,9 +50,7 @@ module Spree
         order = payment.order
         order.reload
 
-        ok = order.paid? || payment.pending?
-
-        if ok
+        if order.paid? || payment.pending?
           render plain: :success
         else
           render plain: :failed, status: 400

data/app/jobs/vpago/payment_processor_job.rb

@@ -6,49 +6,66 @@ module Vpago
     queue_as :payment_processing
 
     def perform(options)
-      started_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-
+      started_at = Vpago::TimingHelper.current_time
       enqueued_at = options[:enqueued_at]
-      queue_wait_ms = if enqueued_at
-                        ((Time.now.to_f - enqueued_at.to_f) * 1000.0).round(1)
-                      end
-
-      Rails.logger.info(
-        {
-          event: 'vpago.payment_processor_job.start',
-          payment_number: options[:payment_number],
+      queue_wait_ms = calculate_queue_wait_ms(enqueued_at)
+
+      log_job_start(options[:payment_number], queue_wait_ms)
+
+      payment = Spree::Payment.find_by!(number: options[:payment_number])
+      Vpago::PaymentProcessor.new(payment: payment).call
+
+      log_job_finish(options[:payment_number], queue_wait_ms, started_at)
+    rescue StandardError => e
+      log_job_error(options[:payment_number], queue_wait_ms, started_at, e)
+      raise
+    end
+
+    private
+
+    def calculate_queue_wait_ms(enqueued_at)
+      return nil unless enqueued_at
+
+      ((Time.now.to_f - enqueued_at.to_f) * 1000.0).round(1)
+    end
+
+    def log_job_start(payment_number, queue_wait_ms)
+      VpagoLogger.log(
+        event: 'vpago.payment_processor_job.start',
+        data: {
+          payment_number: payment_number,
           queue: self.class.queue_name,
           queue_wait_ms: queue_wait_ms
         }
       )
+    end
 
-      payment = Spree::Payment.find_by!(number: options[:payment_number])
-      Vpago::PaymentProcessor.new(payment: payment).call
-
+    def log_job_finish(payment_number, queue_wait_ms, started_at)
       runtime_ms = Vpago::TimingHelper.elapsed_ms(started_at)
-      Rails.logger.info(
-        {
-          event: 'vpago.payment_processor_job.finish',
-          payment_number: options[:payment_number],
+      VpagoLogger.log(
+        event: 'vpago.payment_processor_job.finish',
+        data: {
+          payment_number: payment_number,
           queue: self.class.queue_name,
           queue_wait_ms: queue_wait_ms,
           runtime_ms: runtime_ms
         }
       )
-    rescue StandardError => e
+    end
+
+    def log_job_error(payment_number, queue_wait_ms, started_at, error)
       runtime_ms = Vpago::TimingHelper.elapsed_ms(started_at)
-      Rails.logger.error(
-        {
-          event: 'vpago.payment_processor_job.error',
-          payment_number: options[:payment_number],
+      VpagoLogger.error(
+        event: 'vpago.payment_processor_job.error',
+        data: {
+          payment_number: payment_number,
           queue: self.class.queue_name,
           queue_wait_ms: queue_wait_ms,
           runtime_ms: runtime_ms,
-          error_class: e.class.name,
-          error_message: e.message
+          error_class: error.class.name,
+          error_message: error.message
         }
       )
-      raise
     end
   end
 end

data/app/lib/vpago/timing_helper.rb

@@ -1,5 +1,12 @@
 module Vpago
   module TimingHelper
+    # Gets the current monotonic timestamp.
+    #
+    # @return [Float] current timestamp from Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    def self.current_time
+      Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    end
+
     # Measures elapsed time in milliseconds from a given start timestamp.
     #
     # @param started_at [Float] timestamp from Process.clock_gettime(Process::CLOCK_MONOTONIC)

data/lib/spree_vpago/version.rb

@@ -1,7 +1,7 @@
 module SpreeVpago
   module_function
 
-  VERSION = '2.2.0'.freeze
+  VERSION = '2.2.1'.freeze
 
   def version
     Gem::Version.new VERSION

data/lib/vpago_logger.rb

@@ -0,0 +1,21 @@
+module VpagoLogger
+  def self.log(event:, data: nil)
+    message = { event: event }
+    message.merge!(data) if data
+
+    Rails.logger.info(message.to_json)
+    message
+  rescue StandardError
+    message
+  end
+
+  def self.error(event:, data: nil)
+    message = { event: event }
+    message.merge!(data) if data
+
+    Rails.logger.error(message.to_json)
+    message
+  rescue StandardError
+    message
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - You
@@ -419,6 +419,7 @@ files:
 - lib/vpago/wing_sdk/payment_retriever.rb
 - lib/vpago/wing_sdk/transaction_status_checker.rb
 - lib/vpago/wing_sdk/transaction_status_response.rb
+- lib/vpago_logger.rb
 - node_modules/.yarn-integrity
 - package-lock.json
 - package.json