CLDC-1971: Update text for 'prefers not to say' answer to buyer 1 ethnic group question (#2265)

* CLDC-1971: Update text for 'prefers not to say' answer to buyer 1 ethnic group question

* CLDC-1971: Also correct issue for buyer 2 and fix related CSV export tests

* CLDC-1971: Use nationality instead of ethnic group for inferred CYA value test case

* Also remove inferred check answers value for buyer 2 ethnic group

app/models/form/sales/questions/buyer1_ethnic_group.rb

@@ -7,12 +7,6 @@ class Form::Sales::Questions::Buyer1EthnicGroup < ::Form::Question
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
-    @inferred_check_answers_value = [{
-      "condition" => {
-        "ethnic_group" => 17,
-      },
-      "value" => "Prefers not to say",
-    }]
     @check_answers_card_number = 1
     @question_number = 22
   end
@@ -24,6 +18,6 @@ class Form::Sales::Questions::Buyer1EthnicGroup < ::Form::Question
     "3" => { "value" => "Black, African, Caribbean or Black British" },
     "4" => { "value" => "Arab or other ethnic group" },
     "divider" => { "value" => true },
-    "17" => { "value" => "Buyer 1 prefers not to say" },
+    "17" => { "value" => "Buyer prefers not to say" },
   }.freeze
 end

app/models/form/sales/questions/buyer2_ethnic_group.rb

@@ -6,12 +6,6 @@ class Form::Sales::Questions::Buyer2EthnicGroup < ::Form::Question
     @header = "What is buyer 2’s ethnic group?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @inferred_check_answers_value = [{
-      "condition" => {
-        "ethnic_group2" => 17,
-      },
-      "value" => "Prefers not to say",
-    }]
     @check_answers_card_number = 2
     @question_number = 30
   end
@@ -23,6 +17,6 @@ class Form::Sales::Questions::Buyer2EthnicGroup < ::Form::Question
     "3" => { "value" => "Black, African, Caribbean or Black British" },
     "4" => { "value" => "Arab or other ethnic group" },
     "divider" => { "value" => true },
-    "17" => { "value" => "Buyer 2 prefers not to say" },
+    "17" => { "value" => "Buyer prefers not to say" },
   }.freeze
 end

spec/fixtures/files/sales_logs_csv_export_labels_23.csv

@@ -1,2 +1,2 @@
 id,status,duplicate_set_id,created_at,updated_at,old_form_id,collection_start_year,creation_method,is_dpo,owning_organisation_name,managing_organisation_name,created_by,day,month,year,purchid,ownershipsch,type,othtype,companybuy,buylivein,jointpur,jointmore,beds,proptype,builtype,pcodenk,uprn,uprn_confirmed,address_line1,address_line2,town_or_city,county,pcode1,pcode2,la_known,la,la_label,wchair,noint,privacynotice,age1,sex1,ethnic_group,ethnic,nationality_all,national,ecstat1,buy1livein,relat2,age2,sex2,ethnic_group2,ethnicbuy2,nationality_all_buyer2,nationalbuy2,ecstat2,buy2livein,hholdcount,relat3,age3,sex3,ecstat3,relat4,age4,sex4,ecstat4,relat5,age5,sex5,ecstat5,relat6,age6,sex6,ecstat6,prevten,ppcodenk,ppostc1,ppostc2,previous_la_known,prevloc,prevloc_label,pregyrha,pregother,pregla,pregghb,pregblank,buy2living,prevtenbuy2,hhregres,hhregresstill,armedforcesspouse,disabled,wheel,income1nk,income1,inc1mort,income2nk,income2,inc2mort,hb,savingsnk,savings,prevown,prevshared,proplen,staircase,stairbought,stairowned,staircasesale,resale,exday,exmonth,exyear,hoday,homonth,hoyear,lanomagr,soctenant,frombeds,fromprop,socprevten,value,equity,mortgageused,mortgage,mortgagelender,mortgagelenderother,mortlen,extrabor,deposit,cashdis,mrent,has_mscharge,mscharge,discount,grant
-,completed,,2023-12-08T00:00:00+00:00,2024-01-01T00:00:00+00:00,,2023,single log,false,DLUHC,DLUHC,billyboy@eyeklaud.com,8,12,2023,,Yes - a discounted ownership scheme,Right to Acquire (RTA),,,,Yes,Yes,2,Flat or maisonette,Purpose built,0,,,Address line 1,,Town or city,,SW1A,1AA,1,E09000003,Barnet,Yes,Yes,1,30,Non-binary,Buyer 1 prefers not to say,17,,United Kingdom,Full-time - 30 hours or more,Yes,Partner,35,Non-binary,Buyer 2 prefers not to say,,,Buyer prefers not to say,Full-time - 30 hours or more,Yes,3,Child,14,Non-binary,Child under 16,Other,Not known,Non-binary,"In government training into work, such as New Deal",Prefers not to say,Not known,Prefers not to say,Prefers not to say,,,,,Local authority tenant,No,,,No,,,1,1,1,1,,Don't know,,Yes,Yes,No,Yes,Yes,Yes,10000,Yes,Yes,10000,Yes,"Don’t know ",No,,Yes,No,10,,,,,,,,,,,,,,,,,110000.0,,Yes,20000.0,Cambridge Building Society,,10,Yes,80000.0,,,Yes,100.0,,10000.0
+,completed,,2023-12-08T00:00:00+00:00,2024-01-01T00:00:00+00:00,,2023,single log,false,DLUHC,DLUHC,billyboy@eyeklaud.com,8,12,2023,,Yes - a discounted ownership scheme,Right to Acquire (RTA),,,,Yes,Yes,2,Flat or maisonette,Purpose built,0,,,Address line 1,,Town or city,,SW1A,1AA,1,E09000003,Barnet,Yes,Yes,1,30,Non-binary,Buyer prefers not to say,17,,United Kingdom,Full-time - 30 hours or more,Yes,Partner,35,Non-binary,Buyer prefers not to say,,,Buyer prefers not to say,Full-time - 30 hours or more,Yes,3,Child,14,Non-binary,Child under 16,Other,Not known,Non-binary,"In government training into work, such as New Deal",Prefers not to say,Not known,Prefers not to say,Prefers not to say,,,,,Local authority tenant,No,,,No,,,1,1,1,1,,Don't know,,Yes,Yes,No,Yes,Yes,Yes,10000,Yes,Yes,10000,Yes,"Don’t know ",No,,Yes,No,10,,,,,,,,,,,,,,,,,110000.0,,Yes,20000.0,Cambridge Building Society,,10,Yes,80000.0,,,Yes,100.0,,10000.0

spec/fixtures/files/sales_logs_csv_export_labels_24.csv

@@ -1,2 +1,2 @@
 id,status,duplicate_set_id,created_at,updated_at,old_form_id,collection_start_year,creation_method,is_dpo,owning_organisation_name,managing_organisation_name,created_by,day,month,year,purchid,ownershipsch,type,othtype,companybuy,buylivein,jointpur,jointmore,noint,privacynotice,uprn,uprn_confirmed,address_line1,address_line2,town_or_city,county,pcode1,pcode2,la_known,la,la_label,beds,proptype,builtype,pcodenk,wchair,age1,sex1,ethnic_group,ethnic,national,nationality_all,ecstat1,buy1livein,relat2,age2,sex2,ethnic_group2,ethnicbuy2,nationalbuy2,nationality_all_buyer2,ecstat2,buy2livein,hholdcount,relat3,age3,sex3,ecstat3,relat4,age4,sex4,ecstat4,relat5,age5,sex5,ecstat5,relat6,age6,sex6,ecstat6,prevten,ppcodenk,ppostc1,ppostc2,previous_la_known,prevloc,prevloc_label,pregyrha,pregother,pregla,pregghb,pregblank,buy2living,prevtenbuy2,hhregres,hhregresstill,armedforcesspouse,disabled,wheel,income1nk,income1,inc1mort,income2nk,income2,inc2mort,hb,savingsnk,savings,prevown,prevshared,proplen,staircase,stairbought,stairowned,staircasesale,resale,exday,exmonth,exyear,hoday,homonth,hoyear,lanomagr,soctenant,frombeds,fromprop,socprevten,value,equity,mortgageused,mortgage,mortgagelender,mortgagelenderother,mortlen,extrabor,deposit,cashdis,mrent,has_mscharge,mscharge,discount,grant
-,completed,,2023-12-08T00:00:00+00:00,2024-05-01T00:00:00+01:00,,2023,single log,false,DLUHC,DLUHC,billyboy@eyeklaud.com,8,12,2023,,Yes - a discounted ownership scheme,Right to Acquire (RTA),,,,Yes,Yes,Yes,1,,,Address line 1,,Town or city,,SW1A,1AA,1,E09000003,Barnet,2,Flat or maisonette,Purpose built,0,Yes,30,Non-binary,Buyer 1 prefers not to say,17,United Kingdom,,Full-time - 30 hours or more,Yes,Partner,35,Non-binary,Buyer 2 prefers not to say,,Buyer prefers not to say,,Full-time - 30 hours or more,Yes,3,Child,14,Non-binary,Child under 16,Other,Not known,Non-binary,"In government training into work, such as New Deal",Prefers not to say,Not known,Prefers not to say,Prefers not to say,,,,,Local authority tenant,No,,,No,,,1,1,1,1,,Don't know,,Yes,Yes,No,Yes,Yes,Yes,10000,Yes,Yes,10000,Yes,"Don’t know ",No,,Yes,No,10,,,,,,,,,,,,,,,,,110000.0,,Yes,20000.0,Cambridge Building Society,,10,Yes,80000.0,,,Yes,100.0,,10000.0
+,completed,,2023-12-08T00:00:00+00:00,2024-05-01T00:00:00+01:00,,2023,single log,false,DLUHC,DLUHC,billyboy@eyeklaud.com,8,12,2023,,Yes - a discounted ownership scheme,Right to Acquire (RTA),,,,Yes,Yes,Yes,1,,,Address line 1,,Town or city,,SW1A,1AA,1,E09000003,Barnet,2,Flat or maisonette,Purpose built,0,Yes,30,Non-binary,Buyer prefers not to say,17,United Kingdom,,Full-time - 30 hours or more,Yes,Partner,35,Non-binary,Buyer prefers not to say,,Buyer prefers not to say,,Full-time - 30 hours or more,Yes,3,Child,14,Non-binary,Child under 16,Other,Not known,Non-binary,"In government training into work, such as New Deal",Prefers not to say,Not known,Prefers not to say,Prefers not to say,,,,,Local authority tenant,No,,,No,,,1,1,1,1,,Don't know,,Yes,Yes,No,Yes,Yes,Yes,10000,Yes,Yes,10000,Yes,"Don’t know ",No,,Yes,No,10,,,,,,,,,,,,,,,,,110000.0,,Yes,20000.0,Cambridge Building Society,,10,Yes,80000.0,,,Yes,100.0,,10000.0

spec/models/form/question_spec.rb

@@ -357,8 +357,8 @@ RSpec.describe Form::Question, type: :model do
       end
 
       context "when Sales form" do
-        let(:sales_log) { FactoryBot.create(:sales_log, :completed, ethnic_group: 17, saledate: Time.zone.local(2022, 1, 1)) }
+        let(:sales_log) { FactoryBot.create(:sales_log, :completed, national: 13, saledate: Time.zone.local(2022, 1, 1)) }
-        let(:question) { sales_log.form.get_question("ethnic_group", sales_log) }
+        let(:question) { sales_log.form.get_question("national", sales_log) }
 
         it "returns the inferred label value" do
           expect(question.answer_label(sales_log)).to eq("Prefers not to say")

spec/models/form/sales/questions/buyer1_ethnic_group_spec.rb

@@ -39,7 +39,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicGroup, type: :model do
     expect(question.answer_options).to eq({
       "0" => { "value" => "White" },
       "1" => { "value" => "Mixed or Multiple ethnic groups" },
-      "17" => { "value" => "Buyer 1 prefers not to say" },
+      "17" => { "value" => "Buyer prefers not to say" },
       "2" => { "value" => "Asian or Asian British" },
       "3" => { "value" => "Black, African, Caribbean or Black British" },
       "4" => { "value" => "Arab or other ethnic group" },
@@ -50,13 +50,4 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicGroup, type: :model do
   it "has the correct check_answers_card_number" do
     expect(question.check_answers_card_number).to eq(1)
   end
-
-  it "has the correct inferred_check_answers_value" do
-    expect(question.inferred_check_answers_value).to eq([{
-      "condition" => {
-        "ethnic_group" => 17,
-      },
-      "value" => "Prefers not to say",
-    }])
-  end
 end

spec/models/form/sales/questions/buyer2_ethnic_group_spec.rb

@@ -39,7 +39,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicGroup, type: :model do
     expect(question.answer_options).to eq({
       "0" => { "value" => "White" },
       "1" => { "value" => "Mixed or Multiple ethnic groups" },
-      "17" => { "value" => "Buyer 2 prefers not to say" },
+      "17" => { "value" => "Buyer prefers not to say" },
       "2" => { "value" => "Asian or Asian British" },
       "3" => { "value" => "Black, African, Caribbean or Black British" },
       "4" => { "value" => "Arab or other ethnic group" },
@@ -50,13 +50,4 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicGroup, type: :model do
   it "has the correct check_answers_card_number" do
     expect(question.check_answers_card_number).to eq(2)
   end
-
-  it "has the correct inferred_check_answers_value" do
-    expect(question.inferred_check_answers_value).to eq([{
-      "condition" => {
-        "ethnic_group2" => 17,
-      },
-      "value" => "Prefers not to say",
-    }])
-  end
 end