fix: validation and styling

Move validation from model to controller so validation doesn't block new user creation and is only valid for the member details page.

Author: davidmillen50

app/controllers/member/details_controller.rb

@@ -15,6 +15,12 @@ def edit
   def update
     attrs = member_params.to_h
 
+    if attrs[:how_you_found_us].blank?
+      @member.assign_attributes(attrs)
+      @member.errors.add(:how_you_found_us, 'You must select at least one option')
+      return render :edit
+    end
+
     how_found = params.dig(:member, :how_you_found_us)
     attrs[:how_you_found_us] =
       if how_found.is_a?(Array)
@@ -37,4 +43,4 @@ def update
     member_params[:newsletter] ? subscribe_to_newsletter(@member) : unsubscribe_from_newsletter(@member)
     redirect_to step2_member_path
   end
-end
+end

app/controllers/members_controller.rb

@@ -12,9 +12,7 @@ def new
 
   end
 
-  def edit
-    binding.pry
-  end
+  def edit; end
 
   def step2
     @type = cookies[:member_type]

app/models/member.rb

@@ -19,7 +19,6 @@ class Member < ApplicationRecord
   validates :name, :surname, :email, :about_you, presence: true, if: :can_log_in?
   validates :email, uniqueness: true
   validates :about_you, length: { maximum: 255 }
-  validate :how_you_found_us_must_have_at_least_one_option
 
   scope :accepted_toc, -> { where.not(accepted_toc_at: nil) }
   scope :order_by_email, -> { order(:email) }
@@ -126,12 +125,6 @@ def self.find_members_by_name(name)
 
   private
 
-  def how_you_found_us_must_have_at_least_one_option
-    if how_you_found_us.blank? || how_you_found_us.reject(&:blank?).empty?
-      errors.add(:how_you_found_us, 'You must select at least one option')
-    end
-  end
-
   def invitations_on(date)
     workshop_invitations
       .joins(:workshop)

app/views/member/details/edit.html.haml

@@ -15,21 +15,18 @@
           = f.input :about_you, as: :text, label: t('member.details.edit.coach.about_you'), input_html: { rows: 3 }, required: true
         - else
           = f.input :about_you, as: :text, label: t('member.details.edit.student.about_you'), input_html: { rows: 3 }, required: true
-        - if @member.errors.any?
-          #error_explanation
-            %h2= "#{pluralize(@member.errors.count, 'error')} prohibited this member from being saved:"
-            %ul
-              - @member.errors.full_messages.each do |msg|
-                %li= msg
+        - if @member.errors[:how_you_found_us].any?
+          %span.text-danger= @member.errors[:how_you_found_us].first
         .col-12.mb-3
           %label{ for: 'how_you_found_us' }= t('member.details.edit.how_you_found_us')
+          %span *
           - options = ['From a friend', 'Search engine (Google etc.)', 'Social Media', "One of Codebar's hosts or partners"]
           - options.each do |option|
             .form-check
               = check_box_tag 'member[how_you_found_us][]', option, false, id: "how_you_found_us_#{option.parameterize}", class: 'form-check-input'
               = label_tag "how_you_found_us_#{option.parameterize}", option, class: 'form-check-label', style: 'margin-left: 8px;'
           = label_tag :other_reason, t('member.details.edit.other_reason'), class: 'my-1'
-          = text_field_tag :other_reason, nil, placeholder: "Please specify", style: 'width: 500px;'
+          = text_field_tag :other_reason, nil, placeholder: "Please specify how you heard about us", class: 'form-control w-100;'
         = f.input :newsletter, as: :boolean, checked_value: true, unchecked_value: false
         .text-right.mb-4
           = hidden_field_tag :next_page, step2_member_path(member_type: @type)

spec/features/member_joining_spec.rb

@@ -27,6 +27,7 @@
     expect(page).to have_content "Surname can't be blank"
     expect(page).to have_content "Email address can't be blank"
     expect(page).to have_content "About you can't be blank"
+    expect(page).to have_content "You must select at least one option"
   end
 
   scenario 'A new member details are successfully captured' do
@@ -40,6 +41,8 @@
     fill_in 'member_surname', with: 'Doe'
     fill_in 'member_email', with: 'jane@codebar.io'
     fill_in 'member_about_you', with: Faker::Lorem.paragraph
+    find('#how_you_found_us_from-a-friend').click
+    fill_in 'other_reason', with: 'found on a poster', id: true
     click_on 'Next'
 
     expect(page).to have_current_path(step2_member_path)