epb_view_models 1.2.3 → 2.0.0

data/lib/presenter/sap/summary.rb

@@ -45,10 +45,7 @@ module Presenter
           },
           current_carbon_emission:
             convert_to_big_decimal(@view_model.current_carbon_emission),
-          current_energy_efficiency_band:
-            Helper::EnergyBandCalculator.domestic(
-              @view_model.current_energy_rating,
-            ),
+          current_energy_efficiency_band: Helper::EnergyBandCalculator.domestic(@view_model.current_energy_rating),
           current_energy_efficiency_rating: @view_model.current_energy_rating,
           dwelling_type: @view_model.dwelling_type,
           estimated_energy_cost:,
@@ -58,10 +55,9 @@ module Presenter
               @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,
           },
           heating_cost_current: @view_model.heating_cost_current,
           heating_cost_potential: @view_model.heating_cost_potential,
@@ -71,10 +67,7 @@ module Presenter
           lighting_cost_potential: @view_model.lighting_cost_potential,
           potential_carbon_emission:
             convert_to_big_decimal(@view_model.potential_carbon_emission),
-          potential_energy_efficiency_band:
-            Helper::EnergyBandCalculator.domestic(
-              @view_model.potential_energy_rating,
-            ),
+          potential_energy_efficiency_band: Helper::EnergyBandCalculator.domestic(@view_model.potential_energy_rating),
           potential_energy_efficiency_rating: @view_model.potential_energy_rating,
           potential_energy_saving:
             Helper::EstimatedCostPotentialSavingHelper.new.potential_saving(
@@ -83,25 +76,22 @@ module Presenter
               @view_model.lighting_cost_potential,
               estimated_energy_cost,
             ),
-          primary_energy_use: @view_model.primary_energy_use,
+          primary_energy_use: @view_model.respond_to?(:primary_energy_use) ? @view_model.primary_energy_use : nil,
           energy_consumption_potential: @view_model.energy_consumption_potential,
-          property_age_band: @view_model.property_age_band,
+          property_age_band: @view_model.respond_to?(:property_age_band) ? @view_model.property_age_band : nil,
           property_summary: @view_model.property_summary,
           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,
           lzc_energy_sources: @view_model.lzc_energy_sources,
-          related_party_disclosure_number:
-            @view_model.related_party_disclosure_number,
+          related_party_disclosure_number: @view_model.respond_to?(:related_party_disclosure_number) ? @view_model.related_party_disclosure_number : nil,
           related_party_disclosure_text:
             @view_model.related_party_disclosure_text,
-          tenure: @view_model.tenure,
-          transaction_type: @view_model.transaction_type,
+          tenure: @view_model.respond_to?(:tenure) ? @view_model.tenure : nil,
+          transaction_type: @view_model.respond_to?(:transaction_type) ? @view_model.transaction_type : nil,
           total_floor_area: convert_to_big_decimal(@view_model.total_floor_area),
           total_roof_area: @view_model.respond_to?(:total_roof_area) ? @view_model.total_roof_area : nil,
           status: @view_model.status,
@@ -110,20 +100,20 @@ module Presenter
             @view_model.environmental_impact_potential,
           co2_emissions_current_per_floor_area:
             @view_model.co2_emissions_current_per_floor_area,
-          mains_gas: @view_model.mains_gas,
+          mains_gas: @view_model.respond_to?(:mains_gas) ? @view_model.mains_gas : nil,
           level: @view_model.level,
           top_storey: @view_model.top_storey,
-          storey_count: @view_model.storey_count,
+          storey_count: @view_model.respond_to?(:storey_count) ? @view_model.storey_count : nil,
           main_heating_controls: @view_model.main_heating_controls,
-          multiple_glazed_proportion: @view_model.multiple_glazed_proportion,
-          glazed_area: @view_model.glazed_area,
-          habitable_room_count: @view_model.habitable_room_count,
-          heated_room_count: @view_model.heated_room_count,
-          low_energy_lighting: @view_model.low_energy_lighting,
-          fixed_lighting_outlets_count: @view_model.fixed_lighting_outlets_count,
+          multiple_glazed_proportion: @view_model.respond_to?(:multiple_glazed_proportion) ? @view_model.multiple_glazed_proportion : nil,
+          glazed_area: @view_model.respond_to?(:glazed_area) ? @view_model.glazed_area : nil,
+          habitable_room_count: @view_model.respond_to?(:habitable_room_count) ? @view_model.habitable_room_count : nil,
+          heated_room_count: @view_model.respond_to?(:heated_room_count) ? @view_model.heated_room_count : nil,
+          low_energy_lighting: @view_model.respond_to?(:low_energy_lighting) ? @view_model.low_energy_lighting : nil,
+          fixed_lighting_outlets_count: @view_model.respond_to?(:fixed_lighting_outlets_count) ? @view_model.fixed_lighting_outlets_count : nil,
           low_energy_fixed_lighting_outlets_count:
-            @view_model.low_energy_fixed_lighting_outlets_count,
-          open_fireplaces_count: @view_model.open_fireplaces_count,
+            @view_model.respond_to?(:low_energy_fixed_lighting_outlets_count) ? @view_model.low_energy_fixed_lighting_outlets_count : nil,
+          open_fireplaces_count: @view_model.respond_to?(:open_fireplaces_count) ? @view_model.open_fireplaces_count : nil,
           hot_water_description: @view_model.hot_water_description,
           hot_water_energy_efficiency_rating:
             @view_model.hot_water_energy_efficiency_rating,
@@ -145,22 +135,18 @@ module Presenter
             @view_model.lighting_energy_efficiency_rating,
           lighting_environmental_efficiency_rating:
             @view_model.lighting_environmental_efficiency_rating,
-          photovoltaic_roof_area_percent:
-            @view_model.photovoltaic_roof_area_percent,
-          heat_loss_corridor: @view_model.heat_loss_corridor,
+          photovoltaic_roof_area_percent: @view_model.respond_to?(:photovoltaic_roof_area_percent) ? @view_model.photovoltaic_roof_area_percent : nil,
+          heat_loss_corridor: @view_model.respond_to?(:heat_loss_corridor) ? @view_model.heat_loss_corridor : nil,
           wind_turbine_count: @view_model.wind_turbine_count,
-          unheated_corridor_length: @view_model.unheated_corridor_length,
+          unheated_corridor_length: @view_model.respond_to?(:unheated_corridor_length) ? @view_model.unheated_corridor_length : nil,
           built_form:
             Helper::XmlEnumsToOutput.built_form_string(@view_model.built_form),
           mainheat_description:
             @view_model.all_main_heating_descriptions.join(", "),
-          extensions_count:
-            if @view_model.respond_to?(:extensions_count)
-              @view_model.extensions_count
-            end,
+          extensions_count: @view_model.respond_to?(:extensions_count) ? @view_model.extensions_count : nil,
           addendum: @view_model.addendum,
-          gas_smart_meter_present: @view_model.gas_smart_meter_present,
-          electricity_smart_meter_present: @view_model.electricity_smart_meter_present,
+          gas_smart_meter_present: @view_model.respond_to?(:gas_smart_meter_present) ? @view_model.gas_smart_meter_present : nil,
+          electricity_smart_meter_present: @view_model.respond_to?(:electricity_smart_meter_present) ? @view_model.electricity_smart_meter_present : nil,
           country_code: @view_model.country_code,
         }
       end

data/lib/view_model/cepc31/cepc.rb

@@ -1,48 +1,24 @@
 module ViewModel
   module Cepc31
     class Cepc < ViewModel::Cepc31::CommonSchema
-      def ac_inspection_commissioned
-        nil
-      end
-
-      def ac_kw_rating
-        nil
-      end
-
-      def ac_present
-        nil
-      end
-
-      def building_emission_rate
-        nil
-      end
-
-      def building_emission
-        nil
-      end
-
       def building_environment
         xpath(%w[Building-Environment])
       end
 
       def building_level
-        xpath(%w[Building-Level])
+        xpath(%w[Building-Level])&.to_i
       end
 
       def energy_efficiency_rating
-        xpath(%w[Asset-Rating])
+        xpath(%w[Asset-Rating])&.to_i
       end
 
       def epc_related_party_disclosure
         xpath(%w[Related-Party-Disclosure])
       end
 
-      def estimated_ac_kw_rating
-        nil
-      end
-
       def existing_build_rating
-        xpath(%w[Existing-Stock-Benchmark])
+        xpath(%w[Existing-Stock-Benchmark])&.to_i
       end
 
       def floor_area
@@ -54,7 +30,7 @@ module ViewModel
       end
 
       def new_build_rating
-        xpath(%w[New-Build-Benchmark])
+        xpath(%w[New-Build-Benchmark])&.to_i
       end
 
       def other_fuel_description
@@ -77,22 +53,6 @@ module ViewModel
         xpath(%w[Special-Energy-Uses])
       end
 
-      def standard_emissions
-        nil
-      end
-
-      def target_emissions
-        nil
-      end
-
-      def transaction_type
-        nil
-      end
-
-      def typical_emissions
-        nil
-      end
-
       def renewable_sources
         xpath(%w[Renewable-Sources])
       end

data/lib/view_model/cepc31/common_schema.rb

@@ -103,7 +103,7 @@ module ViewModel
       end
 
       def building_level
-        xpath(%w[Building-Level])
+        xpath(%w[Building-Level])&.to_i
       end
     end
   end

data/lib/view_model/cepc31/dec.rb

@@ -1,14 +1,6 @@
 module ViewModel
   module Cepc31
     class Dec < ViewModel::Cepc31::CommonSchema
-      def estimated_ac_kw_rating
-        nil
-      end
-
-      def ac_present
-        nil
-      end
-
       def main_benchmark
         xpath(%w[OR-Benchmark-Data Main-Benchmark])
       end
@@ -30,7 +22,7 @@ module ViewModel
       end
 
       def energy_efficiency_rating
-        xpath(%w[This-Assessment Energy-Rating])
+        xpath(%w[This-Assessment Energy-Rating])&.to_i
       end
 
       def current_assessment_date
@@ -38,15 +30,15 @@ module ViewModel
       end
 
       def current_heating_co2
-        xpath(%w[This-Assessment Heating-CO2])
+        xpath(%w[This-Assessment Heating-CO2])&.to_i
       end
 
       def current_electricity_co2
-        xpath(%w[This-Assessment Electricity-CO2])
+        xpath(%w[This-Assessment Electricity-CO2])&.to_i
       end
 
       def current_renewables_co2
-        xpath(%w[This-Assessment Renewables-CO2])
+        xpath(%w[This-Assessment Renewables-CO2])&.to_i
       end
 
       def year1_assessment_date
@@ -54,19 +46,19 @@ module ViewModel
       end
 
       def year1_heating_co2
-        xpath(%w[Year1-Assessment Heating-CO2])
+        xpath(%w[Year1-Assessment Heating-CO2])&.to_i
       end
 
       def year1_electricity_co2
-        xpath(%w[Year1-Assessment Electricity-CO2])
+        xpath(%w[Year1-Assessment Electricity-CO2])&.to_i
       end
 
       def year1_renewables_co2
-        xpath(%w[Year1-Assessment Renewables-CO2])
+        xpath(%w[Year1-Assessment Renewables-CO2])&.to_i
       end
 
       def year1_energy_efficiency_rating
-        xpath(%w[Year1-Assessment Energy-Rating])
+        xpath(%w[Year1-Assessment Energy-Rating])&.to_i
       end
 
       def year2_assessment_date
@@ -74,19 +66,19 @@ module ViewModel
       end
 
       def year2_heating_co2
-        xpath(%w[Year2-Assessment Heating-CO2])
+        xpath(%w[Year2-Assessment Heating-CO2])&.to_i
       end
 
       def year2_electricity_co2
-        xpath(%w[Year2-Assessment Electricity-CO2])
+        xpath(%w[Year2-Assessment Electricity-CO2])&.to_i
       end
 
       def year2_renewables_co2
-        xpath(%w[Year2-Assessment Renewables-CO2])
+        xpath(%w[Year2-Assessment Renewables-CO2])&.to_i
       end
 
       def year2_energy_efficiency_rating
-        xpath(%w[Year2-Assessment Energy-Rating])
+        xpath(%w[Year2-Assessment Energy-Rating])&.to_i
       end
 
       def main_heating_fuel
@@ -110,7 +102,7 @@ module ViewModel
       end
 
       def asset_rating
-        xpath(%w[OR-Previous-Data Asset-Rating])
+        xpath(%w[OR-Previous-Data Asset-Rating])&.to_i
       end
 
       def property_type
@@ -141,10 +133,6 @@ module ViewModel
         xpath(%w[DEC-Annual-Energy-Summary Renewables-Electrical])
       end
 
-      def dec_status
-        nil
-      end
-
       def dec_related_party_disclosure
         xpath(%w[Related-Party-Disclosure])
       end
@@ -173,14 +161,6 @@ module ViewModel
         []
       end
 
-      def ac_kw_rating
-        nil
-      end
-
-      def ac_inspection_commissioned
-        nil
-      end
-
       def or_energy_consumption
         @xml_doc
           .search("OR-Energy-Consumption")
@@ -191,7 +171,7 @@ module ViewModel
               consumption: xpath(%w[Consumption], node),
               start_date: xpath(%w[Start-Date], node),
               end_date: xpath(%w[End-Date], node),
-              estimate: xpath(%w[Estimate], node),
+              estimate: xpath(%w[Estimate], node)&.to_i,
               name: node.name,
             }
           end

data/lib/view_model/cepc40/ac_report.rb

@@ -13,7 +13,7 @@ module ViewModel
         nodes.filter_map do |node|
           unless node.at("Text").content.nil? || node.at("Text").content.empty?
             {
-              sequence: node.at("Seq-Number").content,
+              sequence: node.at("Seq-Number").content&.to_i,
               text: node.at("Text").content,
             }
           end

data/lib/view_model/cepc40/cepc.rb

@@ -6,31 +6,23 @@ module ViewModel
       end
 
       def ac_kw_rating
-        xpath(%w[AC-kW-Rating])
+        xpath(%w[AC-kW-Rating])&.to_i
       end
 
       def ac_present
         xpath(%w[AC-Present])
       end
 
-      def building_emission_rate
-        nil
-      end
-
-      def building_emission
-        nil
-      end
-
       def building_environment
         xpath(%w[Building-Environment])
       end
 
       def building_level
-        xpath(%w[Building-Level])
+        xpath(%w[Building-Level])&.to_i
       end
 
       def energy_efficiency_rating
-        xpath(%w[Asset-Rating])
+        xpath(%w[Asset-Rating])&.to_i
       end
 
       def epc_related_party_disclosure
@@ -38,11 +30,11 @@ module ViewModel
       end
 
       def estimated_ac_kw_rating
-        xpath(%w[AC-Estimated-Output])
+        xpath(%w[AC-Estimated-Output])&.to_i
       end
 
       def existing_build_rating
-        xpath(%w[Existing-Stock-Benchmark])
+        xpath(%w[Existing-Stock-Benchmark])&.to_i
       end
 
       def floor_area
@@ -54,7 +46,7 @@ module ViewModel
       end
 
       def new_build_rating
-        xpath(%w[New-Build-Benchmark])
+        xpath(%w[New-Build-Benchmark])&.to_i
       end
 
       def other_fuel_description
@@ -77,22 +69,6 @@ module ViewModel
         xpath(%w[Special-Energy-Uses])
       end
 
-      def standard_emissions
-        nil
-      end
-
-      def target_emissions
-        nil
-      end
-
-      def transaction_type
-        nil
-      end
-
-      def typical_emissions
-        nil
-      end
-
       def renewable_sources
         xpath(%w[Renewable-Sources])
       end

data/lib/view_model/cepc40/common_schema.rb

@@ -103,7 +103,7 @@ module ViewModel
       end
 
       def building_level
-        xpath(%w[Building-Level])
+        xpath(%w[Building-Level])&.to_i
       end
     end
   end

data/lib/view_model/cepc40/dec.rb

@@ -18,7 +18,7 @@ module ViewModel
       end
 
       def energy_efficiency_rating
-        xpath(%w[This-Assessment Energy-Rating])
+        xpath(%w[This-Assessment Energy-Rating])&.to_i
       end
 
       def current_assessment_date
@@ -26,15 +26,15 @@ module ViewModel
       end
 
       def current_heating_co2
-        xpath(%w[This-Assessment Heating-CO2])
+        xpath(%w[This-Assessment Heating-CO2])&.to_i
       end
 
       def current_electricity_co2
-        xpath(%w[This-Assessment Electricity-CO2])
+        xpath(%w[This-Assessment Electricity-CO2])&.to_i
       end
 
       def current_renewables_co2
-        xpath(%w[This-Assessment Renewables-CO2])
+        xpath(%w[This-Assessment Renewables-CO2])&.to_i
       end
 
       def year1_assessment_date
@@ -42,19 +42,19 @@ module ViewModel
       end
 
       def year1_heating_co2
-        xpath(%w[Year1-Assessment Heating-CO2])
+        xpath(%w[Year1-Assessment Heating-CO2])&.to_i
       end
 
       def year1_electricity_co2
-        xpath(%w[Year1-Assessment Electricity-CO2])
+        xpath(%w[Year1-Assessment Electricity-CO2])&.to_i
       end
 
       def year1_renewables_co2
-        xpath(%w[Year1-Assessment Renewables-CO2])
+        xpath(%w[Year1-Assessment Renewables-CO2])&.to_i
       end
 
       def year1_energy_efficiency_rating
-        xpath(%w[Year1-Assessment Energy-Rating])
+        xpath(%w[Year1-Assessment Energy-Rating])&.to_i
       end
 
       def year2_assessment_date
@@ -62,19 +62,19 @@ module ViewModel
       end
 
       def year2_heating_co2
-        xpath(%w[Year2-Assessment Heating-CO2])
+        xpath(%w[Year2-Assessment Heating-CO2])&.to_i
       end
 
       def year2_electricity_co2
-        xpath(%w[Year2-Assessment Electricity-CO2])
+        xpath(%w[Year2-Assessment Electricity-CO2])&.to_i
       end
 
       def year2_renewables_co2
-        xpath(%w[Year2-Assessment Renewables-CO2])
+        xpath(%w[Year2-Assessment Renewables-CO2])&.to_i
       end
 
       def year2_energy_efficiency_rating
-        xpath(%w[Year2-Assessment Energy-Rating])
+        xpath(%w[Year2-Assessment Energy-Rating])&.to_i
       end
 
       def main_heating_fuel
@@ -90,7 +90,7 @@ module ViewModel
       end
 
       def asset_rating
-        xpath(%w[OR-Previous-Data Asset-Rating])
+        xpath(%w[OR-Previous-Data Asset-Rating])&.to_i
       end
 
       def annual_energy_use_fuel_thermal
@@ -159,7 +159,7 @@ module ViewModel
               consumption: xpath(%w[Consumption], node),
               start_date: xpath(%w[Start-Date], node),
               end_date: xpath(%w[End-Date], node),
-              estimate: xpath(%w[Estimate], node),
+              estimate: xpath(%w[Estimate], node)&.to_i,
               name: node.name,
             }
           end
@@ -202,11 +202,11 @@ module ViewModel
       end
 
       def ac_kw_rating
-        xpath(%w[AC-kW-Rating])
+        xpath(%w[AC-kW-Rating])&.to_i
       end
 
       def estimated_ac_kw_rating
-        xpath(%w[AC-Estimated-Output])
+        xpath(%w[AC-Estimated-Output])&.to_i
       end
 
       def building_category

data/lib/view_model/cepc50/ac_report.rb

@@ -13,7 +13,7 @@ module ViewModel
         nodes.filter_map do |node|
           unless node.at("Text").content.nil? || node.at("Text").content.empty?
             {
-              sequence: node.at("Seq-Number").content,
+              sequence: node.at("Seq-Number").content&.to_i,
               text: node.at("Text").content,
             }
           end

data/lib/view_model/cepc50/cepc.rb

@@ -6,7 +6,7 @@ module ViewModel
       end
 
       def ac_kw_rating
-        xpath(%w[AC-kW-Rating])
+        xpath(%w[AC-kW-Rating])&.to_i
       end
 
       def ac_present
@@ -18,7 +18,7 @@ module ViewModel
       end
 
       def building_level
-        xpath(%w[Building-Level])
+        xpath(%w[Building-Level])&.to_i
       end
 
       def building_emission_rate
@@ -26,7 +26,7 @@ module ViewModel
       end
 
       def energy_efficiency_rating
-        xpath(%w[Asset-Rating])
+        xpath(%w[Asset-Rating])&.to_i
       end
 
       def epc_related_party_disclosure
@@ -34,11 +34,11 @@ module ViewModel
       end
 
       def estimated_ac_kw_rating
-        xpath(%w[AC-Estimated-Output])
+        xpath(%w[AC-Estimated-Output])&.to_i
       end
 
       def existing_build_rating
-        xpath(%w[Existing-Stock-Benchmark])
+        xpath(%w[Existing-Stock-Benchmark])&.to_i
       end
 
       def floor_area
@@ -50,17 +50,13 @@ module ViewModel
       end
 
       def new_build_rating
-        xpath(%w[New-Build-Benchmark])
+        xpath(%w[New-Build-Benchmark])&.to_i
       end
 
       def other_fuel_description
         xpath(%w[Other-Fuel-Description])
       end
 
-      def primary_energy_use
-        nil
-      end
-
       def property_type
         xpath(%w[Property-Type])
       end

data/lib/view_model/cepc50/common_schema.rb

@@ -102,7 +102,7 @@ module ViewModel
       end
 
       def building_level
-        xpath(%w[Building-Level])
+        xpath(%w[Building-Level])&.to_i
       end
     end
   end