chellow 1749578506.0.0__tar.gz → 1750597108.0.0__tar.gz

{chellow-1749578506.0.0 → chellow-1750597108.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1749578506.0.0
+Version: 1750597108.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-1750597108.0.0/VERSION

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

{chellow-1749578506.0.0 → chellow-1750597108.0.0}/chellow/e/views.py

@@ -2172,54 +2172,7 @@ def era_edit_delete(era_id):
         return hx_redirect(f"/supplies/{supply.id}")
     except BadRequest as e:
         flash(e.description)
-        energisation_statuses = g.sess.query(EnergisationStatus).order_by(
-            EnergisationStatus.code
-        )
-        pcs = g.sess.query(Pc).order_by(Pc.code)
-        cops = g.sess.query(Cop).order_by(Cop.code)
-        comms = g.sess.execute(select(Comm).order_by(Comm.code)).scalars()
-        gsp_groups = g.sess.query(GspGroup).order_by(GspGroup.code)
-        mop_contracts = (
-            g.sess.query(Contract)
-            .join(MarketRole)
-            .filter(MarketRole.code == "M")
-            .order_by(Contract.name)
-        )
-        dc_contracts = (
-            g.sess.query(Contract)
-            .join(MarketRole)
-            .filter(MarketRole.code.in_(("C", "D")))
-            .order_by(Contract.name)
-        )
-        supplier_contracts = (
-            g.sess.query(Contract)
-            .join(MarketRole)
-            .filter(MarketRole.code == "X")
-            .order_by(Contract.name)
-        )
-        site_eras = (
-            g.sess.query(SiteEra)
-            .join(Site)
-            .filter(SiteEra.era == era)
-            .order_by(Site.code)
-            .all()
-        )
-        return make_response(
-            render_template(
-                "era_edit.html",
-                era=era,
-                pcs=pcs,
-                cops=cops,
-                comms=comms,
-                gsp_groups=gsp_groups,
-                mop_contracts=mop_contracts,
-                dc_contracts=dc_contracts,
-                supplier_contracts=supplier_contracts,
-                site_eras=site_eras,
-                energisation_statuses=energisation_statuses,
-            ),
-            400,
-        )
+        return hx_redirect(f"/eras/{era.id}/edit", code=307)
 
 
 @e.route("/eras/<int:era_id>/add_supplier_bill")

{chellow-1749578506.0.0 → chellow-1750597108.0.0}/chellow/fake_batch_updater.py

@@ -144,7 +144,7 @@ def run_import(sess, log, set_progress):
         ).one_or_none()
 
         if fake_batch is not None:
-            log("Found existing fake batch")
+            log(f"Found existing fake batch {fake_batch_name}")
             first_fake_bill = sess.scalars(
                 select(GBill)
                 .where(GBill.g_batch == fake_batch)
@@ -157,10 +157,25 @@ def run_import(sess, log, set_progress):
                 fake_batch.delete(sess)
                 sess.flush()
                 fake_batch = None
+                log(f"Deleted fake batch {fake_batch_name}")
 
         if fake_batch is None:
-            log("Adding a new fake batch")
-            fake_batch = g_contract.insert_g_batch(sess, fake_batch_name, "Fake Batch")
+            latest_bill = sess.scalars(
+                select(GBill)
+                .join(GBatch)
+                .where(GBatch.g_contract == g_contract)
+                .order_by(GBill.finish_date.desc())
+            ).first()
+            if latest_bill is None:
+                log(
+                    "No actual bills found for this contract, so not creating fake "
+                    "batch"
+                )
+                continue
+            if latest_bill.finish_date >= last_month_start:
+                log("Actual bills found in the last month, so not creating fake batch")
+                continue
+
             raw_bills = fb_func(
                 sess,
                 log,
@@ -170,6 +185,10 @@ def run_import(sess, log, set_progress):
                 current_month_finish,
             )
             if raw_bills is not None and len(raw_bills) > 0:
+                log(f"Adding a new fake batch {fake_batch_name}")
+                fake_batch = g_contract.insert_g_batch(
+                    sess, fake_batch_name, "Fake Batch"
+                )
                 log("About to insert raw bills")
                 for raw_bill in raw_bills:
                     bill_type = BillType.get_by_code(sess, raw_bill["bill_type_code"])
@@ -213,6 +232,8 @@ def run_import(sess, log, set_progress):
                             pres_type,
                         )
                     sess.commit()
+            else:
+                log("No raw bills available, so not adding fake batch")
             sess.commit()
 
 

{chellow-1749578506.0.0 → chellow-1750597108.0.0}/chellow/gas/bill_parser_total_edi.py

@@ -32,6 +32,7 @@ SUPPLIER_CODE_MAP = {
     "MET": ("commodity", Decimal("100000"), Decimal("1000")),
     "CCL": ("ccl", Decimal("100000"), Decimal("1000")),
     "SUN": ("sundry", Decimal("1000"), Decimal("100")),
+    "ADJ": ("sundry", Decimal("1000"), Decimal("100")),
 }
 
 UNIT_MAP = {"M3": "M3", "HH": "HCUF", "HCUF": "HCUF"}
@@ -54,7 +55,7 @@ def _process_ADJ(elements, headers):
 def _process_BCD(elements, headers):
     ivdt = elements["IVDT"]
     headers["issue_date"] = to_date(ivdt[0])
-
+    headers["start_date"] = to_date(ivdt[0])
     invn = elements["INVN"]
     headers["reference"] = invn[0]
 

{chellow-1749578506.0.0 → chellow-1750597108.0.0}/test/e/test_e_views.py

@@ -1633,6 +1633,122 @@ def test_era_edit_post_fail(client, sess):
     match(response, 400)
 
 
+def test_era_edit_delete_fail(client, sess):
+    vf = 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", vf, 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", 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, "", {}, 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")
+    insert_comms(sess)
+    comm = Comm.get_by_code(sess, "GSM")
+    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", vf, 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", 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, "grid")
+    insert_energisation_statuses(sess)
+    energisation_status = EnergisationStatus.get_by_code(sess, "E")
+    gsp_group = GspGroup.insert(sess, "_L", "South Western")
+    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(2000, 1, 1),
+        utc_datetime(2020, 1, 1),
+        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,
+    )
+    era = supply.eras[0]
+
+    sess.commit()
+
+    response = client.delete(f"/e/eras/{era.id}/edit")
+
+    match(response, 307)
+
+
 def test_get_era_bundles_bill_after_supply_end(sess, client):
     """Check that a bill starting after the end of a supply still gets
     shown.

chellow-1749578506.0.0/VERSION

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