chellow 1752836620.0.0__tar.gz → 1753106469.0.0__tar.gz

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

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

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

{chellow-1752836620.0.0 → chellow-1753106469.0.0}/chellow/e/views.py

@@ -5714,20 +5714,34 @@ def supply_post(supply_id):
         if "new_msn" in request.form:
             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.")
 
             msn = req_str("msn")
+            msg = ""
             era = supply.find_era_at(g.sess, start_date)
             if era is None:
-                raise BadRequest(f"There isn't an era at {start_date}")
-            if era.msn == msn:
-                raise BadRequest(f"The era at {start_date} already has the MSN {msn}")
+                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.start_date != start_date:
-                era = supply.insert_era_at(g.sess, start_date)
-            era.msn = msn
-            g.sess.commit()
-            flash("MSN updated successfully")
-            return render_template("supply_post.html")
+                        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")
 
     except BadRequest as e:
         flash(e.description)

{chellow-1752836620.0.0 → chellow-1753106469.0.0}/chellow/models.py

@@ -4271,16 +4271,16 @@ class Supply(Base, PersistentClass):
 
     def find_eras(self, sess, start, finish):
         eras = (
-            sess.query(Era)
-            .filter(
+            select(Era)
+            .where(
                 Era.supply == self,
                 or_(Era.finish_date == null(), Era.finish_date >= start),
             )
             .order_by(Era.start_date)
         )
         if finish is not None:
-            eras = eras.filter(Era.start_date <= finish)
-        return eras.all()
+            eras = eras.where(Era.start_date <= finish)
+        return sess.scalars(eras).all()
 
     def update_era(
         self,

{chellow-1752836620.0.0 → chellow-1753106469.0.0}/test/e/test_e_views.py

@@ -4246,6 +4246,150 @@ def test_supply_edit_post(client, sess):
     assert rolled_back
 
 
+def test_supply_post(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(2000, 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(2010, 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-1752836620.0.0/VERSION

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