epb_view_models 1.2.3 → 2.0.0

data/lib/view_model/cepc71/ac_cert.rb

@@ -21,7 +21,7 @@ module ViewModel
       end
 
       def ac_rated_output
-        xpath(%w[AC-Rated-Output AC-kW-Rating])
+        xpath(%w[AC-Rated-Output AC-kW-Rating])&.to_i
       end
 
       def random_sampling
@@ -29,7 +29,7 @@ module ViewModel
       end
 
       def treated_floor_area
-        xpath(%w[Air-Conditioning-Inspection-Certificate Treated-Floor-Area])
+        xpath(%w[Air-Conditioning-Inspection-Certificate Treated-Floor-Area])&.to_i
       end
 
       def ac_system_metered
@@ -41,7 +41,7 @@ module ViewModel
       def refrigerant_charge
         xpath(
           %w[Air-Conditioning-Inspection-Certificate Refrigerant-Charge-Total],
-        )
+        )&.to_i
       end
 
       def related_rrn

data/lib/view_model/cepc71/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/cepc71/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
@@ -26,11 +26,11 @@ module ViewModel
       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 +38,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 +54,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

data/lib/view_model/cepc71/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

data/lib/view_model/cepc71/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
@@ -94,7 +94,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
@@ -155,7 +155,7 @@ module ViewModel
           .map do |node|
             {
               name: xpath(%w[Name], node),
-              id: xpath(%w[Benchmark-ID], node),
+              id: xpath(%w[Benchmark-ID], node)&.to_i,
               tufa: xpath(%w[TUFA], node),
             }
           end
@@ -171,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
@@ -210,11 +210,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/cepc800/ac_cert.rb

@@ -21,7 +21,7 @@ module ViewModel
       end
 
       def ac_rated_output
-        xpath(%w[AC-Rated-Output AC-kW-Rating])
+        xpath(%w[AC-Rated-Output AC-kW-Rating])&.to_i
       end
 
       def random_sampling
@@ -29,7 +29,7 @@ module ViewModel
       end
 
       def treated_floor_area
-        xpath(%w[Air-Conditioning-Inspection-Certificate Treated-Floor-Area])
+        xpath(%w[Air-Conditioning-Inspection-Certificate Treated-Floor-Area])&.to_i
       end
 
       def ac_system_metered
@@ -41,7 +41,7 @@ module ViewModel
       def refrigerant_charge
         xpath(
           %w[Air-Conditioning-Inspection-Certificate Refrigerant-Charge-Total],
-        )
+        )&.to_i
       end
 
       def related_rrn

data/lib/view_model/cepc800/ac_report.rb

@@ -20,7 +20,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/cepc800/cepc.rb

@@ -6,18 +6,13 @@ 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_emissions
-        xpath(%w[BER])
-      end
-
-      # This would seem to be a copy? Is the method name used?
       def building_emission_rate
         xpath(%w[BER])
       end
@@ -27,7 +22,7 @@ module ViewModel
       end
 
       def building_level
-        xpath(%w[Building-Level])
+        xpath(%w[Building-Level])&.to_i
       end
 
       # Is this used?
@@ -36,7 +31,7 @@ module ViewModel
       end
 
       def energy_efficiency_rating
-        xpath(%w[Asset-Rating])
+        xpath(%w[Asset-Rating])&.to_i
       end
 
       def epc_related_party_disclosure
@@ -44,11 +39,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
@@ -61,7 +56,7 @@ module ViewModel
 
       # This is new_build_benchmark in the CEPC wrapper
       def new_build_rating
-        xpath(%w[New-Build-Benchmark])
+        xpath(%w[New-Build-Benchmark])&.to_i
       end
 
       def or_assessment_start_date

data/lib/view_model/cepc800/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

data/lib/view_model/cepc800/dec.rb

@@ -20,7 +20,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
@@ -28,15 +28,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
@@ -44,19 +44,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
@@ -64,19 +64,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
@@ -92,7 +92,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
@@ -153,7 +153,7 @@ module ViewModel
           .map do |node|
             {
               name: xpath(%w[Name], node),
-              id: xpath(%w[Benchmark-ID], node),
+              id: xpath(%w[Benchmark-ID], node)&.to_i,
               tufa: xpath(%w[TUFA], node),
             }
           end
@@ -169,7 +169,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
@@ -216,11 +216,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/cepc_ni800/ac_cert.rb

@@ -21,7 +21,7 @@ module ViewModel
       end
 
       def ac_rated_output
-        xpath(%w[AC-Rated-Output AC-kW-Rating])
+        xpath(%w[AC-Rated-Output AC-kW-Rating])&.to_i
       end
 
       def random_sampling
@@ -29,7 +29,7 @@ module ViewModel
       end
 
       def treated_floor_area
-        xpath(%w[Air-Conditioning-Inspection-Certificate Treated-Floor-Area])
+        xpath(%w[Air-Conditioning-Inspection-Certificate Treated-Floor-Area])&.to_i
       end
 
       def ac_system_metered
@@ -41,7 +41,7 @@ module ViewModel
       def refrigerant_charge
         xpath(
           %w[Air-Conditioning-Inspection-Certificate Refrigerant-Charge-Total],
-        )
+        )&.to_i
       end
 
       def related_rrn

data/lib/view_model/cepc_ni800/ac_report.rb

@@ -12,7 +12,7 @@ module ViewModel
       def extract_aci_recommendations(nodes)
         recommendations = nodes.map do |node|
           {
-            sequence: node.at("Seq-Number").content,
+            sequence: node.at("Seq-Number").content&.to_i,
             text: node.at("Text").content,
           }
         end

data/lib/view_model/cepc_ni800/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
@@ -17,10 +17,6 @@ module ViewModel
         xpath(%w[AC-Rated-Output])
       end
 
-      def building_emissions
-        xpath(%w[BER])
-      end
-
       def building_emission_rate
         xpath(%w[BER])
       end
@@ -30,7 +26,7 @@ module ViewModel
       end
 
       def building_level
-        xpath(%w[Building-Level])
+        xpath(%w[Building-Level])&.to_i
       end
 
       def effective_date
@@ -38,7 +34,7 @@ module ViewModel
       end
 
       def energy_efficiency_rating
-        xpath(%w[Asset-Rating])
+        xpath(%w[Asset-Rating])&.to_i
       end
 
       def epc_related_party_disclosure
@@ -46,11 +42,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
@@ -62,7 +58,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

data/lib/view_model/cepc_ni800/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

data/lib/view_model/cepc_ni800/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
@@ -151,7 +151,7 @@ module ViewModel
           .map do |node|
             {
               name: xpath(%w[Name], node),
-              id: xpath(%w[Benchmark-ID], node),
+              id: xpath(%w[Benchmark-ID], node)&.to_i,
               tufa: xpath(%w[TUFA], node),
             }
           end
@@ -167,7 +167,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
@@ -210,11 +210,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