RubyGems - epb_view_models - Versions diffs - 2.2.9 → 2.2.10 - Mend

epb_view_models 2.2.9 → 2.2.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

checksums.yaml +4 -4
data/lib/epb_view_models.rb +1 -1
data/lib/presenter/cepc/certificate_summary.rb +9 -37
data/lib/presenter/cs63/certificate_summary.rb +1 -1
data/lib/presenter/dec/certificate_summary.rb +15 -16
data/lib/presenter/dec_rr/certificate_summary.rb +11 -10
data/lib/view_model/cepc_s_71/cepc.rb +2 -2
metadata +1 -1

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dcf0bbef8d6df145835428d355332d1141ef5d323e554c1f40d77410d4019df
-  data.tar.gz: ff5bad3db382217b163b22db8163019b83159f5e415015f0d25d797297df203a
+  metadata.gz: 18f96c7089d68a8329ebc158cd9d7033670216c37a602224213f391229a98395
+  data.tar.gz: 961f3ffac930c5c55a7dab6fc99962e30d9ee6e12d3f63a04c99f638150690ec
 SHA512:
-  metadata.gz: 4872046aef2084c409a287985a00513bbc982255012213f526a750e88e55fc6161e35694b5745b8a4035337a883360db3608d35514ca0a9b158c1b6eac75d09a
-  data.tar.gz: 5f2fc8ac67ad081a2069a636f98e81e84ccbc008d664e838210535a21be73a039a9dc634a12a2c9bfd6874526fee7fb76bd9539946b6b94357bbf49aac1e78cf
+  metadata.gz: de82ce7474d3caf06366e4c4d1602c6c90fa0b1f9db38108dde2523b9cb60894a78efa4714bb5955f14130ea33f67f64ff477564df220029117e6d78cd03e727
+  data.tar.gz: c08523068af1017de65854660746d566103c5d5e4ed38c5a72ff8af92e1cd7123941d945e6cbb02b6dabcf6a6cbc66277e8c40e10d933873d485dac60763efb4

data/lib/epb_view_models.rb CHANGED Viewed

@@ -5,7 +5,7 @@ loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.setup
 module EpbViewModels
-  VERSION = "2.2.9"
+  VERSION = "2.2.10"
 end
 # Monkey patching to avoid using ActiveRecord::Type::Boolean.new.cast

data/lib/presenter/cepc/certificate_summary.rb CHANGED Viewed

@@ -57,9 +57,9 @@ module Presenter
         {
           type_of_assessment: TYPE_OF_ASSESSMENT,
           assessment_id: @view_model.assessment_id,
-          date_of_expiry: @view_model.date_of_expiry,
           report_type: @view_model.report_type,
           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_line1: @view_model.address_line1,
@@ -90,9 +90,9 @@ module Presenter
             floor_area: @view_model.floor_area,
           },
           current_energy_efficiency_rating: @view_model.energy_efficiency_rating,
-          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,
+          potential_energy_efficiency_rating: @view_model.potential_energy_rating,
+          potential_energy_efficiency_band: @view_model.potential_energy_band,
           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,
@@ -109,40 +109,12 @@ module Presenter
           calculation_tool: @view_model.calculation_tool,
           ter_2002: @view_model.ter_2002,
           ter: @view_model.ter,
-          recommendations: [
-            @view_model.short_payback_recommendations.map do |recommendation|
-              {
-                payback_type: "short",
-                recommendation_code: recommendation[:code],
-                recommendation: recommendation[:text],
-                cO2_Impact: recommendation[:cO2Impact],
-              }
-            end,
-            @view_model.medium_payback_recommendations.map do |recommendation|
-              {
-                payback_type: "medium",
-                recommendation_code: recommendation[:code],
-                recommendation: recommendation[:text],
-                cO2_Impact: recommendation[:cO2Impact],
-              }
-            end,
-            @view_model.long_payback_recommendations.map do |recommendation|
-              {
-                payback_type: "long",
-                recommendation_code: recommendation[:code],
-                recommendation: recommendation[:text],
-                cO2_Impact: recommendation[:cO2Impact],
-              }
-            end,
-            @view_model.other_recommendations.map do |recommendation|
-              {
-                payback_type: "other",
-                recommendation_code: recommendation[:code],
-                recommendation: recommendation[:text],
-                cO2_Impact: recommendation[:cO2Impact],
-              }
-            end,
-          ].flatten,
+          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_payback_recommendations: @view_model.other_payback_recommendations,
         }
       end
     end

data/lib/presenter/cs63/certificate_summary.rb CHANGED Viewed

@@ -12,8 +12,8 @@ module Presenter
           type_of_assessment: TYPE_OF_ASSESSMENT,
           assessment_id: @view_model.assessment_id,
           epc_assessment_id: @view_model.epc_assessment_id,
-          sale_lease_date: @view_model.sale_lease_date,
           report_type: @view_model.report_type,
+          sale_lease_date: @view_model.sale_lease_date,
           date_of_assessment: @view_model.assessment_date,
           plan_report_date: @view_model.plan_report_date,
           delegated_protocol_date: @view_model.delegated_protocol_date,

data/lib/presenter/dec/certificate_summary.rb CHANGED Viewed

@@ -10,12 +10,14 @@ module Presenter
       def to_certificate_summary
         {
+          type_of_assessment: TYPE_OF_ASSESSMENT,
+          schema_version: @schema_type.gsub(/[a-zA-Z-]/, ""),
           assessment_id: @view_model.assessment_id,
+          report_type: @view_model.report_type,
           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,
@@ -23,9 +25,18 @@ module Presenter
             town: @view_model.town,
             postcode: @view_model.postcode,
           },
-          type_of_assessment: TYPE_OF_ASSESSMENT,
-          schema_version: @schema_type.gsub(/[a-zA-Z-]/, ""),
-          report_type: @view_model.report_type,
+          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,
+            },
+            company_details: {
+              name: @view_model.company_name,
+              address: @view_model.company_address,
+            },
+          },
           current_assessment: {
             date: @view_model.current_assessment_date,
             energy_efficiency_rating: @view_model.energy_efficiency_rating,
@@ -66,18 +77,6 @@ module Presenter
             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,

data/lib/presenter/dec_rr/certificate_summary.rb CHANGED Viewed

@@ -11,10 +11,9 @@ module Presenter
           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,
+          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,
@@ -25,21 +24,21 @@ module Presenter
           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,
             },
+            company_details: {
+              name: @view_model.company_name,
+              address: @view_model.company_address,
+            },
           },
           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,
+          other_payback_recommendations: @view_model.other_recommendations,
           technical_information: {
             building_environment: @view_model.building_environment,
             floor_area: @view_model.floor_area,
@@ -47,14 +46,16 @@ module Presenter
             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,
           },
+          administrative_information: {
+            issue_date: @view_model.date_of_issue,
+            calculation_tool: @view_model.calculation_tool,
+            related_rrn: @view_model.related_rrn,
+          },
           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

data/lib/view_model/cepc_s_71/cepc.rb CHANGED Viewed

@@ -48,7 +48,7 @@ module ViewModel
       end
       def floor_area
-        xpath(%w[Technical-Information Floor-Area])
+        xpath(%w[Technical-Information Floor-Area])&.to_i
       end
       def main_heating_fuel
@@ -124,7 +124,7 @@ module ViewModel
         recommendations("Long-Payback")
       end
-      def other_recommendations
+      def other_payback_recommendations
         recommendations("Other-Payback")
       end

metadata CHANGED Viewed

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