solidus_bactracs 3.1.2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57358a842b15f8f01b4ef06b6e665d3da2d1e71c2cb9d0c963a53cf790329431
-  data.tar.gz: 50ec2b26961894f93f194047564ffc09df92337fcbcc2ef924d241dda879bb84
+  metadata.gz: e67ac9974b0c0fb6e097172f14667e73c99c5d4ccd948423e48dcdd5820becde
+  data.tar.gz: a7fb4b01e858278ab263373d087aa5a4c63222f9389d2f2a8087566e50f42270
 SHA512:
-  metadata.gz: 61b6d5945b5bea4a67e85b44bb2cd719740466d0737599d1e77bb4aad035ce488e7cbb0df89ddedf1307d958dff901f01d0c9f66bb2006d4df06deb62836473e
-  data.tar.gz: 9db512ac8470045e746d5afada89e2634845d175c4bbb45aca29cb6196d8199c5e65aeef0123cd0e5b75e1cfb6b483cbc0e186143e26fedfc5ceadb81b19089d
+  metadata.gz: d6232847569c2a6166959fcfdd3791597d8e32aaa71f68def3d4eff77b8b8269857c0973143f5c8af3b33cf47ffcd326b209a43f8c36d6ae07c0542db3255205
+  data.tar.gz: d61675ac31273aa2751b300350d3b3b20ce8d4c23c62c39192a9a90c489762c4d6ff5179abefbcb53ce17031c4f9a68c976663599b49194078a3857d49cf6116

data/app/jobs/solidus_bactracs/api/schedule_shipment_syncs_job.rb

@@ -21,16 +21,17 @@ module SolidusBactracs
       end
 
       def query_shipments
-        shipments = SolidusBactracs::Shipment::PendingApiSyncQuery.apply(
-          ::Spree::Shipment
+        shipments = SolidusBactracs::Shipment::PendingApiSyncQuery.apply(all_elegible_shipments)
+      end
+
+      def all_elegible_shipments(skus: SolidusBactracs.config.shippable_skus, state: :ready)
+        ::Spree::Shipment
             .joins(inventory_units: [:variant])
-            .where("spree_variants.sku" => SolidusBactracs.config.shippable_skus)
-            .where("spree_shipments.state" => :ready)
+            .where("spree_variants.sku" => skus)
+            .where("spree_shipments.state" => state)
             .where(bactracs_synced_at: nil)
             .distinct
-        )
       end
     end
   end
 end
-

data/lib/solidus_bactracs/api/request_runner.rb

@@ -13,18 +13,18 @@ module SolidusBactracs
         @retries  = SolidusBactracs.configuration.api_retries
       end
 
-      def authenticated_call(method: nil, path: nil, serializer: nil, shipment: nil, count: 0)
+      def authenticated_call(serializer: nil, shipment: nil, method: :post, path: '/webservices/rma/rmaservice.asmx', count: 0)
         if count <= @retries
           sguid = authenticate! rescue nil
 
           if !sguid.presence
             clear_cache
             count += 1
-            self.authenticated_call(method: :post, path: '/webservices/rma/rmaservice.asmx', serializer: serializer, shipment: shipment, count: count)
+            self.authenticated_call(method: method, path: path, serializer: serializer, shipment: shipment, count: count)
           else
             params = serializer.call(shipment, sguid)
 
-            rma_response = call(method: :post, path: path, params: params)
+            rma_response = call(method: method, path: path, params: params)
             if create_rma_success?(rma_response)
               Rails.logger.info({ event: 'success CreateRMA', rma: shipment.number, response: parse_rma_creation_response(rma_response, "Message")})
               shipment_synced(shipment)
@@ -35,11 +35,12 @@ module SolidusBactracs
               clear_cache
               count += 1
               Rails.logger.warn({ event: 'bactracs failed CreateRMA', error: parse_rma_creation_response(rma_response, "Message")})
-              self.authenticated_call(method: :post, path: '/webservices/rma/rmaservice.asmx', serializer: serializer, shipment: shipment, count: count)
+              self.authenticated_call(method: method, path: path, serializer: serializer, shipment: shipment, count: count)
             end
           end
         else
           shipment_sync_failed(shipment)
+          return false
         end
       end
 
@@ -77,7 +78,7 @@ module SolidusBactracs
         @response = nil
       end
 
-      def authenticate!()
+      def authenticate!
         unless @username.present? || @password.present? || @api_base.present?
           raise "Credentials not defined for Authentication"
         end
@@ -110,7 +111,7 @@ module SolidusBactracs
 
       def rma_exists?(response)
         if parse_rma_creation_response(response, "Message").match(/rma .* already exists/)
-          Rails.logger.warn({ event: 'bactracs failed CreateRMA', error: parse_rma_creation_response(rma_response, "Message")})
+          Rails.logger.warn({ event: 'bactracs failed CreateRMA', error: parse_rma_creation_response(response, "Message")})
           return true
         end
       end

data/lib/solidus_bactracs/console_harness.rb

@@ -0,0 +1,53 @@
+module SolidusBactracs
+  class ConsoleHarness
+    attr_reader :runner, :syncer, :sync, :shipments, :shipments_elegible
+
+    attr_accessor :cursor, :batch
+
+    def initialize
+      @runner = SolidusBactracs::Api::RequestRunner.new
+      @syncer = SolidusBactracs::Api::BatchSyncer.from_config
+      @sync = SolidusBactracs::Api::ScheduleShipmentSyncsJob.new
+      @shipments = SolidusBactracs::Api::ScheduleShipmentSyncsJob.new.query_shipments
+      @shipments_elegible = SolidusBactracs::Api::ScheduleShipmentSyncsJob.new.all_elegible_shipments
+      @cursor = 0
+      @batch = 4
+    end
+
+    def refresh
+      @shipments = SolidusBactracs::Api::ScheduleShipmentSyncsJob.new.query_shipments
+    end
+
+    def shipment(id)
+      @shipments.find_by(id: id)
+    end
+
+    def shipment_number(ship_number)
+      @shipments.find_by(number: ship_number)
+    end
+
+    def serialize(shipment)
+      # SolidusShipstation::Api::ApplianceShipmentSerializer.new(shipment)
+      @syncer.client.shipment_serializer.call(shipment, @runner.authenticate!)
+    end
+
+    def try_one
+      puts "trying shipment #{(shipment = @shipments[@cursor]).id}"
+      # resp = @runner.call(:post, '/orders/createorders', [serialize(shipment)])
+      resp = @runner.authenticated_call(shipment: shipment, serializer: @syncer.client.shipment_serializer)
+      if resp
+        @cursor += 1
+        return resp
+      end
+    ensure
+      puts resp
+    end
+
+    def try_batch(batch_size=nil)
+      b = [batch_size.to_i, @batch].max
+      b.times do
+        break unless try_one
+      end
+    end
+  end
+end

data/lib/solidus_bactracs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusBactracs
-  VERSION = '3.1.2'
+  VERSION = '3.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bactracs
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.2.0
 platform: ruby
 authors:
 - Zeryab Ali
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-26 00:00:00.000000000 Z
+date: 2022-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -171,7 +171,6 @@ files:
 - lib/bactracs_service.rb
 - lib/generators/solidus_bactracs/install/install_generator.rb
 - lib/generators/solidus_bactracs/install/templates/initializer.rb
-- lib/solidus_backtracs/version.rb
 - lib/solidus_bactracs.rb
 - lib/solidus_bactracs/api/batch_syncer.rb
 - lib/solidus_bactracs/api/client.rb
@@ -181,6 +180,7 @@ files:
 - lib/solidus_bactracs/api/shipment_serializer.rb
 - lib/solidus_bactracs/api/threshold_verifier.rb
 - lib/solidus_bactracs/configuration.rb
+- lib/solidus_bactracs/console_harness.rb
 - lib/solidus_bactracs/engine.rb
 - lib/solidus_bactracs/errors.rb
 - lib/solidus_bactracs/shipment_notice.rb

data/lib/solidus_backtracs/version.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-module SolidusBacktracs
-  VERSION = '3.1.0'
-end