From 20159bba13cde8c5c5fef2d53510a58dd9ade026 Mon Sep 17 00:00:00 2001 From: James Rose Date: Thu, 3 Nov 2022 10:26:39 +0000 Subject: [PATCH] Ensure that logs exported with datetimes are local times (#965) Follows on from https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data/pull/960 --- .../exports/lettings_log_export_service.rb | 14 +++++--------- spec/factories/lettings_log.rb | 2 +- spec/fixtures/exports/general_needs_log.csv | 2 +- spec/fixtures/exports/general_needs_log.xml | 10 +++++----- spec/fixtures/exports/supported_housing_logs.xml | 10 +++++----- 5 files changed, 17 insertions(+), 21 deletions(-) diff --git a/app/services/exports/lettings_log_export_service.rb b/app/services/exports/lettings_log_export_service.rb index 51d69173a..1819670b8 100644 --- a/app/services/exports/lettings_log_export_service.rb +++ b/app/services/exports/lettings_log_export_service.rb @@ -176,16 +176,12 @@ module Exports attribute_hash["manhcnum"] = lettings_log.managing_organisation.housing_registration_no end - # Mapping which would require a change in our data model - attribute_hash["createddate"] = attribute_hash["created_at"] - attribute_hash["uploaddate"] = attribute_hash["updated_at"] - # Covert date times to ISO 8601 - attribute_hash["createddate"] = attribute_hash["createddate"]&.iso8601 - attribute_hash["uploaddate"] = attribute_hash["uploaddate"]&.iso8601 - attribute_hash["mrcdate"] = attribute_hash["mrcdate"]&.iso8601 - attribute_hash["startdate"] = attribute_hash["startdate"]&.iso8601 - attribute_hash["voiddate"] = attribute_hash["voiddate"]&.iso8601 + attribute_hash["createddate"] = lettings_log.created_at&.iso8601 + attribute_hash["uploaddate"] = lettings_log.updated_at&.iso8601 + attribute_hash["mrcdate"] = lettings_log.mrcdate&.iso8601 + attribute_hash["startdate"] = lettings_log.startdate&.iso8601 + attribute_hash["voiddate"] = lettings_log.voiddate&.iso8601 attribute_hash["cbl"] = 2 if attribute_hash["cbl"]&.zero? attribute_hash["cap"] = 2 if attribute_hash["cap"]&.zero? diff --git a/spec/factories/lettings_log.rb b/spec/factories/lettings_log.rb index fc5906a16..d337bc592 100644 --- a/spec/factories/lettings_log.rb +++ b/spec/factories/lettings_log.rb @@ -132,7 +132,7 @@ FactoryBot.define do hbrentshortfall { 1 } tshortfall { 12 } property_relet { 0 } - mrcdate { Time.utc(2020, 5, 0o5, 10, 36, 49) } + mrcdate { Time.zone.local(2020, 5, 5, 10, 36, 49) } incref { 0 } startdate { Time.utc(2022, 2, 2, 10, 36, 49) } armedforces { 1 } diff --git a/spec/fixtures/exports/general_needs_log.csv b/spec/fixtures/exports/general_needs_log.csv index 548f949a5..d93f66ab0 100644 --- a/spec/fixtures/exports/general_needs_log.csv +++ b/spec/fixtures/exports/general_needs_log.csv @@ -1,2 +1,2 @@ status,tenancycode,age1,sex1,ethnic,national,prevten,ecstat1,hhmemb,age2,sex2,ecstat2,age3,sex3,ecstat3,age4,sex4,ecstat4,age5,sex5,ecstat5,age6,sex6,ecstat6,age7,sex7,ecstat7,age8,sex8,ecstat8,homeless,underoccupation_benefitcap,leftreg,reservist,illness,preg_occ,startertenancy,tenancylength,tenancy,ppostcode_full,rsnvac,unittype_gn,beds,offered,wchair,earnings,incfreq,benefits,period,layear,waityear,postcode_full,reasonpref,cbl,chr,cap,reasonother,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_f,housingneeds_g,housingneeds_h,illness_type_1,illness_type_2,illness_type_3,illness_type_4,illness_type_8,illness_type_5,illness_type_6,illness_type_7,illness_type_9,illness_type_10,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,tenancyother,irproduct_other,reason,propcode,la,prevloc,hb,hbrentshortfall,mrcdate,incref,startdate,armedforces,unitletas,builtype,voiddate,renttype,needstype,lettype,totchild,totelder,totadult,nocharge,referral,brent,scharge,pscharge,supcharg,tcharge,tshortfall,chcharge,ppcodenk,has_benefits,renewal,wrent,wscharge,wpschrge,wsupchrg,wtcharge,wtshortfall,refused,housingneeds,wchchrg,newprop,relat2,relat3,relat4,relat5,relat6,relat7,relat8,lar,irproduct,joint,sheltered,hhtype,new_old,vacdays,form,owningorgid,owningorgname,hcnum,maningorgid,maningorgname,manhcnum,createddate,uploaddate -2,BZ737,35,F,2,4,6,0,2,32,M,6,,,,,,,,,,,,,,,,,,,1,0,1,1,1,2,1,5,1,SE2 6RT,6,7,3,2,1,68,1,1,2,2,1,NW1 5TY,1,1,1,2,,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,,,4,123,E09000003,E07000105,6,1,2020-05-05T10:36:49Z,0,2022-02-02T10:36:49Z,1,2,1,2019-11-03T00:00:00Z,2,1,7,0,0,2,0,2,200.0,50.0,40.0,35.0,325.0,12.0,,1,1,0,100.0,25.0,20.0,17.5,162.5,6.0,0,1,,2,P,,,,,,,,,,,4,2,638,{id},{owning_org_id},DLUHC,1234,{managing_org_id},DLUHC,1234,2022-02-08T16:52:15Z,2022-02-08T16:52:15Z +2,BZ737,35,F,2,4,6,0,2,32,M,6,,,,,,,,,,,,,,,,,,,1,0,1,1,1,2,1,5,1,SE2 6RT,6,7,3,2,1,68,1,1,2,2,1,NW1 5TY,1,1,1,2,,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,,,4,123,E09000003,E07000105,6,1,2020-05-05T10:36:49+01:00,0,2022-02-02T10:36:49+00:00,1,2,1,2019-11-03T00:00:00+00:00,2,1,7,0,0,2,0,2,200.0,50.0,40.0,35.0,325.0,12.0,,1,1,0,100.0,25.0,20.0,17.5,162.5,6.0,0,1,,2,P,,,,,,,,,,,4,2,638,{id},{owning_org_id},DLUHC,1234,{managing_org_id},DLUHC,1234,2022-02-08T16:52:15+00:00,2022-02-08T16:52:15+00:00 diff --git a/spec/fixtures/exports/general_needs_log.xml b/spec/fixtures/exports/general_needs_log.xml index e499ba271..8e72e23de 100644 --- a/spec/fixtures/exports/general_needs_log.xml +++ b/spec/fixtures/exports/general_needs_log.xml @@ -87,13 +87,13 @@ E07000105 6 1 - 2020-05-05T10:36:49Z + 2020-05-05T10:36:49+01:00 0 - 2022-02-02T10:36:49Z + 2022-02-02T10:36:49+00:00 1 2 1 - 2019-11-03T00:00:00Z + 2019-11-03T00:00:00+00:00 2 1 7 @@ -142,8 +142,8 @@ {managing_org_id} DLUHC 1234 - 2022-02-08T16:52:15Z - 2022-02-08T16:52:15Z + 2022-02-08T16:52:15+00:00 + 2022-02-08T16:52:15+00:00 1 diff --git a/spec/fixtures/exports/supported_housing_logs.xml b/spec/fixtures/exports/supported_housing_logs.xml index 3e094bb1e..bd5b1d209 100644 --- a/spec/fixtures/exports/supported_housing_logs.xml +++ b/spec/fixtures/exports/supported_housing_logs.xml @@ -86,13 +86,13 @@ E07000105 6 1 - 2020-05-05T10:36:49Z + 2020-05-05T10:36:49+01:00 0 - 2022-02-02T10:36:49Z + 2022-02-02T10:36:49+00:00 1 - 2019-11-03T00:00:00Z + 2019-11-03T00:00:00+00:00 2 2 8 @@ -141,8 +141,8 @@ {managing_org_id} DLUHC 1234 - 2022-02-08T16:52:15Z - 2022-02-08T16:52:15Z + 2022-02-08T16:52:15+00:00 + 2022-02-08T16:52:15+00:00 7 1 G