epb_view_models 2.2.17 → 2.2.19

data/api/schemas/xml/RdSAP-Schema-S-16.1/RdSAP/UDT/TypeDefinitions.xsd

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.est.org.uk/epc/estcrV1/DCLG-HIP" xmlns:HIP="http://www.est.org.uk/epc/estcrV1/DCLG-HIP" xmlns:pfdt="http://www.est.org.uk/epc/estcrV1/DCLG-HIP/BaseDataTypes" targetNamespace="http://www.est.org.uk/epc/estcrV1/DCLG-HIP" elementFormDefault="qualified" version="LIG-16.1">
+	<xs:annotation>
+		<xs:documentation>© Department of Communities and Local Government. © Crown copyright, 2007. The Home Condition Report logo and associated wording is a registered trade mark - any unlicensed use is not permitted. Copyright in the typographical arrangement of this document rests with the Crown. This publication, excluding logos, may be reproduced free of charge in any format or medium for research, private study, for internal circulation within an organisation or by registered scheme users. This is subject to it being reproduced accurately and not used in a misleading context. 
+
+Type Definitions (TypeDefinitions.xsd) are constrained variants of a primitive datatype whose allowed values must meet some predefined rules 
+
+Exactly what is a type definition is a bit subjective because it is generally up to the data modeller to make the decision between what is a Value-Type and what is an Entity-Type. 
+
+For example in some contexts an Address (House Number, Street, Town, Postcode) may be declared as a composite datatype where the value of each Address is recorded against the Addressable Entity but in another context the Address (where there are details to be gathered about the Address itself) it could be a defined referenced Business Entity instead.
+
+However, even allowing for some fuzziness at the boundary, a general rule of thumb is that a Type Definition is a data-item that is generally defined outside of the domain and it is not within the domains authority to extend or redefine. There is also only ever one definition in force at any time.
+</xs:documentation>
+	</xs:annotation>
+	<xs:element name="UValue" type="UValue"/>
+	<xs:complexType name="UValue">
+		<xs:sequence/>
+	</xs:complexType>
+</xs:schema>

data/api/schemas/xml/RdSAP-Schema-S-17.00/RdSAP/Templates/RdSAP-Report.xsd

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 rel. 3 U (http://www.altova.com) by Jim Bowery (Landmark Information Group Ltd.) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.epcregister.com/xsd/rdsap" targetNamespace="http://www.epcregister.com/xsd/rdsap" elementFormDefault="qualified" attributeFormDefault="unqualified" version="LIG-17.00">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+		   xmlns="http://www.epcregister.com/xsd/rdsap"
+		   targetNamespace="http://www.epcregister.com/xsd/rdsap"
+		   elementFormDefault="qualified"
+		   attributeFormDefault="unqualified"
+		   version="LIG-17.00">
 	<xs:annotation>
 		<xs:documentation>© Department of Communities and Local Government. © Crown copyright, 2007. The Home Condition Report logo and associated wording is a registered trade mark - any unlicensed use is not permitted. Copyright in the typographical arrangement of this document rests with the Crown. This publication, excluding logos, may be reproduced free of charge in any format or medium for research, private study, for internal circulation within an organisation or by registered scheme users. This is subject to it being reproduced accurately and not used in a misleading context.</xs:documentation>
 	</xs:annotation>

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

data/lib/presenter/xsd.rb

@@ -25,15 +25,8 @@ module Presenter
     end
 
     def unique_enums(domain_arguments)
-      uniq_enums = []
       enums = get_enums_by_type(domain_arguments).values
-
-      enums.each_with_index do |_hash, i|
-        if i.positive? && (enums[i].to_a != enums[i + 1].to_a)
-          uniq_enums << enums[i]
-        end
-      end
-      uniq_enums
+      enums.group_by(&:inspect).values.map(&:first)
     end
 
     def variation_between_schema_versions?(enums_hash)

data/lib/view_model/cepc_s_70/cepc.rb

@@ -0,0 +1,184 @@
+module ViewModel
+  module CepcS70
+    class Cepc < ViewModel::Cepc71::CommonSchema
+      def date_of_expiry
+        expires_at = (Date.parse(date_of_registration) - 1) >> 12 * 10
+
+        expires_at.to_s
+      end
+
+      def building_environment
+        xpath(%w[Building-Environment])
+      end
+
+      def energy_efficiency_rating
+        xpath(%w[Asset-Rating])&.to_i
+      end
+
+      def current_energy_efficiency_band
+        xpath(%w[Energy-Band])
+      end
+
+      def potential_energy_rating
+        xpath(%w[Potential-Rating])&.to_i
+      end
+
+      def potential_energy_band
+        xpath(%w[Potential-Band])
+      end
+
+      def new_build_benchmark_band
+        xpath(%w[New-Build-Benchmark-Band])
+      end
+
+      def comparative_asset_rating
+        xpath(%w[Comparative-Asset-Rating])&.to_i
+      end
+
+      def comparative_asset_band
+        xpath(%w[Comparative-Energy-Band])
+      end
+
+      def epc_rating_ber
+        xpath(%w[BER])&.to_f
+      end
+
+      def approximate_energy_use
+        xpath(%w[Approximate-Energry-Use])&.to_i
+      end
+
+      def floor_area
+        xpath(%w[Technical-Information Floor-Area])&.to_i
+      end
+
+      def main_heating_fuel
+        xpath(%w[Main-Heating-Fuel])
+      end
+
+      def property_type
+        xpath(%w[Property-Type Long-Description])
+      end
+
+      def property_long_description
+        xpath(%w[Property-Type Long-Description])
+      end
+
+      def property_short_description
+        xpath(%w[Property-Type Short-Description])
+      end
+
+      def compliant_2002
+        nil
+      end
+
+      def renewable_energy_sources
+        @xml_doc.search("Renewable-Energy-Sources").children.search("Renewable-Energy-Source").map(&:content)
+      end
+
+      def electricity_sources
+        @xml_doc.search("Electricity-Sources").children.search("Electricity-Source").map(&:content)
+      end
+
+      def primary_energy_indicator
+        xpath(%w[Primary-Energry-Indicator])&.to_i
+      end
+
+      def calculation_tool
+        xpath(%w[Calculation-Tool])
+      end
+
+      def ter_2002
+        nil
+      end
+
+      def ter
+        xpath(%w[TER])&.to_f
+      end
+
+      def recommendations(payback = "")
+        if payback.empty?
+          # return an enumerable of all nodes
+          @xml_doc.xpath "Recommendations-Report RR-Recommendations"
+        else
+          @xml_doc
+            .search("Recommendations-Report RR-Recommendations/#{payback}")
+            .map do |node|
+              {
+                code: node.at("Recommendation-Code").content,
+                text: node.at("Recommendation").content,
+                cO2Impact: node.at("CO2-Impact").content,
+              }
+          end
+        end
+      end
+
+      def short_payback_recommendations
+        recommendations("Short-Payback")
+      end
+
+      def medium_payback_recommendations
+        recommendations("Medium-Payback")
+      end
+
+      def long_payback_recommendations
+        recommendations("Long-Payback")
+      end
+
+      def other_payback_recommendations
+        recommendations("Other-Payback")
+      end
+
+      def related_rrn
+        nil
+      end
+
+      def new_build_rating
+        xpath(%w[New-Build-Benchmark])&.to_i
+      end
+
+      def existing_build_rating
+        nil
+      end
+
+      def epc_related_party_disclosure
+        nil
+      end
+
+      def trading_address
+        xpath(%w[Trading-Address])
+      end
+
+      def company_name
+        xpath(%w[Company-Name])
+      end
+
+      def insurer
+        xpath(%w[Insurer])
+      end
+
+      def policy_no
+        xpath(%w[Policy-No])
+      end
+
+      def insurer_effective_date
+        xpath(%w[Effective-Date])
+      end
+
+      def insurer_expiry_date
+        xpath(%w[Expiry-Date])
+      end
+
+      def insurer_pi_limit
+        xpath(%w[PI-Limit])
+      end
+
+      def inspection_date
+        xpath(%w[Inspection-Date])
+      end
+
+      def completion_date
+        xpath(%w[Completion-Date])
+      end
+    end
+  end
+end

data/lib/view_model/cepc_wrapper.rb

@@ -61,6 +61,8 @@ module ViewModel
         ViewModel::Cepc40::Cepc.new xml_doc
       when :"CEPC-3.1"
         ViewModel::Cepc31::Cepc.new xml_doc
+      when :"CEPC-S-7.0"
+        ViewModel::CepcS70::Cepc.new xml_doc
       when :"CEPC-S-7.1"
         ViewModel::CepcS71::Cepc.new xml_doc
       else

data/lib/view_model/factory.rb

@@ -18,6 +18,7 @@ module ViewModel
       CEPC-5.0
       CEPC-4.0
       CEPC-3.1
+      CEPC-S-7.0
       CEPC-S-7.1
     ].freeze
     TYPES_OF_RD_SAP = %i[
@@ -39,6 +40,7 @@ module ViewModel
       RdSAP-Schema-S-21.0
       RdSAP-Schema-S-18.0
       RdSAP-Schema-S-17.00
+      RdSAP-Schema-S-16.1
     ].freeze
     TYPES_OF_SAP = %i[
       SAP-Schema-19.2.0