Add models to support request units

app/models/item.rb

@@ -47,7 +47,7 @@ class Item < ApplicationRecord
   has_many :storage_locations, through: :inventory_items
   has_many :donations, through: :line_items, source: :itemizable, source_type: "::Donation"
   has_many :distributions, through: :line_items, source: :itemizable, source_type: "::Distribution"
-  has_many :request_units, class_name: "ItemRequestUnit", dependent: :destroy
+  has_many :request_units, class_name: "ItemUnit", dependent: :destroy
 
   scope :active, -> { where(active: true) }
 

app/models/item_request_unit.rb → app/models/item_unit.rb

@@ -1,14 +1,14 @@
 # == Schema Information
 #
-# Table name: item_request_units
+# Table name: item_units
 #
 #  id         :bigint           not null, primary key
 #  name       :string           not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #  item_id    :bigint
 #
-class ItemRequestUnit < ApplicationRecord
+class ItemUnit < ApplicationRecord
   belongs_to :item
 
   validate do

app/models/organization.rb

@@ -72,7 +72,7 @@ class Organization < ApplicationRecord
     has_many :transfers
     has_many :users, -> { distinct }, through: :roles
     has_many :vendors
-    has_many :request_units
+    has_many :request_units, class_name: 'Unit'
   end
 
   has_many :items, dependent: :destroy do

app/models/partners/item_request.rb

@@ -6,6 +6,7 @@
 #  name                   :string
 #  partner_key            :string
 #  quantity               :string
+#  request_unit           :string
 #  created_at             :datetime         not null
 #  updated_at             :datetime         not null
 #  item_id                :integer
@@ -29,7 +30,7 @@ class ItemRequest < Base
     def request_unit_is_supported
       return if request_unit.blank?
 
-      names = request.organization.request_units.map(&:name)
+      names = item.request_units.map(&:name)
       unless names.include?(request_unit)
         errors.add(:request_unit, "is not supported")
       end

app/models/request_unit.rb → app/models/unit.rb

@@ -1,13 +1,13 @@
 # == Schema Information
 #
-# Table name: request_units
+# Table name: units
 #
 #  id              :bigint           not null, primary key
 #  name            :string           not null
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
 #  organization_id :bigint
 #
-class RequestUnit < ApplicationRecord
+class Unit < ApplicationRecord
   belongs_to :organization
 end

db/migrate/20240426135118_add_pack_models.rb

@@ -1,12 +1,12 @@
 class AddPackModels < ActiveRecord::Migration[7.0]
   def change
-    create_table :request_units do |t|
+    create_table :units do |t|
       t.string :name, null: false
       t.references :organization, foreign_key: true
       t.timestamps
     end
 
-    create_table :item_request_units do |t|
+    create_table :item_units do |t|
       t.string :name, null: false
       t.references :item, foreign_key: true
       t.timestamps

db/schema.rb

@@ -372,14 +372,6 @@
     t.index ["partner_group_id"], name: "index_item_categories_partner_groups_on_partner_group_id"
   end
 
-  create_table "item_request_units", force: :cascade do |t|
-    t.string "name", null: false
-    t.bigint "item_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["item_id"], name: "index_item_request_units_on_item_id"
-  end
-
   create_table "item_requests", force: :cascade do |t|
     t.string "name"
     t.string "quantity"
@@ -394,6 +386,14 @@
     t.index ["partner_request_id"], name: "index_item_requests_on_partner_request_id"
   end
 
+  create_table "item_units", force: :cascade do |t|
+    t.string "name", null: false
+    t.bigint "item_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["item_id"], name: "index_item_units_on_item_id"
+  end
+
   create_table "items", id: :serial, force: :cascade do |t|
     t.string "name"
     t.string "category"
@@ -734,14 +734,6 @@
     t.datetime "updated_at", null: false
   end
 
-  create_table "request_units", force: :cascade do |t|
-    t.string "name", null: false
-    t.bigint "organization_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["organization_id"], name: "index_request_units_on_organization_id"
-  end
-
   create_table "requests", force: :cascade do |t|
     t.bigint "partner_id"
     t.bigint "organization_id"
@@ -799,6 +791,14 @@
     t.index ["organization_id"], name: "index_transfers_on_organization_id"
   end
 
+  create_table "units", force: :cascade do |t|
+    t.string "name", null: false
+    t.bigint "organization_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["organization_id"], name: "index_units_on_organization_id"
+  end
+
   create_table "users", id: :serial, force: :cascade do |t|
     t.string "email", default: "", null: false
     t.string "encrypted_password", default: "", null: false
@@ -897,7 +897,7 @@
   add_foreign_key "item_categories", "organizations"
   add_foreign_key "item_categories_partner_groups", "item_categories"
   add_foreign_key "item_categories_partner_groups", "partner_groups"
-  add_foreign_key "item_request_units", "items"
+  add_foreign_key "item_units", "items"
   add_foreign_key "items", "item_categories"
   add_foreign_key "items", "kits"
   add_foreign_key "kit_allocations", "kits"
@@ -913,9 +913,9 @@
   add_foreign_key "partner_served_areas", "partner_profiles"
   add_foreign_key "partners", "storage_locations", column: "default_storage_location_id"
   add_foreign_key "product_drives", "organizations"
-  add_foreign_key "request_units", "organizations"
   add_foreign_key "requests", "distributions"
   add_foreign_key "requests", "organizations"
   add_foreign_key "requests", "partners"
+  add_foreign_key "units", "organizations"
   add_foreign_key "users", "users_roles", column: "last_role_id", on_delete: :nullify
 end

spec/factories/item_request_units.rb → spec/factories/item_units.rb

@@ -1,6 +1,6 @@
 # == Schema Information
 #
-# Table name: item_request_units
+# Table name: item_units
 #
 #  id         :bigint           not null, primary key
 #  name       :string           not null
@@ -9,7 +9,7 @@
 #  item_id    :bigint
 #
 FactoryBot.define do
-  factory :item_request_unit do
+  factory :item_unit do
     sequence(:name) { |n| "Unit #{n}" }
     item
 

spec/factories/request_units.rb → spec/factories/units.rb

@@ -1,6 +1,6 @@
 # == Schema Information
 #
-# Table name: request_units
+# Table name: units
 #
 #  id              :bigint           not null, primary key
 #  name            :string           not null
@@ -9,7 +9,7 @@
 #  organization_id :bigint
 #
 FactoryBot.define do
-  factory :request_unit do
+  factory :unit do
     sequence(:name) { |n| "Unit #{n}" }
     organization
   end

spec/models/item_request_unit_spec.rb → spec/models/item_unit_spec.rb

@@ -8,18 +8,18 @@
 #  updated_at :datetime         not null
 #  item_id    :bigint
 #
-RSpec.describe ItemRequestUnit, type: :model do
+RSpec.describe ItemUnit, type: :model do
   context "Validations >" do
     let(:organization) { create(:organization) }
     let(:item) { create(:item, organization: organization) }
     it "should only be valid if the organization has a corresponding unit" do
-      unit = build(:item_request_unit, item: item, name: "pack")
-      expect(unit.valid?).to eq(false)
-      expect(unit.errors.full_messages).to eq(["Name is not supported by the organization"])
+      item_unit = build(:item_unit, item: item, name: "pack")
+      expect(item_unit.valid?).to eq(false)
+      expect(item_unit.errors.full_messages).to eq(["Name is not supported by the organization"])
 
-      create(:request_unit, organization: organization, name: "pack")
+      create(:unit, organization: organization, name: "pack")
       organization.reload
-      expect(unit.valid?).to eq(true)
+      expect(item_unit.valid?).to eq(true)
     end
   end
 end

spec/models/partners/item_request_spec.rb

@@ -6,6 +6,7 @@
 #  name                   :string
 #  partner_key            :string
 #  quantity               :string
+#  request_unit           :string
 #  created_at             :datetime         not null
 #  updated_at             :datetime         not null
 #  item_id                :integer
@@ -28,17 +29,21 @@
     it { should validate_presence_of(:name) }
     it { should validate_presence_of(:partner_key) }
 
-    it "should only be able to use organization's request units" do
-      request_unit = create(:request_unit, name: 'pack', organization: organization)
+    it "should only be able to use item's request units" do
+      unit = create(:unit, organization: organization, name: 'pack')
+      item = create(:item, organization: organization)
+      item_unit = create(:item_unit, name: 'pack', item: item)
       request = build(:request, organization: organization)
 
-      item_request = build(:item_request, request_unit: "flat", request: request)
+      item_request = build(:item_request, request_unit: "flat", request: request, item: item)
 
       expect(item_request.valid?).to eq(false)
       expect(item_request.errors.full_messages).to eq(["Request unit is not supported"])
 
-      request_unit.update!(name: 'flat')
+      unit.update!(name: 'flat')
       organization.reload
+      item_unit.update!(name: 'flat')
+      item.reload
       expect(item_request.valid?).to eq(true)
     end
   end