Merge branch 'main' into validation-error-status-change-5569

Author: stefannibrasil

CONTRIBUTING.md

@@ -198,7 +198,7 @@ Only take multiple issues if they are related and you can solve all of them at t
 Users that are frequent contributors and are involved in discussion (join the slack channel! :)) may be given direct Contributor access to the Repo so they can submit Pull Requests directly instead of Forking first.
 
 ## Debugging
-If starting server directly, via `rail s` or `rail console`, or built-in debugger in RubyMine, or running `bundle exec rspec path/to/spec.rb:line_no`, then you can use `binding.pry` to debug. Drop the pry where you want the execution to pause.
+If starting server directly, via `rails s` or `rails console`, or built-in debugger in RubyMine, or running `bundle exec rspec path/to/spec.rb:line_no`, then you can use `binding.pry` to debug. Drop the pry where you want the execution to pause.
 
 If starting via Procfile with `bin/start`, then drop a ``binding.remote_pry`` into the line where you want execution to pause at. Then run ``pry-remote`` in the terminal to connect to it.
 https://github.com/Mon-Ouie/pry-remote

Gemfile.lock

@@ -84,20 +84,20 @@ GEM
       execjs (~> 2)
     awesome_print (1.9.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1233.0)
-    aws-sdk-core (3.244.0)
+    aws-partitions (1.1255.0)
+    aws-sdk-core (3.250.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.123.0)
-      aws-sdk-core (~> 3, >= 3.244.0)
+    aws-sdk-kms (1.128.0)
+      aws-sdk-core (~> 3, >= 3.248.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.218.0)
-      aws-sdk-core (~> 3, >= 3.244.0)
+    aws-sdk-s3 (1.224.0)
+      aws-sdk-core (~> 3, >= 3.248.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
@@ -111,7 +111,7 @@ GEM
       net-http-persistent (~> 4.0)
       nokogiri (~> 1, >= 1.10.8)
     base64 (0.3.0)
-    bcrypt (3.1.21)
+    bcrypt (3.1.22)
     benchmark (0.5.0)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
@@ -128,7 +128,7 @@ GEM
     bindex (0.8.1)
     binding_of_caller (2.0.0)
       debug_inspector (>= 1.2.0)
-    bootsnap (1.24.1)
+    bootsnap (1.24.5)
       msgpack (~> 1.2)
     bootstrap (5.2.3)
       autoprefixer-rails (>= 9.1.0)
@@ -139,7 +139,7 @@ GEM
     bugsnag (6.30.0)
       concurrent-ruby (~> 1.0)
     builder (3.3.0)
-    bullet (8.1.0)
+    bullet (8.1.2)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     capybara (3.40.0)
@@ -156,7 +156,7 @@ GEM
       launchy
     childprocess (5.0.0)
     choice (0.2.0)
-    clockwork (3.0.2)
+    clockwork (4.0.1)
       activesupport
       tzinfo
     coderay (1.1.3)
@@ -189,13 +189,13 @@ GEM
       delayed_job (> 2.0.3)
       rack-protection (>= 1.5.5)
       sinatra (>= 1.4.4)
-    devise (5.0.2)
+    devise (5.0.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 7.0)
       responders
       warden (~> 1.2.3)
-    devise_invitable (2.0.11)
+    devise_invitable (2.0.12)
       actionmailer (>= 5.0)
       devise (>= 4.6)
     diff-lcs (1.6.2)
@@ -229,7 +229,7 @@ GEM
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    erb (6.0.2)
+    erb (6.0.4)
     erb_lint (0.9.0)
       activesupport
       better_html (>= 2.0.1)
@@ -277,11 +277,12 @@ GEM
       concurrent-ruby (~> 1.1)
       webrick (~> 1.7)
       websocket-driver (~> 0.7)
+    ffi (1.17.4)
     ffi (1.17.4-arm64-darwin)
     ffi (1.17.4-x86_64-darwin)
     ffi (1.17.4-x86_64-linux-gnu)
     filterrific (5.2.7)
-    flipper (1.4.1)
+    flipper (1.4.2)
       concurrent-ruby (< 2)
     flipper-active_record (1.4.1)
       activerecord (>= 4.2, < 9)
@@ -333,12 +334,12 @@ GEM
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
     io-console (0.8.2)
-    irb (1.17.0)
+    irb (1.18.0)
       pp (>= 0.6.0)
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    jbuilder (2.14.1)
+    jbuilder (2.15.1)
       actionview (>= 7.0.0)
       activesupport (>= 7.0.0)
     jmespath (1.6.2)
@@ -386,7 +387,8 @@ GEM
       pry
       pry-stack_explorer
       rails (>= 5.0)
-    mail (2.8.1)
+    mail (2.9.0)
+      logger
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
@@ -398,6 +400,7 @@ GEM
     memory_profiler (1.1.0)
     method_source (1.1.0)
     mini_mime (1.1.5)
+    mini_portile2 (2.8.9)
     minitest (6.0.6)
       drb (~> 2.0)
       prism (~> 1.5)
@@ -411,7 +414,7 @@ GEM
       monetize (~> 2.0)
       money (~> 7.0)
       railties (>= 7.0)
-    msgpack (1.8.0)
+    msgpack (1.8.1)
     multi_xml (0.8.1)
       bigdecimal (>= 3.1, < 5)
     multipart-post (2.4.1)
@@ -420,7 +423,7 @@ GEM
     nenv (0.3.0)
     net-http-persistent (4.0.8)
       connection_pool (>= 2.2.4, < 4)
-    net-imap (0.5.9)
+    net-imap (0.6.4)
       date
       net-protocol
     net-pop (0.1.2)
@@ -429,9 +432,12 @@ GEM
       timeout
     net-smtp (0.5.1)
       net-protocol
-    newrelic_rpm (10.2.0)
+    newrelic_rpm (10.5.0)
       logger
     nio4r (2.7.5)
+    nokogiri (1.19.0)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
     nokogiri (1.19.0-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.19.0-x86_64-darwin)
@@ -483,6 +489,7 @@ GEM
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
+    pg (1.6.3)
     pg (1.6.3-arm64-darwin)
     pg (1.6.3-x86_64-darwin)
     pg (1.6.3-x86_64-linux)
@@ -577,7 +584,7 @@ GEM
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.3.1)
+    rake (13.4.2)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
@@ -755,10 +762,11 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yard (0.9.38)
-    zeitwerk (2.7.5)
+    zeitwerk (2.8.2)
 
 PLATFORMS
   arm64-darwin
+  ruby
   x86_64-darwin
   x86_64-linux
   x86_64-linux-gnu

app/controllers/donations_controller.rb

@@ -134,7 +134,7 @@ def donation_item_params
     def filter_params
     return {} unless params.key?(:filters)
 
-    params.require(:filters).permit(:at_storage_location, :by_source, :from_donation_site, :by_product_drive, :by_product_drive_participant, :from_manufacturer, :by_category)
+    params.require(:filters).permit(:at_storage_location, :by_source, :from_donation_site, :by_product_drive, :by_product_drive_participant, :from_manufacturer, :by_item_id, :by_category)
   end
 
   # Omits donation_site_id or product_drive_participant_id if those aren't selected as source

app/controllers/items_controller.rb

@@ -11,7 +11,7 @@ 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(item: {line_items: :item})
+    @kits = current_organization.kits.includes(kit_item: {line_items: :item})
     @storages = current_organization.storage_locations.active.order(id: :asc)
 
     @include_inactive_items = params[:include_inactive_items]

app/controllers/kits_controller.rb

@@ -4,7 +4,7 @@ def show
   end
 
   def index
-    @kits = current_organization.kits.includes(item: {line_items: :item}).class_filter(filter_params)
+    @kits = current_organization.kits.includes(kit_item: {line_items: :item}).class_filter(filter_params)
     @inventory = View::Inventory.new(current_organization.id)
     unless params[:include_inactive_items]
       @kits = @kits.active
@@ -16,8 +16,8 @@ def new
     load_form_collections
 
     @kit = current_organization.kits.new
-    @kit.item = current_organization.items.new
-    @kit.item.line_items.build
+    @kit.kit_item = KitItem.new(organization: current_organization)
+    @kit.kit_item.line_items.build
   end
 
   def create
@@ -36,8 +36,9 @@ def create
       kit_only_params = kit_params.except(:line_items_attributes)
       @kit = Kit.new(kit_only_params)
       load_form_collections
-      @kit.item ||= current_organization.items.new(kit_params.slice(:line_items_attributes))
-      @kit.item.line_items.build if @kit.item.line_items.empty?
+      @kit.kit_item ||= KitItem.new(organization: current_organization,
+                                    **kit_params.slice(:line_items_attributes))
+      @kit.kit_item.line_items.build if @kit.kit_item.line_items.empty?
 
       render :new
     end
@@ -96,7 +97,7 @@ def kit_params
       :visible_to_partners,
       :value_in_dollars
     )
-    item_params = params.require(:item)
+    item_params = params.require(:kit_item)
       .permit(line_items_attributes: [:item_id, :quantity, :_destroy])
     kit_params.to_h.merge(item_params.to_h)
   end

app/events/kit_allocate_event.rb

@@ -1,6 +1,6 @@
 class KitAllocateEvent < Event
   def self.event_line_items(kit, storage_location, quantity)
-    items = kit.item.line_items.map do |item|
+    items = kit.kit_item.line_items.map do |item|
       EventTypes::EventLineItem.new(
         quantity: item.quantity * quantity,
         item_id: item.item_id,
@@ -11,8 +11,8 @@ def self.event_line_items(kit, storage_location, quantity)
     end
     items.push(EventTypes::EventLineItem.new(
       quantity: quantity,
-      item_id: kit.item.id,
-      item_value_in_cents: kit.item.value_in_cents,
+      item_id: kit.kit_item.id,
+      item_value_in_cents: kit.kit_item.value_in_cents,
       to_storage_location: storage_location,
       from_storage_location: nil
     ))

app/events/kit_deallocate_event.rb

@@ -1,6 +1,6 @@
 class KitDeallocateEvent < Event
   def self.event_line_items(kit, storage_location, quantity)
-    items = kit.item.line_items.map do |item|
+    items = kit.kit_item.line_items.map do |item|
       EventTypes::EventLineItem.new(
         quantity: item.quantity * quantity,
         item_id: item.item_id,
@@ -11,8 +11,8 @@ def self.event_line_items(kit, storage_location, quantity)
     end
     items.push(EventTypes::EventLineItem.new(
       quantity: quantity,
-      item_id: kit.item.id,
-      item_value_in_cents: kit.item.value_in_cents,
+      item_id: kit.kit_item.id,
+      item_value_in_cents: kit.kit_item.value_in_cents,
       from_storage_location: storage_location,
       to_storage_location: nil
     ))

app/helpers/application_helper.rb

@@ -126,6 +126,6 @@ def storage_location_for_source(source_object)
   end
 
   def default_location(source_object)
-    current_organization.default_storage_location || source_object.storage_location_id.presence || current_organization.intake_location
+    source_object.storage_location_id.presence || current_organization.default_storage_location || current_organization.intake_location
   end
 end

app/models/concrete_item.rb

@@ -0,0 +1,26 @@
+# == Schema Information
+#
+# Table name: items
+#
+#  id                           :integer          not null, primary key
+#  active                       :boolean          default(TRUE)
+#  additional_info              :text
+#  barcode_count                :integer
+#  distribution_quantity        :integer
+#  name                         :string
+#  on_hand_minimum_quantity     :integer          default(0), not null
+#  on_hand_recommended_quantity :integer
+#  package_size                 :integer
+#  partner_key                  :string
+#  reporting_category           :string
+#  type                         :string           default("ConcreteItem"), not null
+#  value_in_cents               :integer          default(0)
+#  visible_to_partners          :boolean          default(TRUE), not null
+#  created_at                   :datetime         not null
+#  updated_at                   :datetime         not null
+#  item_category_id             :integer
+#  kit_id                       :integer
+#  organization_id              :integer
+#
+class ConcreteItem < Item
+end

app/models/donation.rb

@@ -52,6 +52,7 @@ class Donation < ApplicationRecord
     where(manufacturer_id: manufacturer_id)
   }
 
+  scope :by_item_id, ->(item_id) { joins(:items).where(items: { id: item_id }).distinct }
   scope :by_category, ->(item_category) {
     joins(line_items: {item: :item_category}).where("item_categories.name ILIKE ?", item_category)
   }