chellow 1720006293.0.0__tar.gz → 1720600044.0.0__tar.gz

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

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

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

{chellow-1720006293.0.0 → chellow-1720600044.0.0}/chellow/e/views.py

@@ -79,7 +79,6 @@ from chellow.models import (
 )
 from chellow.utils import (
     HH,
-    PropDict,
     c_months_u,
     csv_make_val,
     ct_datetime,
@@ -3732,24 +3731,15 @@ def pc_get(pc_id):
 
 @e.route("/supplier_bills/<int:bill_id>/add_read")
 def read_add_get(bill_id):
-    read_types = g.sess.query(ReadType).order_by(ReadType.code)
-    estimated_read_type_id = (
-        g.sess.query(ReadType.id).filter(ReadType.code == "E").scalar()
-    )
-    tprs = g.sess.query(Tpr).order_by(Tpr.code)
+    read_types = g.sess.scalars(select(ReadType).order_by(ReadType.code))
+    estimated_read_type = ReadType.get_by_code(g.sess, "E")
+    tprs = g.sess.scalars(select(Tpr).order_by(Tpr.code))
     bill = Bill.get_by_id(g.sess, bill_id)
     coefficient = 1
     mpan_str = msn = previous_date = previous_value = previous_type_id = None
 
     era = bill.supply.find_era_at(g.sess, bill.start_date)
     if era is not None:
-        era_properties = PropDict(
-            f"{chellow.utils.url_root}eras/{era.id}", loads(era.properties)
-        )
-        try:
-            coefficient = float(era_properties["coefficient"])
-        except KeyError:
-            pass
         mpan_str = era.imp_mpan_core
         msn = era.msn
 
@@ -3778,7 +3768,7 @@ def read_add_get(bill_id):
         previous_date=previous_date,
         previous_value=previous_value,
         previous_type_id=previous_type_id,
-        estimated_read_type_id=estimated_read_type_id,
+        estimated_read_type_id=estimated_read_type.id,
     )
 
 

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

@@ -6687,28 +6687,7 @@ def insert_dtc_meter_types(sess):
         DtcMeterType.insert(sess, code, desc)
 
 
-def db_init(sess, root_path):
-    db_name = config["PGDATABASE"]
-    log_message("Initializing database.")
-
-    ct_now = ct_datetime_now()
-    last_month_start, _ = list(
-        c_months_u(finish_year=ct_now.year, finish_month=ct_now.month, months=2)
-    )[0]
-
-    insert_voltage_levels(sess)
-    sess.commit()
-
-    for code in ("editor", "viewer", "party-viewer"):
-        UserRole.insert(sess, code)
-    sess.commit()
-
-    insert_sources(sess)
-    sess.commit()
-
-    insert_generator_types(sess)
-    sess.commit()
-
+def insert_read_types(sess):
     for code, desc in (
         ("A", "Actual Change of Supplier Read"),
         ("D", "Deemed (Settlement Registers) or Estimated (Non-Settlement Registers)"),
@@ -6731,6 +6710,31 @@ def db_init(sess, root_path):
         ("Z", "Actual Change of Tenancy Read"),
     ):
         sess.add(ReadType(code, desc))
+
+
+def db_init(sess, root_path):
+    db_name = config["PGDATABASE"]
+    log_message("Initializing database.")
+
+    ct_now = ct_datetime_now()
+    last_month_start, _ = list(
+        c_months_u(finish_year=ct_now.year, finish_month=ct_now.month, months=2)
+    )[0]
+
+    insert_voltage_levels(sess)
+    sess.commit()
+
+    for code in ("editor", "viewer", "party-viewer"):
+        UserRole.insert(sess, code)
+    sess.commit()
+
+    insert_sources(sess)
+    sess.commit()
+
+    insert_generator_types(sess)
+    sess.commit()
+
+    insert_read_types(sess)
     sess.commit()
 
     insert_cops(sess)

{chellow-1720006293.0.0 → chellow-1720600044.0.0}/chellow/reports/report_429.py

@@ -102,6 +102,7 @@ def content(g_batch_id, g_bill_id, g_contract_id, start_date, finish_date, user_
                     _process_g_bill_ids(
                         sess,
                         report_context,
+                        g_contract,
                         g_bill_ids,
                         forecast_date,
                         bill_titles,
@@ -122,6 +123,7 @@ def content(g_batch_id, g_bill_id, g_contract_id, start_date, finish_date, user_
 def _process_g_bill_ids(
     sess,
     report_context,
+    g_contract,
     g_bill_ids,
     forecast_date,
     bill_titles,
@@ -132,15 +134,24 @@ def _process_g_bill_ids(
     g_bill_id = list(sorted(g_bill_ids))[0]
     g_bill_ids.remove(g_bill_id)
     g_bill = sess.query(GBill).filter(GBill.id == g_bill_id).one()
-    problem = ""
     g_supply = g_bill.g_supply
+    vals = {
+        "covered_vat_gbp": Decimal("0.00"),
+        "covered_net_gbp": Decimal("0.00"),
+        "covered_gross_gbp": Decimal("0.00"),
+        "covered_kwh": Decimal(0),
+        "covered_start": g_bill.start_date,
+        "covered_finish": g_bill.finish_date,
+        "covered_bill_ids": [],
+        "virtual_problem": "",
+    }
     read_dict = defaultdict(set)
     for g_read in g_bill.g_reads:
         if not all(
             g_read.msn == era.msn
             for era in g_supply.find_g_eras(sess, g_read.prev_date, g_read.pres_date)
         ):
-            problem += (
+            vals["virtual_problem"] += (
                 f"The MSN {g_read.msn} of the register read {g_read.id} doesn't match "
                 f"the MSN of all the relevant eras."
             )
@@ -152,17 +163,9 @@ def _process_g_bill_ids(
             typ_set = read_dict[str(dt) + "-" + g_read.msn]
             typ_set.add(typ)
             if len(typ_set) > 1:
-                problem += f" Reads taken on {dt} have differing read types."
-
-    vals = {
-        "covered_vat_gbp": Decimal("0.00"),
-        "covered_net_gbp": Decimal("0.00"),
-        "covered_gross_gbp": Decimal("0.00"),
-        "covered_kwh": Decimal(0),
-        "covered_start": g_bill.start_date,
-        "covered_finish": g_bill.finish_date,
-        "covered_bill_ids": [],
-    }
+                vals[
+                    "virtual_problem"
+                ] += f" Reads taken on {dt} have differing read types."
 
     covered_primary_bill = None
     enlarged = True
@@ -270,12 +273,19 @@ def _process_g_bill_ids(
             or_(GEra.finish_date == null(), GEra.finish_date >= vals["covered_start"]),
         )
     ).scalars():
+        if g_era.g_contract != g_contract:
+            vals[
+                "virtual_problem"
+            ] += "The contract of the bill is different from the contract of the era."
+            continue
         site = (
             sess.query(Site)
             .join(SiteGEra)
             .filter(SiteGEra.is_physical == true(), SiteGEra.g_era == g_era)
             .one()
         )
+        vals["site_code"] = site.code
+        vals["site_name"] = site.name
 
         chunk_start = hh_max(vals["covered_start"], g_era.start_date)
         chunk_finish = hh_min(vals["covered_finish"], g_era.finish_date)
@@ -314,8 +324,6 @@ def _process_g_bill_ids(
     vals["bill_finish_date"] = g_bill.finish_date
     vals["mprn"] = g_supply.mprn
     vals["supply_name"] = g_supply.name
-    vals["site_code"] = site.code
-    vals["site_name"] = site.name
 
     for k, v in vals.items():
         if k == "covered_bill_ids":
@@ -332,9 +340,7 @@ def _process_g_bill_ids(
             except KeyError:
                 vals[title] = None
 
-    csv_writer.writerow(
-        [(vals.get(k) if vals.get(k) is not None else "") for k in titles]
-    )
+    csv_writer.writerow([csv_make_val(vals.get(k)) for k in titles])
 
 
 def do_get(sess):

{chellow-1720006293.0.0 → chellow-1720600044.0.0}/chellow/templates/general_imports.html

@@ -445,6 +445,7 @@
 				<td><em>update</em></td>
 				<td><em>g_era</em></td>
 				<td>MPRN</td>
+				<td>Date</td>
 				<td>Start date</td>
 				<td>Finish date</td>
 				<td>Meter Serial Number</td>

{chellow-1720006293.0.0 → chellow-1720600044.0.0}/test/e/test_e_views.py

@@ -1,4 +1,3 @@
-from datetime import datetime as Datetime
 from decimal import Decimal
 from io import BytesIO
 
@@ -13,7 +12,6 @@ from chellow.e import hh_importer
 from chellow.e.views import (
     duration_report_get,
     get_era_bundles,
-    read_add_get,
 )
 from chellow.models import (
     BatchFile,
@@ -45,6 +43,7 @@ from chellow.models import (
     insert_cops,
     insert_dtc_meter_types,
     insert_energisation_statuses,
+    insert_read_types,
     insert_sources,
     insert_voltage_levels,
 )
@@ -2444,36 +2443,238 @@ class Sess:
         return next(self.it)
 
 
-def test_read_add_get(mocker, app):
-    bill_id = 1
+def test_read_add_get_no_existing_era(sess, client):
+    vf = to_utc(ct_datetime(2000, 1, 1))
+    site = Site.insert(sess, "CI017", "Water Works")
 
-    class MockDatetime(Datetime):
-        def __new__(cls, y, m, d):
-            return Datetime.__new__(cls, y, m, d)
+    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", 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 Ltd", 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, {}
+    )
+    insert_cops(sess)
+    insert_comms(sess)
+    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_sources(sess)
+    pc = Pc.insert(sess, "00", "", vf, None)
+    cop = Cop.get_by_code(sess, "5")
+    comm = Comm.get_by_code(sess, "GSM")
+    imp_supplier_contract = Contract.insert_supplier(
+        sess, "Fusion Supplier 2000", participant, "", {}, 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_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")
+    source = Source.get_by_code(sess, "net")
+    gsp_group = GspGroup.insert(sess, "_L", "South Western")
+    supply = site.insert_e_supply(
+        sess,
+        source,
+        None,
+        "Bob",
+        utc_datetime(2020, 1, 1),
+        utc_datetime(2020, 1, 31),
+        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,
+    )
+    batch = imp_supplier_contract.insert_batch(sess, "b1", "batch 1")
+    insert_bill_types(sess)
+    bill_type_N = BillType.get_by_code(sess, "N")
+    bill = batch.insert_bill(
+        sess,
+        "xx",
+        "4432",
+        to_utc(ct_datetime(2020, 1, 1)),
+        to_utc(ct_datetime(2018, 1, 3)),
+        to_utc(ct_datetime(2018, 1, 5)),
+        Decimal("482"),
+        Decimal("5.67"),
+        Decimal("0.00"),
+        Decimal("8.55"),
+        bill_type_N,
+        {"vat": {5: {"vat": Decimal("0"), "net": Decimal("34.66")}}},
+        supply,
+    )
+    insert_read_types(sess)
 
-    dt = MockDatetime(2019, 1, 1)
-    dt.desc = mocker.Mock()
+    sess.commit()
 
-    with app.app_context():
-        g = mocker.patch("chellow.e.views.g", autospec=True)
-        g.sess = Sess(None, None)
+    response = client.get(f"/e/supplier_bills/{bill.id}/add_read")
+    patterns = []
+    match(response, 200, *patterns)
 
-        MockBill = mocker.patch("chellow.e.views.Bill", autospec=True)
-        MockBill.supply = mocker.Mock()
-        MockBill.start_date = dt
 
-        mock_bill = mocker.Mock()
-        MockBill.get_by_id.return_value = mock_bill
-        mock_bill.supply.find_era_at.return_value = None
-        mock_bill.finish_date = dt
+def test_read_add_get_existing_era(sess, client):
+    vf = to_utc(ct_datetime(2000, 1, 1))
+    site = Site.insert(sess, "CI017", "Water Works")
 
-        MockRegisterRead = mocker.patch("chellow.e.views.RegisterRead", autospec=True)
-        MockRegisterRead.bill = mocker.Mock()
-        MockRegisterRead.present_date = dt
+    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", 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 Ltd", 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, {}
+    )
+    insert_cops(sess)
+    insert_comms(sess)
+    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_sources(sess)
+    pc = Pc.insert(sess, "00", "", vf, None)
+    cop = Cop.get_by_code(sess, "5")
+    comm = Comm.get_by_code(sess, "GSM")
+    imp_supplier_contract = Contract.insert_supplier(
+        sess, "Fusion Supplier 2000", participant, "", {}, 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_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")
+    source = Source.get_by_code(sess, "net")
+    gsp_group = GspGroup.insert(sess, "_L", "South Western")
+    supply = site.insert_e_supply(
+        sess,
+        source,
+        None,
+        "Bob",
+        utc_datetime(2020, 1, 1),
+        utc_datetime(2020, 1, 31),
+        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,
+    )
+    batch = imp_supplier_contract.insert_batch(sess, "b1", "batch 1")
+    insert_bill_types(sess)
+    bill_type_N = BillType.get_by_code(sess, "N")
+    bill = batch.insert_bill(
+        sess,
+        "xx",
+        "4432",
+        to_utc(ct_datetime(2020, 1, 1)),
+        to_utc(ct_datetime(2020, 1, 3)),
+        to_utc(ct_datetime(2020, 1, 5)),
+        Decimal("482"),
+        Decimal("5.67"),
+        Decimal("0.00"),
+        Decimal("8.55"),
+        bill_type_N,
+        {"vat": {5: {"vat": Decimal("0"), "net": Decimal("34.66")}}},
+        supply,
+    )
+    insert_read_types(sess)
 
-        mocker.patch("chellow.e.views.render_template", autospec=True)
+    sess.commit()
 
-        read_add_get(bill_id)
+    response = client.get(f"/e/supplier_bills/{bill.id}/add_read")
+    patterns = []
+    match(response, 200, *patterns)
 
 
 def test_scenario_edit_post(sess, client):

{chellow-1720006293.0.0 → chellow-1720600044.0.0}/test/reports/test_report_429.py

@@ -53,10 +53,12 @@ def test_process_g_bill_ids(mocker):
     vbf = mocker.Mock()
     titles = []
     csv_writer = mocker.Mock()
+    g_contract = mocker.Mock()
 
     chellow.reports.report_429._process_g_bill_ids(
         sess,
         report_context,
+        g_contract,
         g_bill_ids,
         forecast_date,
         bill_titles,

chellow-1720006293.0.0/VERSION

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