epb_view_models 2.2.7 → 2.2.8

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

data/lib/presenter/cepc/certificate_summary.rb

@@ -63,9 +63,9 @@ module Presenter
           date_of_registration: @view_model.date_of_registration,
           address: {
             address_line1: @view_model.address_line1,
-            address_line2: @view_model.address_line2,
-            address_line3: @view_model.address_line3,
-            address_line4: @view_model.address_line4,
+            address_line2: @view_model.address_line2.to_s,
+            address_line3: @view_model.address_line3.to_s,
+            address_line4: @view_model.address_line4.to_s,
             town: @view_model.town,
             postcode: @view_model.postcode,
           },

data/lib/presenter/dec/certificate_summary.rb

@@ -8,7 +8,7 @@ module Presenter
         @schema_type = schema_type.to_s
       end
 
-      def to_hash
+      def to_certificate_summary
         {
           assessment_id: @view_model.assessment_id,
           date_of_assessment: @view_model.date_of_assessment,
@@ -24,7 +24,7 @@ module Presenter
             postcode: @view_model.postcode,
           },
           type_of_assessment: TYPE_OF_ASSESSMENT,
-          schema_version: @schema_type.gsub(/[a-zA-Z-]/, "").to_f,
+          schema_version: @schema_type.gsub(/[a-zA-Z-]/, ""),
           report_type: @view_model.report_type,
           current_assessment: {
             date: @view_model.current_assessment_date,

data/lib/presenter/dec_rr/certificate_summary.rb

@@ -5,7 +5,7 @@ module Presenter
         @view_model = view_model
       end
 
-      def to_hash
+      def to_certificate_summary
         {
           type_of_assessment: @view_model&.type_of_assessment,
           assessment_id: @view_model.assessment_id,

data/lib/presenter/rd_sap/certificate_summary.rb

@@ -25,7 +25,7 @@ module Presenter
             address_line1: @view_model.address_line1,
             address_line2: @view_model.address_line2,
             address_line3: @view_model.address_line3,
-            address_line4: nil,
+            address_line4: "",
             town: @view_model.town,
             postcode: @view_model.postcode,
           },

data/lib/presenter/sap/certificate_summary.rb

@@ -22,7 +22,7 @@ module Presenter
             address_line1: @view_model.address_line1,
             address_line2: @view_model.address_line2,
             address_line3: @view_model.address_line3,
-            address_line4: nil,
+            address_line4: "",
             town: @view_model.town,
             postcode: @view_model.postcode,
           },

data/lib/view_model/dec_rr_wrapper.rb

@@ -23,7 +23,7 @@ module ViewModel
     end
 
     def to_certificate_summary
-      @certificate_summary.to_hash
+      @certificate_summary.to_certificate_summary
     end
 
     def get_view_model

data/lib/view_model/dec_wrapper.rb

@@ -24,7 +24,7 @@ module ViewModel
     end
 
     def to_certificate_summary
-      @certificate_summary.to_hash
+      @certificate_summary.to_certificate_summary
     end
 
     def get_view_model

data/lib/view_model/decar_s_70/dec.rb

@@ -88,7 +88,7 @@ module ViewModel
       end
 
       def floor_area
-        xpath(%w[Technical-Information Floor-Area])
+        xpath(%w[Technical-Information Floor-Area])&.to_f
       end
 
       def asset_rating
@@ -96,27 +96,27 @@ module ViewModel
       end
 
       def annual_energy_use_fuel_thermal
-        xpath(%w[Annual-Energy-Use-Fuel-Thermal])
+        xpath(%w[Annual-Energy-Use-Fuel-Thermal])&.to_i
       end
 
       def annual_energy_use_electrical
-        xpath(%w[DEC-Annual-Energy-Summary Annual-Energy-Use-Electrical])
+        xpath(%w[DEC-Annual-Energy-Summary Annual-Energy-Use-Electrical])&.to_i
       end
 
       def typical_thermal_use
-        xpath(%w[DEC-Annual-Energy-Summary Typical-Thermal-Use])
+        xpath(%w[DEC-Annual-Energy-Summary Typical-Thermal-Use])&.to_i
       end
 
       def typical_electrical_use
-        xpath(%w[DEC-Annual-Energy-Summary Typical-Electrical-Use])
+        xpath(%w[DEC-Annual-Energy-Summary Typical-Electrical-Use])&.to_i
       end
 
       def renewables_fuel_thermal
-        xpath(%w[DEC-Annual-Energy-Summary Renewables-Fuel-Thermal])
+        xpath(%w[DEC-Annual-Energy-Summary Renewables-Fuel-Thermal])&.to_i
       end
 
       def renewables_electrical
-        xpath(%w[DEC-Annual-Energy-Summary Renewables-Electrical])
+        xpath(%w[DEC-Annual-Energy-Summary Renewables-Electrical])&.to_i
       end
 
       def dec_status

data/lib/view_model/decar_s_70/dec_rr.rb

@@ -38,7 +38,7 @@ module ViewModel
         {
           description:
             @xml_doc.at("Site-Services/#{service}/Description").content,
-          quantity: @xml_doc.at("Site-Services/#{service}/Quantity").content,
+          quantity: @xml_doc.at("Site-Services/#{service}/Quantity").content&.to_i,
         }
       end
 
@@ -71,7 +71,7 @@ module ViewModel
       end
 
       def floor_area
-        xpath(%w[Advisory-Report Technical-Information Floor-Area])
+        xpath(%w[Advisory-Report Technical-Information Floor-Area])&.to_f
       end
 
       def building_environment

data/lib/view_model/rd_sap_schema_s_190/common_schema.rb

@@ -238,11 +238,11 @@ module ViewModel
       end
 
       def primary_energy_use
-        xpath(%w[Energy-Consumption-Current])
+        xpath(%w[Energy-Consumption-Current])&.to_f
       end
 
       def energy_consumption_potential
-        xpath(%w[Energy-Consumption-Potential])
+        xpath(%w[Energy-Consumption-Potential])&.to_f
       end
 
       def all_roof_descriptions
@@ -308,7 +308,7 @@ module ViewModel
       end
 
       def co2_emissions_current_per_floor_area
-        xpath(%w[CO2-Emissions-Current-Per-Floor-Area])
+        xpath(%w[CO2-Emissions-Current-Per-Floor-Area])&.to_f
       end
 
       def mains_gas

data/lib/view_model/sap_schema_s_1900/common_schema.rb

@@ -171,17 +171,17 @@ module ViewModel
       end
 
       def primary_energy_use
-        xpath(%w[Energy-Consumption-Current])
+        xpath(%w[Energy-Consumption-Current])&.to_f
       end
 
       def energy_consumption_potential
-        xpath(%w[Energy-Consumption-Potential])
+        xpath(%w[Energy-Consumption-Potential])&.to_f
       end
 
       def estimated_energy_cost; end
 
       def total_floor_area
-        xpath(%w[Property-Summary Total-Floor-Area])&.to_i
+        xpath(%w[Property-Summary Total-Floor-Area])&.to_f
       end
 
       def total_roof_area
@@ -352,7 +352,7 @@ module ViewModel
       end
 
       def co2_emissions_current_per_floor_area
-        xpath(%w[CO2-Emissions-Current-Per-Floor-Area])
+        xpath(%w[CO2-Emissions-Current-Per-Floor-Area])&.to_f
       end
 
       def main_heating_controls

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epb_view_models
 version: !ruby/object:Gem::Version
-  version: 2.2.7
+  version: 2.2.8
 platform: ruby
 authors:
 - MHCLG Energy Performance of Buildings