diff --git a/app/models/eligible_fe_provider.rb b/app/models/eligible_fe_provider.rb index de99c83331..35a3a26490 100644 --- a/app/models/eligible_fe_provider.rb +++ b/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 diff --git a/app/models/eligible_fe_providers_importer.rb b/app/models/eligible_fe_providers_importer.rb index c8dcf4fe73..5028e13e15 100644 --- a/app/models/eligible_fe_providers_importer.rb +++ b/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 diff --git a/config/analytics_blocklist.yml b/config/analytics_blocklist.yml index 8966aa4831..2711fdefac 100644 --- a/config/analytics_blocklist.yml +++ b/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: diff --git a/db/migrate/20240821121253_add_primary_contact_email_address_to_eligile_fe_providers.rb b/db/migrate/20240821121253_add_primary_contact_email_address_to_eligile_fe_providers.rb new file mode 100644 index 0000000000..70ede423ec --- /dev/null +++ b/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 diff --git a/db/schema.rb b/db/schema.rb index 5667259b99..0e77b03a1f 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[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 diff --git a/spec/factories/eligible_fe_providers.rb b/spec/factories/eligible_fe_providers.rb index 32269cff59..c497d8074a 100644 --- a/spec/factories/eligible_fe_providers.rb +++ b/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 diff --git a/spec/features/admin/eligible_fe_providers_spec.rb b/spec/features/admin/eligible_fe_providers_spec.rb index c3b16789c3..2058cef1be 100644 --- a/spec/features/admin/eligible_fe_providers_spec.rb +++ b/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 diff --git a/spec/fixtures/files/eligible_fe_providers.csv b/spec/fixtures/files/eligible_fe_providers.csv index c48c3ef9f0..b765828129 100644 --- a/spec/fixtures/files/eligible_fe_providers.csv +++ b/spec/fixtures/files/eligible_fe_providers.csv @@ -1,289 +1,289 @@ -ukprn,max_award_amount,lower_award_amount -10083728,4000,2000 -10000055,6000,3000 -10004927,6000,3000 -10057981,6000,3000 -10000330,5000,2500 -10082366,6000,3000 -10000415,6000,3000 -10000528,6000,3000 -10000533,6000,3000 -10000536,6000,3000 -10000552,4000,2000 -10000560,6000,3000 -10001465,6000,3000 -10086696,6000,3000 -10000610,6000,3000 -10000670,5000,2500 -10046350,6000,3000 -10084488,5000,2500 -10064686,6000,3000 -10006442,6000,3000 -10000720,6000,3000 -10000721,6000,3000 -10000747,6000,3000 -10000754,6000,3000 -10088739,6000,3000 -10000794,6000,3000 -10000796,6000,3000 -10000812,6000,3000 -10000840,6000,3000 -10000878,6000,3000 -10000887,4000,2000 -10000944,5000,2500 -10000950,6000,3000 -10000473,6000,3000 -10001000,6000,3000 -10001004,6000,3000 -10001005,6000,3000 -10001093,6000,3000 -10064832,5000,2500 -10092570,4000,2000 -10001116,6000,3000 -10068090,5000,2500 -10001148,6000,3000 -10007455,6000,3000 -10001165,5000,2500 -10001201,5000,2500 -10042362,5000,2500 -10001353,6000,3000 -10005972,6000,3000 -10001378,6000,3000 -10007817,6000,3000 -10001416,6000,3000 -10001446,5000,2500 -10005128,6000,3000 -10001467,6000,3000 -10007945,6000,3000 -10065146,6000,3000 -10001475,6000,3000 -10007578,6000,3000 -10001535,6000,3000 -10042041,6000,3000 -10001696,6000,3000 -10003010,6000,3000 -10001743,6000,3000 -10001778,6000,3000 -10001850,6000,3000 -10001919,6000,3000 -10001934,6000,3000 -10083743,6000,3000 -10004695,6000,3000 -10007924,6000,3000 -10092987,5000,2500 -10002094,6000,3000 -10004116,6000,3000 -10002111,6000,3000 -10047200,6000,3000 -10067981,6000,3000 -10002130,6000,3000 -10002923,6000,3000 -10006570,6000,3000 -10053859,6000,3000 -10065149,4000,2000 -10002370,5000,2500 -10045912,4000,2000 -10002412,5000,2500 -10002570,5000,2500 -10002599,6000,3000 -10002638,6000,3000 -10085525,6000,3000 -10002696,6000,3000 -10065147,4000,2000 -10002743,6000,3000 -10002770,5000,2500 -10002852,6000,3000 -10040630,6000,3000 -10053513,4000,2000 -10002899,6000,3000 -10088761,6000,3000 -10068120,6000,3000 -10093049,5000,2500 -10047216,5000,2500 -10002917,6000,3000 -10080810,4000,2000 -10005979,5000,2500 -10007977,6000,3000 -10007289,6000,3000 -10003022,5000,2500 -10062355,4000,2000 -10003023,5000,2500 -10003029,6000,3000 -10003035,6000,3000 -10003094,4000,2000 -10003128,5000,2500 -10003146,6000,3000 -10007193,6000,3000 -10003188,5000,2500 -10003193,6000,3000 -10003200,6000,3000 -10093051,4000,2000 -10005077,6000,3000 -10003427,6000,3000 -10003491,5000,2500 -10003511,6000,3000 -10003558,5000,2500 -10042040,4000,2000 -10065472,5000,2500 -10086880,5000,2500 -10046829,4000,2000 -10003676,6000,3000 -10003189,6000,3000 -10003753,6000,3000 -10003755,6000,3000 -10003768,6000,3000 -10090876,4000,2000 -10044606,5000,2500 -10003855,6000,3000 -10093053,5000,2500 -10003867,6000,3000 -10003899,6000,3000 -10003928,6000,3000 -10056979,5000,2500 -10037983,5000,2500 -10065007,6000,3000 -10000948,6000,3000 -10004088,4000,2000 -10064664,6000,3000 -10004108,6000,3000 -10004112,5000,2500 -10023139,6000,3000 -10024962,6000,3000 -10004125,6000,3000 -10004144,6000,3000 -10065462,4000,2000 -10004344,6000,3000 -10004340,6000,3000 -10004375,6000,3000 -10004432,6000,3000 -10004442,6000,3000 -10004478,6000,3000 -10004599,6000,3000 -10004552,6000,3000 -10006963,6000,3000 -10083760,6000,3000 -10065005,5000,2500 -10004576,6000,3000 -10063721,5000,2500 -10004579,6000,3000 -10004596,6000,3000 -10004603,6000,3000 -10004607,6000,3000 -10066505,5000,2500 -10004608,6000,3000 -10004686,6000,3000 -10004690,6000,3000 -10004721,6000,3000 -10004718,6000,3000 -10007011,6000,3000 -10004772,6000,3000 -10004785,6000,3000 -10004577,6000,3000 -10004835,6000,3000 -10065145,6000,3000 -10053874,5000,2500 -10005072,4000,2000 -10004676,6000,3000 -10005124,6000,3000 -10005200,6000,3000 -10063846,5000,2500 -10065941,5000,2500 -10094319,5000,2500 -10065473,4000,2000 -10005404,6000,3000 -10065148,4000,2000 -10089242,4000,2000 -10065834,6000,3000 -10003088,6000,3000 -10002863,6000,3000 -10005534,6000,3000 -10063421,6000,3000 -10005575,5000,2500 -10005032,6000,3000 -10046731,4000,2000 -10005669,6000,3000 -10005687,6000,3000 -10005810,6000,3000 -10039420,6000,3000 -10005822,6000,3000 -10005859,6000,3000 -10042335,4000,2000 -10067306,4000,2000 -10005946,6000,3000 -10064663,6000,3000 -10005967,6000,3000 -10093936,6000,3000 -10005977,6000,3000 -10005981,6000,3000 -10036143,6000,3000 -10007928,6000,3000 -10023526,6000,3000 -10003674,6000,3000 -10006038,6000,3000 -10006050,5000,2500 -10006130,5000,2500 -10006135,6000,3000 -10006148,4000,2000 -10008007,6000,3000 -10006174,6000,3000 -10006195,5000,2500 -10065835,6000,3000 -10009439,6000,3000 -10006349,6000,3000 -10006378,5000,2500 -10006398,6000,3000 -10006494,6000,3000 -10007938,6000,3000 -10006549,6000,3000 -10000756,5000,2500 -10000820,6000,3000 -10006813,6000,3000 -10003955,6000,3000 -10001550,4000,2000 -10007916,6000,3000 -10006341,6000,3000 -10003011,4000,2000 -10003406,6000,3000 -10083773,5000,2500 -10001503,6000,3000 -10006770,6000,3000 -10005788,6000,3000 -10005881,4000,2000 -10065175,4000,2000 -10000952,6000,3000 -10005998,6000,3000 -10065942,6000,3000 -10041654,6000,3000 -10055888,6000,3000 -10007063,5000,2500 -10005999,6000,3000 -10001476,6000,3000 -10086705,5000,2500 -10005736,5000,2500 -10007212,5000,2500 -10007315,6000,3000 -10007321,6000,3000 -10007339,6000,3000 -10007859,6000,3000 -10007417,6000,3000 -10007427,6000,3000 -10007431,6000,3000 -10007434,6000,3000 -10007459,6000,3000 -10007469,6000,3000 -10007500,6000,3000 -10007503,6000,3000 -10006864,6000,3000 -10007527,6000,3000 -10002107,5000,2500 -10007546,5000,2500 -10007553,6000,3000 -10007636,4000,2000 -10065150,5000,2500 -10087582,5000,2500 -10065366,5000,2500 -10007671,5000,2500 -10007673,5000,2500 -10007682,6000,3000 -10007696,6000,3000 -10007709,5000,2500 \ No newline at end of file +ukprn,max_award_amount,lower_award_amount,primary_key_contact_email_address +10083728,4000,2000,claimteacherid+ukprn-10083728@gmail.com +10000055,6000,3000,claimteacherid+ukprn-10000055@gmail.com +10004927,6000,3000,claimteacherid+ukprn-10004927@gmail.com +10057981,6000,3000,claimteacherid+ukprn-10057981@gmail.com +10000330,5000,2500,claimteacherid+ukprn-10000330@gmail.com +10082366,6000,3000,claimteacherid+ukprn-10082366@gmail.com +10000415,6000,3000,claimteacherid+ukprn-10000415@gmail.com +10000528,6000,3000,claimteacherid+ukprn-10000528@gmail.com +10000533,6000,3000,claimteacherid+ukprn-10000533@gmail.com +10000536,6000,3000,claimteacherid+ukprn-10000536@gmail.com +10000552,4000,2000,claimteacherid+ukprn-10000552@gmail.com +10000560,6000,3000,claimteacherid+ukprn-10000560@gmail.com +10001465,6000,3000,claimteacherid+ukprn-10001465@gmail.com +10086696,6000,3000,claimteacherid+ukprn-10086696@gmail.com +10000610,6000,3000,claimteacherid+ukprn-10000610@gmail.com +10000670,5000,2500,claimteacherid+ukprn-10000670@gmail.com +10046350,6000,3000,claimteacherid+ukprn-10046350@gmail.com +10084488,5000,2500,claimteacherid+ukprn-10084488@gmail.com +10064686,6000,3000,claimteacherid+ukprn-10064686@gmail.com +10006442,6000,3000,claimteacherid+ukprn-10006442@gmail.com +10000720,6000,3000,claimteacherid+ukprn-10000720@gmail.com +10000721,6000,3000,claimteacherid+ukprn-10000721@gmail.com +10000747,6000,3000,claimteacherid+ukprn-10000747@gmail.com +10000754,6000,3000,claimteacherid+ukprn-10000754@gmail.com +10088739,6000,3000,claimteacherid+ukprn-10088739@gmail.com +10000794,6000,3000,claimteacherid+ukprn-10000794@gmail.com +10000796,6000,3000,claimteacherid+ukprn-10000796@gmail.com +10000812,6000,3000,claimteacherid+ukprn-10000812@gmail.com +10000840,6000,3000,claimteacherid+ukprn-10000840@gmail.com +10000878,6000,3000,claimteacherid+ukprn-10000878@gmail.com +10000887,4000,2000,claimteacherid+ukprn-10000887@gmail.com +10000944,5000,2500,claimteacherid+ukprn-10000944@gmail.com +10000950,6000,3000,claimteacherid+ukprn-10000950@gmail.com +10000473,6000,3000,claimteacherid+ukprn-10000473@gmail.com +10001000,6000,3000,claimteacherid+ukprn-10001000@gmail.com +10001004,6000,3000,claimteacherid+ukprn-10001004@gmail.com +10001005,6000,3000,claimteacherid+ukprn-10001005@gmail.com +10001093,6000,3000,claimteacherid+ukprn-10001093@gmail.com +10064832,5000,2500,claimteacherid+ukprn-10064832@gmail.com +10092570,4000,2000,claimteacherid+ukprn-10092570@gmail.com +10001116,6000,3000,claimteacherid+ukprn-10001116@gmail.com +10068090,5000,2500,claimteacherid+ukprn-10068090@gmail.com +10001148,6000,3000,claimteacherid+ukprn-10001148@gmail.com +10007455,6000,3000,claimteacherid+ukprn-10007455@gmail.com +10001165,5000,2500,claimteacherid+ukprn-10001165@gmail.com +10001201,5000,2500,claimteacherid+ukprn-10001201@gmail.com +10042362,5000,2500,claimteacherid+ukprn-10042362@gmail.com +10001353,6000,3000,claimteacherid+ukprn-10001353@gmail.com +10005972,6000,3000,claimteacherid+ukprn-10005972@gmail.com +10001378,6000,3000,claimteacherid+ukprn-10001378@gmail.com +10007817,6000,3000,claimteacherid+ukprn-10007817@gmail.com +10001416,6000,3000,claimteacherid+ukprn-10001416@gmail.com +10001446,5000,2500,claimteacherid+ukprn-10001446@gmail.com +10005128,6000,3000,claimteacherid+ukprn-10005128@gmail.com +10001467,6000,3000,claimteacherid+ukprn-10001467@gmail.com +10007945,6000,3000,claimteacherid+ukprn-10007945@gmail.com +10065146,6000,3000,claimteacherid+ukprn-10065146@gmail.com +10001475,6000,3000,claimteacherid+ukprn-10001475@gmail.com +10007578,6000,3000,claimteacherid+ukprn-10007578@gmail.com +10001535,6000,3000,claimteacherid+ukprn-10001535@gmail.com +10042041,6000,3000,claimteacherid+ukprn-10042041@gmail.com +10001696,6000,3000,claimteacherid+ukprn-10001696@gmail.com +10003010,6000,3000,claimteacherid+ukprn-10003010@gmail.com +10001743,6000,3000,claimteacherid+ukprn-10001743@gmail.com +10001778,6000,3000,claimteacherid+ukprn-10001778@gmail.com +10001850,6000,3000,claimteacherid+ukprn-10001850@gmail.com +10001919,6000,3000,claimteacherid+ukprn-10001919@gmail.com +10001934,6000,3000,claimteacherid+ukprn-10001934@gmail.com +10083743,6000,3000,claimteacherid+ukprn-10083743@gmail.com +10004695,6000,3000,claimteacherid+ukprn-10004695@gmail.com +10007924,6000,3000,claimteacherid+ukprn-10007924@gmail.com +10092987,5000,2500,claimteacherid+ukprn-10092987@gmail.com +10002094,6000,3000,claimteacherid+ukprn-10002094@gmail.com +10004116,6000,3000,claimteacherid+ukprn-10004116@gmail.com +10002111,6000,3000,claimteacherid+ukprn-10002111@gmail.com +10047200,6000,3000,claimteacherid+ukprn-10047200@gmail.com +10067981,6000,3000,claimteacherid+ukprn-10067981@gmail.com +10002130,6000,3000,claimteacherid+ukprn-10002130@gmail.com +10002923,6000,3000,claimteacherid+ukprn-10002923@gmail.com +10006570,6000,3000,claimteacherid+ukprn-10006570@gmail.com +10053859,6000,3000,claimteacherid+ukprn-10053859@gmail.com +10065149,4000,2000,claimteacherid+ukprn-10065149@gmail.com +10002370,5000,2500,claimteacherid+ukprn-10002370@gmail.com +10045912,4000,2000,claimteacherid+ukprn-10045912@gmail.com +10002412,5000,2500,claimteacherid+ukprn-10002412@gmail.com +10002570,5000,2500,claimteacherid+ukprn-10002570@gmail.com +10002599,6000,3000,claimteacherid+ukprn-10002599@gmail.com +10002638,6000,3000,claimteacherid+ukprn-10002638@gmail.com +10085525,6000,3000,claimteacherid+ukprn-10085525@gmail.com +10002696,6000,3000,claimteacherid+ukprn-10002696@gmail.com +10065147,4000,2000,claimteacherid+ukprn-10065147@gmail.com +10002743,6000,3000,claimteacherid+ukprn-10002743@gmail.com +10002770,5000,2500,claimteacherid+ukprn-10002770@gmail.com +10002852,6000,3000,claimteacherid+ukprn-10002852@gmail.com +10040630,6000,3000,claimteacherid+ukprn-10040630@gmail.com +10053513,4000,2000,claimteacherid+ukprn-10053513@gmail.com +10002899,6000,3000,claimteacherid+ukprn-10002899@gmail.com +10088761,6000,3000,claimteacherid+ukprn-10088761@gmail.com +10068120,6000,3000,claimteacherid+ukprn-10068120@gmail.com +10093049,5000,2500,claimteacherid+ukprn-10093049@gmail.com +10047216,5000,2500,claimteacherid+ukprn-10047216@gmail.com +10002917,6000,3000,claimteacherid+ukprn-10002917@gmail.com +10080810,4000,2000,claimteacherid+ukprn-10080810@gmail.com +10005979,5000,2500,claimteacherid+ukprn-10005979@gmail.com +10007977,6000,3000,claimteacherid+ukprn-10007977@gmail.com +10007289,6000,3000,claimteacherid+ukprn-10007289@gmail.com +10003022,5000,2500,claimteacherid+ukprn-10003022@gmail.com +10062355,4000,2000,claimteacherid+ukprn-10062355@gmail.com +10003023,5000,2500,claimteacherid+ukprn-10003023@gmail.com +10003029,6000,3000,claimteacherid+ukprn-10003029@gmail.com +10003035,6000,3000,claimteacherid+ukprn-10003035@gmail.com +10003094,4000,2000,claimteacherid+ukprn-10003094@gmail.com +10003128,5000,2500,claimteacherid+ukprn-10003128@gmail.com +10003146,6000,3000,claimteacherid+ukprn-10003146@gmail.com +10007193,6000,3000,claimteacherid+ukprn-10007193@gmail.com +10003188,5000,2500,claimteacherid+ukprn-10003188@gmail.com +10003193,6000,3000,claimteacherid+ukprn-10003193@gmail.com +10003200,6000,3000,claimteacherid+ukprn-10003200@gmail.com +10093051,4000,2000,claimteacherid+ukprn-10093051@gmail.com +10005077,6000,3000,claimteacherid+ukprn-10005077@gmail.com +10003427,6000,3000,claimteacherid+ukprn-10003427@gmail.com +10003491,5000,2500,claimteacherid+ukprn-10003491@gmail.com +10003511,6000,3000,claimteacherid+ukprn-10003511@gmail.com +10003558,5000,2500,claimteacherid+ukprn-10003558@gmail.com +10042040,4000,2000,claimteacherid+ukprn-10042040@gmail.com +10065472,5000,2500,claimteacherid+ukprn-10065472@gmail.com +10086880,5000,2500,claimteacherid+ukprn-10086880@gmail.com +10046829,4000,2000,claimteacherid+ukprn-10046829@gmail.com +10003676,6000,3000,claimteacherid+ukprn-10003676@gmail.com +10003189,6000,3000,claimteacherid+ukprn-10003189@gmail.com +10003753,6000,3000,claimteacherid+ukprn-10003753@gmail.com +10003755,6000,3000,claimteacherid+ukprn-10003755@gmail.com +10003768,6000,3000,claimteacherid+ukprn-10003768@gmail.com +10090876,4000,2000,claimteacherid+ukprn-10090876@gmail.com +10044606,5000,2500,claimteacherid+ukprn-10044606@gmail.com +10003855,6000,3000,claimteacherid+ukprn-10003855@gmail.com +10093053,5000,2500,claimteacherid+ukprn-10093053@gmail.com +10003867,6000,3000,claimteacherid+ukprn-10003867@gmail.com +10003899,6000,3000,claimteacherid+ukprn-10003899@gmail.com +10003928,6000,3000,claimteacherid+ukprn-10003928@gmail.com +10056979,5000,2500,claimteacherid+ukprn-10056979@gmail.com +10037983,5000,2500,claimteacherid+ukprn-10037983@gmail.com +10065007,6000,3000,claimteacherid+ukprn-10065007@gmail.com +10000948,6000,3000,claimteacherid+ukprn-10000948@gmail.com +10004088,4000,2000,claimteacherid+ukprn-10004088@gmail.com +10064664,6000,3000,claimteacherid+ukprn-10064664@gmail.com +10004108,6000,3000,claimteacherid+ukprn-10004108@gmail.com +10004112,5000,2500,claimteacherid+ukprn-10004112@gmail.com +10023139,6000,3000,claimteacherid+ukprn-10023139@gmail.com +10024962,6000,3000,claimteacherid+ukprn-10024962@gmail.com +10004125,6000,3000,claimteacherid+ukprn-10004125@gmail.com +10004144,6000,3000,claimteacherid+ukprn-10004144@gmail.com +10065462,4000,2000,claimteacherid+ukprn-10065462@gmail.com +10004344,6000,3000,claimteacherid+ukprn-10004344@gmail.com +10004340,6000,3000,claimteacherid+ukprn-10004340@gmail.com +10004375,6000,3000,claimteacherid+ukprn-10004375@gmail.com +10004432,6000,3000,claimteacherid+ukprn-10004432@gmail.com +10004442,6000,3000,claimteacherid+ukprn-10004442@gmail.com +10004478,6000,3000,claimteacherid+ukprn-10004478@gmail.com +10004599,6000,3000,claimteacherid+ukprn-10004599@gmail.com +10004552,6000,3000,claimteacherid+ukprn-10004552@gmail.com +10006963,6000,3000,claimteacherid+ukprn-10006963@gmail.com +10083760,6000,3000,claimteacherid+ukprn-10083760@gmail.com +10065005,5000,2500,claimteacherid+ukprn-10065005@gmail.com +10004576,6000,3000,claimteacherid+ukprn-10004576@gmail.com +10063721,5000,2500,claimteacherid+ukprn-10063721@gmail.com +10004579,6000,3000,claimteacherid+ukprn-10004579@gmail.com +10004596,6000,3000,claimteacherid+ukprn-10004596@gmail.com +10004603,6000,3000,claimteacherid+ukprn-10004603@gmail.com +10004607,6000,3000,claimteacherid+ukprn-10004607@gmail.com +10066505,5000,2500,claimteacherid+ukprn-10066505@gmail.com +10004608,6000,3000,claimteacherid+ukprn-10004608@gmail.com +10004686,6000,3000,claimteacherid+ukprn-10004686@gmail.com +10004690,6000,3000,claimteacherid+ukprn-10004690@gmail.com +10004721,6000,3000,claimteacherid+ukprn-10004721@gmail.com +10004718,6000,3000,claimteacherid+ukprn-10004718@gmail.com +10007011,6000,3000,claimteacherid+ukprn-10007011@gmail.com +10004772,6000,3000,claimteacherid+ukprn-10004772@gmail.com +10004785,6000,3000,claimteacherid+ukprn-10004785@gmail.com +10004577,6000,3000,claimteacherid+ukprn-10004577@gmail.com +10004835,6000,3000,claimteacherid+ukprn-10004835@gmail.com +10065145,6000,3000,claimteacherid+ukprn-10065145@gmail.com +10053874,5000,2500,claimteacherid+ukprn-10053874@gmail.com +10005072,4000,2000,claimteacherid+ukprn-10005072@gmail.com +10004676,6000,3000,claimteacherid+ukprn-10004676@gmail.com +10005124,6000,3000,claimteacherid+ukprn-10005124@gmail.com +10005200,6000,3000,claimteacherid+ukprn-10005200@gmail.com +10063846,5000,2500,claimteacherid+ukprn-10063846@gmail.com +10065941,5000,2500,claimteacherid+ukprn-10065941@gmail.com +10094319,5000,2500,claimteacherid+ukprn-10094319@gmail.com +10065473,4000,2000,claimteacherid+ukprn-10065473@gmail.com +10005404,6000,3000,claimteacherid+ukprn-10005404@gmail.com +10065148,4000,2000,claimteacherid+ukprn-10065148@gmail.com +10089242,4000,2000,claimteacherid+ukprn-10089242@gmail.com +10065834,6000,3000,claimteacherid+ukprn-10065834@gmail.com +10003088,6000,3000,claimteacherid+ukprn-10003088@gmail.com +10002863,6000,3000,claimteacherid+ukprn-10002863@gmail.com +10005534,6000,3000,claimteacherid+ukprn-10005534@gmail.com +10063421,6000,3000,claimteacherid+ukprn-10063421@gmail.com +10005575,5000,2500,claimteacherid+ukprn-10005575@gmail.com +10005032,6000,3000,claimteacherid+ukprn-10005032@gmail.com +10046731,4000,2000,claimteacherid+ukprn-10046731@gmail.com +10005669,6000,3000,claimteacherid+ukprn-10005669@gmail.com +10005687,6000,3000,claimteacherid+ukprn-10005687@gmail.com +10005810,6000,3000,claimteacherid+ukprn-10005810@gmail.com +10039420,6000,3000,claimteacherid+ukprn-10039420@gmail.com +10005822,6000,3000,claimteacherid+ukprn-10005822@gmail.com +10005859,6000,3000,claimteacherid+ukprn-10005859@gmail.com +10042335,4000,2000,claimteacherid+ukprn-10042335@gmail.com +10067306,4000,2000,claimteacherid+ukprn-10067306@gmail.com +10005946,6000,3000,claimteacherid+ukprn-10005946@gmail.com +10064663,6000,3000,claimteacherid+ukprn-10064663@gmail.com +10005967,6000,3000,claimteacherid+ukprn-10005967@gmail.com +10093936,6000,3000,claimteacherid+ukprn-10093936@gmail.com +10005977,6000,3000,claimteacherid+ukprn-10005977@gmail.com +10005981,6000,3000,claimteacherid+ukprn-10005981@gmail.com +10036143,6000,3000,claimteacherid+ukprn-10036143@gmail.com +10007928,6000,3000,claimteacherid+ukprn-10007928@gmail.com +10023526,6000,3000,claimteacherid+ukprn-10023526@gmail.com +10003674,6000,3000,claimteacherid+ukprn-10003674@gmail.com +10006038,6000,3000,claimteacherid+ukprn-10006038@gmail.com +10006050,5000,2500,claimteacherid+ukprn-10006050@gmail.com +10006130,5000,2500,claimteacherid+ukprn-10006130@gmail.com +10006135,6000,3000,claimteacherid+ukprn-10006135@gmail.com +10006148,4000,2000,claimteacherid+ukprn-10006148@gmail.com +10008007,6000,3000,claimteacherid+ukprn-10008007@gmail.com +10006174,6000,3000,claimteacherid+ukprn-10006174@gmail.com +10006195,5000,2500,claimteacherid+ukprn-10006195@gmail.com +10065835,6000,3000,claimteacherid+ukprn-10065835@gmail.com +10009439,6000,3000,claimteacherid+ukprn-10009439@gmail.com +10006349,6000,3000,claimteacherid+ukprn-10006349@gmail.com +10006378,5000,2500,claimteacherid+ukprn-10006378@gmail.com +10006398,6000,3000,claimteacherid+ukprn-10006398@gmail.com +10006494,6000,3000,claimteacherid+ukprn-10006494@gmail.com +10007938,6000,3000,claimteacherid+ukprn-10007938@gmail.com +10006549,6000,3000,claimteacherid+ukprn-10006549@gmail.com +10000756,5000,2500,claimteacherid+ukprn-10000756@gmail.com +10000820,6000,3000,claimteacherid+ukprn-10000820@gmail.com +10006813,6000,3000,claimteacherid+ukprn-10006813@gmail.com +10003955,6000,3000,claimteacherid+ukprn-10003955@gmail.com +10001550,4000,2000,claimteacherid+ukprn-10001550@gmail.com +10007916,6000,3000,claimteacherid+ukprn-10007916@gmail.com +10006341,6000,3000,claimteacherid+ukprn-10006341@gmail.com +10003011,4000,2000,claimteacherid+ukprn-10003011@gmail.com +10003406,6000,3000,claimteacherid+ukprn-10003406@gmail.com +10083773,5000,2500,claimteacherid+ukprn-10083773@gmail.com +10001503,6000,3000,claimteacherid+ukprn-10001503@gmail.com +10006770,6000,3000,claimteacherid+ukprn-10006770@gmail.com +10005788,6000,3000,claimteacherid+ukprn-10005788@gmail.com +10005881,4000,2000,claimteacherid+ukprn-10005881@gmail.com +10065175,4000,2000,claimteacherid+ukprn-10065175@gmail.com +10000952,6000,3000,claimteacherid+ukprn-10000952@gmail.com +10005998,6000,3000,claimteacherid+ukprn-10005998@gmail.com +10065942,6000,3000,claimteacherid+ukprn-10065942@gmail.com +10041654,6000,3000,claimteacherid+ukprn-10041654@gmail.com +10055888,6000,3000,claimteacherid+ukprn-10055888@gmail.com +10007063,5000,2500,claimteacherid+ukprn-10007063@gmail.com +10005999,6000,3000,claimteacherid+ukprn-10005999@gmail.com +10001476,6000,3000,claimteacherid+ukprn-10001476@gmail.com +10086705,5000,2500,claimteacherid+ukprn-10086705@gmail.com +10005736,5000,2500,claimteacherid+ukprn-10005736@gmail.com +10007212,5000,2500,claimteacherid+ukprn-10007212@gmail.com +10007315,6000,3000,claimteacherid+ukprn-10007315@gmail.com +10007321,6000,3000,claimteacherid+ukprn-10007321@gmail.com +10007339,6000,3000,claimteacherid+ukprn-10007339@gmail.com +10007859,6000,3000,claimteacherid+ukprn-10007859@gmail.com +10007417,6000,3000,claimteacherid+ukprn-10007417@gmail.com +10007427,6000,3000,claimteacherid+ukprn-10007427@gmail.com +10007431,6000,3000,claimteacherid+ukprn-10007431@gmail.com +10007434,6000,3000,claimteacherid+ukprn-10007434@gmail.com +10007459,6000,3000,claimteacherid+ukprn-10007459@gmail.com +10007469,6000,3000,claimteacherid+ukprn-10007469@gmail.com +10007500,6000,3000,claimteacherid+ukprn-10007500@gmail.com +10007503,6000,3000,claimteacherid+ukprn-10007503@gmail.com +10006864,6000,3000,claimteacherid+ukprn-10006864@gmail.com +10007527,6000,3000,claimteacherid+ukprn-10007527@gmail.com +10002107,5000,2500,claimteacherid+ukprn-10002107@gmail.com +10007546,5000,2500,claimteacherid+ukprn-10007546@gmail.com +10007553,6000,3000,claimteacherid+ukprn-10007553@gmail.com +10007636,4000,2000,claimteacherid+ukprn-10007636@gmail.com +10065150,5000,2500,claimteacherid+ukprn-10065150@gmail.com +10087582,5000,2500,claimteacherid+ukprn-10087582@gmail.com +10065366,5000,2500,claimteacherid+ukprn-10065366@gmail.com +10007671,5000,2500,claimteacherid+ukprn-10007671@gmail.com +10007673,5000,2500,claimteacherid+ukprn-10007673@gmail.com +10007682,6000,3000,claimteacherid+ukprn-10007682@gmail.com +10007696,6000,3000,claimteacherid+ukprn-10007696@gmail.com +10007709,5000,2500,claimteacherid+ukprn-10007709@gmail.com diff --git a/spec/models/eligible_fe_providers_importer_spec.rb b/spec/models/eligible_fe_providers_importer_spec.rb index d865dc5775..e9fbebf634 100644 --- a/spec/models/eligible_fe_providers_importer_spec.rb +++ b/spec/models/eligible_fe_providers_importer_spec.rb @@ -26,7 +26,7 @@ def to_row(hash) subject.run expect(subject.errors).to be_present - expect(subject.errors).to include("The selected file is missing some expected columns: ukprn, max_award_amount, lower_award_amount") + expect(subject.errors).to include("The selected file is missing some expected columns: ukprn, max_award_amount, lower_award_amount, primary_key_contact_email_address") end end