epb_view_models 1.0.16 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79ae310938a850d789aa00468e9ccfb69bf5bf0c198b4ba306e83f15b626cf77
-  data.tar.gz: dede5d0236911e00b5d5378e32745c05764e01dbb68e918fa335b83d373a8733
+  metadata.gz: 4dd0d9d3d0906689a919d76f7df73fddbccd8cc0eeaf97edee21ddead0b790b3
+  data.tar.gz: 6ded2596cf0adebfae41916318e561798d2aed7fd0c54a248d1751940865b54d
 SHA512:
-  metadata.gz: 57c32e59da653209820c2284da3b10a75adc13296f42d1dda1ce7766b1c959f9a6557e3421db7958c9caa19c5a60cc9f049c48c0141042893a5be263175191dc
-  data.tar.gz: 804e20015ee1ce0f5fbc53676e9067068913d9a0ba84345e3f1d8104fc2a935583392487a544721e2fac332a000006c58037798e223434fbd66bf86605bf4714
+  metadata.gz: 434eac8a26a57b6658b6948d5fde772cf6cb4af70927bd736b96e8317d4f7046d3c32176f6b605f47ce2b3c7149494899182c8e2b67acfdd1656ba0519b76403
+  data.tar.gz: 4dc074660c6a3693440d653375b49a993b6eca0813ca574a5f68285de34d8f03f39471e00ac430d77a39101cc75f0b748a5cd3aa0db8d73a8e37532f3ebc60f6

data/lib/epb_view_models.rb

@@ -5,7 +5,7 @@ loader = Zeitwerk::Loader.for_gem
 loader.setup
 
 module EpbViewModels
-  VERSION = "1.0.16"
+  VERSION = "1.0.17"
 end
 
 # Monkey patching to avoid using ActiveRecord::Type::Boolean.new.cast

data/lib/presenter/rd_sap/hera.rb

@@ -0,0 +1,35 @@
+module Presenter
+  module RdSap
+    class Hera
+      TYPE_OF_ASSESSMENT = "RdSAP".freeze
+      private_constant :TYPE_OF_ASSESSMENT
+
+      def initialize(view_model)
+        @view_model = view_model
+      end
+
+      def to_hera_hash
+        {
+          type_of_assessment: TYPE_OF_ASSESSMENT,
+          assessment_id: @view_model.assessment_id,
+          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,
+            town: @view_model.town,
+            postcode: @view_model.postcode,
+          },
+          dwelling_type: @view_model.dwelling_type,
+          built_form: @view_model.built_form,
+          main_dwelling_construction_age_band_or_year: @view_model.main_dwelling_construction_age_band_or_year,
+          property_summary: @view_model.property_summary,
+          main_heating_category: @view_model.main_heating_category,
+          main_fuel_type: @view_model.main_fuel_type,
+          has_hot_water_cylinder: @view_model.has_hot_water_cylinder,
+        }
+      end
+    end
+  end
+end

data/lib/presenter/sap/hera.rb

@@ -0,0 +1,32 @@
+module Presenter
+  module Sap
+    class Hera
+      def initialize(view_model)
+        @view_model = view_model
+      end
+
+      def to_hera_hash
+        {
+          type_of_assessment: @view_model.type_of_assessment,
+          assessment_id: @view_model.assessment_id,
+          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: nil,
+            town: @view_model.town,
+            postcode: @view_model.postcode,
+          },
+          dwelling_type: @view_model.dwelling_type,
+          built_form: @view_model.built_form,
+          main_dwelling_construction_age_band_or_year: @view_model.main_dwelling_construction_age_band_or_year,
+          property_summary: @view_model.property_summary,
+          main_heating_category: @view_model.main_heating_category,
+          main_fuel_type: @view_model.main_fuel_type,
+          has_hot_water_cylinder: @view_model.has_hot_water_cylinder,
+        }
+      end
+    end
+  end
+end

data/lib/view_model/domestic_epc_view_model.rb

@@ -54,6 +54,16 @@ module ViewModel
       xpath(%w[Water-Heating-Code])
     end
 
+    def has_hot_water_cylinder
+      return "false" if xpath(%w[Has-Hot-Water-Cylinder]).nil?
+
+      xpath(%w[Has-Hot-Water-Cylinder])
+    end
+
+    def main_heating_category
+      xpath(%w[Main-Heating-Category])
+    end
+
   private
 
     def fetch_addendum_numbers

data/lib/view_model/rd_sap_schema_200/common_schema.rb

@@ -350,10 +350,6 @@ module ViewModel
         xpath(%w[Immersion-Heating-Type])
       end
 
-      def main_heating_category
-        xpath(%w[Main-Heating-Category])
-      end
-
       def main_fuel_type
         xpath(%w[Main-Fuel-Type])
       end

data/lib/view_model/rd_sap_schema_ni_200/common_schema.rb

@@ -337,10 +337,6 @@ module ViewModel
         xpath(%w[Immersion-Heating-Type])
       end
 
-      def main_heating_category
-        xpath(%w[Main-Heating-Category])
-      end
-
       def main_fuel_type
         xpath(%w[Main-Fuel-Type])
       end

data/lib/view_model/rd_sap_wrapper.rb

@@ -8,6 +8,7 @@ module ViewModel
       @summary = Presenter::RdSap::Summary.new(view_model)
       @report = Presenter::RdSap::Report.new(view_model, schema_type, additional_data)
       @recommendation_report = Presenter::RdSap::RecommendationReport.new(view_model)
+      @hera = Presenter::RdSap::Hera.new(view_model)
     end
 
     def type
@@ -30,6 +31,10 @@ module ViewModel
       @recommendation_report.to_hash
     end
 
+    def to_hera_hash
+      @hera.to_hera_hash
+    end
+
     def get_view_model
       view_model
     end

data/lib/view_model/sap_schema_1800/common_schema.rb

@@ -301,10 +301,6 @@ module ViewModel
         xpath(%w[Immersion-Heating-Type])
       end
 
-      def main_heating_category
-        xpath(%w[Main-Heating-Category])
-      end
-
       def main_fuel_type
         xpath(%w[Main-Fuel-Type])
       end

data/lib/view_model/sap_schema_1900/common_schema.rb

@@ -301,10 +301,6 @@ module ViewModel
         xpath(%w[Immersion-Heating-Type])
       end
 
-      def main_heating_category
-        xpath(%w[Main-Heating-Category])
-      end
-
       def main_fuel_type
         xpath(%w[Main-Fuel-Type])
       end

data/lib/view_model/sap_schema_ni_1800/common_schema.rb

@@ -271,10 +271,6 @@ module ViewModel
         xpath(%w[Immersion-Heating-Type])
       end
 
-      def main_heating_category
-        xpath(%w[Main-Heating-Category])
-      end
-
       def main_fuel_type
         xpath(%w[Main-Fuel-Type])
       end

data/lib/view_model/sap_wrapper.rb

@@ -8,6 +8,7 @@ module ViewModel
       @summary = Presenter::Sap::Summary.new(view_model)
       @report = Presenter::Sap::Report.new(view_model, schema_type, additional_data)
       @recommendation_report = Presenter::Sap::RecommendationReport.new(view_model)
+      @hera = Presenter::Sap::Hera.new(view_model)
     end
 
     def type
@@ -30,6 +31,10 @@ module ViewModel
       @recommendation_report.to_hash
     end
 
+    def to_hera_hash
+      @hera.to_hera_hash
+    end
+
     def get_view_model
       view_model
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epb_view_models
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.17
 platform: ruby
 authors:
 - MHCLG Energy Performance of Buildings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-11 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -1675,10 +1675,12 @@ files:
 - lib/presenter/export/domestic.rb
 - lib/presenter/export/statistics.rb
 - lib/presenter/rd_sap/export_configuration.rb
+- lib/presenter/rd_sap/hera.rb
 - lib/presenter/rd_sap/recommendation_report.rb
 - lib/presenter/rd_sap/report.rb
 - lib/presenter/rd_sap/summary.rb
 - lib/presenter/sap/export_configuration.rb
+- lib/presenter/sap/hera.rb
 - lib/presenter/sap/recommendation_report.rb
 - lib/presenter/sap/report.rb
 - lib/presenter/sap/summary.rb