epb_view_models 2.0.3 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 768d1bc10b159343564b8a6a1d9b7392798195b2d98f9657744466cc378bcce7
-  data.tar.gz: d63ea784d42ac5f2e9740a36001f6695010c08c776c75d39701b9f3ca61022e8
+  metadata.gz: 6e37a534e069f0cce99aa4c94a5e819e4c95cae08ab7bac23a3d9e275d70f4ae
+  data.tar.gz: b0caa2877b0671963f6161c235a99011239d341de4819d27a78631cab6e7df40
 SHA512:
-  metadata.gz: 5a988e042c962e0d0f12da4be1b2cc52a60a79fb581cddaa43ff897af2ab8ed9b182d56b97397785490924a5c033f4cddfc4ec17bcda35d42bbf7092cbe003e1
-  data.tar.gz: 407b7f502348d6b181d44027ce7db28420da8e1c6ea1cbd1508ed60c9fc5f364c3f71f530d82918ea24e62a25f4f1020ce3ec6e6a45e09157484af31c2bc24be
+  metadata.gz: aecff0311df24627d53c49edab0de44c2dbafec75f54282da82a1a21a73a0f630c06971a28fde0924b890bf4420a0dd0028aad1963734b5cd9fc4b2dd6969dcd
+  data.tar.gz: 1756934eace6db26256901e75241744a1d106f3c5e3604fb9e65e64e13e5b9a83485bfa493b40ed633f1418fd7fbf598cd2a622e6d4739cd906b7393bf679443

data/.ruby-version

@@ -1 +1 @@
-3.1.3
+3.3.4

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-ruby ">=2.7", "<3.2"
+ruby "3.3.4"
 
 source "https://rubygems.org"
 
@@ -10,6 +10,6 @@ group :test do
   gem "rubocop-govuk", "~> 4.7.0", require: false
 end
 
-gem "nokogiri", "~> 1.16"
-gem "rexml", "~> 3.2", ">= 3.2.5"
+gem "nokogiri", "~> 1.16", ">= 1.16.5"
+gem "rexml", ">= 3.3.9"
 gem "zeitwerk", "~> 2.6"

data/Gemfile.lock

@@ -21,11 +21,9 @@ GEM
     i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     json (2.7.1)
-    mini_portile2 (2.8.5)
     minitest (5.22.2)
     mutex_m (0.2.0)
-    nokogiri (1.16.2)
-      mini_portile2 (~> 2.8.2)
+    nokogiri (1.18.1-arm64-darwin)
       racc (~> 1.4)
     parallel (1.24.0)
     parser (3.3.0.5)
@@ -36,7 +34,7 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.9.0)
-    rexml (3.2.6)
+    rexml (3.4.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -86,15 +84,15 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  nokogiri (~> 1.16)
+  nokogiri (~> 1.16, >= 1.16.5)
   rake (~> 13.0.6)
-  rexml (~> 3.2, >= 3.2.5)
+  rexml (>= 3.3.9)
   rspec (~> 3.0)
   rubocop-govuk (~> 4.7.0)
   zeitwerk (~> 2.6)
 
 RUBY VERSION
-   ruby 2.7.5p203
+   ruby 3.3.4p94
 
 BUNDLED WITH
    2.3.15

data/api/schemas/xml/RdSAP-Schema-21.0.0/RdSAP/ExternalDefinitions.xml

@@ -458,8 +458,8 @@
     </Recommendation>
     <Recommendation>
       <Improvement-Number>59</Improvement-Number>
-      <Improvement-Summary language="1">High heat retention storage heaters and dual immersion cylinder</Improvement-Summary>
-      <Improvement-Summary language="2">Gwresogyddion storio sy’n cadw llawer o wres a silindr sydd â dau dwymwr tanddwr</Improvement-Summary>
+      <Improvement-Summary language="1">High heat retention storage heaters and dual immersion cylinder and dual rate meter<</Improvement-Summary>
+      <Improvement-Summary language="2">Gwresogyddion storio sy’n cadw llawer o wres a silindr sydd â dau dwymwr tanddwr a mesurydd cyfradd ddeuol</Improvement-Summary>
       <Improvement-Heading language="1">High heat retention storage heaters</Improvement-Heading>
       <Improvement-Heading language="2">Gwresogyddion storio sy’n cadw llawer o wres</Improvement-Heading>
       <Improvement-Description language="1">High heat retention storage heaters</Improvement-Description>
@@ -476,8 +476,8 @@
     </Recommendation>
     <Recommendation>
       <Improvement-Number>61</Improvement-Number>
-      <Improvement-Summary language="1">High heat retention storage heaters and dual immersion cylinder</Improvement-Summary>
-      <Improvement-Summary language="2">Gwresogyddion storio sy’n cadw llawer o wres a silindr sydd â dau dwymwr tanddwr</Improvement-Summary>
+      <Improvement-Summary language="1">High heat retention storage heaters and dual immersion cylinder and dual rate meter</Improvement-Summary>
+      <Improvement-Summary language="2">Gwresogyddion storio sy’n cadw llawer o wres a silindr sydd â dau dwymwr tanddwr a mesurydd cyfradd ddeuol</Improvement-Summary>
       <Improvement-Heading language="1">High heat retention storage heaters</Improvement-Heading>
       <Improvement-Heading language="2">Gwresogyddion storio sy’n cadw llawer o wres</Improvement-Heading>
       <Improvement-Description language="1">High heat retention storage heaters</Improvement-Description>
@@ -485,8 +485,8 @@
     </Recommendation>
     <Recommendation>
       <Improvement-Number>62</Improvement-Number>
-      <Improvement-Summary language="1">High heat retention storage heaters</Improvement-Summary>
-      <Improvement-Summary language="2">Gwresogyddion storio sy’n cadw llawer o wres</Improvement-Summary>
+      <Improvement-Summary language="1">High heat retention storage heaters and dual rate meter</Improvement-Summary>
+      <Improvement-Summary language="2">Gwresogyddion storio sy’n cadw llawer o wres a mesurydd cyfradd ddeuol</Improvement-Summary>
       <Improvement-Heading language="1">High heat retention storage heaters</Improvement-Heading>
       <Improvement-Heading language="2">Gwresogyddion storio sy’n cadw llawer o wres</Improvement-Heading>
       <Improvement-Description language="1">High heat retention storage heaters</Improvement-Description>

data/api/schemas/xml/RdSAP-Schema-21.0.0/RdSAP/Templates/EPC-CollectedData.xsd

@@ -167,7 +167,7 @@ This is actually the type differentiator for Property but only a limited number
                     <xs:documentation>Mechanical ventilation duct insulation; if MVHR from PCDB.</xs:documentation>
                 </xs:annotation>
             </xs:element>
-            <xs:element name="Mechanical-Ventilation-Duct-Insulation" type="SAP-DuctInsulationCode" minOccurs="0">
+            <xs:element name="Mechanical-Vent-Duct-Insulation" type="SAP-DuctInsulationCode" minOccurs="0">
                 <xs:annotation>
                     <xs:documentation>Relevant when mechanical ventilation system is from PCDB.</xs:documentation>
                 </xs:annotation>
@@ -441,7 +441,12 @@ For the purpose of calculating the overall Energy Assessment for the property de
                 </xs:annotation>
             </xs:element>
             <xs:element name="SAP-Room-In-Roof" type="SAP-Room-In-Roof" minOccurs="0"/>
-            <xs:element name="SAP-Alternative-Wall" type="SAP-Alternative-Wall" minOccurs="0">
+            <xs:element name="SAP-Alternative-Wall-1" type="SAP-Alternative-Wall" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>Included only for building parts that have an alternative wall</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="SAP-Alternative-Wall-2" type="SAP-Alternative-Wall" minOccurs="0">
                 <xs:annotation>
                     <xs:documentation>Included only for building parts that have an alternative wall</xs:documentation>
                 </xs:annotation>
@@ -452,7 +457,6 @@ For the purpose of calculating the overall Energy Assessment for the property de
     <xs:element name="SAP-Alternative-Wall" type="SAP-Alternative-Wall"/>
     <xs:complexType name="SAP-Alternative-Wall">
         <xs:all>
-            <xs:element name="Alternative-Wall-Number" type="AlternativeWallCount"/>
             <xs:element name="Wall-Construction" type="WallConstructionCode"/>
             <xs:element name="Wall-Insulation-Type" type="WallInsulationCode"/>
             <xs:element name="Wall-Area" type="Measurement"/>

data/api/schemas/xml/RdSAP-Schema-21.0.0/RdSAP/UDT/SAP-Domains.xsd

@@ -2008,11 +2008,6 @@ Northern Ireland: 2014 onwards (TBA)</xs:documentation>
                     <xs:documentation>125mm</xs:documentation>
                 </xs:annotation>
             </xs:enumeration>
-            <xs:enumeration value="125mm">
-                <xs:annotation>
-                    <xs:documentation>125mm</xs:documentation>
-                </xs:annotation>
-            </xs:enumeration>
             <xs:enumeration value="150mm">
                 <xs:annotation>
                     <xs:documentation>150mm</xs:documentation>
@@ -2182,12 +2177,6 @@ Northern Ireland: 2014 onwards (TBA)</xs:documentation>
             <xs:maxInclusive value="4"/>
         </xs:restriction>
     </xs:simpleType>
-    <xs:simpleType name="AlternativeWallCount">
-        <xs:restriction base="xs:integer">
-            <xs:minInclusive value="1"/>
-            <xs:maxInclusive value="2"/>
-        </xs:restriction>
-    </xs:simpleType>
     <xs:simpleType name="SAP-OpeningDataSourceCode">
         <xs:restriction base="xs:integer">
             <xs:enumeration value="2">

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

data/lib/presenter/sap/certificate_details.rb

@@ -0,0 +1,153 @@
+module Presenter
+  module Sap
+    class CertificateDetails
+      def initialize(view_model)
+        @view_model = view_model
+      end
+
+      def to_hash
+        estimated_energy_cost =
+          Helper::EstimatedCostPotentialSavingHelper.new.estimated_cost(
+            @view_model.heating_cost_current,
+            @view_model.hot_water_cost_current,
+            @view_model.lighting_cost_current,
+          )
+        {
+          type_of_assessment: @view_model.type_of_assessment,
+          assessment_id: @view_model.assessment_id,
+          date_of_expiry: @view_model.date_of_expiry,
+          date_of_assessment: @view_model.date_of_assessment,
+          date_of_registration: @view_model.date_of_registration,
+          date_registered: @view_model.date_of_registration,
+          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: nil,
+          town: @view_model.town,
+          postcode: @view_model.postcode,
+          assessor: {
+            scheme_assessor_id: @view_model.scheme_assessor_id,
+            name: @view_model.assessor_name,
+            contact_details: {
+              email: @view_model.assessor_email,
+              telephone: @view_model.assessor_telephone,
+            },
+          },
+          current_carbon_emission:
+            convert_to_big_decimal(@view_model.current_carbon_emission),
+          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,
+          estimated_energy_cost:,
+          main_fuel_type: @view_model.main_fuel_type,
+          heat_demand: {
+            current_space_heating_demand:
+              @view_model.current_space_heating_demand&.to_i,
+            current_water_heating_demand:
+              @view_model.current_water_heating_demand&.to_i,
+            impact_of_cavity_insulation: @view_model.respond_to?(:impact_of_cavity_insulation) ? @view_model.impact_of_cavity_insulation : nil,
+            impact_of_loft_insulation: @view_model.respond_to?(:impact_of_loft_insulation) ? @view_model.impact_of_loft_insulation : nil,
+            impact_of_solid_wall_insulation: @view_model.respond_to?(:impact_of_solid_wall_insulation) ? @view_model.impact_of_solid_wall_insulation : nil,
+          },
+          heating_cost_current: @view_model.heating_cost_current,
+          heating_cost_potential: @view_model.heating_cost_potential,
+          hot_water_cost_current: @view_model.hot_water_cost_current,
+          hot_water_cost_potential: @view_model.hot_water_cost_potential,
+          lighting_cost_current: @view_model.lighting_cost_current,
+          lighting_cost_potential: @view_model.lighting_cost_potential,
+          potential_carbon_emission:
+            convert_to_big_decimal(@view_model.potential_carbon_emission),
+          potential_energy_efficiency_band: Helper::EnergyBandCalculator.domestic(@view_model.potential_energy_rating),
+          potential_energy_efficiency_rating: @view_model.potential_energy_rating,
+          potential_energy_saving:
+            Helper::EstimatedCostPotentialSavingHelper.new.potential_saving(
+              @view_model.heating_cost_potential,
+              @view_model.hot_water_cost_potential,
+              @view_model.lighting_cost_potential,
+              estimated_energy_cost,
+            ),
+          primary_energy_use: @view_model.respond_to?(:primary_energy_use) ? @view_model.primary_energy_use : nil,
+          energy_consumption_potential: @view_model.energy_consumption_potential,
+          property_age_band: @view_model.respond_to?(:property_age_band) ? @view_model.property_age_band : nil,
+          property_summary: @view_model.property_summary,
+          recommended_improvements:
+            @view_model.improvements.map do |improvement|
+              improvement[:energy_performance_band_improvement] =
+                Helper::EnergyBandCalculator.domestic(improvement[:energy_performance_rating_improvement])
+              improvement
+            end,
+          lzc_energy_sources: @view_model.lzc_energy_sources,
+          related_party_disclosure_number: @view_model.respond_to?(:related_party_disclosure_number) ? @view_model.related_party_disclosure_number : nil,
+          related_party_disclosure_text:
+            @view_model.related_party_disclosure_text,
+          tenure: @view_model.respond_to?(:tenure) ? @view_model.tenure : nil,
+          transaction_type: @view_model.respond_to?(:transaction_type) ? @view_model.transaction_type : nil,
+          total_floor_area: convert_to_big_decimal(@view_model.total_floor_area),
+          total_roof_area: @view_model.respond_to?(:total_roof_area) ? @view_model.total_roof_area : nil,
+          status: @view_model.status,
+          environmental_impact_current: @view_model.environmental_impact_current,
+          environmental_impact_potential:
+            @view_model.environmental_impact_potential,
+          co2_emissions_current_per_floor_area:
+            @view_model.co2_emissions_current_per_floor_area,
+          mains_gas: @view_model.respond_to?(:mains_gas) ? @view_model.mains_gas : nil,
+          level: @view_model.level,
+          top_storey: @view_model.top_storey,
+          storey_count: @view_model.respond_to?(:storey_count) ? @view_model.storey_count : nil,
+          main_heating_controls: @view_model.main_heating_controls,
+          multiple_glazed_proportion: @view_model.respond_to?(:multiple_glazed_proportion) ? @view_model.multiple_glazed_proportion : nil,
+          glazed_area: @view_model.respond_to?(:glazed_area) ? @view_model.glazed_area : nil,
+          habitable_room_count: @view_model.respond_to?(:habitable_room_count) ? @view_model.habitable_room_count : nil,
+          heated_room_count: @view_model.respond_to?(:heated_room_count) ? @view_model.heated_room_count : nil,
+          low_energy_lighting: @view_model.respond_to?(:low_energy_lighting) ? @view_model.low_energy_lighting : nil,
+          fixed_lighting_outlets_count: @view_model.respond_to?(:fixed_lighting_outlets_count) ? @view_model.fixed_lighting_outlets_count : nil,
+          low_energy_fixed_lighting_outlets_count:
+            @view_model.respond_to?(:low_energy_fixed_lighting_outlets_count) ? @view_model.low_energy_fixed_lighting_outlets_count : nil,
+          open_fireplaces_count: @view_model.respond_to?(:open_fireplaces_count) ? @view_model.open_fireplaces_count : nil,
+          hot_water_description: @view_model.hot_water_description,
+          hot_water_energy_efficiency_rating:
+            @view_model.hot_water_energy_efficiency_rating,
+          hot_water_environmental_efficiency_rating:
+            @view_model.hot_water_environmental_efficiency_rating,
+          window_description: @view_model.window_description,
+          window_energy_efficiency_rating:
+            @view_model.window_energy_efficiency_rating,
+          window_environmental_efficiency_rating:
+            @view_model.window_environmental_efficiency_rating,
+          secondary_heating_description:
+            @view_model.secondary_heating_description,
+          secondary_heating_energy_efficiency_rating:
+            @view_model.secondary_heating_energy_efficiency_rating,
+          secondary_heating_environmental_efficiency_rating:
+            @view_model.secondary_heating_environmental_efficiency_rating,
+          lighting_description: @view_model.lighting_description,
+          lighting_energy_efficiency_rating:
+            @view_model.lighting_energy_efficiency_rating,
+          lighting_environmental_efficiency_rating:
+            @view_model.lighting_environmental_efficiency_rating,
+          photovoltaic_roof_area_percent: @view_model.respond_to?(:photovoltaic_roof_area_percent) ? @view_model.photovoltaic_roof_area_percent : nil,
+          heat_loss_corridor: @view_model.respond_to?(:heat_loss_corridor) ? @view_model.heat_loss_corridor : nil,
+          wind_turbine_count: @view_model.wind_turbine_count,
+          unheated_corridor_length: @view_model.respond_to?(:unheated_corridor_length) ? @view_model.unheated_corridor_length : nil,
+          built_form:
+            Helper::XmlEnumsToOutput.built_form_string(@view_model.built_form),
+          main_heat_description:
+            @view_model.all_main_heating_descriptions.join(", "),
+          extensions_count: @view_model.respond_to?(:extensions_count) ? @view_model.extensions_count : nil,
+          addendum: @view_model.addendum,
+          gas_smart_meter_present: @view_model.respond_to?(:gas_smart_meter_present) ? @view_model.gas_smart_meter_present : nil,
+          electricity_smart_meter_present: @view_model.respond_to?(:electricity_smart_meter_present) ? @view_model.electricity_smart_meter_present : nil,
+        }
+      end
+
+    private
+
+      def convert_to_big_decimal(node)
+        return "" unless node
+
+        BigDecimal(node, 0)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epb_view_models
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.5
 platform: ruby
 authors:
 - DLUHC Energy Performance of Buildings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-21 00:00:00.000000000 Z
+date: 2025-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -1702,6 +1702,7 @@ files:
 - lib/presenter/rd_sap/recommendation_report.rb
 - lib/presenter/rd_sap/report.rb
 - lib/presenter/rd_sap/summary.rb
+- lib/presenter/sap/certificate_details.rb
 - lib/presenter/sap/domestic_digest.rb
 - lib/presenter/sap/export_configuration.rb
 - lib/presenter/sap/recommendation_report.rb
@@ -1895,7 +1896,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Library used to parse Energy Performance Certificates (EPC)