From 3a815ce67091d0380b18809079147628d7f71626 Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Fri, 17 Feb 2023 17:07:25 +0000
Subject: [PATCH] Import a completed shared ownership example

---
 .../imports/sales_logs_import_service.rb      | 19 +++++++---
 .../00d2343e-d5fa-4c89-8400-ec3854b0f2b4.xml  | 35 +++++++++----------
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/app/services/imports/sales_logs_import_service.rb b/app/services/imports/sales_logs_import_service.rb
index 4bb44c2b5..f0d2e7b53 100644
--- a/app/services/imports/sales_logs_import_service.rb
+++ b/app/services/imports/sales_logs_import_service.rb
@@ -75,8 +75,8 @@ module Imports
       attributes["hb"] = unsafe_string_as_integer(xml_doc, "Q2A")
       attributes["frombeds"] = safe_string_as_integer(xml_doc, "Q20BEDROOMS")
       attributes["staircase"] = unsafe_string_as_integer(xml_doc, "Q17ASTAIRCASE")
-      attributes["stairbought"] = nil # ?
-      attributes["stairowned"] = nil # ?
+      attributes["stairbought"] = safe_string_as_integer(xml_doc, "PERCENTBOUGHT") # ?
+      attributes["stairowned"] = safe_string_as_integer(xml_doc, "PERCENTOWNS") # ?
       attributes["mrent"] = safe_string_as_decimal(xml_doc, "Q28MONTHLYRENT")
       attributes["exdate"] = compose_date(xml_doc, "EXDAY", "EXMONTH", "EXYEAR")
       attributes["exday"] = safe_string_as_integer(xml_doc, "EXDAY")
@@ -87,7 +87,6 @@ module Imports
       attributes["cashdis"] = safe_string_as_decimal(xml_doc, "Q27SOCIALHOMEBUY")
       attributes["disabled"] = unsafe_string_as_integer(xml_doc, "DISABILITY")
       attributes["lanomagr"] = unsafe_string_as_integer(xml_doc, "Q19REHOUSED")
-      attributes["soctenant"] = nil # ?
       attributes["value"] = safe_string_as_decimal(xml_doc, "Q22PURCHASEPRICE")
       attributes["equity"] = safe_string_as_decimal(xml_doc, "Q23EQUITY")
       attributes["discount"] = safe_string_as_decimal(xml_doc, "Q33DISCOUNT")
@@ -136,7 +135,8 @@ module Imports
       attributes["ethnicbuy2"] = nil
       attributes["prevshared"] = nil
       attributes["staircasesale"] = nil
-      
+      attributes["soctenant"] = soctenant(attributes)
+
       # Required for our form invalidated questions (not present in import)
       attributes["previous_la_known"] = attributes["prevloc"].nil? ? 0 : 1
       attributes["is_la_inferred"] = attributes["postcode_full"].present?
@@ -393,5 +393,16 @@ module Imports
         1
       end
     end
+
+    def soctenant(attributes)
+      return nil unless attributes["ownershipsch"] == 1
+
+      if attributes["frombeds"].blank? && attributes["fromprop"].blank? && attributes["socprevten"].blank?
+        2
+      else
+        1
+      end
+      # NO (2) if FROMBEDS, FROMPROP and socprevten are blank, and YES(1) if they are completed
+    end
   end
 end
diff --git a/spec/fixtures/imports/sales_logs/00d2343e-d5fa-4c89-8400-ec3854b0f2b4.xml b/spec/fixtures/imports/sales_logs/00d2343e-d5fa-4c89-8400-ec3854b0f2b4.xml
index 6876927a0..9afe9ad0a 100644
--- a/spec/fixtures/imports/sales_logs/00d2343e-d5fa-4c89-8400-ec3854b0f2b4.xml
+++ b/spec/fixtures/imports/sales_logs/00d2343e-d5fa-4c89-8400-ec3854b0f2b4.xml
@@ -22,10 +22,8 @@
     <MONTH>11</MONTH>
     <YEAR>2022</YEAR>
     <!-- for shared ownership testing -->
-    <!-- <OWNERSHIP>1 Yes - a shared ownership scheme</OWNERSHIP>
-    <DERSALETYPE>18 Social Homebuy (shared ownership purchase)</DERSALETYPE> -->
-    <OWNERSHIP>2 Yes - a discount ownership scheme</OWNERSHIP>
-    <DERSALETYPE>8 Right to Acquire (RTA)</DERSALETYPE>
+    <OWNERSHIP>1 Yes - a shared ownership scheme</OWNERSHIP>
+    <DERSALETYPE>18 Social Homebuy (shared ownership purchase)</DERSALETYPE>
     <COMPANY></COMPANY>
     <JOINT>1 Yes</JOINT>
     <Q11BEDROOMS>2</Q11BEDROOMS>
@@ -68,16 +66,17 @@
     <P5ECO>5 Retired</P5ECO>
     <P6ECO>1 Full Time - 30 hours or more a week</P6ECO>
     <DISABILITY>1 Yes</DISABILITY>
-    <Q26CASHDEPOSIT>90_000</Q26CASHDEPOSIT>
-    <Q27SOCIALHOMEBUY></Q27SOCIALHOMEBUY>
-    <Q22PURCHASEPRICE>250_000</Q22PURCHASEPRICE>
-    <Q32REDUCTIONS>10_000</Q32REDUCTIONS>
-    <!-- not sure about q30a format /-->
-    <!-- for shared ownership testing -->
-    <!-- <Q30A></Q30A> -->
-    <!-- <Q32REDUCTIONS></Q32REDUCTIONS> -->
-    <!-- <Q27SOCIALHOMEBUY>1_000</Q27SOCIALHOMEBUY> -->
-    <Q30A>10</Q30A>
+    <Q28MONTHLYRENT>300</Q28MONTHLYRENT>
+    <Q26CASHDEPOSIT>70_000</Q26CASHDEPOSIT>
+    <Q22PURCHASEPRICE>230_000</Q22PURCHASEPRICE>
+    <Q30A>0</Q30A>
+    <Q17ASTAIRCASE>1 Yes</Q17ASTAIRCASE>
+    <PERCENTBOUGHT>10</PERCENTBOUGHT>
+    <PERCENTOWNS>10</PERCENTOWNS>
+    <Q19REHOUSED>1 Yes</Q19REHOUSED>
+    <Q32REDUCTIONS></Q32REDUCTIONS>
+    <Q27SOCIALHOMEBUY>10_000</Q27SOCIALHOMEBUY>
+    <Q23EQUITY>100</Q23EQUITY>
     <PREGYRHA>Yes</PREGYRHA>
     <PREGLA>Yes</PREGLA>
     <PREGOTHER>Yes</PREGOTHER>
@@ -98,12 +97,12 @@
     <Q15WHEELCHAIR>1 Yes</Q15WHEELCHAIR>
     <ARMEDFORCESSPOUSE>5 No</ARMEDFORCESSPOUSE>
     <Q29MONTHLYCHARGES>100</Q29MONTHLYCHARGES>
-    <Q24B></Q24B>
-    <Q34B>10</Q34B>
+    <Q24B>10</Q24B>
+    <Q34B></Q34B>
     <Q41B></Q41B>
     <Q7UNKNOWNPOSTCODE>If postcode not known tick</Q7UNKNOWNPOSTCODE>
-    <Q24AMORTGAGELENDER></Q24AMORTGAGELENDER>
-    <Q34AMORTGAGELENDER>5</Q34AMORTGAGELENDER>
+    <Q24AMORTGAGELENDER>5</Q24AMORTGAGELENDER>
+    <Q34AMORTGAGELENDER></Q34AMORTGAGELENDER>
     <Q41AMORTGAGELENDER></Q41AMORTGAGELENDER>
     <Q24AMORTGAGELENDEROTHER></Q24AMORTGAGELENDEROTHER>
     <Q34AMORTGAGELENDEROTHER></Q34AMORTGAGELENDEROTHER>