epb_view_models 2.2.9 → 2.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dcf0bbef8d6df145835428d355332d1141ef5d323e554c1f40d77410d4019df
-  data.tar.gz: ff5bad3db382217b163b22db8163019b83159f5e415015f0d25d797297df203a
+  metadata.gz: 41dc0de25de650cd2c1ea5bbbef683ead54956c7d9d75608afd2ba64af8da86e
+  data.tar.gz: 0c44d32596cdc1947cec3f45d751ecf50646df36873983bbb6ecff0ceaa9adb2
 SHA512:
-  metadata.gz: 4872046aef2084c409a287985a00513bbc982255012213f526a750e88e55fc6161e35694b5745b8a4035337a883360db3608d35514ca0a9b158c1b6eac75d09a
-  data.tar.gz: 5f2fc8ac67ad081a2069a636f98e81e84ccbc008d664e838210535a21be73a039a9dc634a12a2c9bfd6874526fee7fb76bd9539946b6b94357bbf49aac1e78cf
+  metadata.gz: 1e17fe42abc1d67c57509de21dfc80ed0a38382d1797b66c6107104f819d821c9a9bf3595885dacf2f5f59896f811d75c92e38867e8b02528133e1e77ef6fb48
+  data.tar.gz: f197135027cf11d64667f42d3779ee4bd2ce38736ce1ce4f5b2c30fae9259772134d01f6b8bf3fa5c00381ff9563e9b749366eb0c0343b1c8795ddc97ae1a1d5

data/Gemfile.lock

@@ -1,14 +1,14 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.2)
+    activesupport (8.1.2)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
@@ -16,48 +16,49 @@ GEM
       uri (>= 0.13.1)
     ast (2.4.3)
     base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.2.2)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    bigdecimal (4.0.1)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
     diff-lcs (1.6.2)
     drb (2.2.3)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    json (2.12.2)
+    json (2.18.1)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
     mini_portile2 (2.8.9)
-    minitest (5.25.5)
-    nokogiri (1.18.8)
+    minitest (6.0.2)
+      drb (~> 2.0)
+      prism (~> 1.5)
+    nokogiri (1.19.1)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.10.2)
       ast (~> 2.4.1)
       racc
-    prism (1.4.0)
+    prism (1.9.0)
     racc (1.8.1)
-    rack (3.1.16)
+    rack (3.2.5)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.10.0)
-    rexml (3.4.1)
-    rspec (3.13.1)
+    regexp_parser (2.11.3)
+    rexml (3.4.4)
+    rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.4)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
+    rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.4)
-    rubocop (1.76.2)
+    rspec-support (3.13.7)
+    rubocop (1.82.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -65,23 +66,23 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.45.1, < 2.0)
+      rubocop-ast (>= 1.48.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.1)
+    rubocop-ast (1.49.0)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
+      prism (~> 1.7)
     rubocop-capybara (2.22.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-govuk (5.1.15)
-      rubocop (= 1.76.2)
-      rubocop-ast (= 1.45.1)
+    rubocop-govuk (5.2.0)
+      rubocop (= 1.82.1)
+      rubocop-ast (= 1.49.0)
       rubocop-capybara (= 2.22.1)
-      rubocop-rails (= 2.32.0)
+      rubocop-rails (= 2.34.3)
       rubocop-rake (= 0.7.1)
-      rubocop-rspec (= 3.6.0)
-    rubocop-rails (2.32.0)
+      rubocop-rspec (= 3.9.0)
+    rubocop-rails (2.34.3)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -90,18 +91,18 @@ GEM
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-rspec (3.6.0)
+    rubocop-rspec (3.9.0)
       lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
+      rubocop (~> 1.81)
     ruby-progressbar (1.13.0)
     securerandom (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    uri (1.0.3)
-    zeitwerk (2.7.3)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
+    uri (1.1.1)
+    zeitwerk (2.7.5)
 
 PLATFORMS
   ruby

data/lib/epb_view_models.rb

@@ -5,7 +5,7 @@ loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.setup
 
 module EpbViewModels
-  VERSION = "2.2.9"
+  VERSION = "2.2.11"
 end
 
 # Monkey patching to avoid using ActiveRecord::Type::Boolean.new.cast

data/lib/presenter/cepc/certificate_summary.rb

@@ -57,9 +57,9 @@ module Presenter
         {
           type_of_assessment: TYPE_OF_ASSESSMENT,
           assessment_id: @view_model.assessment_id,
-          date_of_expiry: @view_model.date_of_expiry,
           report_type: @view_model.report_type,
           date_of_assessment: @view_model.date_of_assessment,
+          date_of_expiry: @view_model.date_of_expiry,
           date_of_registration: @view_model.date_of_registration,
           address: {
             address_line1: @view_model.address_line1,
@@ -90,9 +90,9 @@ module Presenter
             floor_area: @view_model.floor_area,
           },
           current_energy_efficiency_rating: @view_model.energy_efficiency_rating,
-          potential_energy_rating: @view_model.potential_energy_rating,
           current_energy_efficiency_band: @view_model.current_energy_efficiency_band,
-          potential_energy_band: @view_model.potential_energy_band,
+          potential_energy_efficiency_rating: @view_model.potential_energy_rating,
+          potential_energy_efficiency_band: @view_model.potential_energy_band,
           new_build_benchmark_rating: @view_model.new_build_rating,
           new_build_benchmark_band: @view_model.new_build_benchmark_band,
           comparative_asset_rating: @view_model.comparative_asset_rating,
@@ -109,40 +109,12 @@ module Presenter
           calculation_tool: @view_model.calculation_tool,
           ter_2002: @view_model.ter_2002,
           ter: @view_model.ter,
-          recommendations: [
-            @view_model.short_payback_recommendations.map do |recommendation|
-              {
-                payback_type: "short",
-                recommendation_code: recommendation[:code],
-                recommendation: recommendation[:text],
-                cO2_Impact: recommendation[:cO2Impact],
-              }
-            end,
-            @view_model.medium_payback_recommendations.map do |recommendation|
-              {
-                payback_type: "medium",
-                recommendation_code: recommendation[:code],
-                recommendation: recommendation[:text],
-                cO2_Impact: recommendation[:cO2Impact],
-              }
-            end,
-            @view_model.long_payback_recommendations.map do |recommendation|
-              {
-                payback_type: "long",
-                recommendation_code: recommendation[:code],
-                recommendation: recommendation[:text],
-                cO2_Impact: recommendation[:cO2Impact],
-              }
-            end,
-            @view_model.other_recommendations.map do |recommendation|
-              {
-                payback_type: "other",
-                recommendation_code: recommendation[:code],
-                recommendation: recommendation[:text],
-                cO2_Impact: recommendation[:cO2Impact],
-              }
-            end,
-          ].flatten,
+          short_payback_recommendations:
+            @view_model.short_payback_recommendations,
+          medium_payback_recommendations:
+            @view_model.medium_payback_recommendations,
+          long_payback_recommendations: @view_model.long_payback_recommendations,
+          other_payback_recommendations: @view_model.other_payback_recommendations,
         }
       end
     end

data/lib/presenter/cs63/certificate_summary.rb

@@ -12,8 +12,8 @@ module Presenter
           type_of_assessment: TYPE_OF_ASSESSMENT,
           assessment_id: @view_model.assessment_id,
           epc_assessment_id: @view_model.epc_assessment_id,
-          sale_lease_date: @view_model.sale_lease_date,
           report_type: @view_model.report_type,
+          sale_lease_date: @view_model.sale_lease_date,
           date_of_assessment: @view_model.assessment_date,
           plan_report_date: @view_model.plan_report_date,
           delegated_protocol_date: @view_model.delegated_protocol_date,

data/lib/presenter/dec/certificate_summary.rb

@@ -10,12 +10,14 @@ module Presenter
 
       def to_certificate_summary
         {
+          type_of_assessment: TYPE_OF_ASSESSMENT,
+          schema_version: @schema_type.gsub(/[a-zA-Z-]/, ""),
           assessment_id: @view_model.assessment_id,
+          report_type: @view_model.report_type,
           date_of_assessment: @view_model.date_of_assessment,
           date_of_expiry: @view_model.date_of_expiry,
           date_of_registration: @view_model.date_of_registration,
           address: {
-            address_id: @view_model.address_id,
             address_line1: @view_model.address_line1,
             address_line2: @view_model.address_line2,
             address_line3: @view_model.address_line3,
@@ -23,9 +25,18 @@ module Presenter
             town: @view_model.town,
             postcode: @view_model.postcode,
           },
-          type_of_assessment: TYPE_OF_ASSESSMENT,
-          schema_version: @schema_type.gsub(/[a-zA-Z-]/, ""),
-          report_type: @view_model.report_type,
+          assessor: {
+            scheme_assessor_id: @view_model.scheme_assessor_id,
+            name: @view_model.assessor_name,
+            contact_details: {
+              email: @view_model.assessor_email,
+              telephone: @view_model.assessor_telephone,
+            },
+            company_details: {
+              name: @view_model.company_name,
+              address: @view_model.company_address,
+            },
+          },
           current_assessment: {
             date: @view_model.current_assessment_date,
             energy_efficiency_rating: @view_model.energy_efficiency_rating,
@@ -66,24 +77,12 @@ module Presenter
             renewables_fuel_thermal: @view_model.renewables_fuel_thermal,
             renewables_electrical: @view_model.renewables_electrical,
           },
-          assessor: {
-            scheme_assessor_id: @view_model.scheme_assessor_id,
-            name: @view_model.assessor_name,
-            company_details: {
-              name: @view_model.company_name,
-              address: @view_model.company_address,
-            },
-            contact_details: {
-              email: @view_model.assessor_email,
-              telephone: @view_model.assessor_telephone,
-            },
-          },
           administrative_information: {
             issue_date: @view_model.date_of_issue,
             calculation_tool: @view_model.calculation_tool,
             related_party_disclosure: @view_model.dec_related_party_disclosure,
-            related_rrn: @view_model.related_rrn,
           },
+          related_rrn: @view_model.related_rrn,
         }
       end
     end

data/lib/presenter/dec_rr/certificate_summary.rb

@@ -11,10 +11,9 @@ module Presenter
           assessment_id: @view_model.assessment_id,
           report_type: @view_model.report_type,
           date_of_assessment: @view_model.date_of_assessment,
-          date_of_registration: @view_model.date_of_registration,
           date_of_expiry: @view_model.date_of_expiry,
+          date_of_registration: @view_model.date_of_registration,
           address: {
-            address_id: @view_model.address_id,
             address_line1: @view_model.address_line1,
             address_line2: @view_model.address_line2,
             address_line3: @view_model.address_line3,
@@ -25,21 +24,21 @@ module Presenter
           assessor: {
             scheme_assessor_id: @view_model.scheme_assessor_id,
             name: @view_model.assessor_name,
-            company_details: {
-              name: @view_model.company_name,
-              address: @view_model.company_address,
-            },
             contact_details: {
               email: @view_model.assessor_email,
               telephone: @view_model.assessor_telephone,
             },
+            company_details: {
+              name: @view_model.company_name,
+              address: @view_model.company_address,
+            },
           },
           short_payback_recommendations:
             @view_model.short_payback_recommendations,
           medium_payback_recommendations:
             @view_model.medium_payback_recommendations,
           long_payback_recommendations: @view_model.long_payback_recommendations,
-          other_recommendations: @view_model.other_recommendations,
+          other_payback_recommendations: @view_model.other_recommendations,
           technical_information: {
             building_environment: @view_model.building_environment,
             floor_area: @view_model.floor_area,
@@ -47,10 +46,12 @@ module Presenter
             property_type: @view_model.property_type,
             renewable_sources: @view_model.renewable_sources,
             discounted_energy: @view_model.discounted_energy,
-            date_of_issue: @view_model.date_of_issue,
-            calculation_tool: @view_model.calculation_tool,
             inspection_type: @view_model.inspection_type,
           },
+          administrative_information: {
+            issue_date: @view_model.date_of_issue,
+            calculation_tool: @view_model.calculation_tool,
+          },
           site_service_one: @view_model.site_service_one,
           site_service_two: @view_model.site_service_two,
           site_service_three: @view_model.site_service_three,

data/lib/view_model/cepc_s_71/cepc.rb

@@ -48,7 +48,7 @@ module ViewModel
       end
 
       def floor_area
-        xpath(%w[Technical-Information Floor-Area])
+        xpath(%w[Technical-Information Floor-Area])&.to_i
       end
 
       def main_heating_fuel
@@ -103,11 +103,11 @@ module ViewModel
           @xml_doc
             .search("Recommendations-Report RR-Recommendations/#{payback}")
             .map do |node|
-            {
-              code: node.at("Recommendation-Code").content,
-              text: node.at("Recommendation").content,
-              cO2Impact: node.at("CO2-Impact").content,
-            }
+              {
+                code: node.at("Recommendation-Code").content,
+                text: node.at("Recommendation").content,
+                cO2Impact: node.at("CO2-Impact").content,
+              }
           end
         end
       end
@@ -124,7 +124,7 @@ module ViewModel
         recommendations("Long-Payback")
       end
 
-      def other_recommendations
+      def other_payback_recommendations
         recommendations("Other-Payback")
       end
 

data/lib/view_model/cs63/common_schema.rb

@@ -153,14 +153,14 @@ module ViewModel
         @xml_doc
           .search("Prescriptive-Improvements Prescriptive-Scenario")
           .map do |node|
-          {
-            measure_description_short:
-              xpath(%w[Measure-Description-Short], node),
-            measure_description_long:
-              xpath(%w[Measure-Description-Long], node),
-            measure_valid: xpath(%w[Measure-Valid], node),
-            measure_type: xpath(%w[Measure-Type], node),
-          }
+            {
+              measure_description_short:
+                xpath(%w[Measure-Description-Short], node),
+              measure_description_long:
+                xpath(%w[Measure-Description-Long], node),
+              measure_valid: xpath(%w[Measure-Valid], node),
+              measure_type: xpath(%w[Measure-Type], node),
+            }
         end
       end
 
@@ -168,14 +168,14 @@ module ViewModel
         @xml_doc
           .search("Alternative-Improvements Alternative-Scenario")
           .map do |node|
-          {
-            measure_description_short:
-              xpath(%w[Measure-Description-Short], node),
-            measure_description_long:
-              xpath(%w[Measure-Description-Long], node),
-            measure_valid: xpath(%w[Measure-Valid], node),
-            measure_type: xpath(%w[Measure-Type], node),
-          }
+            {
+              measure_description_short:
+                xpath(%w[Measure-Description-Short], node),
+              measure_description_long:
+                xpath(%w[Measure-Description-Long], node),
+              measure_valid: xpath(%w[Measure-Valid], node),
+              measure_type: xpath(%w[Measure-Type], node),
+            }
         end
       end
 

data/lib/view_model/rd_sap_schema_170/common_schema.rb

@@ -503,7 +503,7 @@ module ViewModel
 
           # Identifies the Main Dwelling
           if building_part_number&.content == "1"
-            return(
+            return (
               sap_building_part.at_xpath(
                 "Construction-Age-Band | Construction-Year",
               )&.content

data/lib/view_model/rd_sap_schema_171/common_schema.rb

@@ -503,7 +503,7 @@ module ViewModel
 
           # Identifies the Main Dwelling
           if building_part_number&.content == "1"
-            return(
+            return (
               sap_building_part.at_xpath(
                 "Construction-Age-Band | Construction-Year",
               )&.content

data/lib/view_model/rd_sap_schema_180/common_schema.rb

@@ -503,7 +503,7 @@ module ViewModel
 
           # Identifies the Main Dwelling
           if building_part_number&.content == "1"
-            return(
+            return (
               sap_building_part.at_xpath(
                 "Construction-Age-Band | Construction-Year",
               )&.content

data/lib/view_model/rd_sap_schema_190/common_schema.rb

@@ -503,7 +503,7 @@ module ViewModel
 
           # Identifies the Main Dwelling
           if building_part_number&.content == "1"
-            return(
+            return (
               sap_building_part.at_xpath(
                 "Construction-Age-Band | Construction-Year",
               )&.content

data/lib/view_model/rd_sap_schema_200/common_schema.rb

@@ -557,7 +557,7 @@ module ViewModel
 
           # Identifies the Main Dwelling
           if building_part_number&.content == "1"
-            return(
+            return (
               sap_building_part.at_xpath(
                 "Construction-Age-Band | Construction-Year",
               )&.content

data/lib/view_model/rd_sap_schema_210/common_schema.rb

@@ -572,7 +572,7 @@ module ViewModel
 
           # Identifies the Main Dwelling
           if building_part_number&.content == "1"
-            return(
+            return (
               sap_building_part.at_xpath(
                 "Construction-Age-Band | Construction-Year",
               )&.content

data/lib/view_model/rd_sap_schema_2101/common_schema.rb

@@ -572,7 +572,7 @@ module ViewModel
 
           # Identifies the Main Dwelling
           if building_part_number&.content == "1"
-            return(
+            return (
               sap_building_part.at_xpath(
                 "Construction-Age-Band | Construction-Year",
               )&.content

data/lib/view_model/rd_sap_schema_ni_173/common_schema.rb

@@ -492,7 +492,7 @@ module ViewModel
 
           # Identifies the Main Dwelling
           if building_part_number&.content == "1"
-            return(
+            return (
               sap_building_part.at_xpath(
                 "Construction-Age-Band | Construction-Year",
               )&.content
@@ -523,14 +523,14 @@ module ViewModel
         @xml_doc
           .search("Suggested-Improvements Improvement")
           .map do |node|
-          improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
-          {
-            sequence: xpath(%w[Sequence], node).to_i,
-            improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
-            improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-17.3", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
-            improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-17.3", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
-            indicative_cost: xpath(%w[Indicative-Cost], node),
-          }
+            improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
+            {
+              sequence: xpath(%w[Sequence], node).to_i,
+              improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
+              improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-17.3", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
+              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-17.3", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
+              indicative_cost: xpath(%w[Indicative-Cost], node),
+            }
         end
       end
     end

data/lib/view_model/rd_sap_schema_ni_174/common_schema.rb

@@ -492,7 +492,7 @@ module ViewModel
 
           # Identifies the Main Dwelling
           if building_part_number&.content == "1"
-            return(
+            return (
               sap_building_part.at_xpath(
                 "Construction-Age-Band | Construction-Year",
               )&.content
@@ -523,14 +523,14 @@ module ViewModel
         @xml_doc
           .search("Suggested-Improvements Improvement")
           .map do |node|
-          improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
-          {
-            sequence: xpath(%w[Sequence], node).to_i,
-            improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
-            improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-17.4", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
-            improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-17.4", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
-            indicative_cost: xpath(%w[Indicative-Cost], node),
-          }
+            improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
+            {
+              sequence: xpath(%w[Sequence], node).to_i,
+              improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
+              improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-17.4", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
+              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-17.4", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
+              indicative_cost: xpath(%w[Indicative-Cost], node),
+            }
         end
       end
     end

data/lib/view_model/rd_sap_schema_ni_180/common_schema.rb

@@ -492,7 +492,7 @@ module ViewModel
 
           # Identifies the Main Dwelling
           if building_part_number&.content == "1"
-            return(
+            return (
               sap_building_part.at_xpath(
                 "Construction-Age-Band | Construction-Year",
               )&.content
@@ -523,14 +523,14 @@ module ViewModel
         @xml_doc
           .search("Suggested-Improvements Improvement")
           .map do |node|
-          improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
-          {
-            sequence: xpath(%w[Sequence], node).to_i,
-            improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
-            improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-18.0", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
-            improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-18.0", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
-            indicative_cost: xpath(%w[Indicative-Cost], node),
-          }
+            improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
+            {
+              sequence: xpath(%w[Sequence], node).to_i,
+              improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
+              improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-18.0", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
+              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-18.0", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
+              indicative_cost: xpath(%w[Indicative-Cost], node),
+            }
         end
       end
     end

data/lib/view_model/rd_sap_schema_ni_190/common_schema.rb

@@ -492,7 +492,7 @@ module ViewModel
 
           # Identifies the Main Dwelling
           if building_part_number&.content == "1"
-            return(
+            return (
               sap_building_part.at_xpath(
                 "Construction-Age-Band | Construction-Year",
               )&.content
@@ -523,14 +523,14 @@ module ViewModel
         @xml_doc
           .search("Suggested-Improvements Improvement")
           .map do |node|
-          improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
-          {
-            sequence: xpath(%w[Sequence], node).to_i,
-            improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
-            improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-19.0", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
-            improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-19.0", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
-            indicative_cost: xpath(%w[Indicative-Cost], node),
-          }
+            improvement_code = xpath(%w[Improvement-Details Improvement-Number], node)
+            {
+              sequence: xpath(%w[Sequence], node).to_i,
+              improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
+              improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-19.0", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
+              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-19.0", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
+              indicative_cost: xpath(%w[Indicative-Cost], node),
+            }
         end
       end
     end