Merge pull request #3112 from DFE-Digital/LUPEYALPHA-884/add-email-ad…

…dress-to-fe-provider

Add email to eligible_fe_providers

app/models/eligible_fe_provider.rb

@@ -1,8 +1,13 @@
 class EligibleFeProvider < ApplicationRecord
   attribute :academic_year, AcademicYear::Type.new
 
+  validates :primary_key_contact_email_address,
+    presence: true,
+    format: {with: Rails.application.config.email_regexp},
+    length: {maximum: 256}
+
   def self.csv_for_academic_year(academic_year)
-    attribute_names = [:ukprn, :max_award_amount, :lower_award_amount]
+    attribute_names = [:ukprn, :max_award_amount, :lower_award_amount, :primary_key_contact_email_address]
 
     CSV.generate(headers: true) do |csv|
       csv << attribute_names

app/models/eligible_fe_providers_importer.rb

@@ -6,6 +6,7 @@ class EligibleFeProvidersImporter < CsvImporter::Base
       ukprn
       max_award_amount
       lower_award_amount
+      primary_key_contact_email_address
     ]
   )
 
@@ -32,6 +33,7 @@ def row_to_hash(row)
       ukprn: row.fetch("ukprn"),
       max_award_amount: row.fetch("max_award_amount"),
       lower_award_amount: row.fetch("lower_award_amount"),
+      primary_key_contact_email_address: row.fetch("primary_key_contact_email_address"),
       academic_year:
     }
   end

config/analytics_blocklist.yml

@@ -61,6 +61,8 @@
   - secondary_contact_email_address
   - created_at
   - updated_at
+  :eligible_fe_providers:
+  - primary_key_contact_email_address
   :schools:
   - postcode_sanitised
   :file_uploads:

db/migrate/20240821121253_add_primary_contact_email_address_to_eligile_fe_providers.rb

@@ -0,0 +1,5 @@
+class AddPrimaryContactEmailAddressToEligileFeProviders < ActiveRecord::Migration[7.0]
+  def change
+    add_column :eligible_fe_providers, :primary_key_contact_email_address, :string
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2024_08_16_122950) do
+ActiveRecord::Schema[7.0].define(version: 2024_08_21_121253) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "citext"
   enable_extension "pg_trgm"
@@ -207,6 +207,7 @@
     t.decimal "lower_award_amount", precision: 7, scale: 2
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "primary_key_contact_email_address"
     t.index ["academic_year", "ukprn"], name: "index_eligible_fe_providers_on_academic_year_and_ukprn"
   end
 

spec/factories/eligible_fe_providers.rb

@@ -4,5 +4,6 @@
     academic_year { AcademicYear.current }
     max_award_amount { [4_000, 5_000, 6_000].sample }
     lower_award_amount { [2_000, 2_500, 3_000].sample }
+    primary_key_contact_email_address { Faker::Internet.email }
   end
 end

spec/features/admin/eligible_fe_providers_spec.rb

@@ -30,7 +30,7 @@ def eligible_fe_providers_csv_file
 
     3.times do
       hash = attributes_for(:eligible_fe_provider)
-      @eligible_fe_providers_csv_file.write "#{hash[:ukprn]},#{hash[:max_award_amount].to_f},#{hash[:lower_award_amount].to_f}\n"
+      @eligible_fe_providers_csv_file.write "#{hash[:ukprn]},#{hash[:max_award_amount].to_f},#{hash[:lower_award_amount].to_f},#{hash[:primary_key_contact_email_address]}\n"
     end
 
     @eligible_fe_providers_csv_file.rewind