epb_view_models 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dd0d9d3d0906689a919d76f7df73fddbccd8cc0eeaf97edee21ddead0b790b3
-  data.tar.gz: 6ded2596cf0adebfae41916318e561798d2aed7fd0c54a248d1751940865b54d
+  metadata.gz: 21ae4bba2efbc28d42200e7a331a4111b76071399e0a1f901313c2d57035196a
+  data.tar.gz: 0e244cf4dec75c6213a3c3e8bac4aa2fea2c02f44c9958419d5bf9b9bb2f4f38
 SHA512:
-  metadata.gz: 434eac8a26a57b6658b6948d5fde772cf6cb4af70927bd736b96e8317d4f7046d3c32176f6b605f47ce2b3c7149494899182c8e2b67acfdd1656ba0519b76403
-  data.tar.gz: 4dc074660c6a3693440d653375b49a993b6eca0813ca574a5f68285de34d8f03f39471e00ac430d77a39101cc75f0b748a5cd3aa0db8d73a8e37532f3ebc60f6
+  metadata.gz: a2e9785b8c3141d8eaf2b1bf5c1cd647efe67022417b5922e94e44af3b57ce157dab168f4499d4a1b1bce1a6092d8aa87ef954a8ab09cc03335b5bc0a1417571
+  data.tar.gz: dcf95783220f96004c33f270bd844dd22de531f57136d7f9d230e7244a42b880c310088ca070b60aaedaf78dfb2f766f7f783098603302ca5cb2085b1afbc03f

data/lib/epb_view_models.rb

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

data/lib/helper/xml_enums_to_output.rb

@@ -274,6 +274,20 @@ module Helper
       "76" => "bioethanol from any biomass source",
       "99" => "Community heating schemes: special fuel",
     }.freeze
+    MAIN_HEATING_CATEGORY = {
+      "1" => "none",
+      "2" => "boiler with radiators or underfloor heating",
+      "3" => "micro-cogeneration",
+      "4" => "heat pump with radiators or underfloor heating",
+      "5" => "heat pump with warm air distribution",
+      "6" => "community heating system",
+      "7" => "electric storage heaters",
+      "8" => "electric underfloor heating",
+      "9" => "warm air system (not heat pump)",
+      "10" => "room heaters",
+      "11" => "other system",
+      "12" => "not recorded",
+    }.freeze
 
     def self.built_form_string(number)
       BUILT_FORM[number]
@@ -358,6 +372,7 @@ module Helper
       ]
 
       schemes_that_use_l = %i[
+        SAP-Schema-19.0.0
         SAP-Schema-18.0.0
         SAP-Schema-17.1
         SAP-Schema-17.0
@@ -561,6 +576,7 @@ module Helper
       ]
 
       sap = %i[
+        SAP-Schema-19.0.0
         SAP-Schema-18.0.0
         SAP-Schema-17.1
         SAP-Schema-17.0
@@ -611,6 +627,10 @@ module Helper
       end
     end
 
+    def self.main_heating_category(value:)
+      MAIN_HEATING_CATEGORY[value] || value
+    end
+
     private_class_method :is_rdsap, :is_sap
   end
 end

data/lib/presenter/rd_sap/hera.rb

@@ -4,8 +4,9 @@ module Presenter
       TYPE_OF_ASSESSMENT = "RdSAP".freeze
       private_constant :TYPE_OF_ASSESSMENT
 
-      def initialize(view_model)
+      def initialize(view_model, schema_type)
         @view_model = view_model
+        @schema_type = schema_type
       end
 
       def to_hera_hash
@@ -22,11 +23,17 @@ module Presenter
             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,
+          built_form: Helper::XmlEnumsToOutput.built_form_string(@view_model.built_form),
+          main_dwelling_construction_age_band_or_year: Helper::XmlEnumsToOutput.construction_age_band_lookup(
+            @view_model.main_dwelling_construction_age_band_or_year,
+            @schema_type,
+            @view_model.report_type,
+          ),
           property_summary: @view_model.property_summary,
-          main_heating_category: @view_model.main_heating_category,
-          main_fuel_type: @view_model.main_fuel_type,
+          main_heating_category: Helper::XmlEnumsToOutput.main_heating_category(value: @view_model.main_heating_category),
+          main_fuel_type: Helper::XmlEnumsToOutput.fuel_type(@view_model.main_fuel_type,
+                                                             @schema_type,
+                                                             @view_model.report_type),
           has_hot_water_cylinder: @view_model.has_hot_water_cylinder,
         }
       end

data/lib/presenter/sap/hera.rb

@@ -1,8 +1,9 @@
 module Presenter
   module Sap
     class Hera
-      def initialize(view_model)
+      def initialize(view_model, schema_type)
         @view_model = view_model
+        @schema_type = schema_type
       end
 
       def to_hera_hash
@@ -19,11 +20,17 @@ module Presenter
             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,
+          built_form: Helper::XmlEnumsToOutput.built_form_string(@view_model.built_form),
+          main_dwelling_construction_age_band_or_year: Helper::XmlEnumsToOutput.construction_age_band_lookup(
+            @view_model.main_dwelling_construction_age_band_or_year,
+            @schema_type,
+            @view_model.report_type,
+          ),
           property_summary: @view_model.property_summary,
-          main_heating_category: @view_model.main_heating_category,
-          main_fuel_type: @view_model.main_fuel_type,
+          main_heating_category: Helper::XmlEnumsToOutput.main_heating_category(value: @view_model.main_heating_category),
+          main_fuel_type: Helper::XmlEnumsToOutput.fuel_type(@view_model.main_fuel_type,
+                                                             @schema_type,
+                                                             @view_model.report_type),
           has_hot_water_cylinder: @view_model.has_hot_water_cylinder,
         }
       end

data/lib/view_model/rd_sap_wrapper.rb

@@ -8,7 +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)
+      @hera = Presenter::RdSap::Hera.new(view_model, schema_type)
     end
 
     def type

data/lib/view_model/sap_wrapper.rb

@@ -8,7 +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)
+      @hera = Presenter::Sap::Hera.new(view_model, schema_type)
     end
 
     def type

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epb_view_models
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - MHCLG Energy Performance of Buildings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri