chellow 1713259114.0.0__tar.gz → 1713275535.0.0__tar.gz

{chellow-1713259114.0.0 → chellow-1713275535.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1713259114.0.0
+Version: 1713275535.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-1713275535.0.0/VERSION

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

{chellow-1713259114.0.0 → chellow-1713275535.0.0}/chellow/e/views.py

@@ -420,7 +420,7 @@ def channel_snag_edit_post(snag_id):
 
 @e.route("/comms")
 def comms_get():
-    comms = g.sess.execute(select(Cop).order_by(Cop.code)).scalars()
+    comms = g.sess.execute(select(Comm).order_by(Comm.code)).scalars()
     return render_template("comms.html", comms=comms)
 
 

{chellow-1713259114.0.0 → chellow-1713275535.0.0}/chellow/general_import.py

@@ -1255,8 +1255,12 @@ def general_import_supply(sess, action, vals, args):
         cop = Cop.get_by_code(sess, cop_code)
         comm_code = add_arg(args, "Comms Type", vals, 16)
         comm = Comm.get_by_code(sess, comm_code)
-        ssc_code = add_arg(args, "Standard Settlement Configuration", vals, 17)
-        ssc = Ssc.get_by_code(sess, ssc_code) if len(ssc_code) > 0 else None
+        ssc_code_str = add_arg(args, "Standard Settlement Configuration", vals, 17)
+        if len(ssc_code_str) > 0:
+            ssc = Ssc.get_by_code(sess, ssc_code_str, start_date)
+            ssc_code = ssc.code
+        else:
+            ssc_code = None
         energisation_status_code = add_arg(args, "Energisation Status", vals, 18)
         energisation_status = EnergisationStatus.get_by_code(
             sess, energisation_status_code
@@ -1340,7 +1344,7 @@ def general_import_supply(sess, action, vals, args):
             mtc_code,
             cop,
             comm,
-            ssc,
+            ssc_code,
             energisation_status,
             properties,
             imp_mpan_core,

{chellow-1713259114.0.0 → chellow-1713275535.0.0}/chellow/models.py

@@ -2845,44 +2845,21 @@ class MtcSsc(Base, PersistentClass):
     mtc_llfc_sscs = relationship("MtcLlfcSsc", backref="mtc_ssc")
     __table_args__ = (UniqueConstraint("mtc_participant_id", "ssc_id", "valid_from"),)
 
-    def __init__(
-        self,
-        mtc_participant,
-        ssc,
-        valid_from,
-        valid_to,
-    ):
+    def __init__(self, mtc_participant, ssc, valid_from, valid_to):
         self.mtc_participant = mtc_participant
         self.ssc = ssc
         self.valid_from = valid_from
-        self.update(
-            valid_to,
-        )
+        self.update(valid_to)
 
-    def update(
-        self,
-        valid_to,
-    ):
+    def update(self, valid_to):
         self.valid_to = valid_to
 
         if hh_after(self.valid_from, valid_to):
             raise BadRequest("The valid_from date can't be after the valid_to date.")
 
     @classmethod
-    def insert(
-        cls,
-        sess,
-        mtc_participant,
-        ssc,
-        valid_from,
-        valid_to,
-    ):
-        mtc_ssc = cls(
-            mtc_participant,
-            ssc,
-            valid_from,
-            valid_to,
-        )
+    def insert(cls, sess, mtc_participant, ssc, valid_from, valid_to):
+        mtc_ssc = cls(mtc_participant, ssc, valid_from, valid_to)
         sess.add(mtc_ssc)
         sess.flush()
         return mtc_ssc
@@ -2924,44 +2901,21 @@ class MtcLlfcSsc(Base, PersistentClass):
     mtc_llfc_ssc_pcs = relationship("MtcLlfcSscPc", backref="mtc_llfc_ssc")
     __table_args__ = (UniqueConstraint("mtc_ssc_id", "llfc_id", "valid_from"),)
 
-    def __init__(
-        self,
-        mtc_ssc,
-        llfc,
-        valid_from,
-        valid_to,
-    ):
+    def __init__(self, mtc_ssc, llfc, valid_from, valid_to):
         self.mtc_ssc = mtc_ssc
         self.llfc = llfc
         self.valid_from = valid_from
-        self.update(
-            valid_to,
-        )
+        self.update(valid_to)
 
-    def update(
-        self,
-        valid_to,
-    ):
+    def update(self, valid_to):
         self.valid_to = valid_to
 
         if hh_after(self.valid_from, valid_to):
             raise BadRequest("The valid_from date can't be after the valid_to date.")
 
     @classmethod
-    def insert(
-        cls,
-        sess,
-        mtc_ssc,
-        llfc,
-        valid_from,
-        valid_to,
-    ):
-        mtc_llfc_ssc = cls(
-            mtc_ssc,
-            llfc,
-            valid_from,
-            valid_to,
-        )
+    def insert(cls, sess, mtc_ssc, llfc, valid_from, valid_to):
+        mtc_llfc_ssc = cls(mtc_ssc, llfc, valid_from, valid_to)
         sess.add(mtc_llfc_ssc)
         sess.flush()
         return mtc_llfc_ssc

{chellow-1713259114.0.0 → chellow-1713275535.0.0}/chellow/templates/base.html

@@ -107,6 +107,7 @@
 									<li><a href="/e/sscs" title="SSCs">SSCs</a></li>
 									<li><a href="/e/gsp_groups" title="GSP Groups">GSP Groups</a></li>
 									<li><a href="/e/cops" title="CoPs">CoPs</a></li>
+									<li><a href="/e/comms" title="Comms">Comms</a></li>
 									<li><a href="/bill_types" title="Bill Types">Bill Types</a></li>
 									<li><a href="/e/read_types" title="Read Types">Read Types</a></li>
 									<li>

{chellow-1713259114.0.0 → chellow-1713275535.0.0}/chellow/templates/e/comm.html

@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block nav %}
-	<a href="/comms">Comms</a> &raquo; {{comms.description}}
+	<a href="/e/comms">Comms</a> &raquo; {{comm.description}}
 {% endblock %}
 
 {% block content %}
@@ -13,11 +13,11 @@
 	<table>
 		<tr>
 			<th>Code</th>
-			<td>{{comms.code}}</td>
+			<td>{{comm.code}}</td>
 		</tr>
 		<tr>
 			<th>Description</th>
-			<td>{{comms.description}}</td>
+			<td>{{comm.description}}</td>
 		</tr>
 	</table>
 	

{chellow-1713259114.0.0 → chellow-1713275535.0.0}/test/e/test_e_views.py

@@ -49,6 +49,22 @@ from chellow.models import (
 from chellow.utils import ct_datetime, to_utc, utc_datetime
 
 
+def test_comms_get(sess, client):
+    insert_comms(sess)
+    sess.commit()
+
+    response = client.get("/e/comms")
+    match(response, 200)
+
+
+def test_comm_get(sess, client):
+    insert_comms(sess)
+    sess.commit()
+
+    response = client.get("/e/comms/3")
+    match(response, 200)
+
+
 def test_channel_add_post(sess, client):
     valid_from = to_utc(ct_datetime(2000, 1, 1))
     site = Site.insert(sess, "CI017", "Water Works")

{chellow-1713259114.0.0 → chellow-1713275535.0.0}/test/test_general_import.py

@@ -16,11 +16,15 @@ from chellow.models import (
     MeterType,
     Mtc,
     MtcLlfc,
+    MtcLlfcSsc,
+    MtcLlfcSscPc,
     MtcParticipant,
+    MtcSsc,
     Participant,
     Pc,
     Site,
     Source,
+    Ssc,
     VoltageLevel,
     insert_comms,
     insert_cops,
@@ -684,7 +688,7 @@ def test_general_import_llfc_update_valid_to_no_change(sess):
     chellow.general_import.general_import_llfc(sess, action, vals, args)
 
 
-def test_general_import_supply_insert(sess):
+def test_general_import_supply_insert_HH(sess):
     vf = to_utc(ct_datetime(1996, 1, 1))
     site_code = "CI017"
     Site.insert(sess, site_code, "Water Works")
@@ -780,3 +784,107 @@ def test_general_import_supply_insert(sess):
     ]
     args = []
     chellow.general_import.general_import_supply(sess, action, vals, args)
+
+
+def test_general_import_supply_insert_NHH(sess):
+    vf = to_utc(ct_datetime(1996, 1, 1))
+    site_code = "CI017"
+    Site.insert(sess, site_code, "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)
+    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_name = "Fusion"
+    Contract.insert_mop(sess, mop_contract_name, participant, "", {}, vf, None, {})
+    dc_contract_name = "Fusion DC 2000"
+    Contract.insert_dc(sess, dc_contract_name, participant, "", {}, vf, None, {})
+    pc_code = "01"
+    pc = Pc.insert(sess, pc_code, "nhh", vf, None)
+    insert_cops(sess)
+    cop_code = "5"
+    Cop.get_by_code(sess, cop_code)
+    insert_comms(sess)
+    comm_code = "GSM"
+    Comm.get_by_code(sess, comm_code)
+    supplier_contract_name = "Fusion 2000"
+    Contract.insert_supplier(
+        sess, supplier_contract_name, participant, "", {}, vf, None, {}
+    )
+    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_code = "845"
+    mtc = Mtc.insert(sess, mtc_code, 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_code = "521"
+    llfc = dno.insert_llfc(sess, llfc_code, "Imp", voltage_level, False, True, vf, None)
+    MtcLlfc.insert(sess, mtc_participant, llfc, vf, None)
+    insert_sources(sess)
+    source_code = "net"
+    Source.get_by_code(sess, source_code)
+    insert_energisation_statuses(sess)
+    energisation_status_code = "E"
+    EnergisationStatus.get_by_code(sess, energisation_status_code)
+    gsp_group_code = "_L"
+    GspGroup.insert(sess, gsp_group_code, "South Western")
+    supply_name = "Bob"
+    start_date = vf
+    msn = "khgsa;kh"
+    ssc_code = "0393"
+    ssc = Ssc.insert(sess, ssc_code, "All", True, vf, None)
+
+    mtc_ssc = MtcSsc.insert(sess, mtc_participant, ssc, vf, None)
+    mtc_llfc_ssc = MtcLlfcSsc.insert(sess, mtc_ssc, llfc, vf, None)
+    MtcLlfcSscPc.insert(sess, mtc_llfc_ssc, pc, vf, None)
+    sess.commit()
+
+    action = "insert"
+    vals = [
+        site_code,
+        source_code,
+        "",
+        supply_name,
+        gsp_group_code,
+        hh_format(start_date),
+        "",
+        mop_contract_name,
+        "22 7867 6232 781",
+        dc_contract_name,
+        "22 7867 6232 781",
+        msn,
+        "22",
+        pc_code,
+        mtc_code,
+        cop_code,
+        comm_code,
+        ssc_code,
+        energisation_status_code,
+        "{}",
+        "22 7867 6232 781",
+        llfc_code,
+        "0",
+        supplier_contract_name,
+        "22 7867 6232 781",
+    ]
+    args = []
+    chellow.general_import.general_import_supply(sess, action, vals, args)

chellow-1713259114.0.0/VERSION

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