chellow 1714484335.0.0__tar.gz → 1715252645.0.0__tar.gz

{chellow-1714484335.0.0 → chellow-1715252645.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1714484335.0.0
+Version: 1715252645.0.0
 Summary: Web Application for checking UK energy bills.
 Project-URL: Homepage, https://github.com/WessexWater/chellow
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)

chellow-1715252645.0.0/VERSION

@@ -0,0 +1 @@
+__version__ = "1715252645.0.0"

{chellow-1714484335.0.0 → chellow-1715252645.0.0}/chellow/e/computer.py

@@ -552,6 +552,7 @@ class DataSource:
         self.era_map_mop_contracts = self.era_map.get("mop_contracts", {})
         self.era_map_cops = self.era_map.get("cops", {})
         self.era_map_comms = self.era_map.get("comms", {})
+        self.era_map_dtc_meter_types = self.era_map.get("dtc_meter_types", {})
         self.era_map_mpan_cores = self.era_map.get("mpan_cores", {})
         self.era_map_dnos = self.era_map.get("dnos", {})
         self.era_map_gsp_groups = self.era_map.get("gsp_groups", {})
@@ -672,9 +673,16 @@ class SiteSource(DataSource):
             else:
                 self.sc = era.imp_sc
 
-            self.properties = self.era_map.get("properties_overwritten", {})
-            self.properties.update(era.props)
-            self.properties.update(self.era_map.get("properties_overwrite", {}))
+            if era.dtc_meter_type is None:
+                era_dtc_meter_type_code = None
+            else:
+                era_dtc_meter_type_code = era.dtc_meter_type.code
+            if era_dtc_meter_type_code in self.era_map_dtc_meter_types:
+                self.dtc_meter_type_code = self.era_map_dtc_meter_types[
+                    era_dtc_meter_type_code
+                ]
+            else:
+                self.dtc_meter_type_code = era_dtc_meter_type_code
 
             self.is_import = True
             self.voltage_level_code = self.llfc.voltage_level.code
@@ -1051,9 +1059,16 @@ class SupplySource(DataSource):
         else:
             self.comm_code = era.comm.code
 
-        self.properties = dict(self.era_map.get("properties_overwritten", {}))
-        self.properties.update(era.props)
-        self.properties.update(self.era_map.get("properties_overwrite", {}))
+        if era.dtc_meter_type is None:
+            era_dtc_meter_type_code = None
+        else:
+            era_dtc_meter_type_code = era.dtc_meter_type.code
+        if era_dtc_meter_type_code in self.era_map_dtc_meter_types:
+            self.dtc_meter_type_code = self.era_map_dtc_meter_types[
+                era_dtc_meter_type_code
+            ]
+        else:
+            self.dtc_meter_type_code = era_dtc_meter_type_code
 
         self.id = self.mpan_core
         self.msn = era.msn
@@ -1632,18 +1647,6 @@ def _read_generator(sess, supply, start, is_forwards, is_prev):
         if bill.id != r.bill.id:
             continue
 
-        era = supply.find_era_at(sess, dt)
-        if era is None:
-            era_coeff = None
-        else:
-            era_properties = PropDict(
-                chellow.utils.url_root + "eras/" + str(era.id), loads(era.properties)
-            )
-            try:
-                era_coeff = float(era_properties["coefficient"])
-            except KeyError:
-                era_coeff = None
-
         reads = {}
         coeffs = {}
         for coeff, value, tpr_code in sess.query(
@@ -1656,7 +1659,7 @@ def _read_generator(sess, supply, start, is_forwards, is_prev):
             r_dt == dt,
         ):
             reads[tpr_code] = value
-            coeffs[tpr_code] = coeff if era_coeff is None else era_coeff
+            coeffs[tpr_code] = coeff
 
         yield {
             "date": dt,

{chellow-1714484335.0.0 → chellow-1715252645.0.0}/chellow/e/views.py

@@ -42,6 +42,7 @@ from chellow.models import (
     Comm,
     Contract,
     Cop,
+    DtcMeterType,
     EnergisationStatus,
     Era,
     GeneratorType,
@@ -49,7 +50,6 @@ from chellow.models import (
     HhDatum,
     Laf,
     Llfc,
-    METER_TYPES,
     MarketRole,
     MeasurementRequirement,
     MeterPaymentType,
@@ -1505,15 +1505,14 @@ def dno_get(dno_id):
 
 @e.route("/dtc_meter_types")
 def dtc_meter_types_get():
-    return render_template("dtc_meter_types.html", dtc_meter_types=METER_TYPES)
+    dtc_meter_types = g.sess.scalars(select(DtcMeterType).order_by(DtcMeterType.code))
+    return render_template("dtc_meter_types.html", dtc_meter_types=dtc_meter_types)
 
 
-@e.route("/dtc_meter_types/<code>")
-def dtc_meter_type_get(code):
-    desc = METER_TYPES[code]
-    return render_template(
-        "dtc_meter_type.html", dtc_meter_type_code=code, dtc_meter_type_description=desc
-    )
+@e.route("/dtc_meter_types/<int:dtc_meter_type_id>")
+def dtc_meter_type_get(dtc_meter_type_id):
+    dtc_meter_type = DtcMeterType.get_by_id(g.sess, dtc_meter_type_id)
+    return render_template("dtc_meter_type.html", dtc_meter_type=dtc_meter_type)
 
 
 @e.route("/duration_report")
@@ -1569,6 +1568,7 @@ def era_edit_get(era_id):
     cops = g.sess.query(Cop).order_by(Cop.code)
     comms = g.sess.query(Comm).order_by(Comm.code)
     gsp_groups = g.sess.query(GspGroup).order_by(GspGroup.code)
+    dtc_meter_types = g.sess.scalars(select(DtcMeterType).order_by(DtcMeterType.code))
     mop_contracts = (
         g.sess.query(Contract)
         .join(MarketRole)
@@ -1602,6 +1602,7 @@ def era_edit_get(era_id):
         cops=cops,
         comms=comms,
         gsp_groups=gsp_groups,
+        dtc_meter_types=dtc_meter_types,
         mop_contracts=mop_contracts,
         dc_contracts=dc_contracts,
         supplier_contracts=supplier_contracts,
@@ -1619,6 +1620,9 @@ def era_edit_form_get(era_id):
             select(EnergisationStatus).order_by(EnergisationStatus.code)
         )
         default_energisation_status = EnergisationStatus.get_by_code(g.sess, "E")
+        dtc_meter_types = g.sess.scalars(
+            select(DtcMeterType).order_by(DtcMeterType.code)
+        )
 
         if "start_year" in request.values:
             start_date = req_date("start")
@@ -1938,6 +1942,7 @@ def era_edit_form_get(era_id):
             start_date=start_date,
             imp_llfcs=imp_llfcs,
             exp_llfcs=exp_llfcs,
+            dtc_meter_types=dtc_meter_types,
         )
     except BadRequest as e:
         g.sess.rollback()
@@ -1954,6 +1959,7 @@ def era_edit_form_get(era_id):
             sscs=sscs,
             mtc_participants=mtc_participants,
             mtc_participant=mtc_participant,
+            dtc_meter_types=dtc_meter_types,
         )
 
 
@@ -2013,7 +2019,11 @@ def era_edit_post(era_id):
             energisation_status = EnergisationStatus.get_by_id(
                 g.sess, energisation_status_id
             )
-            properties = req_zish("properties")
+            dtc_meter_type_id = req_int_none("dtc_meter_type_id")
+            if dtc_meter_type_id is None:
+                dtc_meter_type = None
+            else:
+                dtc_meter_type = DtcMeterType.get_by_id(g.sess, dtc_meter_type_id)
 
             has_imp_mpan = req_bool("has_imp_mpan")
             has_exp_mpan = req_bool("has_exp_mpan")
@@ -2072,7 +2082,7 @@ def era_edit_post(era_id):
                 comm,
                 ssc_code,
                 energisation_status,
-                properties,
+                dtc_meter_type,
                 imp_mpan_core,
                 imp_llfc_code,
                 imp_supplier_contract,
@@ -4626,7 +4636,12 @@ def site_add_e_supply_post(site_id):
         energisation_status = EnergisationStatus.get_by_id(
             g.sess, energisation_status_id
         )
-        properties = req_zish("properties")
+        dtc_meter_type_id = req_int_none("dtc_meter_type_id")
+        if dtc_meter_type_id is None:
+            dtc_meter_type = None
+        else:
+            dtc_meter_type = DtcMeterType.get_by_id(g.sess, dtc_meter_type_id)
+
         if "generator_type_id" in request.form:
             generator_type_id = req_int("generator_type_id")
             generator_type = GeneratorType.get_by_id(g.sess, generator_type_id)
@@ -4703,7 +4718,7 @@ def site_add_e_supply_post(site_id):
             comm,
             None if ssc is None else ssc.code,
             energisation_status,
-            properties,
+            dtc_meter_type,
             imp_mpan_core,
             imp_llfc_code,
             imp_supplier_contract,

{chellow-1714484335.0.0 → chellow-1715252645.0.0}/chellow/general_import.py

@@ -9,7 +9,7 @@ from sqlalchemy.sql.expression import false
 
 from werkzeug.exceptions import BadRequest
 
-from zish import ZishException, loads
+from zish import loads
 
 from chellow.models import (
     Bill,
@@ -18,6 +18,7 @@ from chellow.models import (
     Comm,
     Contract,
     Cop,
+    DtcMeterType,
     EnergisationStatus,
     Era,
     GContract,
@@ -389,11 +390,11 @@ def general_import_era(sess, action, vals, args):
         else:
             energisation_status = EnergisationStatus.get_by_code(sess, es_code)
 
-        properties_str = add_arg(args, "Properties", vals, 14)
-        if properties_str == NO_CHANGE:
-            properties = loads(existing_era.properties)
+        dtc_meter_type_code = add_arg(args, "DTC Meter Type", vals, 14)
+        if dtc_meter_type_code == NO_CHANGE:
+            dtc_meter_type = existing_era.dtc_meter_type
         else:
-            properties = loads(properties_str)
+            dtc_meter_type = DtcMeterType.get_by_code(sess, dtc_meter_type_code)
 
         imp_mpan_core = add_arg(args, "Import MPAN Core", vals, 15)
         if imp_mpan_core == NO_CHANGE:
@@ -519,7 +520,7 @@ def general_import_era(sess, action, vals, args):
             comm,
             ssc_code,
             energisation_status,
-            properties,
+            dtc_meter_type,
             imp_mpan_core,
             imp_llfc_code,
             imp_supplier_contract,
@@ -1275,11 +1276,8 @@ def general_import_supply(sess, action, vals, args):
         energisation_status = EnergisationStatus.get_by_code(
             sess, energisation_status_code
         )
-        properties_str = add_arg(args, "Properties", vals, 19)
-        try:
-            properties = loads(properties_str)
-        except ZishException as e:
-            raise BadRequest(f"Can't parse the properties field. {e}")
+        dtc_meter_type_code = add_arg(args, "DTC Meter Type", vals, 19)
+        dtc_meter_type = DtcMeterType.get_by_code(sess, dtc_meter_type_code)
         imp_mpan_core = add_arg(args, "Import MPAN Core", vals, 20)
         if len(imp_mpan_core) == 0:
             imp_mpan_core = None
@@ -1356,7 +1354,7 @@ def general_import_supply(sess, action, vals, args):
             comm,
             ssc_code,
             energisation_status,
-            properties,
+            dtc_meter_type,
             imp_mpan_core,
             imp_llfc_code,
             imp_supplier_contract,

{chellow-1714484335.0.0 → chellow-1715252645.0.0}/chellow/models.py

@@ -2452,6 +2452,38 @@ class Laf(Base, PersistentClass):
         self.value = value
 
 
+# J0483 in https://www.electralink.co.uk/data-catalogues/dtc-catalogue/
+class DtcMeterType(Base, PersistentClass):
+    __tablename__ = "dtc_meter_type"
+    id = Column(Integer, primary_key=True)
+    code = Column(String, nullable=False, unique=True)
+    description = Column(String, nullable=False)
+    eras = relationship("Era", backref="dtc_meter_type")
+
+    def __init__(self, code, description):
+        self.code = code
+        self.description = description
+
+    @classmethod
+    def insert(cls, sess, code, description):
+        dtc_meter_type = cls(code, description)
+        sess.add(dtc_meter_type)
+        return dtc_meter_type
+
+    @staticmethod
+    def find_by_code(sess, code):
+        return sess.execute(
+            select(DtcMeterType).where(DtcMeterType.code == code)
+        ).scalar_one_or_none()
+
+    @classmethod
+    def get_by_code(cls, sess, code):
+        dtc_meter_type = cls.find_by_code(sess, code)
+        if dtc_meter_type is None:
+            raise Exception(f"Can't find the DTC meter type with code {code}.")
+        return dtc_meter_type
+
+
 class MeterType(Base, PersistentClass):
     __tablename__ = "meter_type"
     id = Column(Integer, primary_key=True)
@@ -3234,42 +3266,6 @@ class EnergisationStatus(Base, PersistentClass):
         return energisation_status
 
 
-METER_TYPES = {
-    "H": "Half Hourly",
-    "K": "Key",
-    "LAG": "Lag",
-    "LEAD": "Lead",
-    "MAIN": "Main",
-    "N": "Non-Half Hourly",
-    "NCAMR": "Non-remotely Configurable Automated Meter Reading",
-    "NSS": "A meter that meets the definition of an ADM but is not compliant "
-    "with any version of SMETS",
-    "RCAMR": "Remotely Configurable Automated Meter Reading without remote "
-    "enable/disable capability",
-    "RCAMY": "Remotely Configurable Automated Meter Reading with remote "
-    "enable/disable capability",
-    "S": "Smartcard Prepayment",
-    "S1": "A meter that is compliant with the Smart Metering Equipment "
-    "Technical Specifications 1 (SMETS1)",
-    "S2A": "A single element meter that is compliant with SMETS2",
-    "S2B": "A twin element meter that is compliant with SMETS2",
-    "S2C": "A polyphase meter that is compliant with SMETS2",
-    "S2AD": "A single element meter with one or more ALCS that is compliant "
-    "with SMETS2",
-    "S2BD": "A twin element meter with one or more ALCS that is compliant "
-    "with SMETS2",
-    "S2CD": "A polyphase meter with one or more ALCS that is compliant with " "SMETS2",
-    "S2ADE": "Single element meter with one or more ALCS and Boost Function "
-    "that is compliant with SMETS2",
-    "S2BDE": "A twin element meter with one or more ALCS and Boost Function "
-    "that is compliant with SMETS2",
-    "S2CDE": "A polyphase meter with one or more ALCS and Boost Function that "
-    "is compliant with SMETS2",
-    "SPECL": "Special",
-    "T": "Token",
-}
-
-
 class Era(Base, PersistentClass):
     __tablename__ = "era"
     id = Column(Integer, primary_key=True)
@@ -3298,7 +3294,7 @@ class Era(Base, PersistentClass):
     energisation_status_id = Column(
         Integer, ForeignKey("energisation_status.id"), nullable=False
     )
-    properties = Column(Text, nullable=False)
+    dtc_meter_type_id = Column(Integer, ForeignKey("dtc_meter_type.id"))
     imp_mpan_core = Column(String)
     imp_llfc_id = Column(Integer, ForeignKey("llfc.id"))
     imp_llfc = relationship("Llfc", primaryjoin="Llfc.id==Era.imp_llfc_id")
@@ -3441,7 +3437,7 @@ class Era(Base, PersistentClass):
                 self.comm,
                 None if self.ssc is None else self.ssc.code,
                 self.energisation_status,
-                loads(self.properties),
+                self.dtc_meter_type,
                 self.imp_mpan_core,
                 None if self.imp_llfc is None else self.imp_llfc.code,
                 self.imp_supplier_contract,
@@ -3470,7 +3466,7 @@ class Era(Base, PersistentClass):
         comm,
         ssc_code,
         energisation_status,
-        properties,
+        dtc_meter_type,
         imp_mpan_core,
         imp_llfc_code,
         imp_supplier_contract,
@@ -3521,22 +3517,7 @@ class Era(Base, PersistentClass):
                 "A NHH supply must have a Standard Settlement Configuration."
             )
         self.energisation_status = energisation_status
-
-        if isinstance(properties, dict):
-            try:
-                meter_type = properties["meter_type"]
-                if meter_type not in METER_TYPES:
-                    raise BadRequest(
-                        f"The meter type {meter_type} must be one of {METER_TYPES}."
-                    )
-            except KeyError:
-                pass
-
-            self.properties = dumps(properties)
-        else:
-            raise Exception(
-                f"The properties argument must be a dict, rather than {properties}."
-            )
+        self.dtc_meter_type = dtc_meter_type
 
         locs = locals()
         voltage_level = None
@@ -3775,29 +3756,13 @@ class Era(Base, PersistentClass):
         sess.delete(channel)
         sess.flush()
 
-    @property
-    def props(self):
-        if not hasattr(self, "_props"):
-            self._props = loads(self.properties)
-        return self._props
-
     @property
     def meter_category(self):
         if not hasattr(self, "_meter_category"):
-            meter_type = self.props.get("meter_type")
-            try:
-                cat = METER_CATEGORY[meter_type]
-            except KeyError:
-                if self.pc.code == "00":
-                    cat = "hh"
-                elif len(self.channels) > 0:
-                    cat = "amr"
-                elif self.mtc_participant.meter_type.code in ["UM", "PH"]:
-                    cat = "unmetered"
-                else:
-                    cat = "nhh"
+            self._meter_category = METER_CATEGORY[
+                None if self.dtc_meter_type is None else self.dtc_meter_type.code
+            ]
 
-            self._meter_category = cat
         return self._meter_category
 
     def get_physical_site(self, sess):
@@ -3808,7 +3773,42 @@ class Era(Base, PersistentClass):
         )
 
 
-METER_CATEGORY = {"H": "hh", "N": "nhh", "S1": "amr"}
+METER_CATEGORY = {
+    None: "unmetered",
+    "CHECK": "hh",
+    "H": "hh",
+    "K": "nhh",
+    "LAG_": "hh",
+    "LEAD_": "hh",
+    "MAIN_": "hh",
+    "N": "nhh",
+    "NCAMR": "amr",
+    "NSS": "amr",
+    "RCAMR": "amr",
+    "RCAMY": "amr",
+    "S": "nhh",
+    "S1": "amr",
+    "S2A": "amr",
+    "S2B": "amr",
+    "S2C": "amr",
+    "S2AD": "amr",
+    "S2BD": "amr",
+    "S2CDE": "amr",
+    "SPECL": "nhh",
+    "T": "nhh",
+    "2ADF": "amr",
+    "2ADEF": "amr",
+    "2AEF": "amr",
+    "2AF": "amr",
+    "2BF": "amr",
+    "2BDF": "amr",
+    "2BDEF": "amr",
+    "2BEF": "amr",
+    "2CDEF": "amr",
+    "2CF": "amr",
+    "2CDF": "amr",
+    "2CEF": "amr",
+}
 
 
 class Channel(Base, PersistentClass):
@@ -4521,7 +4521,7 @@ class Supply(Base, PersistentClass):
             template_era.comm,
             None if template_era.ssc is None else template_era.ssc.code,
             template_era.energisation_status,
-            loads(template_era.properties),
+            template_era.dtc_meter_type,
             template_era.imp_mpan_core,
             imp_llfc_code,
             template_era.imp_supplier_contract,
@@ -6567,6 +6567,94 @@ def insert_voltage_levels(sess):
         VoltageLevel.insert(sess, code, desc)
 
 
+def insert_dtc_meter_types(sess):
+    for code, desc in (
+        ("CHECK", "Check"),
+        ("H", "Half Hourly"),
+        ("K", "Key"),
+        ("LAG_", "Lag"),
+        ("LEAD_", "Lead"),
+        ("MAIN_", "Main"),
+        ("N", "Non-Half Hourly"),
+        ("NCAMR", "Non-remotely Configurable Automated Meter Reading"),
+        (
+            "NSS",
+            "A meter that meets the definition of an ADM but is not compliant with "
+            "any version of SMETS",
+        ),
+        (
+            "RCAMR",
+            "Remotely Configurable Automated Meter Reading without remote "
+            "enable/disable capability",
+        ),
+        (
+            "RCAMY",
+            "Remotely Configurable Automated Meter Reading with remote "
+            "enable/disable capability",
+        ),
+        ("S", "Smartcard Prepayment"),
+        (
+            "S1",
+            "A meter that is compliant with the Smart Metering Equipment Technical "
+            "Specifications 1 (SMETS1)",
+        ),
+        ("S2A", "A single element meter that is compliant with SMETS2"),
+        ("S2B", "A twin element meter that is compliant with SMETS2"),
+        ("S2C", "A polyphase meter that is compliant with SMETS2"),
+        (
+            "S2AD",
+            "A single element meter with one or more ALCS that is compliant with "
+            "SMETS2",
+        ),
+        (
+            "S2BD",
+            "A twin element meter with one or more ALCS that is compliant with "
+            "SMETS2",
+        ),
+        (
+            "S2CDE",
+            "A polyphase meter with one or more ALCS and Boost Function that is "
+            "compliant with SMETS2",
+        ),
+        ("SPECL", "Special"),
+        ("T", "Token"),
+        (
+            "2ADF",
+            "Single Element with ALCS and Auxiliary Proportional Controller (APC) "
+            "that is compliant with SMETS2",
+        ),
+        (
+            "2ADEF",
+            "Single Element with ALCS, Boost Function and APC that is compliant "
+            "with SMETS2",
+        ),
+        (
+            "2AEF",
+            "Single Element with Boost Function and APC that is compliant with SMETS2",
+        ),
+        ("2AF", "Single Element with APC that is compliant with SMETS2"),
+        ("2BF", "Twin Element with APC that is compliant with SMETS2"),
+        ("2BDF", "Twin Element with ALCS and APC that is compliant with SMETS2"),
+        (
+            "2BDEF",
+            "Twin Element with ALCS, Boost Function and APC that is compliant with "
+            "SMETS2",
+        ),
+        (
+            "2BEF",
+            "Twin Element with Boost Function and APC that is compliant with SMETS2",
+        ),
+        (
+            "2CDEF",
+            "Polyphase with ALCS, Boost Function and APC that is compliant with SMETS2",
+        ),
+        ("2CF", "Polyphase with APC that is compliant with SMETS2"),
+        ("2CDF", "Polyphase with ALCS and APC that is compliant with SMETS2"),
+        ("2CEF", "Polyphase with Boost Function and APC that is compliant with SMETS2"),
+    ):
+        DtcMeterType.insert(sess, code, desc)
+
+
 def db_init(sess, root_path):
     db_name = config["PGDATABASE"]
     log_message("Initializing database.")
@@ -6658,6 +6746,9 @@ def db_init(sess, root_path):
     ):
         Contract.insert_non_core(sess, name, "", properties, last_month_start, None, {})
 
+    insert_dtc_meter_types(sess)
+    sess.commit()
+
     insert_g_read_types(sess)
     sess.commit()
 
@@ -7295,6 +7386,53 @@ def db_upgrade_45_to_46(sess, root_path):
     )
 
 
+def db_upgrade_46_to_47(sess, root_path):
+    insert_dtc_meter_types(sess)
+    sess.flush()
+
+    sess.execute(
+        text(
+            "alter table era add dtc_meter_type_id integer references dtc_meter_type "
+            "(id);"
+        )
+    )
+    for era_id, pc_id, era_properties, mtc_participant_id in sess.execute(
+        text("select era.id, era.pc_id, era.properties, mtc_participant_id from era")
+    ):
+        dtc_meter_type_id = None
+        props = loads(era_properties)
+        if "meter_type" in props:
+            mt_code = props["meter_type"]
+            dtc_meter_type = DtcMeterType.find_by_code(sess, mt_code)
+            dtc_meter_type_id = dtc_meter_type.id
+
+        if dtc_meter_type_id is None:
+            mtc_participant = MtcParticipant.get_by_id(sess, mtc_participant_id)
+            if mtc_participant.meter_type.code not in ["UM", "PH"]:
+                pc = Pc.get_by_id(sess, pc_id)
+                if pc.code == "00":
+                    dtc_meter_type_code = "H"
+                else:
+                    channels = sess.scalars(
+                        select(Channel).where(Channel.era_id == era_id)
+                    ).all()
+                    if len(channels) > 0:
+                        dtc_meter_type_code = "RCAMR"
+                    else:
+                        dtc_meter_type_code = "N"
+                dtc_meter_type = DtcMeterType.get_by_code(sess, dtc_meter_type_code)
+                dtc_meter_type_id = dtc_meter_type.id
+
+        sess.execute(
+            text(
+                "UPDATE era SET dtc_meter_type_id = :dtc_meter_type_id "
+                "where id = :era_id"
+            ),
+            params={"dtc_meter_type_id": dtc_meter_type_id, "era_id": era_id},
+        )
+    sess.execute(text("alter table era drop column properties;"))
+
+
 upgrade_funcs = [None] * 18
 upgrade_funcs.extend(
     [
@@ -7326,6 +7464,7 @@ upgrade_funcs.extend(
         db_upgrade_43_to_44,
         db_upgrade_44_to_45,
         db_upgrade_45_to_46,
+        db_upgrade_46_to_47,
     ]
 )
 

{chellow-1714484335.0.0 → chellow-1715252645.0.0}/chellow/reports/report_33.py

@@ -375,7 +375,7 @@ limit 3
             latest_mop_bill_date,
             supply_start_date,
             supply_finish_date,
-            era.properties,
+            None if era.dtc_meter_type is None else era.dtc_meter_type.code,
             imp_tnuos_band,
         ]
         + channel_values
@@ -447,7 +447,7 @@ def _process(sess, f, date, supply_id, mpan_cores):
         "Latest MOP Bill Date",
         "Supply Start Date",
         "Supply Finish Date",
-        "Properties",
+        "DTC Meter Type",
         "tnuos_band",
         "Import ACTIVE?",
         "Import REACTIVE_IMPORT?",