Merge pull request #5787 from mamhoff/move-promotion-code-batch-services

Move promotion code batch services
solidusio · Jun 14, 2024 · 90d5770 · 90d5770
2 parents 20ddfc4 + d293d0d
commit 90d5770
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 11 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -90,7 +90,6 @@ Layout/EmptyLinesAroundAttributeAccessor:
     - "core/app/models/spree/address/state_validator.rb"
     - "core/app/models/spree/order_updater.rb"
     - "core/app/models/spree/promotion/order_adjustments_recalculator.rb"
-    - "core/app/models/spree/promotion_code/batch_builder.rb"
     - "core/app/models/spree/stock_quantities.rb"
     - "core/app/models/spree/variant.rb"
     - "core/lib/spree/app_configuration.rb"
@@ -311,7 +310,7 @@ Rails/ApplicationController:
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Rails/ApplicationJob:
   Exclude:
-    - "core/app/jobs/spree/promotion_code_batch_job.rb"
+    - "legacy_promotions/app/jobs/spree/promotion_code_batch_job.rb"
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).

diff --git a/core/app/models/spree/promotion_code_batch.rb b/core/app/models/spree/promotion_code_batch.rb
@@ -14,14 +14,5 @@ class CantProcessStartedBatch < StandardError
     def finished?
       state == "completed"
     end
-
-    def process
-      if state == "pending"
-        update!(state: "processing")
-        PromotionCodeBatchJob.perform_later(self)
-      else
-        raise CantProcessStartedBatch.new("Batch #{id} already started")
-      end
-    end
   end
 end
diff --git a/...s/app/decorators/solidus_legacy_promotions/models/spree_promotion_code_batch_decorator.rb b/...s/app/decorators/solidus_legacy_promotions/models/spree_promotion_code_batch_decorator.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module SolidusLegacyPromotions
+  module SpreePromotionCodeBatchDecorator
+    def process
+      if state == "pending"
+        update!(state: "processing")
+        Spree::PromotionCodeBatchJob.perform_later(self)
+      else
+        raise Spree::PromotionCodeBatch::CantProcessStartedBatch.new("Batch #{id} already started")
+      end
+    end
+
+    Spree::PromotionCodeBatch.prepend(self)
+  end
+end
diff --git a/...pp/jobs/spree/promotion_code_batch_job.rb → ...pp/jobs/spree/promotion_code_batch_job.rb b/...pp/jobs/spree/promotion_code_batch_job.rb → ...pp/jobs/spree/promotion_code_batch_job.rb
diff --git a/...lers/spree/promotion_code_batch_mailer.rb → ...lers/spree/promotion_code_batch_mailer.rb b/...lers/spree/promotion_code_batch_mailer.rb → ...lers/spree/promotion_code_batch_mailer.rb
diff --git a/...els/spree/promotion_code/batch_builder.rb → ...els/spree/promotion_code/batch_builder.rb b/...els/spree/promotion_code/batch_builder.rb → ...els/spree/promotion_code/batch_builder.rb
@@ -2,6 +2,7 @@
 
 class ::Spree::PromotionCode::BatchBuilder
   attr_reader :promotion_code_batch, :options
+
   delegate :promotion, :number_of_codes, :base_code, to: :promotion_code_batch
 
   DEFAULT_OPTIONS = {

diff --git a/...ler/promotion_code_batch_errored.text.erb → ...ler/promotion_code_batch_errored.text.erb b/...ler/promotion_code_batch_errored.text.erb → ...ler/promotion_code_batch_errored.text.erb
diff --git a/...er/promotion_code_batch_finished.text.erb → ...er/promotion_code_batch_finished.text.erb b/...er/promotion_code_batch_finished.text.erb → ...er/promotion_code_batch_finished.text.erb
diff --git a/...pec/jobs/promotion_code_batch_job_spec.rb → ...bs/spree/promotion_code_batch_job_spec.rb b/...pec/jobs/promotion_code_batch_job_spec.rb → ...bs/spree/promotion_code_batch_job_spec.rb
diff --git a/...ilers/promotion_code_batch_mailer_spec.rb → ...spree/promotion_code_batch_mailer_spec.rb b/...ilers/promotion_code_batch_mailer_spec.rb → ...spree/promotion_code_batch_mailer_spec.rb
diff --git a/...pree/promotion_code/batch_builder_spec.rb → ...pree/promotion_code/batch_builder_spec.rb b/...pree/promotion_code/batch_builder_spec.rb → ...pree/promotion_code/batch_builder_spec.rb
diff --git a/...models/spree/promotion_code_batch_spec.rb → ...models/spree/promotion_code_batch_spec.rb b/...models/spree/promotion_code_batch_spec.rb → ...models/spree/promotion_code_batch_spec.rb