Add optional tags and remove LA from csv

app/services/csv/missing_addresses_csv_service.rb

@@ -32,7 +32,7 @@ module Csv
       return if logs_with_missing_addresses.empty? && logs_with_missing_town_or_city.empty? && logs_with_wrong_uprn.empty?
 
       CSV.generate(headers: true) do |csv|
-        csv << ["Issue type", "Lettings log ID", "Tenancy start date", "Tenant code", "Property code", "Log owner", "Owning organisation name", "Managing organisation name", "UPRN", "Address line 1", "Address line 2", "Town or City", "County", "Postcode", "Local authority"]
+        csv << ["Issue type", "Lettings log ID", "Tenancy start date", "Tenant code", "Property code", "Log owner", "Owning organisation name", "Managing organisation name", "UPRN", "Address line 1", "Address line 2 (optional)", "Town or City", "County (optional)", "Postcode"]
 
         logs_with_missing_addresses.each do |log|
           csv << ["Full address required",
@@ -48,8 +48,7 @@ module Csv
                   log.address_line2,
                   log.town_or_city,
                   log.county,
-                  log.postcode_full,
-                  log.la]
+                  log.postcode_full]
         end
 
         logs_with_missing_town_or_city.each do |log|
@@ -66,8 +65,7 @@ module Csv
                   log.address_line2,
                   log.town_or_city,
                   log.county,
-                  log.postcode_full,
-                  log.la]
+                  log.postcode_full]
         end
 
         logs_with_wrong_uprn.each do |log|
@@ -84,8 +82,7 @@ module Csv
                   log.address_line2,
                   log.town_or_city,
                   log.county,
-                  log.postcode_full,
-                  log.la]
+                  log.postcode_full]
         end
       end
     end
@@ -116,7 +113,7 @@ module Csv
       return if logs_with_missing_addresses.empty? && logs_with_missing_town_or_city.empty? && logs_with_wrong_uprn.empty?
 
       CSV.generate(headers: true) do |csv|
-        csv << ["Issue type", "Sales log ID", "Sale completion date", "Purchaser code", "Log owner", "Owning organisation name", "UPRN", "Address line 1", "Address line 2", "Town or City", "County", "Postcode", "Local authority"]
+        csv << ["Issue type", "Sales log ID", "Sale completion date", "Purchaser code", "Log owner", "Owning organisation name", "UPRN", "Address line 1", "Address line 2 (optional)", "Town or City", "County (optional)", "Postcode"]
 
         logs_with_missing_addresses.each do |log|
           csv << ["Full address required",
@@ -130,8 +127,7 @@ module Csv
                   log.address_line2,
                   log.town_or_city,
                   log.county,
-                  log.postcode_full,
-                  log.la]
+                  log.postcode_full]
         end
 
         logs_with_missing_town_or_city.each do |log|
@@ -146,8 +142,7 @@ module Csv
                   log.address_line2,
                   log.town_or_city,
                   log.county,
-                  log.postcode_full,
-                  log.la]
+                  log.postcode_full]
         end
 
         logs_with_wrong_uprn.each do |log|
@@ -162,8 +157,7 @@ module Csv
                   log.address_line2,
                   log.town_or_city,
                   log.county,
-                  log.postcode_full,
-                  log.la]
+                  log.postcode_full]
         end
       end
     end

spec/fixtures/files/missing_lettings_logs_addresses.csv

@@ -1,2 +1,2 @@
-Issue type,Lettings log ID,Tenancy start date,Tenant code,Property code,Log owner,Owning organisation name,Managing organisation name,UPRN,Address line 1,Address line 2,Town or City,County,Postcode,Local authority
-Full address required,{id},2023-04-05,tenancycode,propcode,testy@example.com,Address org,Address org,,,,,,,
+Issue type,Lettings log ID,Tenancy start date,Tenant code,Property code,Log owner,Owning organisation name,Managing organisation name,UPRN,Address line 1,Address line 2 (optional),Town or City,County (optional),Postcode
+Full address required,{id},2023-04-05,tenancycode,propcode,testy@example.com,Address org,Address org,,,,,,

spec/fixtures/files/missing_lettings_logs_addresses_all_issues.csv

@@ -1,4 +1,4 @@
-Issue type,Lettings log ID,Tenancy start date,Tenant code,Property code,Log owner,Owning organisation name,Managing organisation name,UPRN,Address line 1,Address line 2,Town or City,County,Postcode,Local authority
-Full address required,{id},2023-04-05,tenancycode,propcode,testy@example.com,Address org,Address org,,,,,,,
-Missing town or city,{id},2023-04-05,tenancycode,propcode,testy@example.com,Address org,Address org,,existing address,,,,,
-UPRN issues,{id},2023-04-05,tenancycode,propcode,testy@example.com,Address org,Address org,123,Some Place,,Bristol,,BS1 1AD,
+Issue type,Lettings log ID,Tenancy start date,Tenant code,Property code,Log owner,Owning organisation name,Managing organisation name,UPRN,Address line 1,Address line 2 (optional),Town or City,County (optional),Postcode
+Full address required,{id},2023-04-05,tenancycode,propcode,testy@example.com,Address org,Address org,,,,,,
+Missing town or city,{id},2023-04-05,tenancycode,propcode,testy@example.com,Address org,Address org,,existing address,,,,
+UPRN issues,{id},2023-04-05,tenancycode,propcode,testy@example.com,Address org,Address org,123,Some Place,,Bristol,,BS1 1AD

spec/fixtures/files/missing_lettings_logs_town_or_city.csv

@@ -1,2 +1,2 @@
-Issue type,Lettings log ID,Tenancy start date,Tenant code,Property code,Log owner,Owning organisation name,Managing organisation name,UPRN,Address line 1,Address line 2,Town or City,County,Postcode,Local authority
-Missing town or city,{id},2023-04-05,tenancycode,propcode,testy@example.com,Address org,Address org,,existing address,,,,,
+Issue type,Lettings log ID,Tenancy start date,Tenant code,Property code,Log owner,Owning organisation name,Managing organisation name,UPRN,Address line 1,Address line 2 (optional),Town or City,County (optional),Postcode
+Missing town or city,{id},2023-04-05,tenancycode,propcode,testy@example.com,Address org,Address org,,existing address,,,,

spec/fixtures/files/missing_lettings_logs_wrong_uprn.csv

@@ -1,2 +1,2 @@
-Issue type,Lettings log ID,Tenancy start date,Tenant code,Property code,Log owner,Owning organisation name,Managing organisation name,UPRN,Address line 1,Address line 2,Town or City,County,Postcode,Local authority
-UPRN issues,{id},2023-04-05,tenancycode,12,testy@example.com,Address org,Address org,12,Some Place,,Newcastle,,EC1N 2TD,
+Issue type,Lettings log ID,Tenancy start date,Tenant code,Property code,Log owner,Owning organisation name,Managing organisation name,UPRN,Address line 1,Address line 2 (optional),Town or City,County (optional),Postcode
+UPRN issues,{id},2023-04-05,tenancycode,12,testy@example.com,Address org,Address org,12,Some Place,,Newcastle,,EC1N 2TD

spec/fixtures/files/missing_sales_logs_addresses.csv

@@ -1,2 +1,2 @@
-Issue type,Sales log ID,Sale completion date,Purchaser code,Log owner,Owning organisation name,UPRN,Address line 1,Address line 2,Town or City,County,Postcode,Local authority
-Full address required,{id},2023-04-05,purchaser code,testy@example.com,Address org,,,,,,,
+Issue type,Sales log ID,Sale completion date,Purchaser code,Log owner,Owning organisation name,UPRN,Address line 1,Address line 2 (optional),Town or City,County (optional),Postcode
+Full address required,{id},2023-04-05,purchaser code,testy@example.com,Address org,,,,,,

spec/fixtures/files/missing_sales_logs_addresses_all_issues.csv

@@ -1,4 +1,4 @@
-Issue type,Sales log ID,Sale completion date,Purchaser code,Log owner,Owning organisation name,UPRN,Address line 1,Address line 2,Town or City,County,Postcode,Local authority
-Full address required,{id},2023-04-05,purchaser code,testy@example.com,Address org,,,,,,,
-Missing town or city,{id},2023-04-05,purchaser code,testy@example.com,Address org,,existing address line 1,,,,,
-UPRN issues,{id},2023-04-05,purchaser code,testy@example.com,Address org,123,Some Place,,Bristol,,BS1 1AD,
+Issue type,Sales log ID,Sale completion date,Purchaser code,Log owner,Owning organisation name,UPRN,Address line 1,Address line 2 (optional),Town or City,County (optional),Postcode
+Full address required,{id},2023-04-05,purchaser code,testy@example.com,Address org,,,,,,
+Missing town or city,{id},2023-04-05,purchaser code,testy@example.com,Address org,,existing address line 1,,,,
+UPRN issues,{id},2023-04-05,purchaser code,testy@example.com,Address org,123,Some Place,,Bristol,,BS1 1AD

spec/fixtures/files/missing_sales_logs_town_or_city.csv

@@ -1,2 +1,2 @@
-Issue type,Sales log ID,Sale completion date,Purchaser code,Log owner,Owning organisation name,UPRN,Address line 1,Address line 2,Town or City,County,Postcode,Local authority
-Missing town or city,{id},2023-04-05,purchaser code,testy@example.com,Address org,,existing address line 1,,,,,
+Issue type,Sales log ID,Sale completion date,Purchaser code,Log owner,Owning organisation name,UPRN,Address line 1,Address line 2 (optional),Town or City,County (optional),Postcode
+Missing town or city,{id},2023-04-05,purchaser code,testy@example.com,Address org,,existing address line 1,,,,

spec/fixtures/files/missing_sales_logs_wrong_uprn.csv

@@ -1,2 +1,2 @@
-Issue type,Sales log ID,Sale completion date,Purchaser code,Log owner,Owning organisation name,UPRN,Address line 1,Address line 2,Town or City,County,Postcode,Local authority
-UPRN issues,{id},2023-04-05,12,testy@example.com,Address org,12,Some Place,,Newcastle,,EC1N 2TD,
+Issue type,Sales log ID,Sale completion date,Purchaser code,Log owner,Owning organisation name,UPRN,Address line 1,Address line 2 (optional),Town or City,County (optional),Postcode
+UPRN issues,{id},2023-04-05,12,testy@example.com,Address org,12,Some Place,,Newcastle,,EC1N 2TD