diff --git a/app/jobs/solidus_bactracs/api/sync_shipments_job.rb b/app/jobs/solidus_bactracs/api/sync_shipments_job.rb index 6d5e358..756170c 100644 --- a/app/jobs/solidus_bactracs/api/sync_shipments_job.rb +++ b/app/jobs/solidus_bactracs/api/sync_shipments_job.rb @@ -30,10 +30,7 @@ def select_shipments(shipments) if ThresholdVerifier.call(shipment) true else - ::Spree::Event.fire( - 'solidus_bactracs.api.sync_skipped', - shipment: shipment, - ) + ::Spree::Bus.publish(:'solidus_bactracs.api.sync_skipped', shipment: shipment) false end diff --git a/lib/solidus_bactracs/api/batch_syncer.rb b/lib/solidus_bactracs/api/batch_syncer.rb index 6150916..ffb71b7 100644 --- a/lib/solidus_bactracs/api/batch_syncer.rb +++ b/lib/solidus_bactracs/api/batch_syncer.rb @@ -23,19 +23,11 @@ def call(shipments) begin response = client.bulk_create_orders(shipments) rescue RateLimitedError => e - ::Spree::Event.fire( - 'solidus_bactracs.api.rate_limited', - shipments: shipments, - error: e, - ) + ::Spree::Bus.publish(:'solidus_bactracs.api.rate_limited', shipments: shipments, error: e) raise e rescue RequestError => e - ::Spree::Event.fire( - 'solidus_bactracs.api.sync_errored', - shipments: shipments, - error: e, - ) + ::Spree::Bus.publish(:'solidus_bactracs.api.sync_errored', shipments: shipments, error: e) raise e end diff --git a/lib/solidus_bactracs/api/request_runner.rb b/lib/solidus_bactracs/api/request_runner.rb index 0e0f56a..8bc9981 100644 --- a/lib/solidus_bactracs/api/request_runner.rb +++ b/lib/solidus_bactracs/api/request_runner.rb @@ -127,17 +127,11 @@ def rma_fail?(response) def shipment_synced(shipment) shipment.update_attribute(:bactracs_synced_at, Time.zone.now) - ::Spree::Event.fire( - 'solidus_bactracs.api.sync_completed', - shipment: shipment - ) + ::Spree::Bus.publish(:'solidus_bactracs.api.sync_completed', shipment: shipment) end def shipment_sync_failed(shipment) - ::Spree::Event.fire( - 'solidus_bactracs.api.sync_failed', - shipment: shipment - ) + ::Spree::Bus.publish(:'solidus_bactracs.api.sync_failed', shipment:) end end end