Implement mandatory fields validation in request approval process

Author: Olexii Kasianenko

app/models/partner.rb

@@ -48,8 +48,6 @@ class Partner < ApplicationRecord
 
   has_many_attached :documents
 
-  # validates :name, presence: true, uniqueness: { scope: :organization }
-
   validates :email, presence: true, uniqueness: { case_sensitive: false }, format: { with: URI::MailTo::EMAIL_REGEXP }
 
   validates :quota, numericality: { greater_than_or_equal_to: 0 }, allow_blank: true

app/models/partners/profile.rb

@@ -191,40 +191,6 @@ def self.agency_types_for_selection
       agency_types.keys.map(&:to_sym).sort_by { |sym| I18n.t(sym, scope: :partners_profile) }.partition { |v| v != :other }.flatten
     end
 
-    def check_social_media
-      return if organization.one_step_partner_invite
-      return if website.present? || twitter.present? || facebook.present? || instagram.present?
-      return if partner.partials_to_show.exclude?("media_information")
-
-      unless no_social_media_presence
-        errors.add(:no_social_media_presence, "No social media presence must be checked if you have not provided any of Website, Twitter, Facebook, or Instagram.")
-      end
-      errors
-    end
-
-    def check_mandatory_fields
-      return if organization.one_step_partner_invite
-
-      mandatory_fields = [
-        :agency_type,
-        :address1,
-        :city,
-        :state,
-        :zip_code,
-        :program_name,
-        :program_description
-      ]
-      messages = []
-      messages << "Name can't be blank" if partner.name.blank?
-      mandatory_fields.each do |field|
-        if send(field).blank?
-          messages << "#{field.to_s.humanize.capitalize} can't be blank"
-        end
-      end
-      errors.add(:base, messages.join(", ")) if messages.any?
-      errors
-    end
-
     private
 
     def client_share_is_0_or_100

app/services/partners/request_approval_service.rb

@@ -33,10 +33,44 @@ def valid?
         errors.add :base, partner.profile.errors.full_messages.join('. ')
       end
 
-      errors.merge! partner.profile.errors if partner.profile.check_social_media
-      errors.merge! partner.profile.errors if partner.profile.check_mandatory_fields
+      check_social_media
+      check_mandatory_fields
 
       errors.none?
     end
+
+    def check_mandatory_fields
+      return if partner.organization.one_step_partner_invite
+
+      mandatory_fields = [
+        :agency_type,
+        :address1,
+        :city,
+        :state,
+        :zip_code,
+        :program_name,
+        :program_description
+      ]
+      messages = []
+      messages << "Name can't be blank" if partner.name.blank?
+      mandatory_fields.each do |field|
+        if partner.profile.send(field).blank?
+          messages << "#{field.to_s.humanize.capitalize} can't be blank"
+        end
+      end
+      errors.add(:base, messages.join(", ")) if messages.any?
+      errors
+    end
+
+    def check_social_media
+      return if partner.organization.one_step_partner_invite
+      return if partner.profile.website.present? || partner.profile.twitter.present? || partner.profile.facebook.present? || partner.profile.instagram.present?
+      return if partner.partials_to_show.exclude?("media_information")
+
+      unless partner.profile.no_social_media_presence
+        errors.add(:base, "No social media presence must be checked if you have not provided any of Website, Twitter, Facebook, or Instagram.")
+      end
+      errors
+    end
   end
 end

spec/services/partners/request_approval_service_spec.rb

@@ -31,9 +31,28 @@
       end
     end
 
+    context 'when the partner is not yet awaiting approval and mandatory fields are missed' do
+      it 'should return an error re mandatory fields' do
+        partner.update(name: '')
+        partner.profile.update(
+          agency_type: '',
+          address1: '',
+          city: '',
+          state: '',
+          zip_code: '',
+          program_name: '',
+          program_description: ''
+        )
+
+        expect(subject.errors.full_messages)
+          .to include("Name can't be blank, Agency type can't be blank, Address1 can't be blank, City can't be blank, State can't be blank, Zip code can't be blank, Program name can't be blank, Program description can't be blank")
+      end
+    end
+
     context 'when the partner is not yet waiting for approval and there is no profile error' do
       it 'does not have an error' do
         partner.profile.update(website: 'website URL', facebook: '', twitter: '', instagram: '', no_social_media_presence: false)
+        partner.organization.update(one_step_partner_invite: true)
         expect(subject.errors.full_messages).to be_empty
       end
     end
@@ -44,6 +63,7 @@
         allow(OrganizationMailer).to receive(:partner_approval_request).with(partner: partner, organization: partner.organization).and_return(fake_mailer)
         expect(partner.status).not_to eq(:awaiting_review)
         partner.profile.update(website: 'website URL')
+        partner.organization.update(one_step_partner_invite: true)
       end
 
       it 'should set the status on the partner record to awaiting_review' do

spec/system/partners/approval_process_spec.rb

@@ -109,89 +109,4 @@
       end
     end
   end
-
-  describe "request approval with invalid details" do
-    let(:partner_user) { partner.primary_user }
-    let(:partner) { FactoryBot.create(:partner) }
-
-    before do
-      login_as(partner_user)
-      visit partner_user_root_path
-      click_on 'My Profile'
-    end
-
-    subject { all('button', text: 'Submit for Approval').last.click }
-
-    context "Social media information is absent" do
-      before do
-        partner.profile.update(website: '', facebook: '', twitter: '', instagram: '', no_social_media_presence: false)
-      end
-
-      context "partner status is invited" do
-        before do
-          partner.update(status: :invited)
-        end
-
-        it "should render an error message", :aggregate_failures do
-          subject
-          assert page.has_content? 'No social media presence must be checked if you have not provided any of Website, Twitter, Facebook, or Instagram.'
-        end
-
-        context "partner's organization one_step_partner_invite is true" do
-          before do
-            partner.organization.update(one_step_partner_invite: true)
-          end
-
-          it "should render an error message about social media presence only", :aggregate_failures do
-            subject
-            assert page.has_content? 'You have submitted your details for approval.'
-          end
-        end
-      end
-
-      context "partner status is awaiting_review" do
-        before do
-          partner.update(status: :awaiting_review)
-        end
-
-        it "should render an error message", :aggregate_failures do
-          subject
-          assert page.has_content? 'This partner has already requested approval.'
-        end
-      end
-    end
-
-    context "Mandatory fields are empty" do
-      before do
-        partner.update(name: '')
-        partner.profile.update(
-          agency_type: '',
-          address1: '',
-          city: '',
-          state: '',
-          zip_code: '',
-          program_name: '',
-          program_description: ''
-        )
-      end
-
-      context "partner status is invited" do
-        before do
-          partner.update(status: :invited)
-        end
-
-        it "should render error messages for each missing field", :aggregate_failures do
-          subject
-          assert page.has_content? "Name can't be blank"
-          assert page.has_content? "Agency type can't be blank"
-          assert page.has_content? "Address1 can't be blank"
-          assert page.has_content? "City can't be blank"
-          assert page.has_content? "State can't be blank"
-          assert page.has_content? "Zip code can't be blank"
-          assert page.has_content? "Program name can't be blank"
-          assert page.has_content? "Program description can't be blank"
-        end
-      end
-    end
-  end
 end

spec/system/partners/profile_edit_system_spec.rb

@@ -292,164 +292,5 @@
         expect(page).to have_link("document2.md")
       end
     end
-
-    context "Mandatory fields validation" do
-      subject { all("input[type='submit'][value='Save Progress']").last.click }
-
-      before do
-        find("button[data-bs-target='#agency_information']").click
-        within "#agency_information" do
-          fill_in "Agency Name", with: "Agency1"
-          select "Basic Needs Bank", from: "Agency Type"
-          fill_in "Address (line 1)", with: "123 Main St"
-          fill_in "City", with: "Metropolis"
-          fill_in "State", with: "CA"
-          fill_in "Zip Code", with: "90210"
-        end
-        find("button[data-bs-target='#agency_stability']").click
-        within "#agency_stability" do
-          fill_in "Program Name(s)", with: "Program 1"
-          fill_in "Program Description(s)", with: "Really great program"
-        end
-      end
-
-      context "No social media filled" do
-        before do
-          find("button[data-bs-target='#media_information']").click
-          within "#media_information" do
-            fill_in "Website", with: ""
-            uncheck "No Social Media Presence"
-          end
-        end
-
-        context "partner status is invited" do
-          before do
-            partner1.invited!
-          end
-
-          it "displays success message" do
-            expect {
-              subject
-            }.to change { partner1.reload.updated_at }
-
-            expect(page).to have_content("Details were successfully updated.")
-          end
-        end
-
-        context "partner status is awaiting_review" do
-          before do
-            partner1.awaiting_review!
-          end
-
-          it "displays validation errors" do
-            expect {
-              subject
-            }.not_to change { partner1.reload.updated_at }
-
-            expect(page).to have_content("At least one social media field must be filled out or 'No social media presence' must be checked.")
-          end
-        end
-
-        context "partner status is approved" do
-          before do
-            partner1.approved!
-          end
-
-          it "displays validation errors" do
-            expect {
-              subject
-            }.not_to change { partner1.reload.updated_at }
-
-            expect(page).to have_content("At least one social media field must be filled out or 'No social media presence' must be checked.")
-          end
-
-          context "partner's organization one_step_partner_invite is true" do
-            before do
-              partner1.organization.update!(one_step_partner_invite: true)
-            end
-
-            it "displays success message" do
-              expect {
-                subject
-              }.to change { partner1.reload.updated_at }
-
-              expect(page).to have_content("Details were successfully updated.")
-            end
-          end
-        end
-      end
-
-      context "Mandatory fields empty" do
-        before do
-          # find("button[data-bs-target='#agency_information']").click
-          within "#agency_information" do
-            fill_in "Agency Name", with: ""
-            select "", from: "Agency Type"
-            fill_in "Address (line 1)", with: ""
-            fill_in "City", with: ""
-            fill_in "State", with: ""
-            fill_in "Zip Code", with: ""
-          end
-          # find("button[data-bs-target='#agency_stability']").click
-          within "#agency_stability" do
-            fill_in "Program Name(s)", with: ""
-            fill_in "Program Description(s)", with: ""
-          end
-        end
-        context "partner status is invited" do
-          before do
-            partner1.invited!
-          end
-
-          it "displays success message" do
-            expect {
-              subject
-            }.to change { partner1.reload.updated_at }
-
-            expect(page).to have_content("Details were successfully updated.")
-          end
-        end
-
-        context "partner status is awaiting_review" do
-          before do
-            partner1.awaiting_review!
-          end
-
-          it "displays validation errors" do
-            expect {
-              subject
-            }.not_to change { partner1.reload.updated_at }
-            expect(page).to have_content("Missing mandatory fields: agency_name, agency_type, address1, city, state, zip_code, program_name, program_description")
-          end
-        end
-
-        context "partner status is approved" do
-          before do
-            partner1.approved!
-          end
-
-          it "displays validation errors" do
-            expect {
-              subject
-            }.not_to change { partner1.reload.updated_at }
-            expect(page).to have_content("Missing mandatory fields: agency_name, agency_type, address1, city, state, zip_code, program_name, program_description")
-          end
-
-          context "partner's organization one_step_partner_invite is true" do
-            before do
-              partner1.organization.update!(one_step_partner_invite: true)
-            end
-
-            it "displays success message" do
-              expect {
-                subject
-              }.to change { partner1.reload.updated_at }
-
-              expect(page).to have_content("Details were successfully updated.")
-            end
-          end
-        end
-      end
-    end
   end
 end