From 75ab682b93fe6d38d188eac25f15a441b9e58eb0 Mon Sep 17 00:00:00 2001 From: James Rose Date: Wed, 2 Nov 2022 10:28:50 +0000 Subject: [PATCH] Export logs with datetimes formatted as ISO 8601 --- app/services/exports/lettings_log_export_service.rb | 7 +++++++ spec/fixtures/exports/general_needs_log.csv | 2 +- spec/fixtures/exports/general_needs_log.xml | 10 +++++----- spec/fixtures/exports/supported_housing_logs.xml | 10 +++++----- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/app/services/exports/lettings_log_export_service.rb b/app/services/exports/lettings_log_export_service.rb index a7fff1d53..51d69173a 100644 --- a/app/services/exports/lettings_log_export_service.rb +++ b/app/services/exports/lettings_log_export_service.rb @@ -180,6 +180,13 @@ module Exports 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["cbl"] = 2 if attribute_hash["cbl"]&.zero? attribute_hash["cap"] = 2 if attribute_hash["cap"]&.zero? attribute_hash["chr"] = 2 if attribute_hash["chr"]&.zero? diff --git a/spec/fixtures/exports/general_needs_log.csv b/spec/fixtures/exports/general_needs_log.csv index 8a2dd1764..3c8617b56 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,0,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-05 10:36:49 UTC,0,2022-02-02 10:36:49 UTC,1,2,1,2019-11-03 00:00:00 UTC,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-08 16:52:15 UTC,2022-02-08 16:52:15 UTC +2,BZ737,35,F,2,4,6,0,2,32,M,6,,,,,,,,,,,,,,,,,,,1,0,1,0,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 diff --git a/spec/fixtures/exports/general_needs_log.xml b/spec/fixtures/exports/general_needs_log.xml index 642b6ac6a..3f1acf814 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-05 10:36:49 UTC + 2020-05-05T10:36:49Z 0 - 2022-02-02 10:36:49 UTC + 2022-02-02T10:36:49Z 1 2 1 - 2019-11-03 00:00:00 UTC + 2019-11-03T00:00:00Z 2 1 7 @@ -142,8 +142,8 @@ {managing_org_id} DLUHC 1234 - 2022-02-08 16:52:15 UTC - 2022-02-08 16:52:15 UTC + 2022-02-08T16:52:15Z + 2022-02-08T16:52:15Z 1 diff --git a/spec/fixtures/exports/supported_housing_logs.xml b/spec/fixtures/exports/supported_housing_logs.xml index b04a86b0c..13f4488a0 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-05 10:36:49 UTC + 2020-05-05T10:36:49Z 0 - 2022-02-02 10:36:49 UTC + 2022-02-02T10:36:49Z 1 - 2019-11-03 00:00:00 UTC + 2019-11-03T00:00:00Z 2 2 8 @@ -141,8 +141,8 @@ {managing_org_id} DLUHC 1234 - 2022-02-08 16:52:15 UTC - 2022-02-08 16:52:15 UTC + 2022-02-08T16:52:15Z + 2022-02-08T16:52:15Z 7 1 G