epb_view_models 1.2.3 → 2.0.0

data/lib/view_model/sap_schema_163/common_schema.rb

@@ -155,11 +155,11 @@ module ViewModel
       end
 
       def potential_energy_rating
-        xpath(%w[Energy-Rating-Potential]).to_i
+        xpath(%w[Energy-Rating-Potential])&.to_i
       end
 
       def current_energy_rating
-        xpath(%w[Energy-Rating-Current]).to_i
+        xpath(%w[Energy-Rating-Current])&.to_i
       end
 
       def primary_energy_use
@@ -200,19 +200,19 @@ module ViewModel
 
       def impact_of_cavity_insulation
         if xpath(%w[Impact-Of-Cavity-Insulation])
-          xpath(%w[Impact-Of-Cavity-Insulation]).to_i
+          xpath(%w[Impact-Of-Cavity-Insulation])&.to_i
         end
       end
 
       def impact_of_loft_insulation
         if xpath(%w[Impact-Of-Loft-Insulation])
-          xpath(%w[Impact-Of-Loft-Insulation]).to_i
+          xpath(%w[Impact-Of-Loft-Insulation])&.to_i
         end
       end
 
       def impact_of_solid_wall_insulation
         if xpath(%w[Impact-Of-Solid-Wall-Insulation])
-          xpath(%w[Impact-Of-Solid-Wall-Insulation]).to_i
+          xpath(%w[Impact-Of-Solid-Wall-Insulation])&.to_i
         end
       end
 
@@ -229,7 +229,7 @@ module ViewModel
       end
 
       def type_of_assessment
-        case xpath(%w[Report-Type]).to_i
+        case xpath(%w[Report-Type])&.to_i
         when 1
           "HCR"
         when 2
@@ -240,21 +240,17 @@ module ViewModel
       end
 
       def environmental_impact_current
-        xpath(%w[Environmental-Impact-Current])
+        xpath(%w[Environmental-Impact-Current])&.to_i
       end
 
       def environmental_impact_potential
-        xpath(%w[Environmental-Impact-Potential])
+        xpath(%w[Environmental-Impact-Potential])&.to_i
       end
 
       def co2_emissions_current_per_floor_area
         xpath(%w[CO2-Emissions-Current-Per-Floor-Area])
       end
 
-      def mains_gas
-        nil
-      end
-
       def level
         xpath(%w[Level])
       end
@@ -264,10 +260,6 @@ module ViewModel
         flat_level_code == "3" ? "Y" : "N"
       end
 
-      def storey_count
-        nil
-      end
-
       def main_heating_controls
         xpath(%w[Main-Heating-Controls Description])
       end
@@ -276,32 +268,20 @@ module ViewModel
         xpath(%w[Multiple-Glazed-Proportion])
       end
 
-      def glazed_area
-        nil
-      end
-
-      def habitable_room_count
-        nil
-      end
-
-      def heated_room_count
-        nil
-      end
-
       def low_energy_lighting
         xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Percentage])
       end
 
       def fixed_lighting_outlets_count
-        xpath(%w[Fixed-Lighting-Outlets-Count])
+        xpath(%w[Fixed-Lighting-Outlets-Count])&.to_i
       end
 
       def low_energy_fixed_lighting_outlets_count
-        xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Count])
+        xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Count])&.to_i
       end
 
       def open_fireplaces_count
-        xpath(%w[Open-Fireplaces-Count])
+        xpath(%w[Open-Fireplaces-Count])&.to_i
       end
 
       def hot_water_description
@@ -352,16 +332,12 @@ module ViewModel
         xpath(%w[Lighting Environmental-Efficiency-Rating])
       end
 
-      def photovoltaic_roof_area_percent
-        nil
-      end
-
       def built_form
         xpath(%w[Built-Form])
       end
 
       def wind_turbine_count
-        xpath(%w[Wind-Turbines-Count])
+        xpath(%w[Wind-Turbines-Count])&.to_i
       end
 
       def heat_loss_corridor
@@ -377,7 +353,7 @@ module ViewModel
       end
 
       def extensions_count
-        xpath(%w[Extensions-Count])
+        xpath(%w[Extensions-Count])&.to_i
       end
 
       def all_main_heating_controls_descriptions
@@ -424,14 +400,6 @@ module ViewModel
         @xml_doc.search("Main-Heating/Energy-Efficiency-Rating").map(&:content)
       end
 
-      def solar_water_heating_flag
-        nil
-      end
-
-      def mechanical_ventilation
-        nil
-      end
-
       def main_dwelling_construction_age_band_or_year
         sap_building_parts =
           @xml_doc.xpath("//SAP-Building-Parts/SAP-Building-Part")
@@ -487,14 +455,6 @@ module ViewModel
       def floor_height
         @xml_doc.search("Storey-Height").map(&:content)
       end
-
-      def gas_smart_meter_present
-        nil
-      end
-
-      def electricity_smart_meter_present
-        nil
-      end
     end
   end
 end

data/lib/view_model/sap_schema_163/rdsap.rb

@@ -42,11 +42,11 @@ module ViewModel
       end
 
       def habitable_room_count
-        xpath(%w[Habitable-Room-Count])
+        xpath(%w[Habitable-Room-Count])&.to_i
       end
 
       def heated_room_count
-        xpath(%w[Heated-Room-Count])
+        xpath(%w[Heated-Room-Count])&.to_i
       end
 
       def photovoltaic_roof_area_percent
@@ -62,7 +62,7 @@ module ViewModel
       end
 
       def storey_count
-        xpath(%w[Storey-Count])
+        xpath(%w[Storey-Count])&.to_i
       end
 
       def energy_tariff
@@ -85,22 +85,6 @@ module ViewModel
         xpath(%w[Cylinder-Thermostat])
       end
 
-      def mech_vent_sys_index_number
-        nil
-      end
-
-      def mechanical_vent_data_source
-        nil
-      end
-
-      def thermal_store
-        nil
-      end
-
-      def ventilation_type
-        nil
-      end
-
       def water_heating_fuel
         xpath(%w[Water-Heating-Fuel])
       end

data/lib/view_model/sap_schema_163/sap.rb

@@ -35,7 +35,7 @@ module ViewModel
       end
 
       def mech_vent_sys_index_number
-        xpath(%w[Mechanical-Vent-System-Index-Number])
+        xpath(%w[Mechanical-Vent-System-Index-Number])&.to_i
       end
 
       def mechanical_vent_data_source

data/lib/view_model/sap_schema_170/common_schema.rb

@@ -85,7 +85,7 @@ module ViewModel
       end
 
       def related_party_disclosure_number
-        xpath(%w[Related-Party-Disclosure-Number]).to_i
+        xpath(%w[Related-Party-Disclosure-Number])&.to_i
       end
 
       def improvements
@@ -159,11 +159,11 @@ module ViewModel
       end
 
       def potential_energy_rating
-        xpath(%w[Energy-Rating-Potential]).to_i
+        xpath(%w[Energy-Rating-Potential])&.to_i
       end
 
       def current_energy_rating
-        xpath(%w[Energy-Rating-Current]).to_i
+        xpath(%w[Energy-Rating-Current])&.to_i
       end
 
       def primary_energy_use
@@ -238,19 +238,19 @@ module ViewModel
 
       def impact_of_cavity_insulation
         if xpath(%w[Impact-Of-Cavity-Insulation])
-          xpath(%w[Impact-Of-Cavity-Insulation]).to_i
+          xpath(%w[Impact-Of-Cavity-Insulation])&.to_i
         end
       end
 
       def impact_of_loft_insulation
         if xpath(%w[Impact-Of-Loft-Insulation])
-          xpath(%w[Impact-Of-Loft-Insulation]).to_i
+          xpath(%w[Impact-Of-Loft-Insulation])&.to_i
         end
       end
 
       def impact_of_solid_wall_insulation
         if xpath(%w[Impact-Of-Solid-Wall-Insulation])
-          xpath(%w[Impact-Of-Solid-Wall-Insulation]).to_i
+          xpath(%w[Impact-Of-Solid-Wall-Insulation])&.to_i
         end
       end
 
@@ -275,21 +275,17 @@ module ViewModel
       end
 
       def environmental_impact_current
-        xpath(%w[Environmental-Impact-Current])
+        xpath(%w[Environmental-Impact-Current])&.to_i
       end
 
       def environmental_impact_potential
-        xpath(%w[Environmental-Impact-Potential])
+        xpath(%w[Environmental-Impact-Potential])&.to_i
       end
 
       def co2_emissions_current_per_floor_area
         xpath(%w[CO2-Emissions-Current-Per-Floor-Area])
       end
 
-      def mains_gas
-        nil
-      end
-
       def level
         xpath(%w[Level])
       end
@@ -299,10 +295,6 @@ module ViewModel
         flat_level_code == "3" ? "Y" : "N"
       end
 
-      def storey_count
-        nil
-      end
-
       def main_heating_controls
         xpath(%w[Main-Heating-Controls Description])
       end
@@ -311,32 +303,20 @@ module ViewModel
         xpath(%w[Multiple-Glazed-Percentage])
       end
 
-      def glazed_area
-        nil
-      end
-
-      def habitable_room_count
-        nil
-      end
-
-      def heated_room_count
-        nil
-      end
-
       def low_energy_lighting
         xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Percentage])
       end
 
       def fixed_lighting_outlets_count
-        xpath(%w[Fixed-Lighting-Outlets-Count])
+        xpath(%w[Fixed-Lighting-Outlets-Count])&.to_i
       end
 
       def low_energy_fixed_lighting_outlets_count
-        xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Count])
+        xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Count])&.to_i
       end
 
       def open_fireplaces_count
-        xpath(%w[Open-Fireplaces-Count])
+        xpath(%w[Open-Fireplaces-Count])&.to_i
       end
 
       def hot_water_description
@@ -387,24 +367,12 @@ module ViewModel
         xpath(%w[Lighting Environmental-Efficiency-Rating])
       end
 
-      def photovoltaic_roof_area_percent
-        nil
-      end
-
       def built_form
         xpath(%w[Built-Form])
       end
 
       def wind_turbine_count
-        xpath(%w[Wind-Turbines-Count])
-      end
-
-      def heat_loss_corridor
-        nil
-      end
-
-      def unheated_corridor_length
-        nil
+        xpath(%w[Wind-Turbines-Count])&.to_i
       end
 
       def all_main_heating_descriptions
@@ -451,18 +419,6 @@ module ViewModel
         xpath(%w[SAP-Flat-Details Level])
       end
 
-      def extensions_count
-        nil
-      end
-
-      def solar_water_heating_flag
-        nil
-      end
-
-      def mechanical_ventilation
-        nil
-      end
-
       def floor_height
         @xml_doc.search("Storey-Height").map(&:content)
       end
@@ -522,7 +478,7 @@ module ViewModel
       end
 
       def mech_vent_sys_index_number
-        xpath(%w[Mechanical-Vent-System-Index-Number])
+        xpath(%w[Mechanical-Vent-System-Index-Number])&.to_i
       end
 
       def mechanical_vent_data_source
@@ -536,14 +492,6 @@ module ViewModel
       def ventilation_type
         xpath(%w[Ventilation-Type])
       end
-
-      def gas_smart_meter_present
-        nil
-      end
-
-      def electricity_smart_meter_present
-        nil
-      end
     end
   end
 end

data/lib/view_model/sap_schema_171/common_schema.rb

@@ -85,7 +85,7 @@ module ViewModel
       end
 
       def related_party_disclosure_number
-        xpath(%w[Related-Party-Disclosure-Number]).to_i
+        xpath(%w[Related-Party-Disclosure-Number])&.to_i
       end
 
       def improvements
@@ -159,11 +159,11 @@ module ViewModel
       end
 
       def potential_energy_rating
-        xpath(%w[Energy-Rating-Potential]).to_i
+        xpath(%w[Energy-Rating-Potential])&.to_i
       end
 
       def current_energy_rating
-        xpath(%w[Energy-Rating-Current]).to_i
+        xpath(%w[Energy-Rating-Current])&.to_i
       end
 
       def primary_energy_use
@@ -238,19 +238,19 @@ module ViewModel
 
       def impact_of_cavity_insulation
         if xpath(%w[Impact-Of-Cavity-Insulation])
-          xpath(%w[Impact-Of-Cavity-Insulation]).to_i
+          xpath(%w[Impact-Of-Cavity-Insulation])&.to_i
         end
       end
 
       def impact_of_loft_insulation
         if xpath(%w[Impact-Of-Loft-Insulation])
-          xpath(%w[Impact-Of-Loft-Insulation]).to_i
+          xpath(%w[Impact-Of-Loft-Insulation])&.to_i
         end
       end
 
       def impact_of_solid_wall_insulation
         if xpath(%w[Impact-Of-Solid-Wall-Insulation])
-          xpath(%w[Impact-Of-Solid-Wall-Insulation]).to_i
+          xpath(%w[Impact-Of-Solid-Wall-Insulation])&.to_i
         end
       end
 
@@ -275,21 +275,17 @@ module ViewModel
       end
 
       def environmental_impact_current
-        xpath(%w[Environmental-Impact-Current])
+        xpath(%w[Environmental-Impact-Current])&.to_i
       end
 
       def environmental_impact_potential
-        xpath(%w[Environmental-Impact-Potential])
+        xpath(%w[Environmental-Impact-Potential])&.to_i
       end
 
       def co2_emissions_current_per_floor_area
         xpath(%w[CO2-Emissions-Current-Per-Floor-Area])
       end
 
-      def mains_gas
-        nil
-      end
-
       def level
         xpath(%w[Level])
       end
@@ -299,10 +295,6 @@ module ViewModel
         flat_level_code == "3" ? "Y" : "N"
       end
 
-      def storey_count
-        nil
-      end
-
       def main_heating_controls
         xpath(%w[Main-Heating-Controls Description])
       end
@@ -311,32 +303,20 @@ module ViewModel
         xpath(%w[Multiple-Glazed-Percentage])
       end
 
-      def glazed_area
-        nil
-      end
-
-      def habitable_room_count
-        nil
-      end
-
-      def heated_room_count
-        nil
-      end
-
       def low_energy_lighting
         xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Percentage])
       end
 
       def fixed_lighting_outlets_count
-        xpath(%w[Fixed-Lighting-Outlets-Count])
+        xpath(%w[Fixed-Lighting-Outlets-Count])&.to_i
       end
 
       def low_energy_fixed_lighting_outlets_count
-        xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Count])
+        xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Count])&.to_i
       end
 
       def open_fireplaces_count
-        xpath(%w[Open-Fireplaces-Count])
+        xpath(%w[Open-Fireplaces-Count])&.to_i
       end
 
       def hot_water_description
@@ -356,15 +336,7 @@ module ViewModel
       end
 
       def wind_turbine_count
-        xpath(%w[Wind-Turbines-Count])
-      end
-
-      def heat_loss_corridor
-        nil
-      end
-
-      def unheated_corridor_length
-        nil
+        xpath(%w[Wind-Turbines-Count])&.to_i
       end
 
       def window_energy_efficiency_rating
@@ -399,10 +371,6 @@ module ViewModel
         xpath(%w[Lighting Environmental-Efficiency-Rating])
       end
 
-      def photovoltaic_roof_area_percent
-        nil
-      end
-
       def built_form
         xpath(%w[Built-Form])
       end
@@ -455,18 +423,6 @@ module ViewModel
         @xml_doc.search("Main-Heating/Energy-Efficiency-Rating").map(&:content)
       end
 
-      def extensions_count
-        nil
-      end
-
-      def solar_water_heating_flag
-        nil
-      end
-
-      def mechanical_ventilation
-        nil
-      end
-
       def floor_height
         @xml_doc.search("Storey-Height").map(&:content)
       end
@@ -522,7 +478,7 @@ module ViewModel
       end
 
       def mech_vent_sys_index_number
-        xpath(%w[Mechanical-Vent-System-Index-Number])
+        xpath(%w[Mechanical-Vent-System-Index-Number])&.to_i
       end
 
       def mechanical_vent_data_source
@@ -536,14 +492,6 @@ module ViewModel
       def ventilation_type
         xpath(%w[Ventilation-Type])
       end
-
-      def gas_smart_meter_present
-        nil
-      end
-
-      def electricity_smart_meter_present
-        nil
-      end
     end
   end
 end