Merge pull request #4669 from rubyforgood/fix-distribution-error

Fix for error on complex case involving multiple distribution destroy…

app/events/inventory_aggregate.rb

@@ -12,6 +12,8 @@ def on(*event_types, &block)
     # @param event_time [DateTime]
     # @param validate [Boolean]
     # @return [EventTypes::Inventory]
+    # This method can take a block so that you can build up the history of a particular item over
+    # time, for instance
     def inventory_for(organization_id, event_time: nil, validate: false)
       last_snapshot = Event.most_recent_snapshot(organization_id)
 
@@ -35,11 +37,13 @@ def inventory_for(organization_id, event_time: nil, validate: false)
         # don't do grouping for UpdateExistingEvents
         if event_batch.any? { |e| e.is_a?(UpdateExistingEvent) }
           handle(last_grouped_event, inventory, validate: validate)
+          yield last_grouped_event, inventory if block_given?
           next
         end
-        previous_event = event_hash[last_grouped_event.eventable]
-        event_hash[last_grouped_event.eventable] = last_grouped_event
+        previous_event = event_hash[[last_grouped_event.eventable_type, last_grouped_event.eventable_id]]
+        event_hash[[last_grouped_event.eventable_type, last_grouped_event.eventable_id]] = last_grouped_event
         handle(last_grouped_event, inventory, validate: validate, previous_event: previous_event)
+        yield last_grouped_event, inventory if block_given?
       end
       inventory
     end