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 privacynotice

pull/1331/head
Kat 3 years ago
parent
16dbf15f2d
commit
bcb44afa58
6 changed files with 16 additions and 16 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. 12
      app/services/imports/sales_logs_import_service.rb
  2. 4
      spec/fixtures/imports/sales_logs/00d2343e-d5fa-4c89-8400-ec3854b0f2b4.xml
  3. 4
      spec/fixtures/imports/sales_logs/0ead17cb-1668-442d-898c-0d52879ff592.xml
  4. 4
      spec/fixtures/imports/sales_logs/166fc004-392e-47a8-acb8-1c018734882b.xml
  5. 4
      spec/fixtures/imports/sales_logs/5ybz29dj-l33t-k1l0-hj86-n4k4ma77xkcd.xml
  6. 4
      spec/fixtures/imports/sales_logs/893ufj2s-lq77-42m4-rty6-ej09gh585uy1.xml

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

@ -57,8 +57,8 @@ module Imports
attributes["builtype"] = unsafe_string_as_integer(xml_doc, "Q13BUILDINGTYPE") attributes["builtype"] = unsafe_string_as_integer(xml_doc, "Q13BUILDINGTYPE")
attributes["proptype"] = unsafe_string_as_integer(xml_doc, "Q12PROPERTYTYPE") attributes["proptype"] = unsafe_string_as_integer(xml_doc, "Q12PROPERTYTYPE")
attributes["noint"] = safe_string_as_integer(xml_doc, "NOINT") attributes["noint"] = safe_string_as_integer(xml_doc, "NOINT")
attributes["buy2livein"] = unsafe_string_as_integer(xml_doc, "LIVEINBUYER2")# liveinbuyer2? attributes["buy2livein"] = unsafe_string_as_integer(xml_doc, "LIVEINBUYER2") # liveinbuyer2?
attributes["privacynotice"] = nil # always yes? attributes["privacynotice"] = 1 if string_or_nil(xml_doc, "QDP") == "Yes" # always yes?
attributes["wheel"] = unsafe_string_as_integer(xml_doc, "Q10WHEELCHAIR") attributes["wheel"] = unsafe_string_as_integer(xml_doc, "Q10WHEELCHAIR")
attributes["hholdcount"] = attributes["hhmemb"] - (attributes["jointpur"] == 1 ? 2 : 1) attributes["hholdcount"] = attributes["hhmemb"] - (attributes["jointpur"] == 1 ? 2 : 1)
attributes["la"] = string_or_nil(xml_doc, "Q14ONSLACODE") attributes["la"] = string_or_nil(xml_doc, "Q14ONSLACODE")
@ -68,7 +68,7 @@ module Imports
attributes["income2"] = safe_string_as_integer(xml_doc, "Q2PERSON2INCOME") # should this be decimal? attributes["income2"] = safe_string_as_integer(xml_doc, "Q2PERSON2INCOME") # should this be decimal?
attributes["income2nk"] = 0 if attributes["income2"].present? # known if given? attributes["income2nk"] = 0 if attributes["income2"].present? # known if given?
attributes["savings"] = safe_string_as_integer(xml_doc, "Q3SAVINGS") attributes["savings"] = safe_string_as_integer(xml_doc, "Q3SAVINGS")
attributes["savingsnk"] = savings_known(xml_doc)# 0 -> known, 1 - not known from the sales xml form, does this actually exist? attributes["savingsnk"] = savings_known(xml_doc) # 0 -> known, 1 - not known from the sales xml form, does this actually exist?
attributes["prevown"] = unsafe_string_as_integer(xml_doc, "Q4PREVOWNEDPROPERTY") attributes["prevown"] = unsafe_string_as_integer(xml_doc, "Q4PREVOWNEDPROPERTY")
attributes["mortgage"] = safe_string_as_decimal(xml_doc, "CALCMORT") attributes["mortgage"] = safe_string_as_decimal(xml_doc, "CALCMORT")
attributes["inc2mort"] = unsafe_string_as_integer(xml_doc, "Q2PERSON2MORTAPPLICATION") attributes["inc2mort"] = unsafe_string_as_integer(xml_doc, "Q2PERSON2MORTAPPLICATION")
@ -363,7 +363,7 @@ module Imports
end end
end end
def mortgage_lender(xml_doc, attributes) def mortgage_lender(xml_doc, attributes)
case attributes["ownershipsch"] case attributes["ownershipsch"]
when 1 when 1
unsafe_string_as_integer(xml_doc, "Q24AMORTGAGELENDER") unsafe_string_as_integer(xml_doc, "Q24AMORTGAGELENDER")
@ -386,9 +386,9 @@ module Imports
end end
def savings_known(xml_doc) def savings_known(xml_doc)
case unsafe_string_as_integer(xml_doc, "savingsKnown") case unsafe_string_as_integer(xml_doc, "savingsKnown")
when 1 # known when 1 # known
0 0
when 2 # unknown when 2 # unknown
1 1
end end

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

@ -28,8 +28,8 @@
<JOINT>1 Yes</JOINT> <JOINT>1 Yes</JOINT>
<Q11BEDROOMS>2</Q11BEDROOMS> <Q11BEDROOMS>2</Q11BEDROOMS>
<JOINTMORE>1 Yes</JOINTMORE> <JOINTMORE>1 Yes</JOINTMORE>
<NOINT>1</NOINT> <NOINT>2</NOINT>
<!-- <privacynotice>1<privacynotice> /--> <QDP>Yes</QDP>
<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>

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

@ -44,8 +44,8 @@
<JOINT>1 Yes</JOINT> <JOINT>1 Yes</JOINT>
<Q11BEDROOMS>2</Q11BEDROOMS> <Q11BEDROOMS>2</Q11BEDROOMS>
<JOINTMORE>1 Yes</JOINTMORE> <JOINTMORE>1 Yes</JOINTMORE>
<NOINT>1</NOINT> <NOINT>2</NOINT>
<!-- <privacynotice>1<privacynotice> /--> <QDP>Yes</QDP>
<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>

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

@ -27,8 +27,8 @@
<JOINT>1 Yes</JOINT> <JOINT>1 Yes</JOINT>
<Q11BEDROOMS>2</Q11BEDROOMS> <Q11BEDROOMS>2</Q11BEDROOMS>
<JOINTMORE>1 Yes</JOINTMORE> <JOINTMORE>1 Yes</JOINTMORE>
<NOINT>1</NOINT> <NOINT>2</NOINT>
<!-- <privacynotice>1<privacynotice> /--> <QDP>Yes</QDP>
<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>

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

@ -27,8 +27,8 @@
<JOINT>1 Yes</JOINT> <JOINT>1 Yes</JOINT>
<Q11BEDROOMS>2</Q11BEDROOMS> <Q11BEDROOMS>2</Q11BEDROOMS>
<JOINTMORE>1 Yes</JOINTMORE> <JOINTMORE>1 Yes</JOINTMORE>
<NOINT>1</NOINT> <NOINT>2</NOINT>
<!-- <privacynotice>1<privacynotice> /--> <QDP>Yes</QDP>
<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>

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

@ -27,8 +27,8 @@
<JOINT>1 Yes</JOINT> <JOINT>1 Yes</JOINT>
<Q11BEDROOMS>2</Q11BEDROOMS> <Q11BEDROOMS>2</Q11BEDROOMS>
<JOINTMORE>1 Yes</JOINTMORE> <JOINTMORE>1 Yes</JOINTMORE>
<NOINT>1</NOINT> <NOINT>2</NOINT>
<!-- <privacynotice>1<privacynotice> /--> <QDP>Yes</QDP>
<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>

Write Preview
Loading…
Cancel
Save