Merge pull request #5032 from coalest/refactor-methods-to-storage-location-model

Refactor Audit/Adjustment class methods to StorageLocation scopes

Author: cielf

app/controllers/adjustments_controller.rb

@@ -14,7 +14,7 @@ def index
                                        .during(helpers.selected_range)
     @paginated_adjustments = @adjustments.page(params[:page])
 
-    @storage_locations = Adjustment.storage_locations_adjusted_for(current_organization).uniq
+    @storage_locations = StorageLocation.with_adjustments_for(current_organization).select(:id, :name)
     @users = current_organization.users
 
     respond_to do |format|

app/controllers/audits_controller.rb

@@ -6,7 +6,7 @@ class AuditsController < ApplicationController
   def index
     @selected_location = filter_params[:at_location]
     @audits = current_organization.audits.class_filter(filter_params)
-    @storage_locations = Audit.storage_locations_audited_for(current_organization).uniq
+    @storage_locations = StorageLocation.with_audits_for(current_organization).select(:id, :name)
   end
 
   def show

app/models/adjustment.rb

@@ -26,10 +26,6 @@ class Adjustment < ApplicationRecord
 
   validate :storage_locations_belong_to_organization
 
-  def self.storage_locations_adjusted_for(organization)
-    includes(:storage_location).joins(:storage_location).where(organization_id: organization.id, storage_location: {discarded_at: nil}).collect(&:storage_location).sort
-  end
-
   def split_difference
     pre_adjustment = line_items.partition { |line_item| line_item.quantity.positive? }
     increasing_adjustment, decreasing_adjustment = pre_adjustment.map { |adjustment| Adjustment.new(line_items: adjustment) }

app/models/audit.rb

@@ -31,10 +31,6 @@ class Audit < ApplicationRecord
   validate :line_items_unique_by_item_id
   validate :user_is_organization_admin_of_the_organization
 
-  def self.storage_locations_audited_for(organization)
-    includes(:storage_location).joins(:storage_location).where(organization_id: organization.id, storage_location: {discarded_at: nil}).collect(&:storage_location).sort
-  end
-
   def self.finalized_since?(itemizable, *location_ids)
     item_ids = itemizable.line_items.pluck(:item_id)
     where(status: "finalized")

app/models/storage_location.rb

@@ -27,6 +27,8 @@ class StorageLocation < ApplicationRecord
   ].freeze
 
   belongs_to :organization
+  has_many :adjustments, dependent: :destroy
+  has_many :audits, dependent: :destroy
   has_many :inventory_items, -> { includes(:item).order("items.name") },
            inverse_of: :storage_location,
            dependent: :destroy
@@ -54,6 +56,12 @@ class StorageLocation < ApplicationRecord
 
   scope :alphabetized, -> { order(:name) }
   scope :active, -> { where(discarded_at: nil) }
+  scope :with_adjustments_for, ->(organization) {
+    joins(:adjustments).where(organization_id: organization.id).distinct.active.alphabetized
+  }
+  scope :with_audits_for, ->(organization) {
+    joins(:audits).where(organization_id: organization.id).distinct.active.alphabetized
+  }
   scope :with_transfers_to, ->(organization) {
     joins(:transfers_to).where(organization_id: organization.id).distinct.order(:name)
   }

spec/models/adjustment_spec.rb

@@ -57,17 +57,6 @@
   end
 
   context "Methods >" do
-    it "`self.storage_locations_adjusted_for` returns only storage_locations that are used in adjustments for one org" do
-      storage_location1 = create(:storage_location, organization: organization)
-      storage_location2 = create(:storage_location, organization: organization)
-      create(:storage_location, organization: organization)
-      storage_location4 = create(:storage_location, organization: create(:organization))
-      create(:adjustment, storage_location: storage_location1, organization: organization)
-      create(:adjustment, storage_location: storage_location2, organization: organization)
-      create(:adjustment, storage_location: storage_location4, organization: storage_location4.organization)
-      expect(Adjustment.storage_locations_adjusted_for(organization).to_a).to match_array([storage_location1, storage_location2])
-    end
-
     describe "split_difference" do
       it "returns two adjustment objects" do
         item = create(:item)

spec/models/audit_spec.rb

@@ -103,17 +103,6 @@
   end
 
   context "Methods >" do
-    it "`self.storage_locations_audited_for` returns only storage_locations that are used for one org" do
-      storage_location1 = create(:storage_location, organization: organization)
-      storage_location2 = create(:storage_location, organization: organization)
-      create(:storage_location, organization: organization)
-      storage_location4 = create(:storage_location, organization: create(:organization))
-      create(:audit, storage_location: storage_location1, organization: organization)
-      create(:audit, storage_location: storage_location2, organization: organization)
-      create(:audit, storage_location: storage_location4, organization: storage_location4.organization)
-      expect(Audit.storage_locations_audited_for(organization).to_a).to match_array([storage_location1, storage_location2])
-    end
-
     it "`self.finalized_since?` returns true iff some finalized audit occurred after itemizable created_at that shares item for location(s)" do
       storage_location1 = create(:storage_location, :with_items, item_quantity: 10, organization: organization)
       storage_location2 = create(:storage_location, :with_items, item_quantity: 10, organization: organization)

spec/models/storage_location_spec.rb

@@ -79,6 +79,34 @@
     end
   end
 
+  context "Scopes >" do
+    describe "with_audits_for" do
+      it "returns only storage locations that are used for one org" do
+        storage_location1 = create(:storage_location, organization: organization)
+        storage_location2 = create(:storage_location, organization: organization)
+        create(:storage_location, organization: organization)
+        storage_location4 = create(:storage_location, organization: create(:organization))
+        create(:audit, storage_location: storage_location1, organization: organization)
+        create(:audit, storage_location: storage_location2, organization: organization)
+        create(:audit, storage_location: storage_location4, organization: storage_location4.organization)
+        expect(StorageLocation.with_audits_for(organization).to_a).to match_array([storage_location1, storage_location2])
+      end
+    end
+
+    describe "with_adjustments_for" do
+      it "returns only storage locations that are used in adjustments for one org" do
+        storage_location1 = create(:storage_location, organization: organization)
+        storage_location2 = create(:storage_location, organization: organization)
+        create(:storage_location, organization: organization)
+        storage_location4 = create(:storage_location, organization: create(:organization))
+        create(:adjustment, storage_location: storage_location1, organization: organization)
+        create(:adjustment, storage_location: storage_location2, organization: organization)
+        create(:adjustment, storage_location: storage_location4, organization: storage_location4.organization)
+        expect(StorageLocation.with_adjustments_for(organization).to_a).to match_array([storage_location1, storage_location2])
+      end
+    end
+  end
+
   context "Methods >" do
     let(:item) { create(:item) }
     subject { create(:storage_location, :with_items, item_quantity: 10, item: item, organization: organization) }