epb_view_models 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b71b827370438edcfacfdd4d8d44e8272526fde8cbd7e58bc77df2d60b5ef1a7
-  data.tar.gz: 374238b4324acea447bcce054ed895960b3c9c684e8efc0e229a418077eb64c2
+  metadata.gz: 80efe4147a186423dd6099c2c495e7f694580511670d9ee054257ddce5e887b8
+  data.tar.gz: 51c6e4233b76f4a3959e73b9e8a2b01dd8d2ede3a363c1e292df66b2ee8c18eb
 SHA512:
-  metadata.gz: e34f118818e142c9d9a9e38628f8f56eb9e02373a41571b632e842674370e84ed36d7bc3fff85e6687af6c06dd61579056050a2f1d34bbb793f21fc125d869ee
-  data.tar.gz: 2b023ad18d63ea973dba32b6849307045372101debda793711a27bca16ebd7bef2459e9c426c1e7e544bdb9835663d07f1905015caca35b90b4ffea3e46953e4
+  metadata.gz: 88e7eb835ea70699291c21118ef0cab44da3e4423dff5032f1d9804b1d55f1014b90afc01ace5ba5bb4681bee1fd0e94e49c3b7095edef5eed2bc2940029a5e2
+  data.tar.gz: a1accb23c50fab70d6404edf6f01e2ee8fb544b276b825f949df758471dd270b8887f90ff4e10fd9593373a2d0e14e0da4e719bb832e4be4550c877520db610c

data/.buildspec.yml

@@ -0,0 +1,13 @@
+version: 0.2
+
+phases:
+  install:
+    runtime-versions:
+      ruby: 2.7
+  pre_build:
+    commands:
+      - gem install bundler:2.2.21
+      - make install
+  build:
+    commands:
+      - make test

data/.gitignore

@@ -6,9 +6,14 @@
 /pkg/
 /spec/reports/
 /tmp/
+.DS_Store
+dump.rdb
 
 # rspec failure tracking
 .rspec_status
 
 # Jetbrains
 .idea
+
+# Avoid committing gem file when releasing
+*.gem

data/.ruby-version

@@ -0,0 +1 @@
+2.7.3

data/Gemfile.lock

@@ -1,5 +1,9 @@
 GEM
   specs:
+
+GEM
+  remote: https://rubygems.org/
+  specs:
     activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
@@ -11,15 +15,26 @@ GEM
     diff-lcs (1.4.4)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
+    mini_portile2 (2.5.3)
     minitest (5.14.4)
+    nokogiri (1.11.7)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    nokogiri (1.11.7-x86_64-darwin)
+      racc (~> 1.4)
     parallel (1.20.1)
     parser (3.0.2.0)
       ast (~> 2.4.1)
     racc (1.5.2)
     rack (2.2.3)
     rainbow (3.0.0)
+    rake (13.0.6)
     regexp_parser (2.1.1)
     rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
     rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
     rspec-expectations (3.10.1)
@@ -40,6 +55,12 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.6.0)
       parser (>= 3.0.1.1)
+    rubocop-govuk (4.0.0)
+      rubocop (~> 1.15.0)
+      rubocop-ast (~> 1.6.0)
+      rubocop-rails (~> 2.10.0)
+      rubocop-rake (= 0.5.1)
+      rubocop-rspec (~> 2.3.0)
     rubocop-rails (2.10.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
@@ -53,26 +74,10 @@ GEM
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    nokogiri (1.11.7-x86_64-darwin)
-      racc (~> 1.4)
-    rake (13.0.6)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rubocop-govuk (4.0.0)
-      rubocop (~> 1.15.0)
-      rubocop-ast (~> 1.6.0)
-      rubocop-rails (~> 2.10.0)
-      rubocop-rake (= 0.5.1)
-      rubocop-rspec (~> 2.3.0)
     zeitwerk (2.4.2)
 
 PLATFORMS
+  ruby
   x86_64-darwin-20
 
 DEPENDENCIES

data/lib/epb_view_models.rb

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

data/lib/helper/xml_enums_to_output.rb

@@ -236,12 +236,13 @@ module Helper
       RATINGS[value]
     end
 
-    def self.energy_tariff(value, report_type = "2")
-      case report_type.to_s
-      when "3"
+    def self.energy_tariff(value, report_type)
+      if is_sap(report_type)
         SAP_ENERGY_TARIFF[value] || value
-      when "2"
+      elsif is_rdsap(report_type)
         RDSAP_ENERGY_TARIFF[value] || value
+      else
+        value
       end
     end
 
@@ -266,14 +267,14 @@ module Helper
     end
 
     def self.transaction_type(value, report_type = "2")
-      if report_type.to_s == "2" && value.to_i >= 12
+      if is_rdsap(report_type) && value.to_i >= 12
         TRANSACTION_TYPE["#{value}RdSAP"]
       else
         TRANSACTION_TYPE[value] || value
       end
     end
 
-    def self.construction_age_band_lookup(value, schema_type, report_type = 0)
+    def self.construction_age_band_lookup(value, schema_type, report_type)
       types_of_sap_pre17 = %w[
         SAP-Schema-16.3
         SAP-Schema-16.2
@@ -344,7 +345,7 @@ module Helper
         RdSAP-Schema-NI-17.3
       ]
 
-      if value == "K" && schema_type == "SAP-Schema-12.0" && report_type == 2
+      if value == "K" && schema_type == "SAP-Schema-12.0" && is_rdsap(report_type)
         return CONSTRUCTION_AGE_BAND["K-12.0"]
       end
 
@@ -353,15 +354,14 @@ module Helper
       end
 
       if value == "NR" &&
-          !schemes_that_use_not_recorded.include?(schema_type) ||
-          report_type == 3
+          (!schemes_that_use_not_recorded.include?(schema_type) || is_sap(report_type))
         return value
       end
 
       return value if value == "L" && !schemes_that_use_l.include?(schema_type)
 
-      if value == "0" && !schemes_that_use_0.include?(schema_type) ||
-          report_type == 3
+      if value == "0" &&
+          (!schemes_that_use_0.include?(schema_type) || is_sap(report_type))
         return value
       end
 
@@ -376,14 +376,14 @@ module Helper
       HEAT_LOSS_CORRIDOR[value] || value
     end
 
-    def self.mechanical_ventilation(value, schema_type, report_type = 0)
+    def self.mechanical_ventilation(value, schema_type, report_type)
       types_of_sap_pre12 = %w[
         SAP-Schema-11.2
         SAP-Schema-11.0
         SAP-Schema-10.2
       ].freeze
 
-      if types_of_sap_pre12.include?(schema_type) && report_type == 2
+      if types_of_sap_pre12.include?(schema_type) && is_rdsap(report_type)
         return MECHANICAL_VENTILATION["#{value}-pre12.0"]
       end
 
@@ -393,5 +393,15 @@ module Helper
     def self.cepc_transaction_type(value)
       CEPC_TRANSACTION_TYPE[value] || value
     end
+
+    def self.is_rdsap(report_type)
+      report_type == "2"
+    end
+
+    def self.is_sap(report_type)
+      report_type == "3"
+    end
+
+    private_class_method :is_rdsap, :is_sap
   end
 end

data/lib/presenter/rd_sap/report.rb

@@ -12,8 +12,198 @@ module Presenter
           .merge(report_from_additional_data)
       end
 
+      def to_hash_ni
+        report_from_ni_assessment_xml
+      end
+
     private
 
+      def report_from_ni_assessment_xml
+        {
+          address1: @view_model.address_line1,
+          address2: @view_model.address_line2,
+          address3: @view_model.address_line3,
+          built_form:
+            Helper::XmlEnumsToOutput.xml_value_to_string(@view_model.built_form),
+          co2_emiss_curr_per_floor_area:
+            @view_model.co2_emissions_current_per_floor_area,
+          co2_emissions_current: @view_model.current_carbon_emission,
+          co2_emissions_potential: @view_model.potential_carbon_emission,
+          construction_age_band:
+            Helper::XmlEnumsToOutput.construction_age_band_lookup(
+              @view_model.property_age_band,
+              @schema_type,
+              @view_model.report_type,
+            ),
+          current_energy_efficiency: @view_model.current_energy_rating.to_s.chomp,
+          current_energy_rating:
+            Helper::EnergyBandCalculator.domestic(
+              @view_model.current_energy_rating,
+            ),
+          cylinder_insul_thickness: @view_model.cylinder_insul_thickness,
+          cylinder_insulation_type: @view_model.cylinder_insulation_type,
+          cylinder_size: @view_model.cylinder_size,
+          has_cylinder_thermostat: @view_model.has_cylinder_thermostat == "Y" ? "true" : "false",
+          energy_consumption_current: @view_model.primary_energy_use,
+          energy_consumption_potential: @view_model.energy_consumption_potential,
+          energy_tariff:
+            Helper::XmlEnumsToOutput.energy_tariff(
+              @view_model.meter_type,
+              @view_model.report_type,
+            ),
+          environment_impact_current: @view_model.environmental_impact_current,
+          environment_impact_potential:
+            @view_model.environmental_impact_potential,
+          extension_count: @view_model.extensions_count,
+          fixed_lighting_outlets_count: @view_model.fixed_lighting_outlets_count,
+          flat_top_storey: @view_model.top_storey,
+          flat_storey_count: @view_model.storey_count,
+          floor_description: @view_model.all_floor_descriptions.first,
+          floor_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_floor_energy_efficiency_rating.first,
+            ),
+          floor_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_floor_env_energy_efficiency_rating.first,
+            ),
+          floor_height: @view_model.floor_height.first,
+          floor_level: @view_model.floor_level,
+          glazed_area:
+            Helper::XmlEnumsToOutput.glazed_area_rdsap(@view_model.glazed_area),
+          glazed_type:
+            Helper::XmlEnumsToOutput.glazed_type_rdsap(
+              @view_model.multi_glazing_type,
+            ),
+          heat_loss_corridor:
+            Helper::XmlEnumsToOutput.heat_loss_corridor(
+              @view_model.heat_loss_corridor,
+            ),
+          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,
+          hot_water_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.hot_water_energy_efficiency_rating,
+            ),
+          hot_water_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.hot_water_environmental_efficiency_rating,
+            ),
+          hotwater_description: @view_model.hot_water_description,
+          inspection_date: @view_model.date_of_assessment,
+          lighting_cost_current: @view_model.lighting_cost_current,
+          lighting_cost_potential: @view_model.lighting_cost_potential,
+          lighting_description: @view_model.lighting_description,
+          lighting_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.lighting_energy_efficiency_rating,
+            ),
+          lighting_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.lighting_environmental_efficiency_rating,
+            ),
+          low_energy_lighting: @view_model.low_energy_lighting,
+          low_energy_fixed_lighting_outlets_count:
+            @view_model.low_energy_fixed_lighting_outlets_count,
+          main_fuel:
+            Helper::XmlEnumsToOutput.main_fuel_rdsap(@view_model.main_fuel_type),
+          mainheat_description:
+            @view_model.all_main_heating_descriptions.join(", "),
+          mainheat_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_main_heating_energy_efficiency.first,
+            ),
+          mainheat_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_main_heating_environmental_efficiency.first,
+            ),
+          mainheatc_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_main_heating_controls_energy_efficiency.first,
+            ),
+          mainheatc_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_main_heating_controls_environmental_efficiency.first,
+            ),
+          mainheatcont_description:
+            @view_model.all_main_heating_controls_descriptions.first,
+          mains_gas_flag: @view_model.mains_gas,
+          mechanical_ventilation:
+            Helper::XmlEnumsToOutput.mechanical_ventilation(
+              @view_model.mechanical_ventilation,
+              @schema_type,
+              @report_type,
+            ),
+          mech_vent_sys_index_number: nil,
+          mechanical_vent_data_source: nil,
+          multi_glaze_proportion: @view_model.multiple_glazed_proportion,
+          number_habitable_rooms: @view_model.habitable_room_count,
+          number_heated_rooms: @view_model.heated_room_count,
+          number_open_fireplaces: @view_model.open_fireplaces_count,
+          photo_supply: @view_model.photovoltaic_roof_area_percent,
+          posttown: @view_model.town,
+          postcode: @view_model.postcode,
+          potential_energy_efficiency:
+            @view_model.potential_energy_rating.to_s.chomp,
+          potential_energy_rating:
+            Helper::EnergyBandCalculator.domestic(
+              @view_model.potential_energy_rating,
+            ),
+          property_type:
+            Helper::XmlEnumsToOutput.property_type(@view_model.property_type),
+          report_type: @view_model.report_type,
+          roof_description: @view_model.all_roof_descriptions.first,
+          roof_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_roof_energy_efficiency_rating.first,
+            ),
+          roof_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_roof_env_energy_efficiency_rating.first,
+            ),
+          secondheat_description: @view_model.secondary_heating_description,
+          sheating_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.secondary_heating_energy_efficiency_rating,
+            ),
+          sheating_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.secondary_heating_environmental_efficiency_rating,
+            ),
+          solar_water_heating_flag: @view_model.solar_water_heating_flag,
+          tenure: Helper::XmlEnumsToOutput.tenure(@view_model.tenure),
+          thermal_store: nil,
+          total_floor_area: @view_model.total_floor_area,
+          transaction_type:
+            Helper::XmlEnumsToOutput.transaction_type(
+              @view_model.transaction_type,
+            ),
+          unheated_corridor_length: @view_model.unheated_corridor_length,
+          walls_description: @view_model.all_wall_descriptions.first,
+          walls_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_wall_energy_efficiency_rating.first,
+            ),
+          walls_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_wall_env_energy_efficiency_rating.first,
+            ),
+          wind_turbine_count: @view_model.wind_turbine_count,
+          windows_description: @view_model.window_description,
+          windows_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.window_energy_efficiency_rating,
+            ),
+          windows_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.window_environmental_efficiency_rating,
+            ),
+
+        }
+      end
+
       def report_from_assessment_xml
         {
           assessment_id: Helper::RrnHelper.hash_rrn(@view_model.assessment_id),
@@ -28,6 +218,7 @@ module Presenter
             Helper::XmlEnumsToOutput.construction_age_band_lookup(
               @view_model.main_dwelling_construction_age_band_or_year,
               @schema_type,
+              @view_model.report_type,
             ),
           current_energy_rating:
             Helper::EnergyBandCalculator.domestic(
@@ -154,13 +345,17 @@ module Presenter
               @view_model.all_wall_env_energy_efficiency_rating.first,
             ),
           energy_tariff:
-            Helper::XmlEnumsToOutput.energy_tariff(@view_model.meter_type),
+            Helper::XmlEnumsToOutput.energy_tariff(
+              @view_model.meter_type,
+              @view_model.report_type,
+            ),
           floor_level: @view_model.floor_level,
           solar_water_heating_flag: @view_model.solar_water_heating_flag,
           mechanical_ventilation:
             Helper::XmlEnumsToOutput.mechanical_ventilation(
               @view_model.mechanical_ventilation,
               @schema_type,
+              @view_model.report_type,
             ),
           floor_height: @view_model.floor_height.first,
           main_fuel: