epb_view_models 1.2.3 → 2.0.0

data/lib/view_model/cepc50/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,15 +62,15 @@ 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 special_energy_uses
@@ -78,7 +78,7 @@ module ViewModel
       end
 
       def year2_energy_efficiency_rating
-        xpath(%w[Year2-Assessment Energy-Rating])
+        xpath(%w[Year2-Assessment Energy-Rating])&.to_i
       end
 
       def occupancy_level
@@ -98,7 +98,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
@@ -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
@@ -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/cepc51/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/cepc51/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
@@ -22,11 +22,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
@@ -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,7 +50,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/cepc51/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/cepc51/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,15 +62,15 @@ 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 special_energy_uses
@@ -78,7 +78,7 @@ module ViewModel
       end
 
       def year2_energy_efficiency_rating
-        xpath(%w[Year2-Assessment Energy-Rating])
+        xpath(%w[Year2-Assessment Energy-Rating])&.to_i
       end
 
       def occupancy_level
@@ -98,7 +98,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
@@ -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
@@ -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/cepc60/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/cepc60/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
@@ -22,7 +22,7 @@ module ViewModel
       end
 
       def building_level
-        xpath(%w[Building-Level])
+        xpath(%w[Building-Level])&.to_i
       end
 
       def floor_area
@@ -30,7 +30,7 @@ module ViewModel
       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 main_heating_fuel
@@ -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/cepc60/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/cepc60/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

data/lib/view_model/cepc70/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/cepc70/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/cepc70/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
@@ -22,11 +22,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
@@ -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/cepc70/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/cepc70/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
@@ -98,7 +98,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
           .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
@@ -175,7 +175,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