diff --git a/app/controllers/bulk_upload_controller.rb b/app/controllers/bulk_upload_controller.rb index bc28180e3..3b09defdf 100644 --- a/app/controllers/bulk_upload_controller.rb +++ b/app/controllers/bulk_upload_controller.rb @@ -2,7 +2,7 @@ class BulkUploadController < ApplicationController SPREADSHEET_CONTENT_TYPES = %w[ application/vnd.ms-excel application/vnd.openxmlformats-officedocument.spreadsheetml.sheet - ] + ].freeze FIRST_DATA_ROW = 7 @@ -23,7 +23,131 @@ class BulkUploadController < ApplicationController row = sheet.row(row_num) CaseLog.create!( tenant_code: row[7], - startertenancy: row[8] + startertenancy: row[8], + age1: row[12], + age2: row[13], + age3: row[14], + age4: row[15], + age5: row[16], + age6: row[17], + age7: row[18], + age8: row[19], + sex1: row[20], + sex2: row[21], + sex3: row[22], + sex4: row[23], + sex5: row[24], + sex6: row[25], + sex7: row[26], + sex8: row[27], + relat2: row[28], + relat3: row[29], + relat4: row[30], + relat5: row[31], + relat6: row[32], + relat7: row[33], + relat8: row[34], + ecstat1: row[35], + ecstat2: row[36], + ecstat3: row[37], + ecstat4: row[38], + ecstat5: row[39], + ecstat6: row[40], + ecstat7: row[41], + ecstat8: row[42], + ethnic: row[43], + national: row[44], + armed_forces: row[45], + armed_forces_partner: "", + prevten: "", + hhmemb: "", + homeless: "", + reason_for_leaving_last_settled_home: "", + underoccupation_benefitcap: "", + leftreg: "", + reservist: "", + illness: "", + preg_occ: "", + accessibility_requirements: "", + condition_effects: "", + tenancy_code: "", + startdate: "", + tenancylength: "", + tenancy: "", + lettype: "", + landlord: "", + property_location: "", + previous_postcode: "", + property_relet: "", + rsnvac: "", + property_reference: "", + unittype_gn: "", + property_building_type: "", + beds: "", + property_void_date: "", + property_major_repairs: "", + property_major_repairs_date: "", + offered: "", + wchair: "", + earnings: "", + incfreq: "", + benefits: "", + housing_benefit: "", + period: "", + brent: "", + scharge: "", + pscharge: "", + supcharg: "", + tcharge: "", + outstanding_amount: "", + layear: "", + lawaitlist: "", + previous_la: "", + property_postcode: "", + reasonpref: "", + reasonable_preference_reason: "", + cbl: "", + chr: "", + cap: "", + outstanding_rent_or_charges: "", + other_reason_for_leaving_last_settled_home: "", + housingneeds_a: "", + housingneeds_b: "", + housingneeds_c: "", + housingneeds_f: "", + housingneeds_g: "", + housingneeds_h: "", + accessibility_requirements_prefer_not_to_say: "", + illness_type_1: "", + illness_type_2: "", + illness_type_3: "", + illness_type_4: "", + illness_type_8: "", + illness_type_5: "", + illness_type_6: "", + illness_type_7: "", + illness_type_9: "", + illness_type_10: "", + condition_effects_prefer_not_to_say: "", + rp_homeless: "", + rp_insan_unsat: "", + rp_medwel: "", + rp_hardship: "", + rp_dontknow: "", + tenancyother: "", + override_net_income_validation: "", + net_income_known: "", + gdpr_acceptance: "", + gdpr_declined: "", + property_owner_organisation: "", + property_manager_organisation: "", + sale_or_letting: "", + tenant_same_property_renewal: "", + rent_type: "", + intermediate_rent_product_name: "", + needs_type: "", + sale_completion_date: "", + purchaser_code: "", ) end redirect_to(case_logs_path) diff --git a/spec/requests/bulk_upload_controller_spec.rb b/spec/requests/bulk_upload_controller_spec.rb index 63cb5ec27..95656ff44 100644 --- a/spec/requests/bulk_upload_controller_spec.rb +++ b/spec/requests/bulk_upload_controller_spec.rb @@ -20,7 +20,7 @@ RSpec.describe BulkUploadController, type: :request do describe "POST #bulk upload" do before do - @file = fixture_file_upload('2021_22_lettings_bulk_upload.xlsx', 'application/vnd.ms-excel') + @file = fixture_file_upload("2021_22_lettings_bulk_upload.xlsx", "application/vnd.ms-excel") end subject { post url, params: { case_log_bulk_upload: @file } }