Merge branch 'main' into CLDC-2140-scheme-typeahead-with-inactive-locations

app/services/bulk_upload/lettings/year2023/row_parser.rb

@@ -766,6 +766,12 @@ private
       mrcdate: %i[field_36 field_37 field_38],
 
       voiddate: %i[field_33 field_34 field_35],
+
+      uprn: [:field_18],
+      address_line1: [:field_19],
+      address_line2: [:field_20],
+      town_or_city: [:field_21],
+      county: [:field_22],
     }
   end
 

spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb

@@ -3,7 +3,7 @@ require "rails_helper"
 RSpec.describe BulkUpload::Lettings::Year2022::RowParser do
   subject(:parser) { described_class.new(attributes) }
 
-  let(:now) { Time.zone.today }
+  let(:now) { Time.zone.parse("01/03/2023") }
 
   let(:attributes) { { bulk_upload: } }
   let(:bulk_upload) { create(:bulk_upload, :lettings, user:) }

spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb

@@ -3,7 +3,7 @@ require "rails_helper"
 RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
   subject(:parser) { described_class.new(attributes) }
 
-  let(:now) { Time.zone.today }
+  let(:now) { Time.zone.parse("01/03/2023") }
 
   let(:attributes) { { bulk_upload: } }
   let(:bulk_upload) { create(:bulk_upload, :lettings, user:, needstype: nil) }
@@ -63,8 +63,19 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
       stub_request(:get, /api.postcodes.io/)
       .to_return(status: 200, body: "{\"status\":200,\"result\":{\"admin_district\":\"Manchester\", \"codes\":{\"admin_district\": \"E08000003\"}}}", headers: {})
 
+      body = {
+        results: [
+          {
+            DPA: {
+              "POSTCODE": "EC1N 2TD",
+              "POST_TOWN": "Newcastle",
+            },
+          },
+        ],
+      }.to_json
+
       stub_request(:get, "https://api.os.uk/search/places/v1/uprn?key=OS_DATA_KEY&uprn=100023336956")
-        .to_return(status: 200, body: "{}", headers: {})
+        .to_return(status: 200, body:, headers: {})
 
       parser.valid?
     end
@@ -712,6 +723,16 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
       end
     end
 
+    describe "#field_18" do # UPRN
+      context "when over 12 characters" do
+        let(:attributes) { { bulk_upload:, field_18: "1234567890123" } }
+
+        it "has errors on the field" do
+          expect(parser.errors[:field_18]).to be_present
+        end
+      end
+    end
+
     describe "#field_30" do
       context "when null" do
         let(:attributes) { setup_section_params.merge({ field_30: nil }) }