<%= notice %>
-- First name: - <%= @facilitator.first_name %> -
+<% @facilitator.display_fields.each do |field| %> ++ <%= field[:label] %>: + <%= field[:value].presence || "N/A" %> +
+<% end %> -- Last name: - <%= @facilitator.last_name %> -
-- Email: - <%= @facilitator.email %> -
<%= link_to 'Edit', edit_facilitator_path(@facilitator) %> | <%= link_to 'Back', facilitators_path %> diff --git a/db/migrate/20250913164451_add_contact_info_to_facilitators.rb b/db/migrate/20250913164451_add_contact_info_to_facilitators.rb new file mode 100644 index 000000000..508a32714 --- /dev/null +++ b/db/migrate/20250913164451_add_contact_info_to_facilitators.rb @@ -0,0 +1,14 @@ +class AddContactInfoToFacilitators < ActiveRecord::Migration[6.1] + def change + add_column :facilitators, :primary_email_address, :string, null: false + add_column :facilitators, :primary_email_address_type, :string, null: false + add_column :facilitators, :street_address, :string, null: false + add_column :facilitators, :city, :string, null: false + add_column :facilitators, :state, :string, null: false + add_column :facilitators, :zip, :string, null: false + add_column :facilitators, :country, :string, null: false + add_column :facilitators, :mailing_address_type, :string, null: false + add_column :facilitators, :phone_number, :string, null: false + add_column :facilitators, :phone_number_type, :string, null: false + end +end diff --git a/db/migrate/20250913171135_remove_email_from_facilitators.rb b/db/migrate/20250913171135_remove_email_from_facilitators.rb new file mode 100644 index 000000000..c2259fac0 --- /dev/null +++ b/db/migrate/20250913171135_remove_email_from_facilitators.rb @@ -0,0 +1,5 @@ +class RemoveEmailFromFacilitators < ActiveRecord::Migration[6.1] + def change + remove_column :facilitators, :email, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 283924a3a..65178cfe6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2025_09_12_173152) do +ActiveRecord::Schema.define(version: 2025_09_13_171135) do create_table "admins", id: :integer, charset: "utf8mb3", force: :cascade do |t| t.string "email", default: "", null: false @@ -142,9 +142,18 @@ create_table "facilitators", charset: "utf8mb3", force: :cascade do |t| t.string "first_name", null: false t.string "last_name", null: false - t.string "email", null: false t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.string "primary_email_address", null: false + t.string "primary_email_address_type", null: false + t.string "street_address", null: false + t.string "city", null: false + t.string "state", null: false + t.string "zip", null: false + t.string "country", null: false + t.string "mailing_address_type", null: false + t.string "phone_number", null: false + t.string "phone_number_type", null: false end create_table "faqs", id: :integer, charset: "utf8mb3", force: :cascade do |t| diff --git a/spec/decorators/facilitator_decorator_spec.rb b/spec/decorators/facilitator_decorator_spec.rb new file mode 100644 index 000000000..6556273f8 --- /dev/null +++ b/spec/decorators/facilitator_decorator_spec.rb @@ -0,0 +1,4 @@ +require 'rails_helper' + +RSpec.describe FacilitatorDecorator do +end diff --git a/spec/factories/facilitators.rb b/spec/factories/facilitators.rb index c52901f61..1c4241ff3 100644 --- a/spec/factories/facilitators.rb +++ b/spec/factories/facilitators.rb @@ -2,6 +2,15 @@ factory :facilitator do first_name { Faker::Name.first_name } last_name { Faker::Name.last_name } - email { Faker::Internet.unique.email } + primary_email_address { Faker::Internet.unique.email } + primary_email_address_type { 'Personal' } + street_address { Faker::Address.street_address } + city { Faker::Address.city } + state { Faker::Address.state } + zip { Faker::Address.postcode } + country { Faker::Address.country} + mailing_address_type { 'Personal' } + phone_number { Faker::PhoneNumber.phone_number } + phone_number_type { 'Personal' } end end diff --git a/spec/models/facilitator_spec.rb b/spec/models/facilitator_spec.rb index 40c41fcf5..7ac26c372 100644 --- a/spec/models/facilitator_spec.rb +++ b/spec/models/facilitator_spec.rb @@ -8,6 +8,18 @@ describe 'validations' do it { should validate_presence_of(:first_name) } it { should validate_presence_of(:last_name) } - it { should validate_presence_of(:email) } + it { should validate_presence_of(:primary_email_address) } + it { should validate_presence_of(:primary_email_address_type) } + it { should validate_presence_of(:street_address) } + it { should validate_presence_of(:city) } + it { should validate_presence_of(:state) } + it { should validate_presence_of(:zip) } + it { should validate_presence_of(:country) } + it { should validate_presence_of(:mailing_address_type) } + it { should validate_presence_of(:phone_number) } + it { should validate_presence_of(:phone_number_type) } + it { should validate_inclusion_of(:primary_email_address_type).in_array(%w[Work Personal]) } + it { should validate_inclusion_of(:mailing_address_type).in_array(%w[Work Personal]) } + it { should validate_inclusion_of(:phone_number_type).in_array(%w[Work Personal]) } end end diff --git a/spec/views/facilitators/edit.html.erb_spec.rb b/spec/views/facilitators/edit.html.erb_spec.rb index 9259818aa..46d5026de 100644 --- a/spec/views/facilitators/edit.html.erb_spec.rb +++ b/spec/views/facilitators/edit.html.erb_spec.rb @@ -15,7 +15,7 @@ it "has a form with the facilitator fields" do expect(rendered).to have_field('First name', with: facilitator.first_name) expect(rendered).to have_field('Last name', with: facilitator.last_name) - expect(rendered).to have_field('Email', with: facilitator.email) + expect(rendered).to have_field('Primary email address', with: facilitator.primary_email_address) end it "has a link to the show page" do diff --git a/spec/views/facilitators/index.html.erb_spec.rb b/spec/views/facilitators/index.html.erb_spec.rb index 11d2dac10..274617b9f 100644 --- a/spec/views/facilitators/index.html.erb_spec.rb +++ b/spec/views/facilitators/index.html.erb_spec.rb @@ -10,7 +10,7 @@ end it "renders a list of facilitators" do - expect(rendered).to match(facilitator.email) - expect(rendered).to match(facilitator_2.email) + expect(rendered).to match(facilitator.primary_email_address) + expect(rendered).to match(facilitator_2.primary_email_address) end end diff --git a/spec/views/facilitators/new.html.erb_spec.rb b/spec/views/facilitators/new.html.erb_spec.rb index 304cc903f..0f8c3be5b 100644 --- a/spec/views/facilitators/new.html.erb_spec.rb +++ b/spec/views/facilitators/new.html.erb_spec.rb @@ -15,7 +15,7 @@ it "has a form with the facilitator fields" do expect(rendered).to have_field('First name') expect(rendered).to have_field('Last name') - expect(rendered).to have_field('Email') + expect(rendered).to have_field('Primary email address') end it "has a link back to the index page" do diff --git a/spec/views/facilitators/show.html.erb_spec.rb b/spec/views/facilitators/show.html.erb_spec.rb index db286e47f..1b5c2bc54 100644 --- a/spec/views/facilitators/show.html.erb_spec.rb +++ b/spec/views/facilitators/show.html.erb_spec.rb @@ -4,13 +4,13 @@ let(:facilitator) { create(:facilitator)} before do - assign(:facilitator, facilitator) + assign(:facilitator, facilitator.decorate) render end it "renders attributes in" do expect(rendered).to match(facilitator.first_name) expect(rendered).to match(facilitator.last_name) - expect(rendered).to match(facilitator.email) + expect(rendered).to match(facilitator.primary_email_address) end end