Add associations and specs to verify them

Author: edwinthinks

app/models/item_category.rb

@@ -4,7 +4,7 @@
 #
 #  id              :bigint           not null, primary key
 #  description     :text
-#  name            :string
+#  name            :string           not null
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
 #  organization_id :integer          not null
@@ -16,4 +16,5 @@ class ItemCategory < ApplicationRecord
 
   belongs_to :organization
   has_many :items, -> { order(name: :asc) }, inverse_of: :item_category
+  has_and_belongs_to_many :partner_groups
 end

app/models/partner.rb

@@ -2,16 +2,17 @@
 #
 # Table name: partners
 #
-#  id              :integer          not null, primary key
-#  email           :string
-#  name            :string
-#  notes           :text
-#  quota           :integer
-#  send_reminders  :boolean          default(FALSE), not null
-#  status          :integer          default("uninvited")
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
-#  organization_id :integer
+#  id               :integer          not null, primary key
+#  email            :string
+#  name             :string
+#  notes            :text
+#  quota            :integer
+#  send_reminders   :boolean          default(FALSE), not null
+#  status           :integer          default("uninvited")
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#  organization_id  :integer
+#  partner_group_id :bigint
 #
 
 class Partner < ApplicationRecord
@@ -26,14 +27,10 @@ class Partner < ApplicationRecord
   enum status: { uninvited: 0, invited: 1, awaiting_review: 2, approved: 3, error: 4, recertification_required: 5, deactivated: 6 }
 
   belongs_to :organization
+  belongs_to :partner_group, optional: true
   has_many :distributions, dependent: :destroy
-
   has_many :requests, dependent: :destroy
 
-  has_many :partner_group_memberships, dependent: :destroy
-  has_many :partner_groups, through: :partner_group_memberships
-  has_many :requestable_items, through: :partner_groups, source: :items
-
   has_many_attached :documents
 
   validates :organization, presence: true

app/models/partner_group.rb

@@ -10,11 +10,8 @@
 #
 class PartnerGroup < ApplicationRecord
   belongs_to :organization
-  has_many :partner_group_memberships, dependent: :destroy
-  has_many :partners, through: :partner_group_memberships
-
-  has_many :partner_group_items, dependent: :destroy
-  has_many :items, through: :partner_group_items
+  has_many :partners
+  has_and_belongs_to_many :item_categories
 
   validates :organization, presence: true
   validates :name, presence: true, uniqueness: { scope: :organization }

db/migrate/20210729003516_add_join_table_between_partner_groups_to_item_categories.rb

@@ -1,8 +1,8 @@
 class AddJoinTableBetweenPartnerGroupsToItemCategories < ActiveRecord::Migration[6.1]
   def change
-    create_table :partner_groups_item_categories do |t|
-      t.references :partner, foreign_key: true
-      t.references :item_categories, foreign_key: true
+    create_table :item_categories_partner_groups do |t|
+      t.references :partner_group, foreign_key: true, null: false
+      t.references :item_category, foreign_key: true, null: false
 
       t.timestamps
     end

db/partners_schema.rb

@@ -10,7 +10,8 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20_200_518_010_905) do
+ActiveRecord::Schema.define(version: 2020_05_18_010905) do
+
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -21,7 +22,7 @@
     t.bigint "blob_id", null: false
     t.datetime "created_at", null: false
     t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
-    t.index %w(record_type record_id name blob_id), name: "index_active_storage_attachments_uniqueness", unique: true
+    t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
   end
 
   create_table "active_storage_blobs", force: :cascade do |t|
@@ -115,7 +116,7 @@
     t.string "value"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index %w(feature_key key value), name: "index_flipper_gates_on_feature_key_and_key_and_value", unique: true
+    t.index ["feature_key", "key", "value"], name: "index_flipper_gates_on_feature_key_and_key_and_value", unique: true
   end
 
   create_table "item_requests", force: :cascade do |t|
@@ -261,7 +262,7 @@
     t.index ["invitation_token"], name: "index_users_on_invitation_token", unique: true
     t.index ["invitations_count"], name: "index_users_on_invitations_count"
     t.index ["invited_by_id"], name: "index_users_on_invited_by_id"
-    t.index %w(invited_by_type invited_by_id), name: "index_users_on_invited_by_type_and_invited_by_id"
+    t.index ["invited_by_type", "invited_by_id"], name: "index_users_on_invited_by"
     t.index ["partner_id"], name: "index_users_on_partner_id"
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end

db/schema.rb

@@ -10,7 +10,8 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20_210_729_003_516) do
+ActiveRecord::Schema.define(version: 2021_07_29_003516) do
+
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -32,7 +33,7 @@
     t.bigint "record_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index %w(record_type record_id name), name: "index_action_text_rich_texts_uniqueness", unique: true
+    t.index ["record_type", "record_id", "name"], name: "index_action_text_rich_texts_uniqueness", unique: true
   end
 
   create_table "active_storage_attachments", force: :cascade do |t|
@@ -42,7 +43,7 @@
     t.bigint "blob_id", null: false
     t.datetime "created_at", null: false
     t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
-    t.index %w(record_type record_id name blob_id), name: "index_active_storage_attachments_uniqueness", unique: true
+    t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
   end
 
   create_table "active_storage_blobs", force: :cascade do |t|
@@ -62,7 +63,7 @@
     t.string "variation_digest", null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-    t.index %w(blob_id variation_digest), name: "index_active_storage_variant_records_uniqueness", unique: true
+    t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
   end
 
   create_table "adjustments", id: :serial, force: :cascade do |t|
@@ -99,7 +100,7 @@
     t.datetime "updated_at", null: false
     t.integer "organization_id"
     t.string "barcodeable_type", default: "Item"
-    t.index %w(barcodeable_type barcodeable_id), name: "index_barcode_items_on_barcodeable_type_and_barcodeable_id"
+    t.index ["barcodeable_type", "barcodeable_id"], name: "index_barcode_items_on_barcodeable_type_and_barcodeable_id"
     t.index ["organization_id"], name: "index_barcode_items_on_organization_id"
   end
 
@@ -136,7 +137,7 @@
     t.string "business_name"
     t.float "latitude"
     t.float "longitude"
-    t.index %w(latitude longitude), name: "index_diaper_drive_participants_on_latitude_and_longitude"
+    t.index ["latitude", "longitude"], name: "index_diaper_drive_participants_on_latitude_and_longitude"
   end
 
   create_table "diaper_drives", force: :cascade do |t|
@@ -175,7 +176,7 @@
     t.integer "organization_id"
     t.float "latitude"
     t.float "longitude"
-    t.index %w(latitude longitude), name: "index_donation_sites_on_latitude_and_longitude"
+    t.index ["latitude", "longitude"], name: "index_donation_sites_on_latitude_and_longitude"
     t.index ["organization_id"], name: "index_donation_sites_on_organization_id"
   end
 
@@ -212,7 +213,7 @@
     t.string "value"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index %w(feature_key key value), name: "index_flipper_gates_on_feature_key_and_key_and_value", unique: true
+    t.index ["feature_key", "key", "value"], name: "index_flipper_gates_on_feature_key_and_key_and_value", unique: true
   end
 
   create_table "inventory_items", id: :serial, force: :cascade do |t|
@@ -229,7 +230,16 @@
     t.integer "organization_id", null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-    t.index %w(name organization_id), name: "index_item_categories_on_name_and_organization_id", unique: true
+    t.index ["name", "organization_id"], name: "index_item_categories_on_name_and_organization_id", unique: true
+  end
+
+  create_table "item_categories_partner_groups", force: :cascade do |t|
+    t.bigint "partner_group_id", null: false
+    t.bigint "item_category_id", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["item_category_id"], name: "index_item_categories_partner_groups_on_item_category_id"
+    t.index ["partner_group_id"], name: "index_item_categories_partner_groups_on_partner_group_id"
   end
 
   create_table "items", id: :serial, force: :cascade do |t|
@@ -263,7 +273,7 @@
     t.boolean "active", default: true
     t.boolean "visible_to_partners", default: true, null: false
     t.integer "value_in_cents", default: 0
-    t.index %w(name organization_id), name: "index_kits_on_name_and_organization_id", unique: true
+    t.index ["name", "organization_id"], name: "index_kits_on_name_and_organization_id", unique: true
     t.index ["organization_id"], name: "index_kits_on_organization_id"
   end
 
@@ -274,7 +284,7 @@
     t.string "itemizable_type"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index %w(itemizable_id itemizable_type), name: "index_line_items_on_itemizable_id_and_itemizable_type"
+    t.index ["itemizable_id", "itemizable_type"], name: "index_line_items_on_itemizable_id_and_itemizable_type"
   end
 
   create_table "manufacturers", force: :cascade do |t|
@@ -305,7 +315,7 @@
     t.integer "default_storage_location"
     t.text "partner_form_fields", default: [], array: true
     t.integer "account_request_id"
-    t.index %w(latitude longitude), name: "index_organizations_on_latitude_and_longitude"
+    t.index ["latitude", "longitude"], name: "index_organizations_on_latitude_and_longitude"
     t.index ["short_name"], name: "index_organizations_on_short_name"
   end
 
@@ -314,19 +324,10 @@
     t.string "name"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-    t.index %w(name organization_id), name: "index_partner_groups_on_name_and_organization_id", unique: true
+    t.index ["name", "organization_id"], name: "index_partner_groups_on_name_and_organization_id", unique: true
     t.index ["organization_id"], name: "index_partner_groups_on_organization_id"
   end
 
-  create_table "partner_groups_item_categories", force: :cascade do |t|
-    t.bigint "partner_id"
-    t.bigint "item_categories_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-    t.index ["item_categories_id"], name: "index_partner_groups_item_categories_on_item_categories_id"
-    t.index ["partner_id"], name: "index_partner_groups_item_categories_on_partner_id"
-  end
-
   create_table "partners", id: :serial, force: :cascade do |t|
     t.string "name"
     t.string "email"
@@ -337,9 +338,9 @@
     t.boolean "send_reminders", default: false, null: false
     t.text "notes"
     t.integer "quota"
-    t.bigint "partner_groups_id"
+    t.bigint "partner_group_id"
     t.index ["organization_id"], name: "index_partners_on_organization_id"
-    t.index ["partner_groups_id"], name: "index_partners_on_partner_groups_id"
+    t.index ["partner_group_id"], name: "index_partners_on_partner_group_id"
   end
 
   create_table "purchases", force: :cascade do |t|
@@ -384,7 +385,7 @@
     t.float "longitude"
     t.integer "square_footage"
     t.string "warehouse_type"
-    t.index %w(latitude longitude), name: "index_storage_locations_on_latitude_and_longitude"
+    t.index ["latitude", "longitude"], name: "index_storage_locations_on_latitude_and_longitude"
     t.index ["organization_id"], name: "index_storage_locations_on_organization_id"
   end
 
@@ -430,7 +431,7 @@
     t.index ["invitation_token"], name: "index_users_on_invitation_token", unique: true
     t.index ["invitations_count"], name: "index_users_on_invitations_count"
     t.index ["invited_by_id"], name: "index_users_on_invited_by_id"
-    t.index %w(invited_by_type invited_by_id), name: "index_users_on_invited_by"
+    t.index ["invited_by_type", "invited_by_id"], name: "index_users_on_invited_by"
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
@@ -446,7 +447,7 @@
     t.float "longitude"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index %w(latitude longitude), name: "index_vendors_on_latitude_and_longitude"
+    t.index ["latitude", "longitude"], name: "index_vendors_on_latitude_and_longitude"
   end
 
   create_table "versions", force: :cascade do |t|
@@ -457,7 +458,7 @@
     t.jsonb "object"
     t.datetime "created_at"
     t.jsonb "object_changes"
-    t.index %w(item_type item_id), name: "index_versions_on_item_type_and_item_id"
+    t.index ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
   end
 
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
@@ -471,14 +472,14 @@
   add_foreign_key "donations", "manufacturers"
   add_foreign_key "donations", "storage_locations"
   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 "items", "item_categories"
   add_foreign_key "items", "kits"
   add_foreign_key "kits", "organizations"
   add_foreign_key "manufacturers", "organizations"
   add_foreign_key "organizations", "account_requests"
   add_foreign_key "partner_groups", "organizations"
-  add_foreign_key "partner_groups_item_categories", "item_categories", column: "item_categories_id"
-  add_foreign_key "partner_groups_item_categories", "partners"
   add_foreign_key "requests", "distributions"
   add_foreign_key "requests", "organizations"
   add_foreign_key "requests", "partners"

spec/factories/item_categories.rb

@@ -4,7 +4,7 @@
 #
 #  id              :bigint           not null, primary key
 #  description     :text
-#  name            :string
+#  name            :string           not null
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
 #  organization_id :integer          not null

spec/factories/partners.rb

@@ -2,16 +2,17 @@
 #
 # Table name: partners
 #
-#  id              :integer          not null, primary key
-#  email           :string
-#  name            :string
-#  notes           :text
-#  quota           :integer
-#  send_reminders  :boolean          default(FALSE), not null
-#  status          :integer          default("uninvited")
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
-#  organization_id :integer
+#  id               :integer          not null, primary key
+#  email            :string
+#  name             :string
+#  notes            :text
+#  quota            :integer
+#  send_reminders   :boolean          default(FALSE), not null
+#  status           :integer          default("uninvited")
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#  organization_id  :integer
+#  partner_group_id :bigint
 #
 
 FactoryBot.define do

spec/factories/users.rb

@@ -2,9 +2,10 @@
 #
 # Table name: users
 #
-#  id                     :bigint           not null, primary key
+#  id                     :integer          not null, primary key
 #  current_sign_in_at     :datetime
 #  current_sign_in_ip     :inet
+#  discarded_at           :datetime
 #  email                  :string           default(""), not null
 #  encrypted_password     :string           default(""), not null
 #  invitation_accepted_at :datetime
@@ -14,17 +15,20 @@
 #  invitation_token       :string
 #  invitations_count      :integer          default(0)
 #  invited_by_type        :string
+#  last_request_at        :datetime
 #  last_sign_in_at        :datetime
 #  last_sign_in_ip        :inet
-#  name                   :string
+#  name                   :string           default("CHANGEME"), not null
+#  organization_admin     :boolean
 #  remember_created_at    :datetime
 #  reset_password_sent_at :datetime
 #  reset_password_token   :string
 #  sign_in_count          :integer          default(0), not null
+#  super_admin            :boolean          default(FALSE)
 #  created_at             :datetime         not null
 #  updated_at             :datetime         not null
-#  invited_by_id          :bigint
-#  partner_id             :bigint
+#  invited_by_id          :integer
+#  organization_id        :integer
 #
 
 FactoryBot.define do