Change with_transfers_to/from class methods to be scopes

app/models/storage_location.rb

@@ -55,6 +55,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]
@@ -72,14 +78,6 @@ def items
     View::Inventory.items_for_location(self).map(&:db_item)
   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
-
   # @return [Integer]
   def size
     View::Inventory.items_for_location(self).map(&:quantity).sum

spec/models/storage_location_spec.rb

@@ -52,6 +52,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
@@ -182,21 +208,6 @@
         expect(storage_location.longitude).not_to eq(nil)
       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