Resolves #4677 - Require Business Name for Vendors

app/models/concerns/provideable.rb

@@ -8,9 +8,6 @@ module Provideable
   included do
     belongs_to :organization # Automatically validates presence as of Rails 5
 
-    validates :contact_name, presence: { message: "Must provide a name or a business name" }, if: proc { |ddp| ddp.business_name.blank? }
-    validates :business_name, presence: { message: "Must provide a name or a business name" }, if: proc { |ddp| ddp.contact_name.blank? }
-
     scope :for_csv_export, ->(organization, *) {
       where(organization: organization).order(:business_name)
     }

app/models/product_drive_participant.rb

@@ -25,6 +25,8 @@ class ProductDriveParticipant < ApplicationRecord
 
   validates :phone, presence: { message: "Must provide a phone or an e-mail" }, if: proc { |pdp| pdp.email.blank? }
   validates :email, presence: { message: "Must provide a phone or an e-mail" }, if: proc { |pdp| pdp.phone.blank? }
+  validates :contact_name, presence: { message: "Must provide a name or a business name" }, if: proc { |pdp| pdp.business_name.blank? }
+  validates :business_name, presence: { message: "Must provide a name or a business name" }, if: proc { |pdp| pdp.contact_name.blank? }
   validates :comment, length: { maximum: 500 }
 
   scope :alphabetized, -> { order(:contact_name) }

app/models/vendor.rb

@@ -23,6 +23,8 @@ class Vendor < ApplicationRecord
 
   has_many :purchases, inverse_of: :vendor, dependent: :destroy
 
+  validates :business_name, presence: true
+
   scope :alphabetized, -> { order(:business_name) }
 
   def volume

db/migrate/20241002205346_backfill_vendor_business_name_from_contact.rb

@@ -0,0 +1,5 @@
+class BackfillVendorBusinessNameFromContact < ActiveRecord::Migration[7.1]
+  def change
+    Vendor.where(business_name: [nil, ""]).update_all('business_name = contact_name')
+  end
+end

spec/models/product_drive_participant_spec.rb

@@ -25,6 +25,13 @@
       expect(build(:product_drive_participant, phone: nil)).to be_valid
       expect(build(:product_drive_participant, email: nil)).to be_valid
     end
+
+    it "is invalid unless it has either a contact name or a business name" do
+      expect(build(:product_drive_participant, contact_name: nil, business_name: nil)).not_to be_valid
+      expect(build(:product_drive_participant, contact_name: nil, business_name: "George Company").valid?).to eq(true)
+      expect(build(:product_drive_participant, contact_name: "George Henry", business_name: nil).valid?).to eq(true)
+    end
+
     it "is invalid if the comment field has more than 500 characters" do
       long_comment = "a" * 501
       expect(build(:product_drive_participant, comment: long_comment)).not_to be_valid

spec/models/vendor_spec.rb

@@ -19,6 +19,13 @@
 RSpec.describe Vendor, type: :model do
   it_behaves_like "provideable"
 
+  context "Validations" do
+    it "validates that a business name is present" do
+      expect(build(:vendor, business_name: "Diaper Enterprises")).to be_valid
+      expect(build(:vendor, business_name: nil)).to_not be_valid
+    end
+  end
+
   context "Methods" do
     describe "volume" do
       it "retrieves the amount of product that has been bought from this vendor" do

spec/support/provideable_shared_example.rb

@@ -2,12 +2,6 @@
   let(:model_f) { described_class.to_s.underscore.to_sym }
 
   context "Validations" do
-    it "is invalid unless it has either a contact name or a business name" do
-      expect(build(model_f, contact_name: nil, business_name: nil)).not_to be_valid
-      expect(build(model_f, contact_name: nil, business_name: "George Company").valid?).to eq(true)
-      expect(build(model_f, contact_name: "George Henry").valid?).to eq(true)
-    end
-
     it "is invalid without an organization" do
       expect(build(model_f, organization: nil)).not_to be_valid
     end