chellow 1718904221.0.0__tar.gz → 1720006293.0.0__tar.gz

{chellow-1718904221.0.0 → chellow-1720006293.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1718904221.0.0
+Version: 1720006293.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-1720006293.0.0/VERSION

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

{chellow-1718904221.0.0 → chellow-1720006293.0.0}/chellow/e/bill_parsers/mm.py

@@ -68,11 +68,16 @@ CHARGE_UNITS_LOOKUP = {
     "SAG": "days",
     "TNUOS": "days",
     "REAP": "kvarh",
+    "DCDA": "days",
+    "MOP1": "days",
+    "COMM": "days",
 }
 
 ELEMENT_LOOKUP = {
     "10ANNUAL": "standing",
     "20RS0108": "single",
+    "30ANNUAL": "mop",
+    "50ANNUAL": "dc",
     "9WANNUAL": "site-fee",
     "20RS0123": "day",
     "30RS0123": "night",

{chellow-1718904221.0.0 → chellow-1720006293.0.0}/chellow/models.py

@@ -7486,6 +7486,18 @@ def db_upgrade_47_to_48(sess, root_path):
         DtcMeterType.insert(sess, code, desc)
 
 
+def db_upgrade_48_to_49(sess, root_path):
+    for code, factor_str in (
+        ("MCUF", "28.316846592"),
+        ("HCUF", "2.8316846592"),
+        ("TCUF", "0.28316846592"),
+        ("OCUF", "0.028316846592"),
+    ):
+        g_unit = GUnit.get_by_code(sess, code)
+        g_unit.factor = Decimal(factor_str)
+        sess.flush()
+
+
 upgrade_funcs = [None] * 18
 upgrade_funcs.extend(
     [
@@ -7519,6 +7531,7 @@ upgrade_funcs.extend(
         db_upgrade_45_to_46,
         db_upgrade_46_to_47,
         db_upgrade_47_to_48,
+        db_upgrade_48_to_49,
     ]
 )
 

{chellow-1718904221.0.0 → chellow-1720006293.0.0}/chellow/reports/report_231.py

@@ -36,6 +36,9 @@ def content(user_id, start_date, finish_date, contract_id):
                 "energisation_status",
                 "gsp_group",
                 "dno",
+                "era_start",
+                "pc",
+                "meter_type",
                 "site_code",
                 "imp_is_substation",
                 "imp_llfc_code",
@@ -46,7 +49,8 @@ def content(user_id, start_date, finish_date, contract_id):
             ]
 
             bill_titles = contract_func(caches, contract, "virtual_bill_titles")()
-            writer.writerow(header_titles + bill_titles)
+            titles = header_titles + bill_titles
+            writer.writerow(titles)
             vb_func = contract_func(caches, contract, "virtual_bill")
 
             for era in (
@@ -77,34 +81,31 @@ def content(user_id, start_date, finish_date, contract_id):
                     exp_llfc_description = supply_source.llfc.description
                     imp_is_substation = imp_llfc_code = imp_llfc_description = None
 
-                out = [
-                    era.imp_mpan_core,
-                    era.exp_mpan_core,
-                    chunk_start,
-                    chunk_finish,
-                    supply_source.energisation_status_code,
-                    supply_source.gsp_group_code,
-                    supply_source.dno_code,
-                    era.get_physical_site(sess).code,
-                    imp_is_substation,
-                    imp_llfc_code,
-                    imp_llfc_description,
-                    exp_is_substation,
-                    exp_llfc_code,
-                    exp_llfc_description,
-                ]
+                out = {
+                    "imp_mpan_core": era.imp_mpan_core,
+                    "exp_mpan_core": era.exp_mpan_core,
+                    "start_date": chunk_start,
+                    "finish_date": chunk_finish,
+                    "energisation_status": supply_source.energisation_status_code,
+                    "gsp_group": supply_source.gsp_group_code,
+                    "dno": supply_source.dno_code,
+                    "era_start": era.start_date,
+                    "pc": supply_source.pc_code,
+                    "meter_type": supply_source.meter_type_code,
+                    "site_code": era.get_physical_site(sess).code,
+                    "imp_is_substation": imp_is_substation,
+                    "imp_llfc_code": imp_llfc_code,
+                    "imp_llfc_description": imp_llfc_description,
+                    "exp_is_substation": exp_is_substation,
+                    "exp_llfc_code": exp_llfc_code,
+                    "exp_llfc_description": exp_llfc_description,
+                }
                 vb_func(supply_source)
                 bill = supply_source.mop_bill
                 for title in bill_titles:
                     if title in bill:
-                        out.append(bill[title])
-                        del bill[title]
-                    else:
-                        out.append("")
-                for k in sorted(bill.keys()):
-                    out.append(k)
-                    out.append(bill[k])
-                writer.writerow(csv_make_val(v) for v in out)
+                        out[title] = bill[title]
+                writer.writerow(csv_make_val(out.get(t)) for t in titles)
 
                 sess.rollback()  # Avoid long-running transactions
     except BadRequest as e:

{chellow-1718904221.0.0 → chellow-1720006293.0.0}/chellow/reports/report_81.py

@@ -37,13 +37,16 @@ def content(user_id, contract_id, end_year, end_month, months):
 
             bill_titles = contract_func(caches, contract, "virtual_bill_titles")()
             header_titles = [
-                "Import MPAN Core",
-                "Export MPAN Core",
-                "Start Date",
-                "Finish Date",
+                "imp_mpan_core",
+                "exp_mpan_core",
+                "start_date",
+                "finish_date",
                 "energisation_status",
                 "gsp_group",
                 "dno",
+                "era_start",
+                "pc",
+                "meter_type",
                 "site_code",
                 "imp_is_substation",
                 "imp_llfc_code",
@@ -55,7 +58,8 @@ def content(user_id, contract_id, end_year, end_month, months):
 
             vb_func = contract_func(caches, contract, "virtual_bill")
 
-            writer.writerow(header_titles + bill_titles)
+            titles = header_titles + bill_titles
+            writer.writerow(titles)
 
             for era in (
                 sess.query(Era)
@@ -86,36 +90,33 @@ def content(user_id, contract_id, end_year, end_month, months):
                     exp_llfc_description = supply_source.llfc.description
                     imp_is_substation = imp_llfc_code = imp_llfc_description = None
 
-                vals = [
-                    era.imp_mpan_core,
-                    era.exp_mpan_core,
-                    chunk_start,
-                    chunk_finish,
-                    supply_source.energisation_status_code,
-                    supply_source.gsp_group_code,
-                    supply_source.dno_code,
-                    era.get_physical_site(sess).code,
-                    imp_is_substation,
-                    imp_llfc_code,
-                    imp_llfc_description,
-                    exp_is_substation,
-                    exp_llfc_code,
-                    exp_llfc_description,
-                ]
+                vals = {
+                    "imp_mpan_core": era.imp_mpan_core,
+                    "exp_mpan_core": era.exp_mpan_core,
+                    "start_date": chunk_start,
+                    "finish_date": chunk_finish,
+                    "energisation_status": supply_source.energisation_status_code,
+                    "gsp_group": supply_source.gsp_group_code,
+                    "dno": supply_source.dno_code,
+                    "era_start": era.start_date,
+                    "pc": supply_source.pc_code,
+                    "meter_type": supply_source.meter_type_code,
+                    "site_code": era.get_physical_site(sess).code,
+                    "imp_is_substation": imp_is_substation,
+                    "imp_llfc_code": imp_llfc_code,
+                    "imp_llfc_description": imp_llfc_description,
+                    "exp_is_substation": exp_is_substation,
+                    "exp_llfc_code": exp_llfc_code,
+                    "exp_llfc_description": exp_llfc_description,
+                }
 
                 vb_func(supply_source)
                 bill = supply_source.dc_bill
 
                 for title in bill_titles:
-                    vals.append(bill.get(title))
-                    if title in bill:
-                        del bill[title]
+                    vals[title] = bill.get(title)
 
-                for k in sorted(bill.keys()):
-                    vals.append(k)
-                    vals.append(bill[k])
-
-                writer.writerow(csv_make_val(v) for v in vals)
+                writer.writerow(csv_make_val(vals.get(t)) for t in titles)
 
                 # Avoid long-running transactions
                 sess.rollback()

{chellow-1718904221.0.0 → chellow-1720006293.0.0}/chellow/reports/report_87.py

@@ -83,37 +83,32 @@ def _process_era(
             exp_llfc_description = data_source.llfc.description
             imp_is_substation = imp_llfc_code = imp_llfc_description = None
 
-        vals = [
-            data_source.mpan_core,
-            site.code,
-            site.name,
-            data_source.supplier_account,
-            data_source.start_date,
-            data_source.finish_date,
-            data_source.energisation_status_code,
-            data_source.gsp_group_code,
-            data_source.dno_code,
-            imp_is_substation,
-            imp_llfc_code,
-            imp_llfc_description,
-            exp_is_substation,
-            exp_llfc_code,
-            exp_llfc_description,
-        ]
+        vals = {
+            "mpan_core": data_source.mpan_core,
+            "site_code": site.code,
+            "site_name": site.name,
+            "account": data_source.supplier_account,
+            "from": data_source.start_date,
+            "to": data_source.finish_date,
+            "energisation_status": data_source.energisation_status_code,
+            "gsp_group": data_source.gsp_group_code,
+            "dno": data_source.dno_code,
+            "era_start": era.start_date,
+            "pc": data_source.pc_code,
+            "meter_type": data_source.meter_type_code,
+            "imp_is_substation": imp_is_substation,
+            "imp_llfc_code": imp_llfc_code,
+            "imp_llfc_description": imp_llfc_description,
+            "exp_is_substation": exp_is_substation,
+            "exp_llfc_code": exp_llfc_code,
+            "exp_llfc_description": exp_llfc_description,
+        }
 
         vb_func(data_source)
         bill = data_source.supplier_bill
         for title in bill_titles:
             if title in bill:
-                val = bill[title]
-                del bill[title]
-            else:
-                val = ""
-            vals.append(val)
-
-        for k in sorted(bill.keys()):
-            vals.append(k)
-            vals.append(str(bill[k]))
+                vals[title] = bill[title]
 
         return vals
 
@@ -163,6 +158,9 @@ def create_csv(f, sess, start_date, finish_date, contract_id):
         "energisation_status",
         "gsp_group",
         "dno",
+        "era_start",
+        "pc",
+        "meter_type",
         "imp_is_substation",
         "imp_llfc_code",
         "imp_llfc_description",
@@ -170,7 +168,8 @@ def create_csv(f, sess, start_date, finish_date, contract_id):
         "exp_llfc_code",
         "exp_llfc_description",
     ]
-    writer.writerow(header_titles + bill_titles)
+    titles = header_titles + bill_titles
+    writer.writerow(titles)
     vb_func = contract_func(caches, contract, "virtual_bill")
 
     for month_start, month_finish in month_pairs:
@@ -201,7 +200,7 @@ def create_csv(f, sess, start_date, finish_date, contract_id):
                     period_finish,
                     era,
                 )
-                writer.writerow(csv_make_val(v) for v in vals)
+                writer.writerow(csv_make_val(vals.get(t)) for t in titles)
             except BadRequest as e:
                 raise BadRequest(
                     f"Problem with {chellow.utils.url_root}eras/{era.id}/edit "

{chellow-1718904221.0.0 → chellow-1720006293.0.0}/chellow/templates/supplies.html

@@ -126,15 +126,10 @@
 			<tbody>
 				{% for g_era in g_eras %}
 					<tr>
-						<td>
-							<a href="/g_supplies/{{g_era.g_supply_id}}">supply</a>
-						</td>
+						<td><a href="/g/supplies/{{g_era.g_supply_id}}">supply</a></td>
 						<td>{{g_era.g_supply.mprn}}</td>
 						<td>{{g_era.msn}}</td>
-						<td>
-							<a
-									href="/g_contracts/{{g_era.g_contract.id}}"
-									>{{g_era.g_contract.name}}</a>
+						<td><a href="/g/contracts/{{g_era.g_contract.id}}">{{g_era.g_contract.name}}</a>
 						</td>
 						<td>{{g_era.account}}</td>
 					</tr>

chellow-1720006293.0.0/test/reports/test_report_231.py

@@ -0,0 +1,291 @@
+import csv
+from io import StringIO
+
+from utils import match_tables
+
+from chellow.models import (
+    Comm,
+    Contract,
+    Cop,
+    DtcMeterType,
+    EnergisationStatus,
+    GspGroup,
+    MarketRole,
+    MeterPaymentType,
+    MeterType,
+    Mtc,
+    MtcLlfc,
+    MtcParticipant,
+    Participant,
+    Pc,
+    Site,
+    Source,
+    User,
+    UserRole,
+    VoltageLevel,
+    insert_comms,
+    insert_cops,
+    insert_dtc_meter_types,
+    insert_energisation_statuses,
+    insert_sources,
+    insert_voltage_levels,
+)
+from chellow.reports.report_231 import content
+from chellow.utils import ct_datetime, to_utc
+
+
+def test_content_no_supplies(mocker, sess):
+    vf = to_utc(ct_datetime(2000, 1, 1))
+    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)
+    bank_holiday_rate_script = {"bank_holidays": []}
+    Contract.insert_non_core(
+        sess,
+        "bank_holidays",
+        "",
+        {},
+        vf,
+        None,
+        bank_holiday_rate_script,
+    )
+    market_role_M = MarketRole.insert(sess, "M", "HH Mop")
+    participant.insert_party(sess, market_role_M, "Fusion MOP", vf, None, None)
+    mop_charge_script = """
+from chellow.utils import reduce_bill_hhs
+
+def virtual_bill_titles():
+    return ['net-gbp', 'problem']
+
+def virtual_bill(ds):
+    for hh in ds.hh_data:
+        hh_start = hh['start-date']
+        bill_hh = ds.supplier_bill_hhs[hh_start]
+
+        bill_hh['net-gbp'] = sum(
+            v for k, v in bill_hh.items() if k.endswith('gbp'))
+
+    ds.mop_bill = reduce_bill_hhs(ds.supplier_bill_hhs)
+"""
+    mop_contract = Contract.insert_mop(
+        sess, "Fusion MOP 2000", participant, mop_charge_script, {}, vf, None, {}
+    )
+    editor = UserRole.insert(sess, "editor")
+    user = User.insert(sess, "admin@example.com", "xxx", editor, None)
+    user_id = user.id
+    sess.commit()
+
+    f = StringIO()
+    f.close = mocker.Mock()
+    mocker.patch("chellow.reports.report_231.open_file", return_value=f)
+    start_date = to_utc(ct_datetime(2020, 1, 1))
+    finish_date = to_utc(ct_datetime(2020, 1, 5))
+    content(user_id, start_date, finish_date, mop_contract.id)
+
+    f.seek(0)
+    sheet = csv.reader(f)
+    actual_table = list(sheet)
+    expected_table = [
+        [
+            "imp_mpan_core",
+            "exp_mpan_core",
+            "start_date",
+            "finish_date",
+            "energisation_status",
+            "gsp_group",
+            "dno",
+            "era_start",
+            "pc",
+            "meter_type",
+            "site_code",
+            "imp_is_substation",
+            "imp_llfc_code",
+            "imp_llfc_description",
+            "exp_is_substation",
+            "exp_llfc_code",
+            "exp_llfc_description",
+            "net-gbp",
+            "problem",
+        ],
+    ]
+    match_tables(expected_table, actual_table)
+
+
+def test_content_one_supply(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)
+    bank_holiday_rate_script = {"bank_holidays": []}
+    Contract.insert_non_core(
+        sess,
+        "bank_holidays",
+        "",
+        {},
+        vf,
+        None,
+        bank_holiday_rate_script,
+    )
+    market_role_M = MarketRole.insert(sess, "M", "HH Mop")
+    market_role_R = MarketRole.insert(sess, "R", "Distributor")
+    market_role_C = MarketRole.insert(sess, "C", "HH Dc")
+    market_role_X = MarketRole.insert(sess, "X", "Supplier")
+    participant.insert_party(sess, market_role_M, "Fusion MOP", vf, None, None)
+    participant.insert_party(sess, market_role_C, "Fusion DC", vf, None, None)
+    participant.insert_party(sess, market_role_X, "Fusion Ltc", vf, None, None)
+    mop_charge_script = """
+from chellow.utils import reduce_bill_hhs
+
+def virtual_bill_titles():
+    return ['net-gbp', 'problem']
+
+def virtual_bill(ds):
+    for hh in ds.hh_data:
+        hh_start = hh['start-date']
+        bill_hh = ds.supplier_bill_hhs[hh_start]
+
+        bill_hh['net-gbp'] = sum(
+            v for k, v in bill_hh.items() if k.endswith('gbp'))
+
+    ds.mop_bill = reduce_bill_hhs(ds.supplier_bill_hhs)
+"""
+    mop_contract = Contract.insert_mop(
+        sess, "Fusion MOP 2000", participant, mop_charge_script, {}, vf, None, {}
+    )
+    dc_contract = Contract.insert_dc(
+        sess, "Fusion DC 2000", participant, "", {}, vf, None, {}
+    )
+    imp_supplier_contract = Contract.insert_supplier(
+        sess, "Fusion Supplier 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")
+    dno = participant.insert_party(sess, market_role_R, "WPD", vf, None, "22")
+    Contract.insert_dno(sess, dno.dno_code, participant, "", {}, vf, None, {})
+    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)
+    insert_sources(sess)
+    source = Source.get_by_code(sess, "net")
+    gsp_group = GspGroup.insert(sess, "_L", "South Western")
+    insert_energisation_statuses(sess)
+    energisation_status = EnergisationStatus.get_by_code(sess, "E")
+    insert_dtc_meter_types(sess)
+    dtc_meter_type = DtcMeterType.get_by_code(sess, "H")
+    site.insert_e_supply(
+        sess,
+        source,
+        None,
+        "Bob",
+        vf,
+        None,
+        gsp_group,
+        mop_contract,
+        "773",
+        dc_contract,
+        "ghyy3",
+        "hgjeyhuw",
+        dno,
+        pc,
+        "845",
+        cop,
+        comm,
+        None,
+        energisation_status,
+        dtc_meter_type,
+        "22 7867 6232 781",
+        "510",
+        imp_supplier_contract,
+        "7748",
+        361,
+        None,
+        None,
+        None,
+        None,
+        None,
+    )
+
+    editor = UserRole.insert(sess, "editor")
+    user = User.insert(sess, "admin@example.com", "xxx", editor, None)
+    user_id = user.id
+    sess.commit()
+
+    f = StringIO()
+    f.close = mocker.Mock()
+    mocker.patch("chellow.reports.report_231.open_file", return_value=f)
+    start_date = to_utc(ct_datetime(2020, 1, 1))
+    finish_date = to_utc(ct_datetime(2020, 1, 5))
+    content(user_id, start_date, finish_date, mop_contract.id)
+
+    f.seek(0)
+    sheet = csv.reader(f)
+    actual_table = list(sheet)
+    expected_table = [
+        [
+            "imp_mpan_core",
+            "exp_mpan_core",
+            "start_date",
+            "finish_date",
+            "energisation_status",
+            "gsp_group",
+            "dno",
+            "era_start",
+            "pc",
+            "meter_type",
+            "site_code",
+            "imp_is_substation",
+            "imp_llfc_code",
+            "imp_llfc_description",
+            "exp_is_substation",
+            "exp_llfc_code",
+            "exp_llfc_description",
+            "net-gbp",
+            "problem",
+        ],
+        [
+            "22 7867 6232 781",
+            "",
+            "2020-01-01 00:00",
+            "2020-01-05 00:00",
+            "E",
+            "_L",
+            "22",
+            "2000-01-01 00:00",
+            "00",
+            "C5",
+            "CI017",
+            "False",
+            "510",
+            "PC 5-8 & HH HV",
+            "",
+            "",
+            "",
+            "0",
+            "",
+        ],
+    ]
+    match_tables(expected_table, actual_table)

{chellow-1718904221.0.0 → chellow-1720006293.0.0}/test/reports/test_report_81.py

@@ -55,13 +55,16 @@ def virtual_bill(ds):
     content(user_id, dc_contract.id, end_year, end_month, months)
     actual = f.getvalue()
     expected = [
-        "Import MPAN Core",
-        "Export MPAN Core",
-        "Start Date",
-        "Finish Date",
+        "imp_mpan_core",
+        "exp_mpan_core",
+        "start_date",
+        "finish_date",
         "energisation_status",
         "gsp_group",
         "dno",
+        "era_start",
+        "pc",
+        "meter_type",
         "site_code",
         "imp_is_substation",
         "imp_llfc_code",

{chellow-1718904221.0.0 → chellow-1720006293.0.0}/test/reports/test_report_87.py

@@ -265,6 +265,7 @@ def virtual_bill(ds):
     mock_file.seek(0)
     sheet = csv.reader(mock_file)
     actual_table = list(sheet)
+    print(actual_table)
 
     expected_table = [
         [
@@ -277,6 +278,9 @@ def virtual_bill(ds):
             "energisation_status",
             "gsp_group",
             "dno",
+            "era_start",
+            "pc",
+            "meter_type",
             "imp_is_substation",
             "imp_llfc_code",
             "imp_llfc_description",
@@ -300,6 +304,9 @@ def virtual_bill(ds):
             "E",
             "_L",
             "22",
+            "1996-01-01 00:00",
+            "00",
+            "C5",
             "False",
             "510",
             "PC 5-8 & HH HV",

chellow-1718904221.0.0/VERSION

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