April 14 evening changes

app/services/imports/case_logs_import_service.rb

@@ -44,15 +44,13 @@ module Imports
 
       # Required fields for status complete or logic to work
       # Note: order matters when we derive from previous values (attributes parameter)
-      attributes["startdate"] = start_date(xml_doc)
+      attributes["startdate"] = compose_date(xml_doc, "DAY", "MONTH", "YEAR")
       attributes["owning_organisation_id"] = find_organisation_id(xml_doc, "OWNINGORGID")
       attributes["managing_organisation_id"] = find_organisation_id(xml_doc, "MANINGORGID")
       attributes["startertenancy"] = unsafe_string_as_integer(xml_doc, "_2a")
       attributes["tenancy"] = unsafe_string_as_integer(xml_doc, "Q2b")
       attributes["tenancyother"] = string_or_nil(xml_doc, "Q2ba")
       attributes["tenancylength"] = safe_string_as_integer(xml_doc, "_2cYears")
-      attributes["previous_postcode_known"] = previous_postcode_known(xml_doc)
-      attributes["ppostcode_full"] = previous_postcode(xml_doc, attributes["previous_postcode_known"])
       attributes["needstype"] = needs_type(xml_doc)
       attributes["lar"] = london_affordable_rent(xml_doc)
       attributes["irproduct"] = unsafe_string_as_integer(xml_doc, "IRPRODUCT")
@@ -72,9 +70,6 @@ module Imports
       attributes["ethnic_group"] = ethnic_group(attributes["ethnic"])
       attributes["national"] = unsafe_string_as_integer(xml_doc, "P1Nat")
       attributes["preg_occ"] = unsafe_string_as_integer(xml_doc, "Preg")
-      %w[a b c f g h].each do |letter|
-        attributes["housingneeds_#{letter}"] = housing_needs(xml_doc, letter)
-      end
 
       attributes["armedforces"] = unsafe_string_as_integer(xml_doc, "ArmedF")
       attributes["leftreg"] = unsafe_string_as_integer(xml_doc, "LeftAF")
@@ -89,12 +84,23 @@ module Imports
       attributes["reason"] = unsafe_string_as_integer(xml_doc, "Q9a")
       attributes["reasonother"] = string_or_nil(xml_doc, "Q9aa")
       attributes["underoccupation_benefitcap"] = unsafe_string_as_integer(xml_doc, "_9b")
+      %w[a b c f g h].each do |letter|
+        attributes["housingneeds_#{letter}"] = housing_needs(xml_doc, letter)
+      end
+
       attributes["illness"] = unsafe_string_as_integer(xml_doc, "Q10ia")
+      (1..10).each do |index|
+        attributes["illness_type_#{index}"] = illness_type(xml_doc, index)
+      end
+
+      attributes["prevten"] = unsafe_string_as_integer(xml_doc, "Q11")
+      attributes["prevloc"] = string_or_nil(xml_doc, "Q12aONS")
+      attributes["previous_postcode_known"] = previous_postcode_known(xml_doc)
+      attributes["ppostcode_full"] = compose_postcode(xml_doc, "PPOSTC1", "PPOSTC2")
       attributes["layear"] = unsafe_string_as_integer(xml_doc, "Q12c")
       attributes["waityear"] = unsafe_string_as_integer(xml_doc, "Q12d")
       attributes["homeless"] = unsafe_string_as_integer(xml_doc, "Q13")
 
-      # Note recheck boolean values for 0 instead of nil
       attributes["reasonpref"] = unsafe_string_as_integer(xml_doc, "Q14a")
       attributes["rp_homeless"] = unsafe_string_as_integer(xml_doc, "Q14b1")
       attributes["rp_insan_unsat"] = unsafe_string_as_integer(xml_doc, "Q14b2")
@@ -106,15 +112,34 @@ module Imports
       attributes["chr"] = unsafe_string_as_integer(xml_doc, "Q15CHR")
       attributes["cap"] = 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")
 
+      attributes["brent"] = safe_string_as_decimal(xml_doc, "Q18ai")
+      attributes["scharge"] = safe_string_as_decimal(xml_doc, "Q18aii")
+      attributes["pscharge"] = safe_string_as_decimal(xml_doc, "Q18aiii")
+      attributes["supcharg"] = safe_string_as_decimal(xml_doc, "Q18aiv")
+      attributes["tcharge"] = safe_string_as_decimal(xml_doc, "Q18av")
+
+      attributes["hbrentshortfall"] = unsafe_string_as_integer(xml_doc, "Q18d")
+
+      attributes["voiddate"] = compose_date(xml_doc, "VDAY", "VMONTH", "VYEAR")
+      attributes["mrcdate"] = compose_date(xml_doc, "MRCDAY", "MRCMONTH", "MRCYEAR")
+
+      attributes["offered"] = safe_string_as_integer(xml_doc, "Q20")
+      attributes["propcode"] = string_or_nil(xml_doc, "Q21a")
       attributes["beds"] = safe_string_as_integer(xml_doc, "Q22")
       attributes["unittype_gn"] = unsafe_string_as_integer(xml_doc, "Q23")
       attributes["builtype"] = unsafe_string_as_integer(xml_doc, "Q24")
       attributes["wchair"] = unsafe_string_as_integer(xml_doc, "Q25")
+      attributes["unitletas"] = unsafe_string_as_integer(xml_doc, "Q26")
       attributes["rsnvac"] = unsafe_string_as_integer(xml_doc, "Q27")
       attributes["renewal"] = renewal(attributes["rsnvac"])
 
+      attributes["la"] = string_or_nil(xml_doc, "Q28ONS")
+      attributes["postcode_full"] = compose_postcode(xml_doc, "POSTCODE", "POSTCOD2")
+      attributes["postcode_known"] = attributes["postcode_full"].nil? ? 0 : 1
+
       # Not specific to our form but required for CDS and can't be inferred
       attributes["old_form_id"] = Integer(field_value(xml_doc, "xmlns", "FORM"))
 
@@ -124,12 +149,9 @@ module Imports
       attributes["created_at"] = Date.parse(field_value(xml_doc, "meta", "created-date"))
       attributes["updated_at"] = Date.parse(field_value(xml_doc, "meta", "modified-date"))
 
-
+      # Pending validation with new form
-      pp attributes
       # case_log = CaseLog.new(attributes)
       # case_log.save!
-      # pp case_log.status
-      # pp case_log.send(:mandatory_fields)
     end
 
     # Safe: A string that represents only an integer (or empty/nil)
@@ -154,12 +176,16 @@ module Imports
       end
     end
 
-    def start_date(xml_doc)
+    def compose_date(xml_doc, day_str, month_str, year_str)
-      day = Integer(field_value(xml_doc, "xmlns", "DAY"))
+      day = Integer(field_value(xml_doc, "xmlns", day_str), exception: false)
-      month = Integer(field_value(xml_doc, "xmlns", "MONTH"))
+      month = Integer(field_value(xml_doc, "xmlns", month_str), exception: false)
-      year = Integer(field_value(xml_doc, "xmlns", "YEAR"))
+      year = Integer(field_value(xml_doc, "xmlns", year_str), exception: false)
+      if day.nil? || month.nil? ||year.nil?
+        nil
+      else
         Date.new(year, month, day)
       end
+    end
 
     def get_form_name_component(xml_doc, index)
       form_name = field_value(xml_doc, "meta", "form-name")
@@ -335,13 +361,13 @@ module Imports
       end
     end
 
-    def previous_postcode(xml_doc, previous_postcode_known)
+    def compose_postcode(xml_doc, outcode, incode)
-      if previous_postcode_known.zero?
+      outcode_value = field_value(xml_doc, "xmlns", outcode)
+      incode_value = field_value(xml_doc, "xmlns", incode)
+      if outcode_value.blank? || incode_value.blank?
         nil
       else
-        outcode = field_value(xml_doc, "xmlns", "PPOSTC1")
+      "#{outcode_value} #{incode_value}"
-        incode = field_value(xml_doc, "xmlns", "PPOSTC2")
-        "#{outcode} #{incode}"
       end
     end
 
@@ -422,5 +448,14 @@ module Imports
       end
     end
 
+    def illness_type(xml_doc, index)
+      illness_type = string_or_nil(xml_doc, "Q10ib-#{index}")
+      if illness_type == "Yes"
+        1
+      else
+        0
+      end
+    end
+
   end
 end

config/forms/2021_2022.json

@@ -841,7 +841,7 @@
               "header": "",
               "description": "",
               "questions": {
-                "property_void_date": {
+                "voiddate": {
                   "check_answer_label": "Void or renewal date",
                   "header": "What is the void or renewal date?",
                   "hint_text": "For example, 27 3 2021.",
@@ -863,7 +863,7 @@
               "header": "",
               "description": "",
               "questions": {
-                "property_void_date": {
+                "voiddate": {
                   "check_answer_label": "New-build handover date",
                   "header": "What is the new-build handover date?",
                   "hint_text": "",

db/migrate/20220411092231_update_case_logs_fields.rb

@@ -2,11 +2,12 @@ class UpdateCaseLogsFields < ActiveRecord::Migration[7.0]
   def change
     change_table :case_logs, bulk: true do |t|
       t.integer :old_form_id, :lar, :irproduct
-      t.remove :day, :month, :year, :other_hhmemb, :accessibility_requirements_prefer_not_to_say, type: :integer
+      t.remove :day, :month, :year, :vday, :vmonth, :vyear, :mrcday, :mrcmonth, :mrcyear, :other_hhmemb, :accessibility_requirements_prefer_not_to_say, type: :integer
-      t.remove :ppostc1, :ppostc2, type: :string
+      t.remove :ppostc1, :ppostc2, :postcode, :postcod2, type: :string
       t.rename :intermediate_rent_product_name, :irproduct_other
       t.rename :lawaitlist, :waityear
       t.rename :other_reason_for_leaving_last_settled_home, :reasonother
+      t.rename :property_void_date, :voiddate
     end
   end
 end

db/schema.rb

@@ -140,13 +140,8 @@ ActiveRecord::Schema[7.0].define(version: 2022_04_11_092231) do
     t.string "prevloc"
     t.integer "hb"
     t.integer "hbrentshortfall"
-    t.string "postcode"
-    t.string "postcod2"
     t.integer "property_relet"
     t.datetime "mrcdate", precision: nil
-    t.integer "mrcday"
-    t.integer "mrcmonth"
-    t.integer "mrcyear"
     t.integer "incref"
     t.datetime "sale_completion_date", precision: nil
     t.datetime "startdate", precision: nil
@@ -154,7 +149,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_04_11_092231) do
     t.integer "first_time_property_let_as_social_housing"
     t.integer "unitletas"
     t.integer "builtype"
-    t.datetime "property_void_date", precision: nil
+    t.datetime "voiddate", precision: nil
     t.bigint "owning_organisation_id"
     t.bigint "managing_organisation_id"
     t.integer "renttype"
@@ -212,9 +207,6 @@ ActiveRecord::Schema[7.0].define(version: 2022_04_11_092231) do
     t.decimal "wtshortfall", precision: 10, scale: 2
     t.integer "refused"
     t.integer "housingneeds"
-    t.integer "vday"
-    t.integer "vmonth"
-    t.integer "vyear"
     t.decimal "wchchrg", precision: 10, scale: 2
     t.integer "newprop"
     t.string "relat2"