epb_view_models 1.2.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cf62aa9cc6d0167f5031c287d6136225cd91cfad1368d8a53eae3e279ed5514
-  data.tar.gz: 3fce86b973053073b1589a9decfe8cf47150bc2384dc7a9ad8ad5c814107bd02
+  metadata.gz: 20d71b9d902f9efa9baef3a61c5f20cfa119204d236b6d02d30c2c2d95fff346
+  data.tar.gz: 1c39408c6a468c2f0a8e0fa9ac76a8a00ab0e4d202c9ed72bc331daddbca3d6e
 SHA512:
-  metadata.gz: c2f2c35cf36818142dc2eaef0eaf2aba70640b42534dbdfdd2141fe2e3b26a410075da07faab7d440c556a7836ed4fdfe027e0f3137e01a5636a867baf313d78
-  data.tar.gz: 0be2e0ba78f2dd1e03181b2ac2fb5eecdae8b006c77f0b0a717b0b5101b919a6a9c524fe9ad31badcbdcb81322bae149d93b893f8c3fb2ab5361ada97f07adcd
+  metadata.gz: 7606269a9f16672a5bc0d4b298f55a475b3761ad95a931bfca640218694384782d12f4ab0baff29ef51126e725e7abefb1ad2666eef505ce4040b8ddae0c160e
+  data.tar.gz: 0d27fd125db4f768a4d20cc2658d8e6440be3e24e0551b71a2a9fc13729a6a592ae8005bbcc5bdeb1957f1ec7c75f903897fa603c8a799402b80eec39561f8a7

data/Gemfile

@@ -10,6 +10,6 @@ group :test do
   gem "rubocop-govuk", "~> 4.7.0", require: false
 end
 
-gem "nokogiri", "~> 1.11"
+gem "nokogiri", "~> 1.16"
 gem "rexml", "~> 3.2", ">= 3.2.5"
 gem "zeitwerk", "~> 2.6"

data/Gemfile.lock

@@ -1,45 +1,55 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.6)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
-    concurrent-ruby (1.2.2)
-    diff-lcs (1.5.0)
-    i18n (1.14.1)
+    base64 (0.2.0)
+    bigdecimal (3.1.6)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    mini_portile2 (2.8.4)
-    minitest (5.18.1)
-    nokogiri (1.15.3)
+    json (2.7.1)
+    mini_portile2 (2.8.5)
+    minitest (5.22.2)
+    mutex_m (0.2.0)
+    nokogiri (1.16.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
-    racc (1.7.1)
-    rack (3.0.8)
+    racc (1.7.3)
+    rack (3.0.9.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.8.1)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    regexp_parser (2.9.0)
+    rexml (3.2.6)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
     rubocop (1.35.0)
       json (~> 2.3)
       parallel (~> 1.10)
@@ -69,14 +79,14 @@ GEM
     ruby-progressbar (1.13.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
-    zeitwerk (2.6.8)
+    unicode-display_width (2.5.0)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  nokogiri (~> 1.11)
+  nokogiri (~> 1.16)
   rake (~> 13.0.6)
   rexml (~> 3.2, >= 3.2.5)
   rspec (~> 3.0)

data/epb_view_models.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = %w[lib]
 
-  spec.add_dependency "nokogiri", "~> 1.11"
+  spec.add_dependency "nokogiri", "~> 1.16"
   spec.add_dependency "zeitwerk", "~> 2.6"
 end

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 = "1.2.3"
+  VERSION = "2.0.0"
 end
 
 # Monkey patching to avoid using ActiveRecord::Type::Boolean.new.cast

data/lib/presenter/cepc/report.rb

@@ -18,27 +18,23 @@ module Presenter
       def report_from_assessment_xml
         {
           assessment_id: Helper::RrnHelper.hash_rrn(@view_model.assessment_id),
-          ac_inspection_commissioned: @view_model.ac_inspection_commissioned,
+          ac_inspection_commissioned: @view_model.respond_to?(:ac_inspection_commissioned) ? @view_model.ac_inspection_commissioned : nil,
           address1: @view_model.address_line1,
           address2: @view_model.address_line2,
           address3: @view_model.address_line3,
-          aircon_kw_rating: @view_model.ac_kw_rating,
+          aircon_kw_rating: @view_model.respond_to?(:ac_kw_rating) ? @view_model.ac_kw_rating : nil,
           aircon_present:
-            if !@view_model.ac_present.nil? &&
-                @view_model.ac_present.upcase == "YES"
+            if @view_model.respond_to?(:ac_present) && @view_model.ac_present.upcase == "YES"
               "Y"
             else
               "N"
             end,
           asset_rating: @view_model.energy_efficiency_rating,
-          asset_rating_band:
-            Helper::EnergyBandCalculator.commercial(
-              @view_model.energy_efficiency_rating.to_i,
-            ),
-          building_emissions: @view_model.building_emission_rate,
+          asset_rating_band: Helper::EnergyBandCalculator.commercial(@view_model.energy_efficiency_rating),
+          building_emissions: @view_model.respond_to?(:building_emission_rate) ? @view_model.building_emission_rate : nil,
           building_environment: @view_model.building_environment,
           building_level: @view_model.building_level,
-          estimated_aircon_kw_rating: @view_model.estimated_ac_kw_rating,
+          estimated_aircon_kw_rating: @view_model.respond_to?(:estimated_ac_kw_rating) ? @view_model.estimated_ac_kw_rating : nil,
           existing_stock_benchmark: @view_model.existing_build_rating,
           floor_area: @view_model.floor_area,
           inspection_date: @view_model.date_of_assessment,
@@ -48,18 +44,18 @@ module Presenter
           other_fuel_desc: @view_model.other_fuel_description,
           postcode: @view_model.postcode,
           posttown: @view_model.town,
-          primary_energy_value: @view_model.primary_energy_use,
+          primary_energy_value: @view_model.respond_to?(:primary_energy_use) ? @view_model.primary_energy_use : nil,
           property_type: @view_model.property_type,
           report_type: @view_model.report_type,
           special_energy_uses: @view_model.special_energy_uses,
-          standard_emissions: @view_model.standard_emissions,
-          target_emissions: @view_model.target_emissions,
+          standard_emissions: @view_model.respond_to?(:standard_emissions) ? @view_model.standard_emissions : nil,
+          target_emissions: @view_model.respond_to?(:target_emissions) ? @view_model.target_emissions : nil,
           transaction_type:
             Helper::XmlEnumsToOutput.cepc_transaction_type(
-              @view_model.transaction_type,
+              @view_model.respond_to?(:transaction_type) ? @view_model.transaction_type : nil,
             ),
           type_of_assessment: TYPE_OF_ASSESSMENT,
-          typical_emissions: @view_model.typical_emissions,
+          typical_emissions: @view_model.respond_to?(:typical_emissions) ? @view_model.typical_emissions : nil,
           renewable_sources: @view_model.renewable_sources,
         }
       end

data/lib/presenter/cepc/summary.rb

@@ -30,19 +30,13 @@ module Presenter
             floor_area: @view_model.floor_area,
             building_level: @view_model.building_level,
           },
-          building_emission_rate: @view_model.building_emission_rate,
-          primary_energy_use: @view_model.primary_energy_use,
+          building_emission_rate: @view_model.respond_to?(:building_emission_rate) ? @view_model.building_emission_rate : nil,
+          primary_energy_use: @view_model.respond_to?(:primary_energy_use) ? @view_model.primary_energy_use : nil,
           related_rrn: @view_model.related_rrn,
           new_build_rating: @view_model.new_build_rating,
-          new_build_band:
-            Helper::EnergyBandCalculator.commercial(
-              @view_model.new_build_rating.to_i,
-            ),
+          new_build_band: Helper::EnergyBandCalculator.commercial(@view_model.new_build_rating),
           existing_build_rating: @view_model.existing_build_rating,
-          existing_build_band:
-            Helper::EnergyBandCalculator.commercial(
-              @view_model.existing_build_rating.to_i,
-            ),
+          existing_build_band: Helper::EnergyBandCalculator.commercial(@view_model.existing_build_rating),
           current_energy_efficiency_rating: @view_model.energy_efficiency_rating,
           energy_efficiency_rating: @view_model.energy_efficiency_rating,
           assessor: {
@@ -58,10 +52,7 @@ module Presenter
             },
           },
           related_party_disclosure: @view_model.epc_related_party_disclosure,
-          current_energy_efficiency_band:
-            Helper::EnergyBandCalculator.commercial(
-              @view_model.energy_efficiency_rating.to_i,
-            ),
+          current_energy_efficiency_band: Helper::EnergyBandCalculator.commercial(@view_model.energy_efficiency_rating),
           property_type: @view_model.property_type,
           building_complexity: @view_model.building_level,
         }

data/lib/presenter/dec/report.rb

@@ -24,10 +24,7 @@ module Presenter
           current_operational_rating: @view_model.energy_efficiency_rating,
           yr1_operational_rating: @view_model.year1_energy_efficiency_rating,
           yr2_operational_rating: @view_model.year2_energy_efficiency_rating,
-          operational_rating_band:
-            Helper::EnergyBandCalculator.commercial(
-              @view_model.energy_efficiency_rating.to_i,
-            ).upcase,
+          operational_rating_band: Helper::EnergyBandCalculator.commercial(@view_model.energy_efficiency_rating).upcase,
           electric_co2: @view_model.current_electricity_co2,
           heating_co2: @view_model.current_heating_co2,
           renewables_co2: @view_model.current_renewables_co2,
@@ -57,15 +54,14 @@ module Presenter
           yr2_renewables_co2: @view_model.year2_renewables_co2,
           # open data request for return value to be Y OR N
           aircon_present:
-            if !@view_model.ac_present.nil? &&
-                @view_model.ac_present.upcase == "YES"
+            if @view_model.respond_to?(:ac_present) && @view_model.ac_present.upcase == "YES"
               "Y"
             else
               "N"
             end,
-          aircon_kw_rating: @view_model.ac_kw_rating,
-          estimated_aircon_kw_rating: @view_model.estimated_ac_kw_rating,
-          ac_inspection_commissioned: @view_model.ac_inspection_commissioned,
+          aircon_kw_rating: @view_model.respond_to?(:ac_kw_rating) ? @view_model.ac_kw_rating : nil,
+          estimated_aircon_kw_rating: @view_model.respond_to?(:estimated_ac_kw_rating) ? @view_model.estimated_ac_kw_rating : nil,
+          ac_inspection_commissioned: @view_model.respond_to?(:ac_inspection_commissioned) ? @view_model.ac_inspection_commissioned : nil,
           building_environment: @view_model.building_environment,
           building_category: @view_model.building_category,
           report_type: @view_model.report_type,

data/lib/presenter/dec/summary.rb

@@ -29,10 +29,7 @@ module Presenter
           current_assessment: {
             date: @view_model.current_assessment_date,
             energy_efficiency_rating: @view_model.energy_efficiency_rating,
-            energy_efficiency_band:
-              Helper::EnergyBandCalculator.commercial(
-                @view_model.energy_efficiency_rating.to_i,
-              ),
+            energy_efficiency_band: Helper::EnergyBandCalculator.commercial(@view_model.energy_efficiency_rating),
             heating_co2: @view_model.current_heating_co2,
             electricity_co2: @view_model.current_electricity_co2,
             renewables_co2: @view_model.current_renewables_co2,
@@ -40,10 +37,7 @@ module Presenter
           year1_assessment: {
             date: @view_model.year1_assessment_date,
             energy_efficiency_rating: @view_model.year1_energy_efficiency_rating,
-            energy_efficiency_band:
-              Helper::EnergyBandCalculator.commercial(
-                @view_model.year1_energy_efficiency_rating.to_i,
-              ),
+            energy_efficiency_band: Helper::EnergyBandCalculator.commercial(@view_model.year1_energy_efficiency_rating),
             heating_co2: @view_model.year1_heating_co2,
             electricity_co2: @view_model.year1_electricity_co2,
             renewables_co2: @view_model.year1_renewables_co2,
@@ -52,9 +46,7 @@ module Presenter
             date: @view_model.year2_assessment_date,
             energy_efficiency_rating: @view_model.year2_energy_efficiency_rating,
             energy_efficiency_band:
-              Helper::EnergyBandCalculator.commercial(
-                @view_model.year2_energy_efficiency_rating.to_i,
-              ),
+              Helper::EnergyBandCalculator.commercial(@view_model.year2_energy_efficiency_rating),
             heating_co2: @view_model.year2_heating_co2,
             electricity_co2: @view_model.year2_electricity_co2,
             renewables_co2: @view_model.year2_renewables_co2,

data/lib/presenter/dec/xml_summary.rb

@@ -20,7 +20,7 @@ module Presenter
           benchmarks: @view_model.benchmarks,
           energy_consumption: @view_model.or_energy_consumption,
           annual_energy_summary: @view_model.annual_energy_summary,
-          dec_status: @view_model.dec_status,
+          dec_status: @view_model.respond_to?(:dec_status) ? @view_model.dec_status : nil,
           current_assessment_date: @view_model.current_assessment_date,
           energy_efficiency_rating: @view_model.energy_efficiency_rating,
           current_electricity_co2: @view_model.current_electricity_co2,
@@ -31,7 +31,7 @@ module Presenter
 
         xml = ERB.new(get_template).result_with_hash dec_data
 
-        if @view_model.dec_status.nil?
+        if !@view_model.respond_to?(:dec_status) || @view_model.dec_status.nil?
           doc = Nokogiri.XML(xml)
           doc.at("DEC-Status").remove
           xml = doc.to_xml

data/lib/presenter/export/base.rb

@@ -1,3 +1,4 @@
+require "active_support"
 require "active_support/core_ext/time/conversions"
 
 module Presenter::Export
@@ -41,10 +42,9 @@ module Presenter::Export
           @view_model.current_space_heating_demand&.to_i,
         current_water_heating_demand:
           @view_model.current_water_heating_demand&.to_i,
-        impact_of_cavity_insulation: @view_model.impact_of_cavity_insulation,
-        impact_of_loft_insulation: @view_model.impact_of_loft_insulation,
-        impact_of_solid_wall_insulation:
-          @view_model.impact_of_solid_wall_insulation,
+        impact_of_cavity_insulation: @view_model.respond_to?(:impact_of_cavity_insulation) ? @view_model.impact_of_cavity_insulation : nil,
+        impact_of_loft_insulation: @view_model.respond_to?(:impact_of_loft_insulation) ? @view_model.impact_of_loft_insulation : nil,
+        impact_of_solid_wall_insulation: @view_model.respond_to?(:impact_of_solid_wall_insulation) ? @view_model.impact_of_solid_wall_insulation : nil,
       }
     end
 

data/lib/presenter/export/commercial.rb

@@ -6,7 +6,7 @@ module Presenter::Export
       view[:type_of_assessment] = @wrapper.type.to_s
       view[:address] = address
       view[:assessor] = assessor
-      view[:building_emission_rate] = @view_model.building_emission_rate
+      view[:building_emission_rate] = @view_model.respond_to?(:building_emission_rate) ? @view_model.building_emission_rate : nil
       view[:date_of_expiry] = @view_model.date_of_expiry
       view[:report_type] = @view_model.report_type
       view[:date_of_assessment] = @view_model.date_of_assessment
@@ -17,7 +17,7 @@ module Presenter::Export
         floor_area: @view_model.floor_area,
         building_level: @view_model.building_level,
       }
-      view[:primary_energy_use] = @view_model.primary_energy_use
+      view[:primary_energy_use] = @view_model.respond_to?(:primary_energy_use) ? @view_model.primary_energy_use : nil
       view[:related_rrn] = @view_model.related_rrn
       view[:new_build_rating] = @view_model.new_build_rating
       view[:related_party_disclosure] = @view_model.epc_related_party_disclosure
@@ -27,43 +27,32 @@ module Presenter::Export
       view[:current_energy_efficiency_rating] =
         @view_model.energy_efficiency_rating
       view[:current_energy_efficiency_band] =
-        Helper::EnergyBandCalculator.commercial(
-          @view_model.energy_efficiency_rating.to_i,
-        )
+        Helper::EnergyBandCalculator.commercial(@view_model.energy_efficiency_rating)
       view[:new_build_band] =
-        Helper::EnergyBandCalculator.commercial(
-          @view_model.new_build_rating.to_i,
-        )
+        Helper::EnergyBandCalculator.commercial(@view_model.new_build_rating)
       view[:existing_build_rating] = @view_model.existing_build_rating
       view[:existing_build_band] =
-        Helper::EnergyBandCalculator.commercial(
-          @view_model.existing_build_rating.to_i,
-        )
-      view[:ac_inspection_commissioned] = @view_model.ac_inspection_commissioned
-      view[:aircon_kw_rating] = @view_model.ac_kw_rating
-      view[:aircon_present] = @view_model.ac_present unless @view_model
-        .ac_present.nil?
+        Helper::EnergyBandCalculator.commercial(@view_model.existing_build_rating)
+      view[:ac_inspection_commissioned] = @view_model.respond_to?(:ac_inspection_commissioned) ? @view_model.ac_inspection_commissioned : nil
+      view[:aircon_kw_rating] = @view_model.respond_to?(:ac_kw_rating) ? @view_model.ac_kw_rating : nil
+      view[:aircon_present] = @view_model.ac_present if @view_model.respond_to?(:ac_present)
       view[:asset_rating] = @view_model.energy_efficiency_rating
       view[:asset_rating_band] =
-        Helper::EnergyBandCalculator.commercial(
-          @view_model.energy_efficiency_rating.to_i,
-        )
+        Helper::EnergyBandCalculator.commercial(@view_model.energy_efficiency_rating)
       view[:building_environment] = @view_model.building_environment
       view[:building_level] = @view_model.building_level
       view[:building_reference_number] = @view_model.address_id
-      view[:estimated_aircon_kw_rating] = @view_model.estimated_ac_kw_rating
-
-      view[:existing_stock_benchmark] =
-        @view_model.existing_build_rating,
-        view[:floor_area] = @view_model.floor_area
+      view[:estimated_aircon_kw_rating] = @view_model.respond_to?(:estimated_ac_kw_rating) ? @view_model.estimated_ac_kw_rating : nil
+      view[:existing_stock_benchmark] = @view_model.existing_build_rating
+      view[:floor_area] = @view_model.floor_area
       view[:main_heating_fuel] = @view_model.main_heating_fuel
       view[:other_fuel_description] = @view_model.other_fuel_description
       view[:special_energy_uses] = @view_model.special_energy_uses
-      view[:standard_emissions] = @view_model.standard_emissions
-      view[:target_emissions] = @view_model.target_emissions
+      view[:standard_emissions] = @view_model.respond_to?(:standard_emissions) ? @view_model.standard_emissions : nil
+      view[:target_emissions] = @view_model.respond_to?(:target_emissions) ? @view_model.target_emissions : nil
       view[:transaction_type] =
-        enum_value(:transaction_type, @view_model.transaction_type)
-      view[:typical_emissions] = @view_model.typical_emissions
+        enum_value(:transaction_type, @view_model.respond_to?(:transaction_type) ? @view_model.transaction_type : nil)
+      view[:typical_emissions] = @view_model.respond_to?(:typical_emissions) ? @view_model.typical_emissions : nil
       view[:renewable_sources] = @view_model.renewable_sources
       view[:metadata] = metadata
 

data/lib/presenter/export/domestic.rb

@@ -20,34 +20,31 @@ module Presenter::Export
       view[:current_carbon_emission] = @view_model.current_carbon_emission.to_f
       view[:current_energy_efficiency_band] =
         Helper::EnergyBandCalculator.domestic(@view_model.current_energy_rating)
-      view[:current_energy_efficiency_rating] =
-        @view_model.current_energy_rating
+      view[:current_energy_efficiency_rating] = @view_model.current_energy_rating
       view[:date_of_assessment] = @view_model.date_of_assessment
       view[:date_of_expiry] = @view_model.date_of_expiry
       view[:date_of_registration] = @view_model.date_of_registration
       view[:dwelling_type] = @view_model.dwelling_type
       view[:energy_consumption_potential] =
         @view_model.energy_consumption_potential.to_i
-      view[:environmental_impact_current] =
-        @view_model.environmental_impact_current.to_i
-      view[:environmental_impact_potential] =
-        @view_model.environmental_impact_potential.to_i
-      unless @view_model.extensions_count.nil?
-        view[:extensions_count] = @view_model.extensions_count.to_i
+      view[:environmental_impact_current] = @view_model.environmental_impact_current
+      view[:environmental_impact_potential] = @view_model.environmental_impact_potential
+      if @view_model.respond_to?(:extensions_count) && !@view_model.extensions_count.nil?
+        view[:extensions_count] = @view_model.extensions_count
       end
       view[:fixed_lighting_outlets_count] =
-        @view_model.fixed_lighting_outlets_count.to_i
-      view[:glazed_area] = @view_model.glazed_area.to_i unless @view_model
+        @view_model.respond_to?(:fixed_lighting_outlets_count) ? @view_model.fixed_lighting_outlets_count : nil
+      view[:glazed_area] = @view_model.glazed_area.to_i if @view_model.respond_to?(:glazed_area) && !@view_model
         .glazed_area.nil?
-      unless @view_model.habitable_room_count.nil?
-        view[:habitable_room_count] = @view_model.habitable_room_count.to_i
+      if @view_model.respond_to?(:habitable_room_count) && !@view_model.habitable_room_count.nil?
+        view[:habitable_room_count] = @view_model.habitable_room_count
       end
       view[:heat_demand] = heat_demand
-      unless @view_model.heat_loss_corridor.nil?
+      if @view_model.respond_to?(:heat_loss_corridor) && !@view_model.heat_loss_corridor.nil?
         view[:heat_loss_corridor] = @view_model.heat_loss_corridor.to_i
       end
-      unless @view_model.heated_room_count.nil?
-        view[:heated_room_count] = @view_model.heated_room_count.to_i
+      if @view_model.respond_to?(:heated_room_count) && !@view_model.heated_room_count.nil?
+        view[:heated_room_count] = @view_model.heated_room_count
       end
       view[:heating_cost_current] = @view_model.heating_cost_current.to_f
       view[:heating_cost_potential] = @view_model.heating_cost_potential.to_f
@@ -68,43 +65,38 @@ module Presenter::Export
       view[:lighting_environmental_efficiency_rating] =
         @view_model.lighting_environmental_efficiency_rating.to_i
       view[:low_energy_fixed_lighting_outlets_count] =
-        @view_model.low_energy_fixed_lighting_outlets_count.nil? ? nil : @view_model.low_energy_fixed_lighting_outlets_count.to_i
-      view[:low_energy_lighting] = @view_model.low_energy_lighting.nil? ? nil : @view_model.low_energy_lighting.to_i
+        @view_model.respond_to?(:low_energy_fixed_lighting_outlets_count) ? @view_model.low_energy_fixed_lighting_outlets_count : nil
+      view[:low_energy_lighting] = @view_model.respond_to?(:low_energy_lighting) ? @view_model.low_energy_lighting&.to_i : nil
       view[:main_fuel_type] = @view_model.main_fuel_type
       view[:main_heating_controls_descriptions] =
         @view_model.all_main_heating_controls_descriptions
       view[:main_heating_descriptions] =
         @view_model.all_main_heating_descriptions
-      view[:mains_gas] = @view_model.mains_gas unless @view_model.mains_gas.nil?
+      view[:mains_gas] = @view_model.mains_gas if @view_model.respond_to?(:mains_gas) && !@view_model.mains_gas.nil?
       view[:multiple_glazed_proportion] =
-        @view_model.multiple_glazed_proportion.to_i
-      view[:open_fireplaces_count] = @view_model.open_fireplaces_count.to_i
-      unless @view_model.photovoltaic_roof_area_percent.nil?
+        @view_model.respond_to?(:multiple_glazed_proportion) ? @view_model.multiple_glazed_proportion.to_i : nil
+      view[:open_fireplaces_count] = @view_model.respond_to?(:open_fireplaces_count) ? @view_model.open_fireplaces_count : nil
+      if @view_model.respond_to?(:photovoltaic_roof_area_percent) && !@view_model.photovoltaic_roof_area_percent.nil?
         view[:photovoltaic_roof_area_percent] =
           @view_model.photovoltaic_roof_area_percent.to_i
       end
       view[:potential_carbon_emission] =
         @view_model.potential_carbon_emission.to_f
       view[:potential_energy_efficiency_band] =
-        Helper::EnergyBandCalculator.domestic(
-          @view_model.potential_energy_rating,
-        )
-      view[:potential_energy_efficiency_rating] =
-        @view_model.potential_energy_rating
-      view[:primary_energy_use] = @view_model.primary_energy_use.to_i
-      view[:property_age_band] = @view_model.property_age_band
+        Helper::EnergyBandCalculator.domestic(@view_model.potential_energy_rating)
+      view[:potential_energy_efficiency_rating] = @view_model.potential_energy_rating
+      view[:primary_energy_use] = @view_model.respond_to?(:primary_energy_use) ? @view_model.primary_energy_use.to_i : nil
+      view[:property_age_band] = @view_model.respond_to?(:property_age_band) ? @view_model.property_age_band : nil
       view[:property_summary] = @view_model.property_summary
       view[:property_type] =
         enum_value(:property_type, @view_model.property_type)
       view[:recommended_improvements] =
         @view_model.improvements.map do |improvement|
           improvement[:energy_performance_band_improvement] =
-            Helper::EnergyBandCalculator.domestic(
-              improvement[:energy_performance_rating_improvement],
-            )
+            Helper::EnergyBandCalculator.domestic(improvement[:energy_performance_rating_improvement])
           improvement
         end
-      unless @view_model.related_party_disclosure_number.nil?
+      if @view_model.respond_to?(:related_party_disclosure_number) && !@view_model.related_party_disclosure_number.nil?
         view[:related_party_disclosure_number] =
           @view_model.related_party_disclosure_number
       end
@@ -119,19 +111,18 @@ module Presenter::Export
       view[:secondary_heating_environmental_efficiency_rating] =
         @view_model.secondary_heating_environmental_efficiency_rating.to_i
       view[:status] = @view_model.status
-      view[:storey_count] = @view_model.storey_count.to_i unless @view_model
+      view[:storey_count] = @view_model.storey_count if @view_model.respond_to?(:storey_count) && !@view_model
         .storey_count.nil?
-      view[:tenure] = enum_value(:tenure, @view_model.tenure)
+      view[:tenure] = enum_value(:tenure, @view_model.respond_to?(:tenure) ? @view_model.tenure : nil)
       view[:top_storey] = @view_model.top_storey
       view[:total_floor_area] = @view_model.total_floor_area.to_f
       view[:transaction_type] =
-        enum_value(:transaction_type, @view_model.transaction_type)
+        enum_value(:transaction_type, @view_model.respond_to?(:transaction_type) ? @view_model.transaction_type : nil)
       view[:type_of_assessment] = @wrapper.type.to_s
-      unless @view_model.unheated_corridor_length.nil?
-        view[:unheated_corridor_length] =
-          @view_model.unheated_corridor_length.to_i
+      if @view_model.respond_to?(:unheated_corridor_length) && !@view_model.unheated_corridor_length.nil?
+        view[:unheated_corridor_length] = @view_model.unheated_corridor_length.to_i
       end
-      view[:wind_turbine_count] = @view_model.wind_turbine_count.to_i
+      view[:wind_turbine_count] = @view_model.wind_turbine_count
       view[:window_description] = @view_model.window_description
       view[:window_energy_efficiency_rating] =
         @view_model.window_energy_efficiency_rating.to_i

data/lib/presenter/rd_sap/domestic_digest.rb

@@ -36,15 +36,13 @@ module Presenter
                                                              @view_model.report_type),
           has_hot_water_cylinder: @view_model.has_hot_water_cylinder,
           total_floor_area: @view_model.total_floor_area.to_s,
-          has_mains_gas: @view_model.mains_gas,
+          has_mains_gas: @view_model.respond_to?(:mains_gas) ? @view_model.mains_gas : nil,
           current_energy_efficiency_rating: @view_model.current_energy_rating,
           potential_energy_efficiency_rating: @view_model.potential_energy_rating,
           type_of_property: Helper::XmlEnumsToOutput.property_type(@view_model.property_type),
           recommended_improvements: @view_model.improvements.map do |improvement|
             improvement[:energy_performance_band_improvement] =
-              Helper::EnergyBandCalculator.domestic(
-                improvement[:energy_performance_rating_improvement],
-              )
+              Helper::EnergyBandCalculator.domestic(improvement[:energy_performance_rating_improvement])
             improvement
           end,
         }