chore: fix merge conflict in schema.rb

Author: davidmillen50

app/controllers/concerns/member_concerns.rb

@@ -10,8 +10,7 @@ module InstanceMethods
 
     def member_params
       params.require(:member).permit(
-        :pronouns, :name, :surname, :email, :mobile, :about_you, :skill_list, :newsletter, :other_dietary_restrictions,
-          dietary_restrictions: [],
+        :pronouns, :name, :surname, :email, :mobile, :about_you, :skill_list, :newsletter, :other_dietary_restrictions, :other_reason,  :how_you_found_us_other_reason, how_you_found_us: [], dietary_restrictions: [] 
       ).tap do |params|
         # We want to keep Rails' hidden blank field in the form so that all dietary restrictions for a member can be
         # removed by submitting the form with all check boxes unticked. However, we want to remove the blank value

app/controllers/member/details_controller.rb

@@ -8,15 +8,29 @@ class Member::DetailsController < ApplicationController
 
   def edit
     accept_terms
-
     flash[notice] = I18n.t('notifications.signing_up')
     @member.newsletter ||= true
   end
 
   def update
-    return render :edit unless @member.update(member_params)
+    how_found = Array(params.dig(:member, :how_you_found_us)).reject(&:blank?)
+    other_reason = params.dig(:member, :how_you_found_us_other_reason)
+
+    how_found << other_reason if other_reason.present?
+    how_found.uniq!
+
+    if how_found.blank?
+      @member.assign_attributes(member_params.to_h.except(:how_you_found_us_other_reason))
+      @member.errors.add(:how_you_found_us, 'You must select at least one option')
+      return render :edit
+    end
+
+    attrs = member_params.to_h.except(:how_you_found_us_other_reason)
+    attrs[:how_you_found_us] = how_found
+
+    return render :edit unless @member.update(attrs)
 
     member_params[:newsletter] ? subscribe_to_newsletter(@member) : unsubscribe_from_newsletter(@member)
     redirect_to step2_member_path
   end
-end
+end

app/controllers/members_controller.rb

@@ -9,6 +9,7 @@ class MembersController < ApplicationController
 
   def new
     @page_title = 'Sign up'
+
   end
 
   def edit; end

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

@@ -19,6 +19,24 @@
           label_method:  ->(r) { r.humanize.upcase_first }
         = f.input :other_dietary_restrictions, placeholder: 'Other dietary restrictions',
             wrapper_html: { class: class_names('mt-n3', 'd-none': !@member.other_dietary_restrictions?) }, label_html: { class: 'sr-only' }
+        - 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 :how_you_found_us_other_reason, t('member.details.edit.how_you_found_us_other_reason'), class: 'my-1'
+          = text_field_tag 'member[how_you_found_us_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)

config/locales/en.yml

@@ -442,6 +442,8 @@ en:
       edit:
         title: Almost there...
         summary: We need some more details from you to finish creating your account. We use these to help run our events.
+        how_you_found_us: "How did you find out about us?"
+        how_you_found_us_other_reason: "Please specify (if Other)"
         coach:
           about_you: What experience do you have? What languages do you like to use? Tell us a little bit about yourself!
         student:

db/migrate/20250823151717_add_how_you_found_us_options.rb

@@ -0,0 +1,5 @@
+class AddHowYouFoundUsOptions < ActiveRecord::Migration[7.0]
+  def change
+    add_column :members, :how_you_found_us, :text, array: true, default: []
+  end
+end

db/schema.rb

@@ -397,6 +397,7 @@
     t.datetime "opt_in_newsletter_at", precision: nil
     t.enum "dietary_restrictions", default: [], array: true, enum_type: "dietary_restriction_enum"
     t.string "other_dietary_restrictions"
+    t.text "how_you_found_us", default: [], array: true
     t.index ["email"], name: "index_members_on_email", unique: true
   end
 

spec/controllers/member/details_controller_spec.rb

@@ -0,0 +1,84 @@
+RSpec.describe Member::DetailsController, type: :controller do
+  render_views
+  let(:member) { Fabricate(:member) }
+
+  before do
+    allow(controller).to receive(:current_user).and_return(member)
+  end
+
+  describe 'PATCH #update' do
+    context 'with valid params' do
+      it 'updates how_you_found_us with checkbox options' do
+        patch :update, params: {
+          id: member.id,
+          member: {
+            how_you_found_us: ['Social Media', 'From a friend'],
+            newsletter: 'true'
+          }
+        }
+
+        member.reload
+        expect(member.how_you_found_us).to contain_exactly('Social Media', 'From a friend')
+        expect(response).to redirect_to(step2_member_path)
+      end
+
+      it 'adds other_reason to how_you_found_us when provided' do
+        patch :update, params: {
+          id: member.id,
+          member: {
+            how_you_found_us: ['Search engine (Google etc.)'],
+            how_you_found_us_other_reason: 'Saw a pamphlet',
+            newsletter: 'false'
+          },
+        }
+
+        member.reload
+        expect(member.how_you_found_us).to contain_exactly('Search engine (Google etc.)', 'Saw a pamphlet')
+        expect(response).to redirect_to(step2_member_path)
+      end
+
+      it 'updates how_you_found_us with only other_reason' do
+        patch :update, params: {
+          id: member.id,
+          member: {
+            how_you_found_us: [],
+            how_you_found_us_other_reason: 'At a meetup',
+            newsletter: 'true'
+          },
+        }
+
+        member.reload
+        expect(member.how_you_found_us).to eq(['At a meetup'])
+        expect(response).to redirect_to(step2_member_path)
+      end
+
+      it 'removes duplicates and blank entries' do
+        patch :update, params: {
+          id: member.id,
+          member: {
+            how_you_found_us: ['From a friend', '', 'From a friend'],
+            how_you_found_us_other_reason: 'From a friend',
+            newsletter: 'true'
+          },
+        }
+
+        member.reload
+        expect(member.how_you_found_us).to eq(['From a friend'])
+        expect(response).to redirect_to(step2_member_path)
+      end
+    end
+
+    context 'when update fails (invalid data)' do
+      it 'renders the edit template' do
+        patch :update, params: {
+          id: member.id,
+          member: {
+            how_you_found_us: []
+          }
+        }
+
+        expect(response.body).to include('You must select at least one option')
+      end
+    end
+  end
+end

spec/fabricators/member_fabricator.rb

@@ -4,6 +4,7 @@
   surname { Faker::Name.last_name }
   email { Faker::Internet.email }
   about_you { Faker::Lorem.sentence }
+  how_you_found_us { ['From a friend'] }
   auth_services(count: 1) { Fabricate(:auth_service) }
   accepted_toc_at { Time.zone.now }
 end

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
@@ -43,6 +44,8 @@
     check 'Vegan'
     check 'Other'
     fill_in 'Other dietary restrictions', with: 'peanut allergy'
+    find('#how_you_found_us_from-a-friend').click
+    fill_in 'member_how_you_found_us_other_reason', with: 'found on a poster', id: true
     click_on 'Next'
 
     expect(page).to have_current_path(step2_member_path)