From 92398ff45ac7e3cb767065a148f31e16e2a2c348 Mon Sep 17 00:00:00 2001 From: baarkerlounger Date: Wed, 15 Jun 2022 10:54:25 +0100 Subject: [PATCH] Fix lettings allocation (cbl, chr, cap) import --- app/services/imports/case_logs_import_service.rb | 15 ++++++++++++--- .../166fc004-392e-47a8-acb8-1c018734882b.xml | 2 +- .../5ybz29dj-l33t-k1l0-hj86-n4k4ma77xkcd.xml | 2 +- .../893ufj2s-lq77-42m4-rty6-ej09gh585uy1.xml | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/services/imports/case_logs_import_service.rb b/app/services/imports/case_logs_import_service.rb index 3b596c863..7af00b12c 100644 --- a/app/services/imports/case_logs_import_service.rb +++ b/app/services/imports/case_logs_import_service.rb @@ -123,9 +123,9 @@ module Imports attributes["rp_hardship"] = unsafe_string_as_integer(xml_doc, "Q14b4").present? ? 1 : nil attributes["rp_dontknow"] = unsafe_string_as_integer(xml_doc, "Q14b5").present? ? 1 : nil - attributes["cbl"] = unsafe_string_as_integer(xml_doc, "Q15CBL").present? ? 1 : nil - attributes["chr"] = unsafe_string_as_integer(xml_doc, "Q15CHR").present? ? 1 : nil - attributes["cap"] = unsafe_string_as_integer(xml_doc, "Q15CAP").present? ? 1 : nil + attributes["cbl"] = allocation_system(unsafe_string_as_integer(xml_doc, "Q15CBL")) + attributes["chr"] = allocation_system(unsafe_string_as_integer(xml_doc, "Q15CHR")) + attributes["cap"] = allocation_system(unsafe_string_as_integer(xml_doc, "Q15CAP")) attributes["referral"] = unsafe_string_as_integer(xml_doc, "Q16") attributes["period"] = unsafe_string_as_integer(xml_doc, "Q17") @@ -553,6 +553,15 @@ module Imports end end + def allocation_system(value) + case value + when 1 + 1 + when 2 + 0 + end + end + def apply_date_consistency!(attributes) return if attributes["voiddate"].nil? || attributes["startdate"].nil? diff --git a/spec/fixtures/softwire_imports/case_logs/166fc004-392e-47a8-acb8-1c018734882b.xml b/spec/fixtures/softwire_imports/case_logs/166fc004-392e-47a8-acb8-1c018734882b.xml index 631f41cae..25fbb2283 100644 --- a/spec/fixtures/softwire_imports/case_logs/166fc004-392e-47a8-acb8-1c018734882b.xml +++ b/spec/fixtures/softwire_imports/case_logs/166fc004-392e-47a8-acb8-1c018734882b.xml @@ -133,7 +133,7 @@ 2 No 2 No - 2 No + 1 Yes 10 Other social landlord diff --git a/spec/fixtures/softwire_imports/case_logs/5ybz29dj-l33t-k1l0-hj86-n4k4ma77xkcd.xml b/spec/fixtures/softwire_imports/case_logs/5ybz29dj-l33t-k1l0-hj86-n4k4ma77xkcd.xml index 2531314dd..0e014e2a3 100644 --- a/spec/fixtures/softwire_imports/case_logs/5ybz29dj-l33t-k1l0-hj86-n4k4ma77xkcd.xml +++ b/spec/fixtures/softwire_imports/case_logs/5ybz29dj-l33t-k1l0-hj86-n4k4ma77xkcd.xml @@ -131,7 +131,7 @@ - 2 No + 1 Yes 2 No 2 No diff --git a/spec/fixtures/softwire_imports/case_logs/893ufj2s-lq77-42m4-rty6-ej09gh585uy1.xml b/spec/fixtures/softwire_imports/case_logs/893ufj2s-lq77-42m4-rty6-ej09gh585uy1.xml index f01bb1baa..3f14dbf1f 100644 --- a/spec/fixtures/softwire_imports/case_logs/893ufj2s-lq77-42m4-rty6-ej09gh585uy1.xml +++ b/spec/fixtures/softwire_imports/case_logs/893ufj2s-lq77-42m4-rty6-ej09gh585uy1.xml @@ -132,7 +132,7 @@ 2 No - 2 No + 1 Yes 2 No