baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Add totadult/totchild and outright sale examples

pull/1331/head
Kat 3 years ago
parent
153f1af33e
commit
bda8381cdb
7 changed files with 38 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      app/services/imports/sales_logs_import_service.rb
  2. 2
      spec/fixtures/imports/sales_logs/00d2343e-d5fa-4c89-8400-ec3854b0f2b4.xml
  3. 2
      spec/fixtures/imports/sales_logs/0b4a68df-30cc-474a-93c0-a56ce8fdad3b.xml
  4. 2
      spec/fixtures/imports/sales_logs/0ead17cb-1668-442d-898c-0d52879ff592.xml
  5. 22
      spec/fixtures/imports/sales_logs/166fc004-392e-47a8-acb8-1c018734882b.xml
  6. 21
      spec/fixtures/imports/sales_logs/5ybz29dj-l33t-k1l0-hj86-n4k4ma77xkcd.xml
  7. 2
      spec/fixtures/imports/sales_logs/893ufj2s-lq77-42m4-rty6-ej09gh585uy1.xml

10
app/services/imports/sales_logs_import_service.rb
Unescape View File

@ -93,7 +93,7 @@ module Imports
attributes["grant"] = safe_string_as_decimal(xml_doc, "Q32REDUCTIONS") attributes["grant"] = safe_string_as_decimal(xml_doc, "Q32REDUCTIONS")
attributes["pregyrha"] = 1 if string_or_nil(xml_doc, "PREGYRHA") == "Yes" attributes["pregyrha"] = 1 if string_or_nil(xml_doc, "PREGYRHA") == "Yes"
attributes["pregla"] = 1 if string_or_nil(xml_doc, "PREGLA") == "Yes" attributes["pregla"] = 1 if string_or_nil(xml_doc, "PREGLA") == "Yes"
attributes["pregghb"] = 1 if string_or_nil(xml_doc, "PREGHBA") == "Yes" # PREGHBA? attributes["pregghb"] = 1 if string_or_nil(xml_doc, "PREGHBA") == "Yes"
attributes["pregother"] = 1 if string_or_nil(xml_doc, "PREGOTHER") == "Yes" attributes["pregother"] = 1 if string_or_nil(xml_doc, "PREGOTHER") == "Yes"
attributes["ppostcode_full"] = compose_postcode(xml_doc, "PPOSTC1", "PPOSTC2") attributes["ppostcode_full"] = compose_postcode(xml_doc, "PPOSTC1", "PPOSTC2")
attributes["prevloc"] = string_or_nil(xml_doc, "Q7ONSLACODE") attributes["prevloc"] = string_or_nil(xml_doc, "Q7ONSLACODE")
@ -117,12 +117,12 @@ module Imports
attributes["hoyear"] = safe_string_as_integer(xml_doc, "HOYEAR") attributes["hoyear"] = safe_string_as_integer(xml_doc, "HOYEAR")
attributes["fromprop"] = unsafe_string_as_integer(xml_doc, "Q21PROPERTYTYPE") attributes["fromprop"] = unsafe_string_as_integer(xml_doc, "Q21PROPERTYTYPE")
attributes["socprevten"] = nil # ? attributes["socprevten"] = nil # ?
attributes["mortgagelender"] = mortgage_lender(xml_doc, attributes) # there's mortgagelender 1/2/3? Q24AMORTGAGELENDER Q34AMORTGAGELENDER Q41AMORTGAGELENDER attributes["mortgagelender"] = mortgage_lender(xml_doc, attributes)
attributes["mortgagelenderother"] = nil # Q24AMORTGAGELENDEROTHER Q34AMORTGAGELENDEROTHER Q41AMORTGAGELENDEROTHER attributes["mortgagelenderother"] = nil # Q24AMORTGAGELENDEROTHER Q34AMORTGAGELENDEROTHER Q41AMORTGAGELENDEROTHER
attributes["mortlen"] = mortgage_length(xml_doc, attributes) # there's mortlen 1/2/3? Q24B Q34B Q41B attributes["mortlen"] = mortgage_length(xml_doc, attributes)
attributes["extrabor"] = unsafe_string_as_integer(xml_doc, "Q25BORROWING") attributes["extrabor"] = unsafe_string_as_integer(xml_doc, "Q25BORROWING")
# attributes["totadult"] = safe_string_as_integer(xml_doc, "TOTADULT") # these would get overridden anyways attributes["totadult"] = safe_string_as_integer(xml_doc, "TOTADULT") # would get overridden
# attributes["totchild"] = safe_string_as_integer(xml_doc, "TOTCHILD") # these would get overridden anyways attributes["totchild"] = safe_string_as_integer(xml_doc, "TOTCHILD") # would get overridden
attributes["hhtype"] = unsafe_string_as_integer(xml_doc, "HHTYPE") attributes["hhtype"] = unsafe_string_as_integer(xml_doc, "HHTYPE")
attributes["pcode1"] = string_or_nil(xml_doc, "PCODE1") attributes["pcode1"] = string_or_nil(xml_doc, "PCODE1")
attributes["pcode2"] = string_or_nil(xml_doc, "PCODE2") attributes["pcode2"] = string_or_nil(xml_doc, "PCODE2")

2
spec/fixtures/imports/sales_logs/00d2343e-d5fa-4c89-8400-ec3854b0f2b4.xml vendored
Unescape View File

@ -83,6 +83,8 @@
<PREGHBA>Yes</PREGHBA> <PREGHBA>Yes</PREGHBA>
<ARMEDF>1 Yes</ARMEDF> <ARMEDF>1 Yes</ARMEDF>
<HHMEMB>6</HHMEMB> <HHMEMB>6</HHMEMB>
<TOTADULT>5</TOTADULT>
<TOTCHILD>1</TOTCHILD>
<LIVEINOTHER>4</LIVEINOTHER> <LIVEINOTHER>4</LIVEINOTHER>
<!-- <PCODE1>LS16</PCODE1> <!-- <PCODE1>LS16</PCODE1>
<PCODE2>6FT</PCODE2> --> <PCODE2>6FT</PCODE2> -->

2
spec/fixtures/imports/sales_logs/0b4a68df-30cc-474a-93c0-a56ce8fdad3b.xml vendored
Unescape View File

@ -77,6 +77,8 @@
<PREGHBA>Yes</PREGHBA> <PREGHBA>Yes</PREGHBA>
<ARMEDF>1 Yes</ARMEDF> <ARMEDF>1 Yes</ARMEDF>
<HHMEMB>6</HHMEMB> <HHMEMB>6</HHMEMB>
<TOTADULT>5</TOTADULT>
<TOTCHILD>1</TOTCHILD>
<LIVEINOTHER>4</LIVEINOTHER> <LIVEINOTHER>4</LIVEINOTHER>
<!-- <PCODE1>LS16</PCODE1> <!-- <PCODE1>LS16</PCODE1>
<PCODE2>6FT</PCODE2> --> <PCODE2>6FT</PCODE2> -->

2
spec/fixtures/imports/sales_logs/0ead17cb-1668-442d-898c-0d52879ff592.xml vendored
Unescape View File

@ -99,6 +99,8 @@
<PREGHBA>Yes</PREGHBA> <PREGHBA>Yes</PREGHBA>
<ARMEDF>1 Yes</ARMEDF> <ARMEDF>1 Yes</ARMEDF>
<HHMEMB>6</HHMEMB> <HHMEMB>6</HHMEMB>
<TOTADULT>5</TOTADULT>
<TOTCHILD>1</TOTCHILD>
<LIVEINOTHER>4</LIVEINOTHER> <LIVEINOTHER>4</LIVEINOTHER>
<!-- <PCODE1>LS16</PCODE1> <!-- <PCODE1>LS16</PCODE1>
<PCODE2>6FT</PCODE2> --> <PCODE2>6FT</PCODE2> -->

22
spec/fixtures/imports/sales_logs/166fc004-392e-47a8-acb8-1c018734882b.xml vendored
Unescape View File

@ -21,9 +21,10 @@
<DAY>5</DAY> <DAY>5</DAY>
<MONTH>11</MONTH> <MONTH>11</MONTH>
<YEAR>2022</YEAR> <YEAR>2022</YEAR>
<OWNERSHIP>2 Yes - a discount ownership scheme</OWNERSHIP> <OWNERSHIP>3 No - this is an outright or other sale</OWNERSHIP>
<DERSALETYPE>8 Right to Acquire (RTA)</DERSALETYPE> <DERSALETYPE>12 Other</DERSALETYPE>
<COMPANY></COMPANY> <Q38OTHERSALE>other</Q38OTHERSALE>
<COMPANY>2 No</COMPANY>
<JOINT>1 Yes</JOINT> <JOINT>1 Yes</JOINT>
<Q11BEDROOMS>2</Q11BEDROOMS> <Q11BEDROOMS>2</Q11BEDROOMS>
<JOINTMORE>1 Yes</JOINTMORE> <JOINTMORE>1 Yes</JOINTMORE>
@ -32,6 +33,7 @@
<P1AGE>30</P1AGE> <P1AGE>30</P1AGE>
<P1SEX>Non-binary</P1SEX> <P1SEX>Non-binary</P1SEX>
<P1NAT>17 Republic of Ireland</P1NAT> <P1NAT>17 Republic of Ireland</P1NAT>
<LIVEINBUYER>1 Yes</LIVEINBUYER>
<LIVEINBUYER1>1 Yes</LIVEINBUYER1> <LIVEINBUYER1>1 Yes</LIVEINBUYER1>
<P2REL>Partner</P2REL> <P2REL>Partner</P2REL>
<Q12PROPERTYTYPE>1 Flat or maisonette</Q12PROPERTYTYPE> <Q12PROPERTYTYPE>1 Flat or maisonette</Q12PROPERTYTYPE>
@ -68,15 +70,17 @@
<Q26CASHDEPOSIT>90_000</Q26CASHDEPOSIT> <Q26CASHDEPOSIT>90_000</Q26CASHDEPOSIT>
<Q27SOCIALHOMEBUY></Q27SOCIALHOMEBUY> <Q27SOCIALHOMEBUY></Q27SOCIALHOMEBUY>
<Q22PURCHASEPRICE>250_000</Q22PURCHASEPRICE> <Q22PURCHASEPRICE>250_000</Q22PURCHASEPRICE>
<Q32REDUCTIONS>10_000</Q32REDUCTIONS> <Q32REDUCTIONS></Q32REDUCTIONS>
<!-- not sure about q30a format /--> <!-- not sure about q30a format /-->
<Q30A>10</Q30A> <Q30A></Q30A>
<PREGYRHA>Yes</PREGYRHA> <PREGYRHA>Yes</PREGYRHA>
<PREGLA>Yes</PREGLA> <PREGLA>Yes</PREGLA>
<PREGOTHER>Yes</PREGOTHER> <PREGOTHER>Yes</PREGOTHER>
<PREGHBA>Yes</PREGHBA> <PREGHBA>Yes</PREGHBA>
<ARMEDF>1 Yes</ARMEDF> <ARMEDF>1 Yes</ARMEDF>
<HHMEMB>6</HHMEMB> <HHMEMB>6</HHMEMB>
<TOTADULT>5</TOTADULT>
<TOTCHILD>1</TOTCHILD>
<LIVEINOTHER>4</LIVEINOTHER> <LIVEINOTHER>4</LIVEINOTHER>
<!-- <PCODE1>LS16</PCODE1> <!-- <PCODE1>LS16</PCODE1>
<PCODE2>6FT</PCODE2> --> <PCODE2>6FT</PCODE2> -->
@ -94,12 +98,12 @@
<LEFTARMEDF>6 No they left more than 2 years ago</LEFTARMEDF> <LEFTARMEDF>6 No they left more than 2 years ago</LEFTARMEDF>
<Q29MONTHLYCHARGES>100</Q29MONTHLYCHARGES> <Q29MONTHLYCHARGES>100</Q29MONTHLYCHARGES>
<Q24B></Q24B> <Q24B></Q24B>
<Q34B>10</Q34B> <Q34B></Q34B>
<Q41B></Q41B> <Q41B>10</Q41B>
<Q7UNKNOWNPOSTCODE>If postcode not known tick</Q7UNKNOWNPOSTCODE> <Q7UNKNOWNPOSTCODE>If postcode not known tick</Q7UNKNOWNPOSTCODE>
<Q24AMORTGAGELENDER></Q24AMORTGAGELENDER> <Q24AMORTGAGELENDER></Q24AMORTGAGELENDER>
<Q34AMORTGAGELENDER>5</Q34AMORTGAGELENDER> <Q34AMORTGAGELENDER></Q34AMORTGAGELENDER>
<Q41AMORTGAGELENDER></Q41AMORTGAGELENDER> <Q41AMORTGAGELENDER>5</Q41AMORTGAGELENDER>
<Q24AMORTGAGELENDEROTHER></Q24AMORTGAGELENDEROTHER> <Q24AMORTGAGELENDEROTHER></Q24AMORTGAGELENDEROTHER>
<Q34AMORTGAGELENDEROTHER></Q34AMORTGAGELENDEROTHER> <Q34AMORTGAGELENDEROTHER></Q34AMORTGAGELENDEROTHER>
<Q41AMORTGAGELENDEROTHER></Q41AMORTGAGELENDEROTHER> <Q41AMORTGAGELENDEROTHER></Q41AMORTGAGELENDEROTHER>

21
spec/fixtures/imports/sales_logs/5ybz29dj-l33t-k1l0-hj86-n4k4ma77xkcd.xml vendored
Unescape View File

@ -21,9 +21,9 @@
<DAY>5</DAY> <DAY>5</DAY>
<MONTH>11</MONTH> <MONTH>11</MONTH>
<YEAR>2022</YEAR> <YEAR>2022</YEAR>
<OWNERSHIP>2 Yes - a discount ownership scheme</OWNERSHIP> <OWNERSHIP>3 No - this is an outright or other sale</OWNERSHIP>
<DERSALETYPE>8 Right to Acquire (RTA)</DERSALETYPE> <DERSALETYPE>10 Outright</DERSALETYPE>
<COMPANY></COMPANY> <COMPANY>2 No</COMPANY>
<JOINT>1 Yes</JOINT> <JOINT>1 Yes</JOINT>
<Q11BEDROOMS>2</Q11BEDROOMS> <Q11BEDROOMS>2</Q11BEDROOMS>
<JOINTMORE>1 Yes</JOINTMORE> <JOINTMORE>1 Yes</JOINTMORE>
@ -32,6 +32,7 @@
<P1AGE>30</P1AGE> <P1AGE>30</P1AGE>
<P1SEX>Non-binary</P1SEX> <P1SEX>Non-binary</P1SEX>
<P1NAT>17 Republic of Ireland</P1NAT> <P1NAT>17 Republic of Ireland</P1NAT>
<LIVEINBUYER>1 Yes</LIVEINBUYER>
<LIVEINBUYER1>1 Yes</LIVEINBUYER1> <LIVEINBUYER1>1 Yes</LIVEINBUYER1>
<P2REL>Partner</P2REL> <P2REL>Partner</P2REL>
<Q12PROPERTYTYPE>1 Flat or maisonette</Q12PROPERTYTYPE> <Q12PROPERTYTYPE>1 Flat or maisonette</Q12PROPERTYTYPE>
@ -68,15 +69,17 @@
<Q26CASHDEPOSIT>90_000</Q26CASHDEPOSIT> <Q26CASHDEPOSIT>90_000</Q26CASHDEPOSIT>
<Q27SOCIALHOMEBUY></Q27SOCIALHOMEBUY> <Q27SOCIALHOMEBUY></Q27SOCIALHOMEBUY>
<Q22PURCHASEPRICE>250_000</Q22PURCHASEPRICE> <Q22PURCHASEPRICE>250_000</Q22PURCHASEPRICE>
<Q32REDUCTIONS>10_000</Q32REDUCTIONS> <Q32REDUCTIONS></Q32REDUCTIONS>
<!-- not sure about q30a format /--> <!-- not sure about q30a format /-->
<Q30A>10</Q30A> <Q30A></Q30A>
<PREGYRHA>Yes</PREGYRHA> <PREGYRHA>Yes</PREGYRHA>
<PREGLA>Yes</PREGLA> <PREGLA>Yes</PREGLA>
<PREGOTHER>Yes</PREGOTHER> <PREGOTHER>Yes</PREGOTHER>
<PREGHBA>Yes</PREGHBA> <PREGHBA>Yes</PREGHBA>
<ARMEDF>1 Yes</ARMEDF> <ARMEDF>1 Yes</ARMEDF>
<HHMEMB>6</HHMEMB> <HHMEMB>6</HHMEMB>
<TOTADULT>5</TOTADULT>
<TOTCHILD>1</TOTCHILD>
<LIVEINOTHER>4</LIVEINOTHER> <LIVEINOTHER>4</LIVEINOTHER>
<!-- <PCODE1>LS16</PCODE1> <!-- <PCODE1>LS16</PCODE1>
<PCODE2>6FT</PCODE2> --> <PCODE2>6FT</PCODE2> -->
@ -94,12 +97,12 @@
<LEFTARMEDF>5 No they left up to and including 2 years ago</LEFTARMEDF> <LEFTARMEDF>5 No they left up to and including 2 years ago</LEFTARMEDF>
<Q29MONTHLYCHARGES>100</Q29MONTHLYCHARGES> <Q29MONTHLYCHARGES>100</Q29MONTHLYCHARGES>
<Q24B></Q24B> <Q24B></Q24B>
<Q34B>10</Q34B> <Q34B></Q34B>
<Q41B></Q41B> <Q41B>10</Q41B>
<Q7UNKNOWNPOSTCODE>If postcode not known tick</Q7UNKNOWNPOSTCODE> <Q7UNKNOWNPOSTCODE>If postcode not known tick</Q7UNKNOWNPOSTCODE>
<Q24AMORTGAGELENDER></Q24AMORTGAGELENDER> <Q24AMORTGAGELENDER></Q24AMORTGAGELENDER>
<Q34AMORTGAGELENDER>5</Q34AMORTGAGELENDER> <Q34AMORTGAGELENDER></Q34AMORTGAGELENDER>
<Q41AMORTGAGELENDER></Q41AMORTGAGELENDER> <Q41AMORTGAGELENDER>5</Q41AMORTGAGELENDER>
<Q24AMORTGAGELENDEROTHER></Q24AMORTGAGELENDEROTHER> <Q24AMORTGAGELENDEROTHER></Q24AMORTGAGELENDEROTHER>
<Q34AMORTGAGELENDEROTHER></Q34AMORTGAGELENDEROTHER> <Q34AMORTGAGELENDEROTHER></Q34AMORTGAGELENDEROTHER>
<Q41AMORTGAGELENDEROTHER></Q41AMORTGAGELENDEROTHER> <Q41AMORTGAGELENDEROTHER></Q41AMORTGAGELENDEROTHER>

2
spec/fixtures/imports/sales_logs/893ufj2s-lq77-42m4-rty6-ej09gh585uy1.xml vendored
Unescape View File

@ -77,6 +77,8 @@
<PREGHBA>Yes</PREGHBA> <PREGHBA>Yes</PREGHBA>
<ARMEDF>1 Yes</ARMEDF> <ARMEDF>1 Yes</ARMEDF>
<HHMEMB>6</HHMEMB> <HHMEMB>6</HHMEMB>
<TOTADULT>5</TOTADULT>
<TOTCHILD>1</TOTCHILD>
<LIVEINOTHER>4</LIVEINOTHER> <LIVEINOTHER>4</LIVEINOTHER>
<!-- <PCODE1>LS16</PCODE1> <!-- <PCODE1>LS16</PCODE1>
<PCODE2>6FT</PCODE2> --> <PCODE2>6FT</PCODE2> -->

Write Preview
Loading…
Cancel
Save