From f8d4059a9616c3f4e443709a12ecee8c4010bc22 Mon Sep 17 00:00:00 2001 From: Kat Date: Tue, 3 Oct 2023 10:21:57 +0100 Subject: [PATCH] Add optional tags and remove LA from csv --- .../csv/missing_addresses_csv_service.rb | 22 +++++++------------ .../files/missing_lettings_logs_addresses.csv | 4 ++-- ...ing_lettings_logs_addresses_all_issues.csv | 8 +++---- .../missing_lettings_logs_town_or_city.csv | 4 ++-- .../missing_lettings_logs_wrong_uprn.csv | 4 ++-- .../files/missing_sales_logs_addresses.csv | 4 ++-- ...issing_sales_logs_addresses_all_issues.csv | 8 +++---- .../files/missing_sales_logs_town_or_city.csv | 4 ++-- .../files/missing_sales_logs_wrong_uprn.csv | 4 ++-- 9 files changed, 28 insertions(+), 34 deletions(-) diff --git a/app/services/csv/missing_addresses_csv_service.rb b/app/services/csv/missing_addresses_csv_service.rb index df800a19e..f9665ca92 100644 --- a/app/services/csv/missing_addresses_csv_service.rb +++ b/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 diff --git a/spec/fixtures/files/missing_lettings_logs_addresses.csv b/spec/fixtures/files/missing_lettings_logs_addresses.csv index 243641c25..56e83b764 100644 --- a/spec/fixtures/files/missing_lettings_logs_addresses.csv +++ b/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,,,,,, diff --git a/spec/fixtures/files/missing_lettings_logs_addresses_all_issues.csv b/spec/fixtures/files/missing_lettings_logs_addresses_all_issues.csv index 5a748ad9f..e0acd8cda 100644 --- a/spec/fixtures/files/missing_lettings_logs_addresses_all_issues.csv +++ b/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 diff --git a/spec/fixtures/files/missing_lettings_logs_town_or_city.csv b/spec/fixtures/files/missing_lettings_logs_town_or_city.csv index d5c554289..0dd4c8cb1 100644 --- a/spec/fixtures/files/missing_lettings_logs_town_or_city.csv +++ b/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,,,, diff --git a/spec/fixtures/files/missing_lettings_logs_wrong_uprn.csv b/spec/fixtures/files/missing_lettings_logs_wrong_uprn.csv index bd7d78c40..bafeaa281 100644 --- a/spec/fixtures/files/missing_lettings_logs_wrong_uprn.csv +++ b/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 diff --git a/spec/fixtures/files/missing_sales_logs_addresses.csv b/spec/fixtures/files/missing_sales_logs_addresses.csv index a26fbdfe4..768c1bffd 100644 --- a/spec/fixtures/files/missing_sales_logs_addresses.csv +++ b/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,,,,,, diff --git a/spec/fixtures/files/missing_sales_logs_addresses_all_issues.csv b/spec/fixtures/files/missing_sales_logs_addresses_all_issues.csv index 0ed0b43f1..532c35ab7 100644 --- a/spec/fixtures/files/missing_sales_logs_addresses_all_issues.csv +++ b/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 diff --git a/spec/fixtures/files/missing_sales_logs_town_or_city.csv b/spec/fixtures/files/missing_sales_logs_town_or_city.csv index ab1913f69..9b37298aa 100644 --- a/spec/fixtures/files/missing_sales_logs_town_or_city.csv +++ b/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,,,, diff --git a/spec/fixtures/files/missing_sales_logs_wrong_uprn.csv b/spec/fixtures/files/missing_sales_logs_wrong_uprn.csv index 3f8e6fe19..7bea7bf00 100644 --- a/spec/fixtures/files/missing_sales_logs_wrong_uprn.csv +++ b/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