chellow 1752486598.0.0__tar.gz → 1752836620.0.0__tar.gz

{chellow-1752486598.0.0 → chellow-1752836620.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1752486598.0.0
+Version: 1752836620.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-1752836620.0.0/VERSION

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

{chellow-1752486598.0.0 → chellow-1752836620.0.0}/chellow/e/bill_parsers/drax_edi.py

@@ -114,7 +114,7 @@ ELEMENT_MAP = {
             "122568": ("nrg-gsp-losses-gbp", "nrg-rate", "nrg-gsp-losses-kwh"),
         },
         "DUSTRN": {
-            "122568": ("nrg-nbp-losses-gbp", "nrg-rate", "nrg-bp-losses-kwh"),
+            "122568": ("nrg-nbp-losses-gbp", "nrg-rate", "nrg-nbp-losses-kwh"),
         },
     },
     "ELX": {

{chellow-1752486598.0.0 → chellow-1752836620.0.0}/chellow/reports/report_ecoes_comparison.py

@@ -479,7 +479,7 @@ def _process(
 
                 chellow_dtc_meter_type = era.dtc_meter_type
                 if chellow_dtc_meter_type is None:
-                    chellow_meter_type = None
+                    chellow_meter_type = ""
                 else:
                     chellow_meter_type = chellow_dtc_meter_type.code
 

{chellow-1752486598.0.0 → chellow-1752836620.0.0}/test/reports/test_report_ecoes_comparison.py

@@ -589,3 +589,197 @@ def test_process_in_chellow_not_ecoes(mocker, sess):
     f.seek(0)
     actual = list(csv.reader(f))
     match_tables(expected, actual)
+
+
+def test_process_dtc_none(mocker, sess):
+    vf = to_utc(ct_datetime(2000, 1, 1))
+    site = Site.insert(sess, "CI017", "Water Works")
+
+    market_role_Z = MarketRole.insert(sess, "Z", "Non-core")
+    participant = Participant.insert(sess, "CALB", "AK Industries")
+    participant.insert_party(sess, market_role_Z, "None core", vf, None, None)
+    market_role_X = MarketRole.insert(sess, "X", "Supplier")
+    market_role_M = MarketRole.insert(sess, "M", "Mop")
+    market_role_C = MarketRole.insert(sess, "C", "HH Dc")
+    market_role_R = MarketRole.insert(sess, "R", "Distributor")
+    participant.insert_party(sess, market_role_M, "Fusion Mop", vf, None, None)
+    participant.insert_party(sess, market_role_X, "Fusion Ltc", vf, None, None)
+    participant.insert_party(sess, market_role_C, "Fusion DC", vf, None, None)
+    mop_contract = Contract.insert_mop(
+        sess, "Fusion", participant, "", {}, vf, None, {}
+    )
+    dc_contract = Contract.insert_dc(
+        sess, "Fusion DC 2000", participant, "", {}, vf, None, {}
+    )
+    pc = Pc.insert(sess, "00", "hh", vf, None)
+    insert_cops(sess)
+    cop = Cop.get_by_code(sess, "5")
+    insert_comms(sess)
+    comm = Comm.get_by_code(sess, "GSM")
+    imp_supplier_contract = Contract.insert_supplier(
+        sess, "Fusion Supplier 2000", participant, "", {}, vf, None, {}
+    )
+    dno = participant.insert_party(sess, market_role_R, "WPD", vf, None, "22")
+    meter_type = MeterType.insert(sess, "C5", "COP 1-5", vf, None)
+    meter_payment_type = MeterPaymentType.insert(sess, "CR", "Credit", vf, None)
+    mtc = Mtc.insert(sess, "845", False, True, vf, None)
+    mtc_participant = MtcParticipant.insert(
+        sess,
+        mtc,
+        participant,
+        "HH COP5 And Above With Comms",
+        False,
+        True,
+        meter_type,
+        meter_payment_type,
+        0,
+        vf,
+        None,
+    )
+    insert_voltage_levels(sess)
+    voltage_level = VoltageLevel.get_by_code(sess, "HV")
+    llfc = dno.insert_llfc(
+        sess, "510", "PC 5-8 & HH HV", voltage_level, False, True, vf, None
+    )
+    MtcLlfc.insert(sess, mtc_participant, llfc, vf, None)
+    dno.insert_llfc(sess, "521", "Export (HV)", voltage_level, False, False, vf, None)
+    insert_sources(sess)
+    source = Source.get_by_code(sess, "grid")
+    insert_energisation_statuses(sess)
+    energisation_status = EnergisationStatus.get_by_code(sess, "E")
+    gsp_group = GspGroup.insert(sess, "_L", "South Western")
+
+    site.insert_e_supply(
+        sess,
+        source,
+        None,
+        "Dave",
+        utc_datetime(2000, 1, 1),
+        None,
+        gsp_group,
+        mop_contract,
+        "773",
+        dc_contract,
+        "ghyy3",
+        "hgjeyhuw",
+        dno,
+        pc,
+        "845",
+        cop,
+        comm,
+        None,
+        energisation_status,
+        None,
+        "22 7868 6232 789",
+        "510",
+        imp_supplier_contract,
+        "7748",
+        361,
+        None,
+        None,
+        None,
+        None,
+        None,
+    )
+    report_run = ReportRun.insert(
+        sess,
+        "ecoes_comparison",
+        None,
+        "ecoes_comparison",
+        {},
+    )
+
+    sess.commit()
+    f = StringIO()
+    ecoes_lines = [
+        "titles",
+        ",".join(
+            (
+                "2278686232789",
+                "address-line-1",
+                "address-line-2",
+                "address-line-3",
+                "address-line-4",
+                "address-line-5",
+                "address-line-6",
+                "address-line-7",
+                "address-line-8",
+                "address-line-9",
+                "post-code",
+                "CALB",
+                "12/10/2022",
+                "845",
+                "12/10/2022",
+                "510",
+                "12/10/2022",
+                "00",
+                "",
+                "measurement-class",
+                "E",
+                "CALB",
+                "CALB",
+                "CALB",
+                "12/10/2022",
+                "_L",
+                "12/10/2022",
+                "22",
+                "hgjeyhuw",
+                "12/10/2022",
+                "",
+                "map-id",
+            ),
+        ),
+    ]
+    exclude_mpan_cores = []
+    ignore_mpan_cores_msn = []
+    show_ignored = True
+
+    _process(
+        sess,
+        ecoes_lines,
+        exclude_mpan_cores,
+        ignore_mpan_cores_msn,
+        f,
+        show_ignored,
+        report_run,
+    )
+    expected = [
+        [
+            "mpan_core",
+            "mpan_core_no_spaces",
+            "ecoes_pc",
+            "chellow_pc",
+            "ecoes_mtc",
+            "ecoes_mtc_date",
+            "chellow_mtc",
+            "ecoes_llfc",
+            "ecoes_llfc_from",
+            "chellow_llfc",
+            "ecoes_ssc",
+            "chellow_ssc",
+            "ecoes_es",
+            "chellow_es",
+            "ecoes_supplier",
+            "ecoes_supplier_registration_from",
+            "chellow_supplier",
+            "chellow_supplier_contract_name",
+            "ecoes_dc",
+            "chellow_dc",
+            "ecoes_mop",
+            "ecoes_mop_appoint_date",
+            "chellow_mop",
+            "ecoes_gsp_group",
+            "ecoes_gsp_effective_from",
+            "chellow_gsp_group",
+            "ecoes_msn",
+            "ecoes_msn_install_date",
+            "chellow_msn",
+            "ecoes_meter_type",
+            "chellow_meter_type",
+            "ignored",
+            "problem",
+        ],
+    ]
+    f.seek(0)
+    actual = list(csv.reader(f))
+    match_tables(expected, actual)

chellow-1752486598.0.0/VERSION

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