epb_view_models 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44f53edb23a539cbc882b65a1ce15baff6f2ab918f565d41918c433622adda46
-  data.tar.gz: fab418244814328f957fcd9539804fdf794cea1b5622be8d3a8278e216abe971
+  metadata.gz: e03d792aa7f6ff2b47d3529c2557bd909b25e23ad5b5664a070230d1a713b2e6
+  data.tar.gz: 79ffc8207ef134924f564e1172444a592dfa9037b265c369264b3e94b64ce595
 SHA512:
-  metadata.gz: 637f1a23d81cb624d8128bfd229a20e3c2db0aae8f50a2704877796dbe64a40756bc015752f92ccea3d4d785598b1640156c0dd5dba02075cf8160f9c4479407
-  data.tar.gz: 0cb4ea6c12754f37fe81a10eecdcb849865fe85383bc74fbd62746e6ad62157f0bc688409eb2c6a766c6821f8ee6b90ca04aef459ae28d4df5d21fef1207d535
+  metadata.gz: '091f3695640add37cf4d5b25e208fb2d3acaac429e1983ff26681eb4510fd7952b8ef09d4341ab350edee3a4c39612aab543788a163185868d931ae82b3b23e4'
+  data.tar.gz: 6a6f1a69c7ecdffbee104ce37a89d3c8150ebdbe052cd33acd8ddce4d97372f8b590901970236a8e88dafb9bd2bc5d9ea789c20685436fe12e02741837d4b3d7

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

data/lib/presenter/cepc/certificate_summary.rb

@@ -93,13 +93,15 @@ module Presenter
           potential_energy_rating: @view_model.potential_energy_rating,
           current_energy_efficiency_band: @view_model.current_energy_efficiency_band,
           potential_energy_band: @view_model.potential_energy_band,
-          new_build_benchmark_rating: @view_model.new_build_benchmark_rating,
+          new_build_benchmark_rating: @view_model.new_build_rating,
           new_build_benchmark_band: @view_model.new_build_benchmark_band,
           comparative_asset_rating: @view_model.comparative_asset_rating,
           epc_rating_ber: @view_model.epc_rating_ber,
           approximate_energy_use: @view_model.approximate_energy_use,
-          property_type: @view_model.property_type,
-          property_short_description: @view_model.property_short_description,
+          property_type: {
+            property_type_long_description: @view_model.property_long_description,
+            property_type_short_description: @view_model.property_short_description,
+          },
           compliant_2002: @view_model.compliant_2002,
           renewable_energy_sources: @view_model.renewable_energy_sources,
           electricity_sources: @view_model.electricity_sources,

data/lib/presenter/dec/certificate_summary.rb

@@ -0,0 +1,91 @@
+module Presenter
+  module Dec
+    class CertificateSummary
+      TYPE_OF_ASSESSMENT = "DEC".freeze
+
+      def initialize(view_model, schema_type)
+        @view_model = view_model
+        @schema_type = schema_type.to_s
+      end
+
+      def to_hash
+        {
+          assessment_id: @view_model.assessment_id,
+          date_of_assessment: @view_model.date_of_assessment,
+          date_of_expiry: @view_model.date_of_expiry,
+          date_of_registration: @view_model.date_of_registration,
+          address: {
+            address_id: @view_model.address_id,
+            address_line1: @view_model.address_line1,
+            address_line2: @view_model.address_line2,
+            address_line3: @view_model.address_line3,
+            address_line4: @view_model.address_line4,
+            town: @view_model.town,
+            postcode: @view_model.postcode,
+          },
+          type_of_assessment: TYPE_OF_ASSESSMENT,
+          schema_version: @schema_type.gsub(/[a-zA-Z-]/, "").to_f,
+          report_type: @view_model.report_type,
+          current_assessment: {
+            date: @view_model.current_assessment_date,
+            energy_efficiency_rating: @view_model.energy_efficiency_rating,
+            energy_efficiency_band: Helper::EnergyBandCalculator.commercial(@view_model.energy_efficiency_rating),
+            heating_co2: @view_model.current_heating_co2,
+            electricity_co2: @view_model.current_electricity_co2,
+            renewables_co2: @view_model.current_renewables_co2,
+          },
+          year1_assessment: {
+            date: @view_model.year1_assessment_date,
+            energy_efficiency_rating: @view_model.year1_energy_efficiency_rating,
+            energy_efficiency_band: Helper::EnergyBandCalculator.commercial(@view_model.year1_energy_efficiency_rating),
+            heating_co2: @view_model.year1_heating_co2,
+            electricity_co2: @view_model.year1_electricity_co2,
+            renewables_co2: @view_model.year1_renewables_co2,
+          },
+          year2_assessment: {
+            date: @view_model.year2_assessment_date,
+            energy_efficiency_rating: @view_model.year2_energy_efficiency_rating,
+            energy_efficiency_band:
+              Helper::EnergyBandCalculator.commercial(@view_model.year2_energy_efficiency_rating),
+            heating_co2: @view_model.year2_heating_co2,
+            electricity_co2: @view_model.year2_electricity_co2,
+            renewables_co2: @view_model.year2_renewables_co2,
+          },
+          technical_information: {
+            main_heating_fuel: @view_model.main_heating_fuel,
+            building_environment: @view_model.building_environment,
+            floor_area: @view_model.floor_area,
+            occupier: @view_model.occupier,
+            asset_rating: @view_model.asset_rating,
+            annual_energy_use_fuel_thermal:
+              @view_model.annual_energy_use_fuel_thermal,
+            annual_energy_use_electrical:
+              @view_model.annual_energy_use_electrical,
+            typical_thermal_use: @view_model.typical_thermal_use,
+            typical_electrical_use: @view_model.typical_electrical_use,
+            renewables_fuel_thermal: @view_model.renewables_fuel_thermal,
+            renewables_electrical: @view_model.renewables_electrical,
+          },
+          assessor: {
+            scheme_assessor_id: @view_model.scheme_assessor_id,
+            name: @view_model.assessor_name,
+            company_details: {
+              name: @view_model.company_name,
+              address: @view_model.company_address,
+            },
+            contact_details: {
+              email: @view_model.assessor_email,
+              telephone: @view_model.assessor_telephone,
+            },
+          },
+          administrative_information: {
+            issue_date: @view_model.date_of_issue,
+            calculation_tool: @view_model.calculation_tool,
+            related_party_disclosure: @view_model.dec_related_party_disclosure,
+            related_rrn: @view_model.related_rrn,
+          },
+        }
+      end
+    end
+  end
+end

data/lib/presenter/dec_rr/certificate_summary.rb

@@ -0,0 +1,62 @@
+module Presenter
+  module DecRr
+    class CertificateSummary
+      def initialize(view_model)
+        @view_model = view_model
+      end
+
+      def to_hash
+        {
+          type_of_assessment: @view_model&.type_of_assessment,
+          assessment_id: @view_model.assessment_id,
+          report_type: @view_model.report_type,
+          date_of_assessment: @view_model.date_of_assessment,
+          date_of_registration: @view_model.date_of_registration,
+          date_of_expiry: @view_model.date_of_expiry,
+          address: {
+            address_id: @view_model.address_id,
+            address_line1: @view_model.address_line1,
+            address_line2: @view_model.address_line2,
+            address_line3: @view_model.address_line3,
+            address_line4: @view_model.address_line4,
+            town: @view_model.town,
+            postcode: @view_model.postcode,
+          },
+          assessor: {
+            scheme_assessor_id: @view_model.scheme_assessor_id,
+            name: @view_model.assessor_name,
+            company_details: {
+              name: @view_model.company_name,
+              address: @view_model.company_address,
+            },
+            contact_details: {
+              email: @view_model.assessor_email,
+              telephone: @view_model.assessor_telephone,
+            },
+          },
+          short_payback_recommendations:
+            @view_model.short_payback_recommendations,
+          medium_payback_recommendations:
+            @view_model.medium_payback_recommendations,
+          long_payback_recommendations: @view_model.long_payback_recommendations,
+          other_recommendations: @view_model.other_recommendations,
+          technical_information: {
+            building_environment: @view_model.building_environment,
+            floor_area: @view_model.floor_area,
+            occupier: @view_model.occupier,
+            property_type: @view_model.property_type,
+            renewable_sources: @view_model.renewable_sources,
+            discounted_energy: @view_model.discounted_energy,
+            date_of_issue: @view_model.date_of_issue,
+            calculation_tool: @view_model.calculation_tool,
+            inspection_type: @view_model.inspection_type,
+          },
+          site_service_one: @view_model.site_service_one,
+          site_service_two: @view_model.site_service_two,
+          site_service_three: @view_model.site_service_three,
+          related_rrn: @view_model.related_rrn,
+        }
+      end
+    end
+  end
+end

data/lib/presenter/rd_sap/certificate_summary.rb

@@ -32,6 +32,8 @@ module Presenter
           assessor: {
             scheme_assessor_id: @view_model.scheme_assessor_id,
             name: @view_model.assessor_name,
+            assessor_contact_address: @view_model.assessor_contact_address,
+            company_name: @view_model.company_name,
             contact_details: {
               email: @view_model.assessor_email,
               telephone: @view_model.assessor_telephone,
@@ -39,6 +41,7 @@ module Presenter
           },
           current_carbon_emission:
             convert_to_big_decimal(@view_model.current_carbon_emission),
+          carbon_emissions_current_per_floor_area: @view_model.co2_emissions_current_per_floor_area,
           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,

data/lib/presenter/sap/certificate_summary.rb

@@ -29,6 +29,8 @@ module Presenter
           assessor: {
             scheme_assessor_id: @view_model.scheme_assessor_id,
             name: @view_model.assessor_name,
+            assessor_contact_address: @view_model.assessor_contact_address,
+            company_name: @view_model.company_name,
             contact_details: {
               email: @view_model.assessor_email,
               telephone: @view_model.assessor_telephone,
@@ -36,6 +38,7 @@ module Presenter
           },
           current_carbon_emission:
             convert_to_big_decimal(@view_model.current_carbon_emission),
+          carbon_emissions_current_per_floor_area: @view_model.co2_emissions_current_per_floor_area,
           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,

data/lib/view_model/cepc_s_71/cepc.rb

@@ -20,23 +20,19 @@ module ViewModel
       end
 
       def potential_energy_rating
-        xpath(%w[Potential-Rating])
+        xpath(%w[Potential-Rating])&.to_i
       end
 
       def potential_energy_band
         xpath(%w[Potential-Band])
       end
 
-      def new_build_benchmark_rating
-        xpath(%w[New-Build-Benchmark])
-      end
-
       def new_build_benchmark_band
         xpath(%w[New-Build-Benchmark-Band])
       end
 
       def comparative_asset_rating
-        xpath(%w[Comparative-Asset-Rating])
+        xpath(%w[Comparative-Asset-Rating])&.to_i
       end
 
       def comparative_asset_band
@@ -44,11 +40,11 @@ module ViewModel
       end
 
       def epc_rating_ber
-        xpath(%w[BER])
+        xpath(%w[BER])&.to_f
       end
 
       def approximate_energy_use
-        xpath(%w[Approximate-Energy-Use])
+        xpath(%w[Approximate-Energy-Use])&.to_i
       end
 
       def floor_area
@@ -60,7 +56,11 @@ module ViewModel
       end
 
       def property_type
-        xpath(%w[Property-Type])
+        xpath(%w[Property-Type Long-Description])
+      end
+
+      def property_long_description
+        xpath(%w[Property-Type Long-Description])
       end
 
       def property_short_description
@@ -72,15 +72,15 @@ module ViewModel
       end
 
       def renewable_energy_sources
-        @xml_doc.search("Renewable-Energy-Sources").map(&:content)
+        @xml_doc.search("Renewable-Energy-Sources").children.search("Renewable-Energy-Source").map(&:content)
       end
 
       def electricity_sources
-        @xml_doc.search("Electricity-Sources").map(&:content)
+        @xml_doc.search("Electricity-Sources").children.search("Electricity-Source").map(&:content)
       end
 
       def primary_energy_indicator
-        xpath(%w[Primary-Energy-Indicator])
+        xpath(%w[Primary-Energy-Indicator])&.to_i
       end
 
       def calculation_tool
@@ -88,15 +88,11 @@ module ViewModel
       end
 
       def ter_2002
-        xpath(%w[TER-2002])
+        xpath(%w[TER-2002])&.to_f
       end
 
       def ter
-        xpath(%w[TER])
-      end
-
-      def renewable_sources
-        xpath(%w[Renewable-Sources])
+        xpath(%w[TER])&.to_f
       end
 
       def recommendations(payback = "")

data/lib/view_model/dec_rr_wrapper.rb

@@ -6,6 +6,7 @@ module ViewModel
       @view_model = build_view_model(xml_doc, schema_type)
       @summary = Presenter::DecRr::Summary.new(view_model)
       @recommendation_report = Presenter::DecRr::RecommendationReport.new(view_model)
+      @certificate_summary = Presenter::DecRr::CertificateSummary.new(view_model)
     end
 
     def type
@@ -21,6 +22,10 @@ module ViewModel
       @recommendation_report.to_hash
     end
 
+    def to_certificate_summary
+      @certificate_summary.to_hash
+    end
+
     def get_view_model
       view_model
     end

data/lib/view_model/dec_wrapper.rb

@@ -6,6 +6,7 @@ module ViewModel
       @view_model = build_view_model(xml_doc, schema_type)
       @summary = Presenter::Dec::Summary.new(view_model, schema_type)
       @report = Presenter::Dec::Report.new(view_model, additional_data)
+      @certificate_summary = Presenter::Dec::CertificateSummary.new(view_model, schema_type)
     end
 
     def type
@@ -22,6 +23,10 @@ module ViewModel
       @report.to_hash
     end
 
+    def to_certificate_summary
+      @certificate_summary.to_hash
+    end
+
     def get_view_model
       view_model
     end

data/lib/view_model/domestic_epc_view_model.rb

@@ -64,6 +64,20 @@ module ViewModel
       xpath(%w[Main-Heating-Category])
     end
 
+    def assessor_contact_address
+      address = xpath(%w[Energy-Assessor Contact-Address]).nil? ? xpath(%w[Home-Inspector Contact-Address]) : xpath(%w[Energy-Assessor Contact-Address])
+      format_address = address&.split("\n")&.map(&:strip)
+      format_address&.reject(&:empty?)&.join(", ")
+    end
+
+    def company_name
+      xpath(%w[Company-Name])
+    end
+
+    def co2_emissions_current_per_floor_area
+      xpath(%w[CO2-Emissions-Current-Per-Floor-Area])
+    end
+
   private
 
     def fetch_addendum_numbers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epb_view_models
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - MHCLG Energy Performance of Buildings
@@ -1590,10 +1590,12 @@ files:
 - lib/presenter/cs63/certificate_summary.rb
 - lib/presenter/cs63/export_configuration.rb
 - lib/presenter/cs63/summary.rb
+- lib/presenter/dec/certificate_summary.rb
 - lib/presenter/dec/export_configuration.rb
 - lib/presenter/dec/report.rb
 - lib/presenter/dec/summary.rb
 - lib/presenter/dec/xml_summary.rb
+- lib/presenter/dec_rr/certificate_summary.rb
 - lib/presenter/dec_rr/export_configuration.rb
 - lib/presenter/dec_rr/recommendation_report.rb
 - lib/presenter/dec_rr/summary.rb