Merge pull request #123 from turingschool/Bug/company_model

Fix/Company Model
turingschool · Feb 11, 2025 · 1148a54 · 1148a54
2 parents 47e4c9d + 0e77b94
commit 1148a54
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/api/v1/contacts_controller.rb b/app/controllers/api/v1/contacts_controller.rb
@@ -25,7 +25,7 @@ def index
       def create 
         authorize Contact
         if (company = Company.find_company(@current_user, params[:company_id])) || params[:company_id].blank?
-          contact = Contact.create_optional_company(contact_params, @current_user.id, params[:company_id])
+          contact = Contact.create_optional_company(contact_params, @current_user.id, company&.id)
           if contact.persisted?
             render json: ContactsSerializer.new(contact), status: :created
           else

diff --git a/app/models/company.rb b/app/models/company.rb
@@ -9,7 +9,7 @@ class Company < ApplicationRecord
   validates :city, presence: true, allow_blank: false
   validates :state, presence: true, allow_blank: false
   validates :zip_code, presence: true, allow_blank: false
-  validates :notes, presence: true, allow_nil: true
+  validates :notes, presence: true, allow_blank: true
 
   def self.find_company(user, company_id)
     if company = user.companies.find_by(id: company_id)