Browse Source

Update some more fields

pull/2943/head
Kat 1 month ago
parent
commit
79045db71d
  1. 4
      app/services/exports/sales_log_export_constants.rb
  2. 2
      app/services/exports/sales_log_export_service.rb
  3. 4
      spec/fixtures/exports/sales_log.xml
  4. 4
      spec/fixtures/exports/sales_log_2024.xml
  5. 2
      spec/services/exports/sales_log_export_service_spec.rb

4
app/services/exports/sales_log_export_constants.rb

@ -12,7 +12,7 @@ module Exports::SalesLogExportConstants
"DAY", "DAY",
"MONTH", "MONTH",
"YEAR", "YEAR",
"DUPLICATE_SET_ID", "DUPLICATESET",
"CREATEDDATE", "CREATEDDATE",
"UPLOADDATE", "UPLOADDATE",
"OWNINGORGID", "OWNINGORGID",
@ -94,7 +94,7 @@ module Exports::SalesLogExportConstants
"BULKUPLOADID", "BULKUPLOADID",
"VALUE_VALUE_CHECK", "VALUE_VALUE_CHECK",
"PREVSHARED", "PREVSHARED",
"STAIRCASESALE", "STAIRCASETOSALE",
"ETHNICGROUP2", "ETHNICGROUP2",
"ETHNIC2", "ETHNIC2",
"BUY2LIVING", "BUY2LIVING",

2
app/services/exports/sales_log_export_service.rb

@ -117,6 +117,8 @@ module Exports
attribute_hash["stairinitialmonth"] = sales_log.initialpurchase&.month attribute_hash["stairinitialmonth"] = sales_log.initialpurchase&.month
attribute_hash["stairinitialyear"] = sales_log.initialpurchase&.year attribute_hash["stairinitialyear"] = sales_log.initialpurchase&.year
attribute_hash["mscharge_value_check"] = sales_log.monthly_charges_value_check attribute_hash["mscharge_value_check"] = sales_log.monthly_charges_value_check
attribute_hash["duplicateset"] = sales_log.duplicate_set_id
attribute_hash["staircasetosale"] = sales_log.staircasesale
attribute_hash.transform_keys!(&:upcase) attribute_hash.transform_keys!(&:upcase)
attribute_hash attribute_hash

4
spec/fixtures/exports/sales_log.xml vendored

@ -81,11 +81,9 @@
<HHTYPE>6</HHTYPE> <HHTYPE>6</HHTYPE>
<VALUE_VALUE_CHECK/> <VALUE_VALUE_CHECK/>
<PREVSHARED>2</PREVSHARED> <PREVSHARED>2</PREVSHARED>
<STAIRCASESALE/>
<BUY2LIVING>3</BUY2LIVING> <BUY2LIVING>3</BUY2LIVING>
<UPRN/> <UPRN/>
<COUNTY/> <COUNTY/>
<DUPLICATE_SET_ID/>
<ADDRESS_SEARCH_VALUE_CHECK/> <ADDRESS_SEARCH_VALUE_CHECK/>
<FIRSTSTAIR/> <FIRSTSTAIR/>
<NUMSTAIR/> <NUMSTAIR/>
@ -150,5 +148,7 @@
<STAIRINITIALMONTH/> <STAIRINITIALMONTH/>
<STAIRINITIALYEAR/> <STAIRINITIALYEAR/>
<MSCHARGE_VALUE_CHECK/> <MSCHARGE_VALUE_CHECK/>
<DUPLICATESET/>
<STAIRCASETOSALE/>
</form> </form>
</forms> </forms>

4
spec/fixtures/exports/sales_log_2024.xml vendored

@ -81,11 +81,9 @@
<HHTYPE>6</HHTYPE> <HHTYPE>6</HHTYPE>
<VALUE_VALUE_CHECK/> <VALUE_VALUE_CHECK/>
<PREVSHARED>2</PREVSHARED> <PREVSHARED>2</PREVSHARED>
<STAIRCASESALE/>
<BUY2LIVING>3</BUY2LIVING> <BUY2LIVING>3</BUY2LIVING>
<UPRN/> <UPRN/>
<COUNTY/> <COUNTY/>
<DUPLICATE_SET_ID/>
<ADDRESS_SEARCH_VALUE_CHECK/> <ADDRESS_SEARCH_VALUE_CHECK/>
<FIRSTSTAIR/> <FIRSTSTAIR/>
<NUMSTAIR/> <NUMSTAIR/>
@ -150,5 +148,7 @@
<STAIRINITIALMONTH/> <STAIRINITIALMONTH/>
<STAIRINITIALYEAR/> <STAIRINITIALYEAR/>
<MSCHARGE_VALUE_CHECK/> <MSCHARGE_VALUE_CHECK/>
<DUPLICATESET/>
<STAIRCASETOSALE/>
</form> </form>
</forms> </forms>

2
spec/services/exports/sales_log_export_service_spec.rb

@ -315,7 +315,7 @@ RSpec.describe Exports::SalesLogExportService do
let!(:sales_log) { FactoryBot.create(:sales_log, :export, duplicate_set_id: 123) } let!(:sales_log) { FactoryBot.create(:sales_log, :export, duplicate_set_id: 123) }
def replace_duplicate_set_id(export_file) def replace_duplicate_set_id(export_file)
export_file.sub!("<DUPLICATE_SET_ID/>", "<DUPLICATE_SET_ID>123</DUPLICATE_SET_ID>") export_file.sub!("<DUPLICATESET/>", "<DUPLICATESET>123</DUPLICATESET>")
end end
it "generates an XML export file with the expected content within the ZIP file" do it "generates an XML export file with the expected content within the ZIP file" do

Loading…
Cancel
Save