chellow 1753175604.0.0__tar.gz → 1753182209.0.0__tar.gz

{chellow-1753175604.0.0 → chellow-1753182209.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1753175604.0.0
+Version: 1753182209.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-1753182209.0.0/VERSION

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

{chellow-1753175604.0.0 → chellow-1753182209.0.0}/chellow/e/views.py

@@ -5714,31 +5714,28 @@ def supply_post(supply_id):
             start_date_str = req_str("start_date")
             start_date = parse_hh_start(start_date_str)
             if start_date is None:
-                raise BadRequest("The data of the MSN change is blank in ECOES.")
+                raise BadRequest("The date of the MSN change is blank.")
 
             msn = req_str("msn")
             msg = ""
             era = supply.find_era_at(g.sess, start_date)
-            if era is None:
-                raise BadRequest(f"There are no eras from {start_date|hh_format}")
-            else:
-                if era.start_date != start_date:
-                    era = supply.insert_era_at(g.sess, start_date)
-                    g.sess.commit()
-                for era in supply.find_eras(g.sess, start_date, None):
-                    if era.msn == msn:
-                        msg += (
-                            f"The era at {hh_format(era.start_date)} already has the "
-                            f"MSN {msn}. "
-                        )
-                    else:
-                        era.msn = msn
+            if era is not None and era.start_date != start_date:
+                era = supply.insert_era_at(g.sess, start_date)
+                g.sess.commit()
+            for era in supply.find_eras(g.sess, start_date, None):
+                if era.msn == msn:
+                    msg += (
+                        f"The era at {hh_format(era.start_date)} already has the "
+                        f"MSN {msn}. "
+                    )
+                else:
+                    era.msn = msn
 
-                        g.sess.commit()
-                        msg += (
-                            f"The era at {hh_format(era.start_date)} has been "
-                            f"successfully updated with the MSN {msn}. "
-                        )
+                    g.sess.commit()
+                    msg += (
+                        f"The era at {hh_format(era.start_date)} has been "
+                        f"successfully updated with the MSN {msn}. "
+                    )
             flash(msg)
         return render_template("supply_post.html")
 

{chellow-1753175604.0.0 → chellow-1753182209.0.0}/chellow/gas/bill_parser_bgs_xlsx.py

@@ -5,12 +5,13 @@ from decimal import Decimal, InvalidOperation
 from enum import Enum, auto
 from io import BytesIO
 
+from dateutil.relativedelta import relativedelta
 
 from openpyxl import load_workbook
 
 from werkzeug.exceptions import BadRequest
 
-from chellow.utils import c_months_u, to_ct, to_utc
+from chellow.utils import to_ct, to_utc
 
 
 class Title(Enum):
@@ -151,13 +152,13 @@ def _parse_row(bills, sheet, row, title_row):
     column_map = make_column_map(title_row)
     mprn_raw = get_value(sheet, row, column_map[Title.MPRN])
     mprn = str(mprn_raw)
-    reference = get_value(sheet, row, column_map[Title.BILL])
+    reference = str(get_value(sheet, row, column_map[Title.BILL]))
     account = get_value(sheet, row, column_map[Title.ACCOUNT])
     issue_date = get_date(sheet, row, column_map[Title.BILL_DATE])
-    period_naive = get_date_naive(sheet, row, column_map[Title.BILLING_PERIOD])
-    start_date, finish_date = list(
-        c_months_u(start_year=period_naive.year, start_month=period_naive.month)
-    )[0]
+    charge_period_from = get_date(sheet, row, column_map[Title.CHARGE_PERIOD_FROM])
+    charge_period_end_naive = get_date_naive(
+        sheet, row, column_map[Title.CHARGE_PERIOD_END]
+    )
 
     try:
         mprn_values = bills[mprn]
@@ -165,16 +166,18 @@ def _parse_row(bills, sheet, row, title_row):
         mprn_values = bills[mprn] = {}
 
     try:
-        bill = mprn_values[period_naive]
+        bill = mprn_values[reference]
     except KeyError:
-        bill = mprn_values[period_naive] = {
-            "bill_type_code": "N",
+        bill = mprn_values[reference] = {
+            "bill_type_code": "W" if reference.startswith("CR") else "N",
             "mprn": mprn,
             "reference": reference,
             "account": account,
             "issue_date": issue_date,
-            "start_date": start_date,
-            "finish_date": finish_date,
+            "start_date": charge_period_from,
+            "finish_date": to_utc(
+                to_ct(charge_period_end_naive) + relativedelta(hours=23, minutes=30)
+            ),
             "kwh": Decimal("0"),
             "breakdown": defaultdict(int, {}),
             "net_gbp": Decimal("0.00"),
@@ -190,6 +193,8 @@ def _parse_row(bills, sheet, row, title_row):
     qunit = get_value(sheet, row, column_map[Title.QUNIT])
     charge = get_dec(sheet, row, column_map[Title.CHARGE]) / Decimal("100")
     total = get_dec(sheet, row, column_map[Title.TOTAL])
+    if bill["bill_type_code"] == "W":
+        quantity = quantity * -1
     if element_desc == "VAT":
         bill["net_gbp"] += quantity
         bill["vat_gbp"] += total

{chellow-1753175604.0.0 → chellow-1753182209.0.0}/test/e/test_e_views.py

@@ -4421,6 +4421,150 @@ def test_supply_post(client, sess):
     assert era.msn == new_msn
 
 
+def test_supply_post_no_era_error(client, sess):
+    valid_from = to_utc(ct_datetime(1996, 1, 1))
+    site = Site.insert(sess, "CI017", "Water Works")
+
+    market_role_Z = MarketRole.get_by_code(sess, "Z")
+    participant = Participant.insert(sess, "CALB", "AK Industries")
+    participant.insert_party(
+        sess, market_role_Z, "None core", utc_datetime(2000, 1, 1), None, None
+    )
+    bank_holiday_rate_script = {"bank_holidays": []}
+    Contract.insert_non_core(
+        sess,
+        "bank_holidays",
+        "",
+        {},
+        utc_datetime(2000, 1, 1),
+        None,
+        bank_holiday_rate_script,
+    )
+    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 Ltd", utc_datetime(2000, 1, 1), None, None
+    )
+    participant.insert_party(
+        sess, market_role_X, "Fusion Ltc", utc_datetime(2000, 1, 1), None, None
+    )
+    participant.insert_party(
+        sess, market_role_C, "Fusion DC", utc_datetime(2000, 1, 1), None, None
+    )
+    mop_contract = Contract.insert_mop(
+        sess, "Fusion", participant, "", {}, utc_datetime(2000, 1, 1), None, {}
+    )
+    dc_contract = Contract.insert_dc(
+        sess, "Fusion DC 2000", participant, "", {}, utc_datetime(2000, 1, 1), None, {}
+    )
+    pc = Pc.insert(sess, "00", "hh", utc_datetime(2000, 1, 1), None)
+    insert_cops(sess)
+    cop = Cop.get_by_code(sess, "5")
+    imp_supplier_contract = Contract.insert_supplier(
+        sess,
+        "Fusion Supplier 2000",
+        participant,
+        "",
+        {},
+        utc_datetime(2000, 1, 1),
+        None,
+        {},
+    )
+    dno = participant.insert_party(
+        sess, market_role_R, "WPD", utc_datetime(2000, 1, 1), None, "22"
+    )
+    meter_type = MeterType.insert(sess, "C5", "COP 1-5", utc_datetime(2000, 1, 1), None)
+    meter_payment_type = MeterPaymentType.insert(
+        sess, "CR", "Credit", utc_datetime(1996, 1, 1), None
+    )
+    mtc = Mtc.insert(sess, "845", False, True, valid_from, None)
+    mtc_participant = MtcParticipant.insert(
+        sess,
+        mtc,
+        participant,
+        "HH COP5 And Above With Comms",
+        False,
+        True,
+        meter_type,
+        meter_payment_type,
+        0,
+        utc_datetime(1996, 1, 1),
+        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,
+        utc_datetime(1996, 1, 1),
+        None,
+    )
+    MtcLlfc.insert(sess, mtc_participant, llfc, valid_from, 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")
+    insert_comms(sess)
+    comm = Comm.get_by_code(sess, "GSM")
+    insert_dtc_meter_types(sess)
+    dtc_meter_type = DtcMeterType.get_by_code(sess, "H")
+    supply = site.insert_e_supply(
+        sess,
+        source,
+        None,
+        "Bob",
+        utc_datetime(2020, 1, 1),
+        None,
+        gsp_group,
+        mop_contract,
+        "773",
+        dc_contract,
+        "ghyy3",
+        "hgjeyhuw",
+        dno,
+        pc,
+        "845",
+        cop,
+        comm,
+        None,
+        energisation_status,
+        dtc_meter_type,
+        "22 0470 7514 535",
+        "510",
+        imp_supplier_contract,
+        "7748",
+        361,
+        None,
+        None,
+        None,
+        None,
+        None,
+    )
+    sess.commit()
+
+    new_msn = "764hlhf"
+    data = {
+        "new_msn": "",
+        "msn": new_msn,
+        "start_date": "2010-01-01 00:00",
+    }
+    response = client.post(f"/e/supplies/{supply.id}", data=data)
+
+    match(response, 200)
+
+    sess.rollback()
+    era = supply.find_era_at(sess, to_utc(ct_datetime(2020, 1, 1)))
+
+    assert era.msn == new_msn
+
+
 def test_supply_get(client, sess):
     valid_from = to_utc(ct_datetime(1996, 1, 1))
     site = Site.insert(sess, "CI017", "Water Works")

chellow-1753182209.0.0/test/gas/bill_parsers/test_bill_parser_bgs_xlsx.py

@@ -0,0 +1,296 @@
+from collections import defaultdict
+from datetime import datetime as Datetime
+from decimal import Decimal
+
+from openpyxl import Workbook
+
+
+from chellow.gas.bill_parser_bgs_xlsx import _make_raw_bills, _parse_row
+from chellow.utils import ct_datetime, to_utc, utc_datetime
+
+
+def test_parse_row():
+    wb = Workbook()
+    ws = wb.active
+
+    rows = [
+        [
+            "Customer",
+            "Account",
+            "MPRN",
+            "Bill",
+            "SupplyAddress",
+            "BillDate",
+            "BillingPeriod",
+            "kWhs",
+            "ChargeType",
+            "ChargePeriodFrom",
+            "ChargePeriodEnd",
+            "Quantity",
+            "QUnit",
+            "Charge",
+            "CUnit",
+            "Total",
+        ],
+        [
+            "Zorin Industries",
+            69389283,
+            86762618,
+            584773269,
+            "Extinct Volcano",
+            Datetime(2025, 6, 13),
+            Datetime(2025, 5, 1),
+            0,
+            "Gas",
+            Datetime(2025, 5, 1),
+            Datetime(2025, 5, 31),
+            0,
+            "kWh",
+            0.5311,
+            "p/kWh",
+            0.00,
+        ],
+    ]
+
+    for row, row_values in enumerate(rows, start=1):
+        for column, value in enumerate(row_values, start=1):
+            ws.cell(row=row, column=column, value=value)
+
+    row = 2
+    title_row = tuple(ws.rows)[0]
+    bills = {}
+    _parse_row(bills, ws, row, title_row)
+
+
+def test_make_raw_bills():
+    wb = Workbook()
+    ws = wb.active
+
+    rows = [
+        [
+            "Customer",
+            "Account",
+            "MPRN",
+            "Bill",
+            "SupplyAddress",
+            "BillDate",
+            "BillingPeriod",
+            "kWhs",
+            "ChargeType",
+            "ChargePeriodFrom",
+            "ChargePeriodEnd",
+            "Quantity",
+            "QUnit",
+            "Charge",
+            "CUnit",
+            "Total",
+        ],
+        [
+            "Zorin Industries",
+            69389283,
+            86762618,
+            584773269,
+            "Extinct Volcano",
+            Datetime(2025, 6, 13),
+            Datetime(2025, 5, 1),
+            0,
+            "Gas",
+            Datetime(2025, 5, 1),
+            Datetime(2025, 5, 31),
+            0,
+            "kWh",
+            0.5311,
+            "p/kWh",
+            0.00,
+        ],
+    ]
+
+    for row, row_vals in enumerate(rows, start=1):
+        for column, value in enumerate(row_vals, start=1):
+            ws.cell(row=row, column=column, value=value)
+
+    bills = _make_raw_bills(ws)
+    expected_bills = [
+        {
+            "bill_type_code": "N",
+            "mprn": "86762618",
+            "reference": "584773269",
+            "account": 69389283,
+            "issue_date": utc_datetime(2025, 6, 12, 23, 0),
+            "start_date": utc_datetime(2025, 4, 30, 23, 0),
+            "finish_date": utc_datetime(2025, 5, 31, 22, 30),
+            "kwh": Decimal("0"),
+            "breakdown": {
+                "admin_variable_gbp": Decimal("0.0"),
+                "admin_variable_kwh": Decimal("0"),
+                "admin_variable_rate": {Decimal("0.005311")},
+            },
+            "net_gbp": Decimal("0.00"),
+            "vat_gbp": Decimal("0.00"),
+            "gross_gbp": Decimal("0.00"),
+            "raw_lines": "['Zorin Industries', 69389283, 86762618, 584773269, 'Extinct "
+            "Volcano', datetime.datetime(2025, 6, 13, 0, 0), "
+            "datetime.datetime(2025, 5, 1, 0, 0), 0, 'Gas', "
+            "datetime.datetime(2025, 5, 1, 0, 0), datetime.datetime(2025, "
+            "5, 31, 0, 0), 0, 'kWh', 0.5311, 'p/kWh', 0.0]",
+            "reads": [],
+        }
+    ]
+    assert bills == expected_bills
+
+
+def test_make_raw_bills_part_month():
+    wb = Workbook()
+    ws = wb.active
+
+    rows = [
+        [
+            "Customer",
+            "Account",
+            "MPRN",
+            "Bill",
+            "SupplyAddress",
+            "BillDate",
+            "BillingPeriod",
+            "kWhs",
+            "ChargeType",
+            "ChargePeriodFrom",
+            "ChargePeriodEnd",
+            "Quantity",
+            "QUnit",
+            "Charge",
+            "CUnit",
+            "Total",
+        ],
+        [
+            "Zorin Industries",
+            69389283,
+            86762618,
+            584773269,
+            "Extinct Volcano",
+            Datetime(2025, 6, 13),
+            Datetime(2025, 5, 1),
+            0,
+            "Gas",
+            Datetime(2025, 5, 1),
+            Datetime(2025, 5, 15),
+            0,
+            "kWh",
+            0.5311,
+            "p/kWh",
+            0.00,
+        ],
+    ]
+
+    for row, row_vals in enumerate(rows, start=1):
+        for column, value in enumerate(row_vals, start=1):
+            ws.cell(row=row, column=column, value=value)
+
+    bills = _make_raw_bills(ws)
+    expected_bills = [
+        {
+            "bill_type_code": "N",
+            "mprn": "86762618",
+            "reference": "584773269",
+            "account": 69389283,
+            "issue_date": utc_datetime(2025, 6, 12, 23, 0),
+            "start_date": to_utc(ct_datetime(2025, 5, 1, 0, 0)),
+            "finish_date": to_utc(ct_datetime(2025, 5, 15, 23, 30)),
+            "kwh": Decimal("0"),
+            "breakdown": defaultdict(
+                int,
+                {
+                    "admin_variable_gbp": Decimal("0.0"),
+                    "admin_variable_kwh": Decimal("0"),
+                    "admin_variable_rate": {Decimal("0.005311")},
+                },
+            ),
+            "net_gbp": Decimal("0.00"),
+            "vat_gbp": Decimal("0.00"),
+            "gross_gbp": Decimal("0.00"),
+            "raw_lines": "['Zorin Industries', 69389283, 86762618, 584773269, 'Extinct "
+            "Volcano', datetime.datetime(2025, 6, 13, 0, 0), "
+            "datetime.datetime(2025, 5, 1, 0, 0), 0, 'Gas', "
+            "datetime.datetime(2025, 5, 1, 0, 0), datetime.datetime(2025, "
+            "5, 15, 0, 0), 0, 'kWh', 0.5311, 'p/kWh', 0.0]",
+            "reads": [],
+        }
+    ]
+    assert bills == expected_bills
+
+
+def test_make_raw_bills_credit():
+    wb = Workbook()
+    ws = wb.active
+
+    rows = [
+        [
+            "Customer",
+            "Account",
+            "MPRN",
+            "Bill",
+            "SupplyAddress",
+            "BillDate",
+            "BillingPeriod",
+            "kWhs",
+            "ChargeType",
+            "ChargePeriodFrom",
+            "ChargePeriodEnd",
+            "Quantity",
+            "QUnit",
+            "Charge",
+            "CUnit",
+            "Total",
+        ],
+        [
+            "Zorin Industries",
+            69389283,
+            86762618,
+            "CR584773269",
+            "Extinct Volcano",
+            Datetime(2025, 6, 13),
+            Datetime(2025, 5, 1),
+            0,
+            "Gas",
+            Datetime(2025, 5, 1),
+            Datetime(2025, 5, 31),
+            10,
+            "kWh",
+            0.5311,
+            "p/kWh",
+            -5.00,
+        ],
+    ]
+
+    for row, row_vals in enumerate(rows, start=1):
+        for column, value in enumerate(row_vals, start=1):
+            ws.cell(row=row, column=column, value=value)
+
+    bills = _make_raw_bills(ws)
+    expected_bills = [
+        {
+            "bill_type_code": "W",
+            "mprn": "86762618",
+            "reference": "CR584773269",
+            "account": 69389283,
+            "issue_date": utc_datetime(2025, 6, 12, 23, 0),
+            "start_date": utc_datetime(2025, 4, 30, 23, 0),
+            "finish_date": utc_datetime(2025, 5, 31, 22, 30),
+            "kwh": Decimal("0"),
+            "breakdown": {
+                "admin_variable_gbp": Decimal("-5.00"),
+                "admin_variable_kwh": Decimal("-10"),
+                "admin_variable_rate": {Decimal("0.005311")},
+            },
+            "net_gbp": Decimal("0.00"),
+            "vat_gbp": Decimal("0.00"),
+            "gross_gbp": Decimal("0.00"),
+            "raw_lines": "['Zorin Industries', 69389283, 86762618, 'CR584773269', "
+            "'Extinct Volcano', datetime.datetime(2025, 6, 13, 0, 0), "
+            "datetime.datetime(2025, 5, 1, 0, 0), 0, 'Gas', "
+            "datetime.datetime(2025, 5, 1, 0, 0), datetime.datetime(2025, "
+            "5, 31, 0, 0), 10, 'kWh', 0.5311, 'p/kWh', -5.0]",
+            "reads": [],
+        }
+    ]
+    assert bills == expected_bills

chellow-1753175604.0.0/VERSION

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