4333 remove inventory items #4607

dorner · 2024-08-23T20:45:34Z

Resolves #4333

Description

Definitely do not merge this.

This removes InventoryItems and all associated functionality, with the exception of the records themselves and the basic associations. It also removes Kit allocation and deallocation.

Need to get all tests passing, and then do some exhaustive manual testing afterwards.

# Conflicts: # app/controllers/storage_locations_controller.rb # app/models/item.rb # app/services/item_create_service.rb # spec/controllers/donations_controller_spec.rb # spec/models/inventory_item_spec.rb # spec/models/organization_stats_spec.rb # spec/requests/distributions_requests_spec.rb # spec/requests/purchases_requests_spec.rb # spec/requests/storage_locations_requests_spec.rb # spec/services/allocate_kit_inventory_service_spec.rb # spec/services/deallocate_kit_inventory_service_spec.rb # spec/system/distribution_system_spec.rb

# Conflicts: # app/controllers/distributions_controller.rb # spec/rails_helper.rb

awwaiid

Some initial notes; I'll need to read through in particular the adjustment (increase/decrease) cleanup in detail

app/controllers/audits_controller.rb

awwaiid · 2024-10-13T21:16:52Z

app/controllers/kits_controller.rb

+      if @change_by.positive?
+        KitAllocateEvent.publish(@kit, @storage_location.id, @change_by)
+      else
+        KitDeallocateEvent.publish(@kit, @storage_location.id, -@change_by)
+      end


Much better

app/controllers/kits_controller.rb

awwaiid · 2024-10-13T21:19:48Z

app/events/kit_deallocate_event.rb

-        to_storage_location: storage_location.id,
+        to_storage_location: storage_location,


Interesting. Good looking.

awwaiid · 2024-10-13T21:23:09Z

app/models/item.rb

@@ -207,16 +196,6 @@ def self.csv_export_headers
    ["Name", "Barcodes", "Base Item", "Quantity"]
  end

-  # TODO remove this method once read_events? is true everywhere


app/services/distribution_itemized_breakdown_service.rb

app/services/donation_itemized_breakdown_service.rb

awwaiid · 2024-10-13T21:28:43Z

app/services/inventory_check_service.rb

@@ -40,9 +37,6 @@ def items_below_minimum_quantity
        if @inventory


@dorner same, etc down

app/services/item_create_service.rb

awwaiid · 2024-10-13T21:32:05Z

app/views/storage_locations/show.html.erb

                  <% else %>
-                    <%= render partial: "inventory_item_row",
-                               collection: @storage_location.inventory_items.joins(:item).where(items: { active: true }),
-                               locals: { version_date: params[:version_date] } %>
                  <% end %>


No longer need the else at all, and maybe don't need to elsif @legacy_inventory block either?

Heh I fell into that trap. We do need this because it tracks inventory from before event sourcing was introduced.

cielf · 2024-10-26T00:42:56Z

@dorner " It also removes Kit allocation and deallocation."
Please tell me more about this --for instance, does that mean that we should be able to handle donating kits now? ( it's failing a test of donating kits where there were no kits allocated, then deallocating them -- but it would have before the change as well.)

awwaiid

I still can't find any issues; I'll ask a bit on our call about the views but really this is mergeable from what I've seen so far.

awwaiid · 2024-11-03T12:41:34Z

app/services/transfer_destroy_service.rb

@@ -28,7 +28,5 @@ def transfer
  end

  def revert_inventory_transfer!


I think we can remove this empty method altogether.

awwaiid · 2024-11-03T13:22:24Z

spec/events/inventory_aggregate_spec.rb

@@ -462,38 +462,6 @@
        }
      ))
    end
-
-    it "should process a snapshot event" do


Should this be kept, or replaces with one that is an event-driven snapshot create?

Eh, I guess the one below covers us

awwaiid · 2024-11-03T13:28:11Z

spec/models/item_spec.rb

@@ -199,15 +199,6 @@
  end

  context "Methods >" do
-    describe "storage_locations_containing" do
-      it "retrieves all storage locations that contain an item" do


I guess this is deleteable mostly because it would need to be completely re-written. Ah -- and it is effectively covered by spec/models/view/inventory_spec.rb #storage_locations_for_item. OK cool.

awwaiid · 2024-11-03T13:28:48Z

spec/models/kit_spec.rb

@@ -113,19 +113,20 @@
      it 'should return false' do
        item = create(:item, :active, organization: organization, kit: kit)
        storage_location = create(:storage_location, :with_items, organization: organization, item: item)
+        kit.reload


Why was this needed?

Oh, probably for kit.item.id to work on the newly created item.

awwaiid · 2024-11-03T13:30:15Z

spec/models/organization_stats_spec.rb

@@ -1,12 +1,7 @@
 # == No Schema Information
 #
 RSpec.describe OrganizationStats, type: :model do
-  let(:partners) { [] }


Nice overall refactor in this spec

awwaiid · 2024-11-03T13:38:01Z

spec/models/inventory_item_spec.rb

-#  storage_location_id :integer
-#
-
-RSpec.describe InventoryItem, type: :model do


Bold deletion, but I suppose true

awwaiid · 2024-11-03T13:43:18Z

app/views/kits/_table.html.erb

@@ -34,13 +34,6 @@
              </tr>
            <% end %>
          <% else %>
-            <% kit.inventory_items.map do |inventory_item| %>


@dorner maybe I'll need a walk through of why we need the empty-else or the condition at all

I don't think we do!

dorner · 2024-11-03T14:00:30Z

Pushed some fixes!

awwaiid

Code review looks great! I think a little manual testing on the Kit de-allocation is all we need before merging.

cielf · 2024-11-04T01:40:37Z

The kit stuff does seem to work. I do not know what I was looking at.

cielf · 2024-11-06T21:37:55Z

@dorner I'm seeing if you put two items that are the same in a purchase, they stay as two lines in this branch, whereas they are combined in main. If I'm reading things correctly, it's been awhile since we've merged main into this. Could we reasonably do that for final testing?

dorner · 2024-11-06T21:40:02Z

It's been merged!

cielf · 2024-11-06T22:18:07Z

Light testing finds no issues.

cielf

Approved from a functional pov

github-actions · 2024-11-10T15:08:01Z

@dorner: Your PR 4333 remove inventory items is part of today's Human Essentials production release: 2024.11.10.
Thank you very much for your contribution!

dorner added 17 commits May 10, 2024 16:54

wip

58844a2

moar updates

16f5bb5

let's try this baby

89a0b91

syntax error

a423ac1

lint fixes, remove workflow

24f3f50

Merge branch 'main' into 4333-remove-inventory-items

6cdba7a

# Conflicts: # app/controllers/distributions_controller.rb # spec/rails_helper.rb

Add items method

26cbf94

fixes

e52672d

more fixes

c02c333

continuing with fixes sir!

bb37eb0

why did I do that

9dfd980

or this?

4bfceb4

moar fixes

4d94a8e

lint fixes

dac83f6

fix

ea7d4e0

flaky spec

93735b0

dorner marked this pull request as ready for review October 13, 2024 21:08

awwaiid reviewed Oct 13, 2024

View reviewed changes

dorner added 2 commits October 13, 2024 18:50

remove unneeded if

23acf67

more fix

3d01a8d

awwaiid reviewed Nov 3, 2024

View reviewed changes

CR fixes

ba825b8

awwaiid reviewed Nov 3, 2024

View reviewed changes

cielf self-requested a review November 4, 2024 21:06

Merge branch 'main' into 4333-remove-inventory-items

b0f600c

cielf approved these changes Nov 7, 2024

View reviewed changes

cielf merged commit b7a331c into main Nov 7, 2024
22 checks passed

cielf deleted the 4333-remove-inventory-items branch November 7, 2024 14:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

4333 remove inventory items #4607

4333 remove inventory items #4607

dorner commented Aug 23, 2024

awwaiid left a comment

awwaiid Oct 13, 2024

awwaiid Oct 13, 2024

awwaiid Oct 13, 2024

awwaiid Oct 13, 2024

awwaiid Oct 13, 2024

dorner Oct 13, 2024

cielf commented Oct 26, 2024 •

edited

Loading

awwaiid left a comment

awwaiid Nov 3, 2024

awwaiid Nov 3, 2024

awwaiid Nov 3, 2024

awwaiid Nov 3, 2024

awwaiid Nov 3, 2024

awwaiid Nov 3, 2024

awwaiid Nov 3, 2024

awwaiid Nov 3, 2024

awwaiid Nov 3, 2024

dorner Nov 3, 2024

dorner commented Nov 3, 2024

awwaiid left a comment

cielf commented Nov 4, 2024

cielf commented Nov 6, 2024

dorner commented Nov 6, 2024

cielf commented Nov 6, 2024

cielf left a comment

github-actions bot commented Nov 10, 2024

		to_storage_location: storage_location.id,
		to_storage_location: storage_location,

		@@ -40,9 +37,6 @@ def items_below_minimum_quantity
		if @inventory

		@@ -28,7 +28,5 @@ def transfer
		end

		def revert_inventory_transfer!

4333 remove inventory items #4607

4333 remove inventory items #4607

Conversation

dorner commented Aug 23, 2024

Description

awwaiid left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cielf commented Oct 26, 2024 • edited Loading

awwaiid left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dorner commented Nov 3, 2024

awwaiid left a comment

Choose a reason for hiding this comment

cielf commented Nov 4, 2024

cielf commented Nov 6, 2024

dorner commented Nov 6, 2024

cielf commented Nov 6, 2024

cielf left a comment

Choose a reason for hiding this comment

github-actions bot commented Nov 10, 2024

cielf commented Oct 26, 2024 •

edited

Loading