fixed wrong multitenancy implementation for vat rates; seeds updated

Author: andrzejkrzywda

ecommerce/taxes/lib/taxes.rb

@@ -9,7 +9,7 @@ module Taxes
   class Configuration
     def call(event_store, command_bus)
       command_bus.register(SetVatRate, SetVatRateHandler.new(event_store))
-      command_bus.register(AddAvailableVatRate, AddAvailableVatRateHandler.new(event_store, command_bus))
+      command_bus.register(AddAvailableVatRate, AddAvailableVatRateHandler.new(event_store))
       command_bus.register(RemoveAvailableVatRate, RemoveAvailableVatRateHandler.new(event_store))
     end
   end

ecommerce/taxes/lib/taxes/commands.rb

@@ -7,7 +7,6 @@ class SetVatRate < Infra::Command
   class AddAvailableVatRate < Infra::Command
     attribute :available_vat_rate_id, Infra::Types::UUID
     attribute :vat_rate, Infra::Types::VatRate
-    attribute :store_id, Infra::Types::UUID
   end
 
   class RemoveAvailableVatRate < Infra::Command

ecommerce/taxes/lib/taxes/services.rb

@@ -20,9 +20,8 @@ def call(cmd)
   class AddAvailableVatRateHandler
     include Infra::Retry
 
-    def initialize(event_store, command_bus)
+    def initialize(event_store)
       @event_store = event_store
-      @command_bus = command_bus
     end
 
     def call(cmd)
@@ -32,13 +31,12 @@ def call(cmd)
 
         expected_version = event ? event_store.position_in_stream(event.event_id, stream_name(cmd)) : -1
         event_store.publish(available_vat_rate_added_event(cmd), stream_name: stream_name(cmd), expected_version: expected_version)
-        command_bus.call(Stores::RegisterVatRate.new(store_id: cmd.store_id, vat_rate_id: cmd.available_vat_rate_id))
       end
     end
 
     private
 
-    attr_reader :event_store, :command_bus
+    attr_reader :event_store
 
     def last_available_vat_rate_event(vat_rate_code)
       event_store

rails_application/app/controllers/available_vat_rates_controller.rb

@@ -53,13 +53,22 @@ def destroy
   private
 
   def add_available_vat_rate(code, rate, available_vat_rate_id)
-    command_bus.(add_available_vat_rate_cmd(code, rate, available_vat_rate_id))
+    ActiveRecord::Base.transaction do
+      command_bus.(add_available_vat_rate_cmd(code, rate, available_vat_rate_id))
+      command_bus.(register_vat_rate_cmd(available_vat_rate_id))
+    end
   end
 
   def add_available_vat_rate_cmd(code, rate, available_vat_rate_id)
     Taxes::AddAvailableVatRate.new(
       available_vat_rate_id: available_vat_rate_id,
-      vat_rate: Infra::Types::VatRate.new(code: code, rate: rate),
+      vat_rate: Infra::Types::VatRate.new(code: code, rate: rate)
+    )
+  end
+
+  def register_vat_rate_cmd(available_vat_rate_id)
+    Stores::RegisterVatRate.new(
+      vat_rate_id: available_vat_rate_id,
       store_id: current_store_id
     )
   end

rails_application/db/seeds.rb

@@ -49,10 +49,16 @@
   ["20", 20],
   ["10", 10]
 ].each do |vat_rate|
+  vat_rate_id = SecureRandom.uuid
   command_bus.call(
     Taxes::AddAvailableVatRate.new(
-      available_vat_rate_id: SecureRandom.uuid,
-      vat_rate: Infra::Types::VatRate.new(code: vat_rate[0], rate: vat_rate[1]),
+      available_vat_rate_id: vat_rate_id,
+      vat_rate: Infra::Types::VatRate.new(code: vat_rate[0], rate: vat_rate[1])
+    )
+  )
+  command_bus.call(
+    Stores::RegisterVatRate.new(
+      vat_rate_id: vat_rate_id,
       store_id: store_1_id
     )
   )