Implement mandatory fields validation and enhance agency information form

Author: Olexii Kasianenko

app/models/partner.rb

@@ -48,7 +48,7 @@ class Partner < ApplicationRecord
 
   has_many_attached :documents
 
-  validates :name, presence: true, uniqueness: { scope: :organization }
+  # validates :name, presence: true, uniqueness: { scope: :organization }
 
   validates :email, presence: true, uniqueness: { case_sensitive: false }, format: { with: URI::MailTo::EMAIL_REGEXP }
 

app/models/partners/profile.rb

@@ -135,8 +135,6 @@ class Profile < Base
       twoycollege: "2YCOLLEGE",
       wic: "WIC"
 
-    validate :check_social_media, on: :edit
-
     validate :client_share_is_0_or_100
     validate :has_at_least_one_request_setting
     validate :pick_up_email_addresses
@@ -193,17 +191,42 @@ 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
 
-    private
-
     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, "must be checked if you have not provided any of Website, Twitter, Facebook, or Instagram.")
+        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
       # business logic:  the client share has to be 0 or 100 -- although it is an estimate only,  making it 0 (not
       # specified at all) or 100 means we won't have people overallocating (> 100) and that they think about what

app/services/partner_profile_update_service.rb

@@ -10,18 +10,13 @@ def initialize(old_partner, new_partner_params, new_profile_params)
   end
 
   def call
-    @return_value = false
+    return self unless validation
+
     perform_profile_service do
       @partner.update(@partner_params)
-      @return_value = @partner.valid?
-
-      if @return_value
-        @profile.served_areas.destroy_all
-        @profile.attributes = @profile_params
-        @profile.save!(context: :edit)
-      else
-        @error = "Partner '#{@partner.name}' had error(s) preventing the profile from being updated: #{@partner.errors.full_messages.join(", ")}"
-      end
+      @profile.served_areas.destroy_all
+      @profile.attributes = @profile_params
+      @profile.save!(context: :edit)
     end
   end
 
@@ -48,4 +43,31 @@ def success?
   def set_error(error)
     @error = error.to_s
   end
+
+  private
+
+  def validation
+    return true unless %w[awaiting_review approved].include?(@partner.status)
+    return true if @partner.organization.one_step_partner_invite
+
+    check_social_media
+    check_mandatory_fields
+    @error.nil?
+  end
+
+  def check_mandatory_fields
+    mandatory_fields = %i[agency_type address1 city state zip_code program_name program_description]
+    missing_fields = mandatory_fields.select { |field| @profile_params[field].blank? }
+    missing_fields.prepend :agency_name if @partner_params[:name].blank?
+    if missing_fields.any?
+      @error = "Missing mandatory fields: #{missing_fields.join(', ')}"
+    end
+  end
+
+  def check_social_media
+    social_media_fields = %i[website facebook twitter instagram]
+    if social_media_fields.all? { |field| @profile_params[field].blank? } && @profile_params[:no_social_media_presence] == '0'
+      @error = "At least one social media field must be filled out or 'No social media presence' must be checked."
+    end
+  end
 end

app/services/partners/request_approval_service.rb

@@ -33,6 +33,9 @@ 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
+
       errors.none?
     end
   end

app/views/partners/profiles/edit/_agency_information.html.erb

@@ -2,7 +2,7 @@
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-12">
-        <div class="card">
+        <div id="agency_information" class="card">
           <div class="card-header bg-white">
             <h3 class="card-title"><strong>Agency Information</strong></h3>
           </div>

spec/system/partner_system_spec.rb

@@ -93,7 +93,7 @@
 
           click_on 'New Partner Agency'
 
-          fill_in 'Name *', with: partner_attributes[:name]
+          fill_in 'Name', with: partner_attributes[:name]
           fill_in 'E-mail *', with: partner_attributes[:email]
           fill_in 'Quota', with: partner_attributes[:quota]
           fill_in 'Notes', with: partner_attributes[:notes]
@@ -125,7 +125,7 @@
           assert page.has_content? "Partner Agencies for #{organization.name}"
           click_on 'New Partner Agency'
 
-          fill_in 'Name *', with: partner_attributes[:name]
+          fill_in 'Name', with: partner_attributes[:name]
 
           find('button', text: 'Add Partner Agency').click
         end
@@ -384,14 +384,6 @@
         expect(partner.name).to eq(name)
       end
 
-      it "prevents a user from updating a partner with empty name" do
-        visit subject
-        fill_in "Name", with: ""
-        click_button "Update Partner"
-
-        expect(page.find(".alert")).to have_content "Something didn't work quite right -- try again?"
-      end
-
       it "User can uncheck send_reminders" do
         visit subject
         uncheck 'send_reminders'
@@ -458,12 +450,11 @@
 
     describe "#edit_profile" do
       let!(:partner) { create(:partner, name: "Frank") }
-      subject { edit_profile_path(partner.id) }
 
       context "when step-wise editing is enabled" do
         before do
           Flipper.enable(:partner_step_form)
-          visit subject
+          visit edit_profile_path(partner.id)
         end
 
         it "displays all sections in a closed state by default" do
@@ -554,6 +545,165 @@
           expect(page).to have_css("#pick_up_person.accordion-collapse.collapse.show", visible: true)
           expect(page).to have_css("#partner_settings.accordion-collapse.collapse.show", visible: true)
         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
+                partner.invited!
+              end
+
+              it "displays success message" do
+                expect {
+                  subject
+                }.to change { partner.reload.updated_at }
+
+                expect(page).to have_content("Details were successfully updated.")
+              end
+            end
+
+            context "partner status is awaiting_review" do
+              before do
+                partner.awaiting_review!
+              end
+
+              it "displays validation errors" do
+                expect {
+                  subject
+                }.not_to change { partner.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
+                partner.approved!
+              end
+
+              it "displays validation errors" do
+                expect {
+                  subject
+                }.not_to change { partner.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
+                  partner.organization.update!(one_step_partner_invite: true)
+                end
+
+                it "displays success message" do
+                  expect {
+                    subject
+                  }.to change { partner.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
+                partner.invited!
+              end
+
+              it "displays success message" do
+                expect {
+                  subject
+                }.to change { partner.reload.updated_at }
+
+                expect(page).to have_content("Details were successfully updated.")
+              end
+            end
+
+            context "partner status is awaiting_review" do
+              before do
+                partner.awaiting_review!
+              end
+
+              it "displays validation errors" do
+                expect {
+                  subject
+                }.not_to change { partner.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
+                partner.approved!
+              end
+
+              it "displays validation errors" do
+                expect {
+                  subject
+                }.not_to change { partner.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
+                  partner.organization.update!(one_step_partner_invite: true)
+                end
+
+                it "displays success message" do
+                  expect {
+                    subject
+                  }.to change { partner.reload.updated_at }
+
+                  expect(page).to have_content("Details were successfully updated.")
+                end
+              end
+            end
+          end
+        end
       end
     end