From 053f8c5f5ceede0521e5ce712df1c80aa0227a75 Mon Sep 17 00:00:00 2001 From: Cory Streiff Date: Thu, 28 Nov 2024 16:17:16 +0100 Subject: [PATCH] Change with_transfers_to/from class methods to be scopes --- app/models/storage_location.rb | 14 ++++----- spec/models/storage_location_spec.rb | 43 +++++++++++++++++----------- 2 files changed, 33 insertions(+), 24 deletions(-) diff --git a/app/models/storage_location.rb b/app/models/storage_location.rb index 5b768a892f..81ca619154 100644 --- a/app/models/storage_location.rb +++ b/app/models/storage_location.rb @@ -62,6 +62,12 @@ class StorageLocation < ApplicationRecord scope :alphabetized, -> { order(:name) } scope :for_csv_export, ->(organization, *) { where(organization: organization) } scope :active_locations, -> { where(discarded_at: nil) } + scope :with_transfers_to, ->(organization) { + joins(:transfers_to).where(organization_id: organization.id).distinct.order(:name) + } + scope :with_transfers_from, ->(organization) { + joins(:transfers_from).where(organization_id: organization.id).distinct.order(:name) + } # @param organization [Organization] # @param inventory [View::Inventory] @@ -77,14 +83,6 @@ def self.items_inventoried(organization, inventory = nil) end end - def self.with_transfers_to(organization) - joins(:transfers_to).where(organization_id: organization.id).distinct.order(:name) - end - - def self.with_transfers_from(organization) - joins(:transfers_from).where(organization_id: organization.id).distinct.order(:name) - end - def item_total(item_id) inventory_items.where(item_id: item_id).pick(:quantity) || 0 end diff --git a/spec/models/storage_location_spec.rb b/spec/models/storage_location_spec.rb index c50246fb0a..baba8a0b9c 100644 --- a/spec/models/storage_location_spec.rb +++ b/spec/models/storage_location_spec.rb @@ -44,7 +44,7 @@ end end - context "Filtering >" do + context "Scopes >" do it "->containing yields only inventories that have that item" do item = create(:item) item2 = create(:item) @@ -62,6 +62,32 @@ expect(results.length).to eq(1) expect(results.first.discarded_at).to be_nil end + + it "->with_transfers_to yields storage locations with transfers to an organization" do + storage_location1 = create(:storage_location, name: "loc1", organization: organization) + storage_location2 = create(:storage_location, name: "loc2", organization: organization) + storage_location3 = create(:storage_location, name: "loc3", organization: organization) + storage_location4 = create(:storage_location, name: "loc4", organization: create(:organization)) + storage_location5 = create(:storage_location, name: "loc5", organization: storage_location4.organization) + create(:transfer, from: storage_location3, to: storage_location1, organization: organization) + create(:transfer, from: storage_location3, to: storage_location2, organization: organization) + create(:transfer, from: storage_location5, to: storage_location4, organization: storage_location4.organization) + + expect(StorageLocation.with_transfers_to(organization).to_a).to match_array([storage_location1, storage_location2]) + end + + it "->with_transfers_from yields storage locations with transfers from an organization" do + storage_location1 = create(:storage_location, name: "loc1", organization: organization) + storage_location2 = create(:storage_location, name: "loc2", organization: organization) + storage_location3 = create(:storage_location, name: "loc3", organization: organization) + storage_location4 = create(:storage_location, name: "loc4", organization: create(:organization)) + storage_location5 = create(:storage_location, name: "loc5", organization: storage_location4.organization) + create(:transfer, from: storage_location3, to: storage_location1, organization: organization) + create(:transfer, from: storage_location3, to: storage_location2, organization: organization) + create(:transfer, from: storage_location5, to: storage_location4, organization: storage_location4.organization) + + expect(StorageLocation.with_transfers_from(organization).to_a).to match_array([storage_location3]) + end end context "Methods >" do @@ -280,21 +306,6 @@ expect(storage_location.csv_export_attributes).to eq([name, address, square_footage, warehouse_type, sum, quantity3, quantity2, quantity1]) end end - - describe "self.with_transfers_to and self.with_transfers_from" do - it "returns storage locations with transfers to/from for an organization" do - storage_location1 = create(:storage_location, name: "loc1", organization: organization) - storage_location2 = create(:storage_location, name: "loc2", organization: organization) - storage_location3 = create(:storage_location, name: "loc3", organization: organization) - storage_location4 = create(:storage_location, name: "loc4", organization: create(:organization)) - storage_location5 = create(:storage_location, name: "loc5", organization: storage_location4.organization) - create(:transfer, from: storage_location3, to: storage_location1, organization: organization) - create(:transfer, from: storage_location3, to: storage_location2, organization: organization) - create(:transfer, from: storage_location5, to: storage_location4, organization: storage_location4.organization) - expect(StorageLocation.with_transfers_to(organization).to_a).to match_array([storage_location1, storage_location2]) - expect(StorageLocation.with_transfers_from(organization).to_a).to match_array([storage_location3]) - end - end end describe "versioning" do