Merge pull request #4607 from rubyforgood/4333-remove-inventory-items

4333 remove inventory items

Author: cielf

.rubocop_todo.yml

@@ -225,7 +225,6 @@ Layout/SpaceInsideHashLiteralBraces:
     - 'app/models/product_drive_participant.rb'
     - 'app/models/distribution.rb'
     - 'app/models/donation.rb'
-    - 'app/models/inventory_item.rb'
     - 'app/models/item.rb'
     - 'app/models/item_category.rb'
     - 'app/models/kit.rb'

app/controllers/audits_controller.rb

@@ -10,11 +10,7 @@ def index
   end
 
   def show
-    if Event.read_events?(@audit.organization)
-      @items = View::Inventory.items_for_location(@audit.storage_location)
-    else
-      @inventory_items = @audit.storage_location.inventory_items
-    end
+    @items = View::Inventory.items_for_location(@audit.storage_location)
   end
 
   def edit
@@ -28,24 +24,7 @@ def finalize
     @audit.adjustment = Adjustment.new(organization_id: @audit.organization_id, storage_location_id: @audit.storage_location_id, user_id: current_user.id, comment: 'Created Automatically through the Auditing Process')
     @audit.save
 
-    inventory_items = @audit.storage_location.inventory_items
-
-    inventory_items.each do |inventory_item|
-      line_item = @audit.line_items.find_by(item: inventory_item.item)
-
-      next if line_item.nil?
-
-      if line_item.quantity != inventory_item.quantity
-        @audit.adjustment.line_items.create(item_id: inventory_item.item.id, quantity: line_item.quantity - inventory_item.quantity)
-      end
-    end
-
-    increasing_adjustment, decreasing_adjustment = @audit.adjustment.split_difference
-    ActiveRecord::Base.transaction do
-      @audit.storage_location.increase_inventory(increasing_adjustment.line_item_values)
-      @audit.storage_location.decrease_inventory(decreasing_adjustment.line_item_values)
-      AuditEvent.publish(@audit)
-    end
+    AuditEvent.publish(@audit)
     @audit.finalized!
     redirect_to audit_path(@audit), notice: "Audit is Finalized."
   rescue => e

app/controllers/distributions_controller.rb

@@ -117,13 +117,9 @@ def create
       @items = current_organization.items.alphabetized
       @partner_list = current_organization.partners.where.not(status: 'deactivated').alphabetized
 
-      if Event.read_events?(current_organization)
-        inventory = View::Inventory.new(@distribution.organization_id)
-        @storage_locations = current_organization.storage_locations.active_locations.alphabetized.select do |storage_loc|
-          inventory.quantity_for(storage_location: storage_loc.id).positive?
-        end
-      else
-        @storage_locations = current_organization.storage_locations.active_locations.has_inventory_items.alphabetized
+      inventory = View::Inventory.new(@distribution.organization_id)
+      @storage_locations = current_organization.storage_locations.active_locations.alphabetized.select do |storage_loc|
+        inventory.quantity_for(storage_location: storage_loc.id).positive?
       end
 
       flash_error = insufficient_error_message(result.error.message)
@@ -151,13 +147,9 @@ def new
     @items = current_organization.items.alphabetized
     @partner_list = current_organization.partners.where.not(status: 'deactivated').alphabetized
 
-    if Event.read_events?(current_organization)
-      inventory = View::Inventory.new(current_organization.id)
-      @storage_locations = current_organization.storage_locations.active_locations.alphabetized.select do |storage_loc|
-        inventory.quantity_for(storage_location: storage_loc.id).positive?
-      end
-    else
-      @storage_locations = current_organization.storage_locations.active_locations.has_inventory_items.alphabetized
+    inventory = View::Inventory.new(current_organization.id)
+    @storage_locations = current_organization.storage_locations.active_locations.alphabetized.select do |storage_loc|
+      inventory.quantity_for(storage_location: storage_loc.id).positive?
     end
   end
 
@@ -183,13 +175,9 @@ def edit
       @audit_warning = current_organization.audits
         .where(storage_location_id: @distribution.storage_location_id)
         .where("updated_at > ?", @distribution.created_at).any?
-      if Event.read_events?(current_organization)
-        inventory = View::Inventory.new(@distribution.organization_id)
-        @storage_locations = current_organization.storage_locations.active_locations.alphabetized.select do |storage_loc|
-          !inventory.quantity_for(storage_location: storage_loc.id).negative?
-        end
-      else
-        @storage_locations = current_organization.storage_locations.active_locations.has_inventory_items.alphabetized
+      inventory = View::Inventory.new(@distribution.organization_id)
+      @storage_locations = current_organization.storage_locations.active_locations.alphabetized.select do |storage_loc|
+        !inventory.quantity_for(storage_location: storage_loc.id).negative?
       end
     else
       redirect_to distributions_path, error: 'To edit a distribution,

app/controllers/donations_controller.rb

@@ -93,7 +93,6 @@ def update
     @original_source = @donation.source
     ItemizableUpdateService.call(itemizable: @donation,
       params: donation_params,
-      type: :increase,
       event_class: DonationEvent)
     flash.clear
     flash[:notice] = "Donation updated!"

app/controllers/items_controller.rb

@@ -11,28 +11,22 @@ def index
     @items = @items.active unless params[:include_inactive_items]
 
     @item_categories = current_organization.item_categories.includes(:items).order('name ASC')
-    @kits = current_organization.kits.includes(line_items: :item, inventory_items: :storage_location)
+    @kits = current_organization.kits.includes(line_items: :item)
     @storages = current_organization.storage_locations.active_locations.order(id: :asc)
 
     @include_inactive_items = params[:include_inactive_items]
     @selected_base_item = filter_params[:by_base_item]
 
     @paginated_items = @items.page(params[:page])
 
-    if Event.read_events?(current_organization)
-      @inventory = View::Inventory.new(current_organization.id)
-    end
+    @inventory = View::Inventory.new(current_organization.id)
     @items_by_storage_collection_and_quantity = ItemsByStorageCollectionAndQuantityQuery.call(organization: current_organization,
       inventory: @inventory,
       filter_params: filter_params)
 
     respond_to do |format|
       format.html
-      if Event.read_events?(current_organization)
-        format.csv { send_data Item.generate_csv_from_inventory(@items, @inventory), filename: "Items-#{Time.zone.today}.csv" }
-      else
-        format.csv { send_data Item.generate_csv(@items), filename: "Items-#{Time.zone.today}.csv" }
-      end
+      format.csv { send_data Item.generate_csv_from_inventory(@items, @inventory), filename: "Items-#{Time.zone.today}.csv" }
     end
   end
 
@@ -71,13 +65,9 @@ def edit
 
   def show
     @item = current_organization.items.find(params[:id])
-    if Event.read_events?(current_organization)
-      @inventory = View::Inventory.new(current_organization.id)
-      storage_location_ids = @inventory.storage_locations_for_item(@item.id)
-      @storage_locations_containing = StorageLocation.find(storage_location_ids)
-    else
-      @storage_locations_containing = current_organization.items.storage_locations_containing(@item)
-    end
+    @inventory = View::Inventory.new(current_organization.id)
+    storage_location_ids = @inventory.storage_locations_for_item(@item.id)
+    @storage_locations_containing = StorageLocation.find(storage_location_ids)
     @barcodes_for = current_organization.items.barcodes_for(@item)
   end
 

app/controllers/kits_controller.rb

@@ -1,9 +1,7 @@
 class KitsController < ApplicationController
   def index
-    @kits = current_organization.kits.includes(line_items: :item, inventory_items: :storage_location).class_filter(filter_params)
-    if Event.read_events?(current_organization)
-      @inventory = View::Inventory.new(current_organization.id)
-    end
+    @kits = current_organization.kits.includes(line_items: :item).class_filter(filter_params)
+    @inventory = View::Inventory.new(current_organization.id)
     unless params[:include_inactive_items]
       @kits = @kits.active
     end
@@ -56,11 +54,7 @@ def reactivate
   def allocations
     @kit = Kit.find(params[:id])
     @storage_locations = current_organization.storage_locations.active_locations
-    if Event.read_events?(current_organization)
-      @inventory = View::Inventory.new(current_organization.id)
-    else
-      @item_inventories = @kit.item.inventory_items
-    end
+    @inventory = View::Inventory.new(current_organization.id)
 
     load_form_collections
   end
@@ -69,21 +63,14 @@ def allocate
     @kit = Kit.find(params[:id])
     @storage_location = current_organization.storage_locations.active_locations.find(kit_adjustment_params[:storage_location_id])
     @change_by = kit_adjustment_params[:change_by].to_i
-
-    if @change_by.positive?
-      service = AllocateKitInventoryService.new(kit: @kit, storage_location: @storage_location, increase_by: @change_by)
-      service.allocate
-      flash[:error] = service.error if service.error
-    elsif @change_by.negative?
-      service = DeallocateKitInventoryService.new(kit: @kit, storage_location: @storage_location, decrease_by: @change_by.abs)
-      service.deallocate
-      flash[:error] = service.error if service.error
-    end
-
-    if service.error
-      flash[:error] = service.error
-    else
-      flash[:notice] = "#{@kit.name} at #{@storage_location.name} quantity has changed by #{@change_by}"
+    begin
+      if @change_by.positive?
+        KitAllocateEvent.publish(@kit, @storage_location.id, @change_by)
+      else
+        KitDeallocateEvent.publish(@kit, @storage_location.id, -@change_by)
+      end
+    rescue => e
+      flash[:error] = e.message
     end
 
     redirect_to allocations_kit_path(id: @kit.id)

app/controllers/partners/dashboards_controller.rb

@@ -24,9 +24,7 @@ def show
 
       @families = @partner.families
       @children = @partner.children
-      if Event.read_events?(@partner.organization)
-        @inventory = View::Inventory.new(@partner.organization_id)
-      end
+      @inventory = View::Inventory.new(@partner.organization_id)
 
       @broadcast_announcements = BroadcastAnnouncement.filter_announcements(@parent_org)
     end

app/controllers/purchases_controller.rb

@@ -68,7 +68,6 @@ def update
     @purchase = current_organization.purchases.find(params[:id])
     ItemizableUpdateService.call(itemizable: @purchase,
       params: purchase_params,
-      type: :increase,
       event_class: PurchaseEvent)
     redirect_to purchases_path
   rescue => e

app/controllers/requests_controller.rb

@@ -63,11 +63,7 @@ def print_unfulfilled
   def load_items
     return unless @request.request_items
 
-    inventory = nil
-    if Event.read_events?(@request.organization)
-      inventory = View::Inventory.new(@request.organization_id)
-    end
-
+    inventory = View::Inventory.new(@request.organization_id)
     @request.request_items.map { |json| RequestItem.from_json(json, @request, inventory) }
   end
 

app/controllers/storage_locations_controller.rb

@@ -9,10 +9,7 @@ def quantity
   end
 
   def index
-    if Event.read_events?(current_organization)
-      @inventory = View::Inventory.new(current_organization.id)
-    end
-
+    @inventory = View::Inventory.new(current_organization.id)
     @selected_item_category = filter_params[:containing]
     @items = StorageLocation.items_inventoried(current_organization, @inventory)
     @include_inactive_storage_locations = params[:include_inactive_storage_locations].present?
@@ -33,21 +30,7 @@ def index
     respond_to do |format|
       format.html
       format.csv do
-        if Event.read_events?(current_organization)
-          send_data StorageLocation.generate_csv_from_inventory(@storage_locations, @inventory), filename: "StorageLocations-#{Time.zone.today}.csv"
-        else
-          active_inventory_item_names = []
-          @storage_locations.each do |storage_location|
-            active_inventory_item_names <<
-              storage_location
-              .active_inventory_items
-              .joins(:item)
-              .select('distinct items.name')
-              .pluck(:name)
-          end
-          active_inventory_item_names = active_inventory_item_names.flatten.uniq.sort
-          send_data StorageLocation.generate_csv(@storage_locations, active_inventory_item_names), filename: "StorageLocations-#{Time.zone.today}.csv"
-        end
+        send_data StorageLocation.generate_csv_from_inventory(@storage_locations, @inventory), filename: "StorageLocations-#{Time.zone.today}.csv"
       end
     end
   end
@@ -78,16 +61,14 @@ def show
     @items_out_total = ItemsOutTotalQuery.new(organization: current_organization, storage_location: @storage_location).call
     @items_in = ItemsInQuery.new(organization: current_organization, storage_location: @storage_location).call
     @items_in_total = ItemsInTotalQuery.new(organization: current_organization, storage_location: @storage_location).call
-    if Event.read_events?(current_organization)
-      if View::Inventory.within_snapshot?(current_organization.id, params[:version_date])
-        @inventory = View::Inventory.new(current_organization.id, event_time: params[:version_date])
-      else
-        @legacy_inventory = View::Inventory.legacy_inventory_for_storage_location(
-          current_organization.id,
-          @storage_location.id,
-          params[:version_date]
-        )
-      end
+    if View::Inventory.within_snapshot?(current_organization.id, params[:version_date])
+      @inventory = View::Inventory.new(current_organization.id, event_time: params[:version_date])
+    else
+      @legacy_inventory = View::Inventory.legacy_inventory_for_storage_location(
+        current_organization.id,
+        @storage_location.id,
+        params[:version_date]
+      )
     end
 
     respond_to do |format|
@@ -154,22 +135,10 @@ def destroy
   end
 
   def inventory
-    if Event.read_events?(current_organization)
-      @items = View::Inventory.items_for_location(StorageLocation.find(params[:id]),
-        include_omitted: params[:include_omitted_items] == "true")
-      respond_to do |format|
-        format.json { render :event_inventory }
-      end
-    else
-      @inventory_items = current_organization.storage_locations
-                                             .includes(inventory_items: :item)
-                                             .find(params[:id])
-                                             .inventory_items
-                                           .active
-
-      @inventory_items += include_omitted_items(@inventory_items.collect(&:item_id)) if params[:include_omitted_items] == "true"
-      @inventory_items.to_a.sort_by! { |inventory_item| inventory_item.item.name.downcase }
-      respond_to :json
+    @items = View::Inventory.items_for_location(StorageLocation.find(params[:id]),
+      include_omitted: params[:include_omitted_items] == "true")
+    respond_to do |format|
+      format.json { render :event_inventory }
     end
   end
 

app/events/event_types/event_line_item.rb

@@ -19,6 +19,17 @@ def same_item?(line_item)
       end
     end
 
+    # @return [EventTypes::EventLineItem]
+    def negative
+      self.class.new(
+        quantity: -quantity,
+        item_id: item_id,
+        item_value_in_cents: item_value_in_cents,
+        from_storage_location: from_storage_location,
+        to_storage_location: to_storage_location
+      )
+    end
+
     # @param line_item [LineItem]
     # @param from [Integer]
     # @param to [Integer]

app/events/kit_deallocate_event.rb

@@ -5,15 +5,15 @@ def self.event_line_items(kit, storage_location, quantity)
         quantity: item.quantity * quantity,
         item_id: item.item_id,
         item_value_in_cents: item.item.value_in_cents,
-        to_storage_location: storage_location.id,
+        to_storage_location: storage_location,
         from_storage_location: nil
       )
     end
     items.push(EventTypes::EventLineItem.new(
       quantity: quantity,
       item_id: kit.item.id,
       item_value_in_cents: kit.item.value_in_cents,
-      from_storage_location: storage_location.id,
+      from_storage_location: storage_location,
       to_storage_location: nil
     ))
     items