chellow 1713170458.0.0__tar.gz → 1713268896.0.0__tar.gz

{chellow-1713170458.0.0 → chellow-1713268896.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1713170458.0.0
+Version: 1713268896.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-1713268896.0.0/VERSION

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

{chellow-1713170458.0.0 → chellow-1713268896.0.0}/chellow/e/bill_parsers/csv.py

@@ -6,6 +6,8 @@ from dateutil.relativedelta import relativedelta
 
 from werkzeug.exceptions import BadRequest
 
+from zish import ZishLocationException
+
 from chellow.utils import (
     HH,
     ct_datetime_parse,
@@ -44,7 +46,7 @@ class Parser:
         raw_bills = []
         next(iter(self.reader))  # skip title row
         blank_set = set(("",))
-        for self.line_number, self.vals in enumerate(self.reader, start=1):
+        for self.line_number, self.vals in enumerate(self.reader, start=2):
             try:
                 # skip blank lines
                 if len(self.vals) == 0 or set(self.vals) == blank_set:
@@ -72,7 +74,7 @@ class Parser:
                     else:
                         try:
                             breakdown = loads(breakdown_str)
-                        except SyntaxError as e:
+                        except ZishLocationException as e:
                             raise BadRequest(str(e))
                 else:
                     raise BadRequest("There isn't a 'breakdown' field on the end.")
@@ -117,7 +119,9 @@ class Parser:
                 }
                 raw_bills.append(raw_bill)
             except BadRequest as e:
-                raise BadRequest(f"Problem at line {self.line_number}: {e.description}")
+                raise BadRequest(
+                    f"Problem at line {self.line_number} {self.vals}: {e.description}"
+                )
 
         return raw_bills
 

{chellow-1713170458.0.0 → chellow-1713268896.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-1713170458.0.0 → chellow-1713268896.0.0}/chellow/general_import.py

@@ -1247,20 +1247,26 @@ def general_import_supply(sess, action, vals, args):
         dc_account = add_arg(args, "DC Account", vals, 10)
         msn = add_arg(args, "Meter Serial Number", vals, 11)
         dno_code = add_arg(args, "DNO Code", vals, 12)
-        dno = Party.get_dno_by_code(sess, dno_code)
+        dno = Party.get_dno_by_code(sess, dno_code, start_date)
         pc_code = add_arg(args, "Profile Class", vals, 13)
         pc = Pc.get_by_code(sess, parse_pc_code(pc_code))
         mtc_code = add_arg(args, "Meter Timeswitch Class", vals, 14)
         cop_code = add_arg(args, "CoP", vals, 15)
         cop = Cop.get_by_code(sess, cop_code)
-        ssc_code = add_arg(args, "Standard Settlement Configuration", vals, 16)
+        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
-        properties_str = add_arg(args, "Properties", vals, 17)
+        energisation_status_code = add_arg(args, "Energisation Status", vals, 18)
+        energisation_status = EnergisationStatus.get_by_code(
+            sess, energisation_status_code
+        )
+        properties_str = add_arg(args, "Properties", vals, 19)
         try:
             properties = loads(properties_str)
         except ZishException as e:
-            raise BadRequest("Can't parse the properties field. " + str(e))
-        imp_mpan_core = add_arg(args, "Import MPAN Core", vals, 18)
+            raise BadRequest(f"Can't parse the properties field. {e}")
+        imp_mpan_core = add_arg(args, "Import MPAN Core", vals, 20)
         if len(imp_mpan_core) == 0:
             imp_mpan_core = None
         else:
@@ -1272,55 +1278,48 @@ def general_import_supply(sess, action, vals, args):
             imp_supplier_account = None
             imp_sc = None
         else:
-            imp_llfc_code = add_arg(args, "Import LLFC", vals, 19)
-            imp_sc_str = add_arg(args, "Import Agreed Supply Capacity", vals, 20)
+            imp_llfc_code = add_arg(args, "Import LLFC", vals, 21)
+            imp_sc_str = add_arg(args, "Import Agreed Supply Capacity", vals, 22)
             try:
                 imp_sc = int(imp_sc_str)
             except ValueError as e:
-                raise BadRequest(
-                    "The import supply capacity must be an integer." + str(e)
-                )
+                raise BadRequest(f"The import supply capacity must be an integer. {e}")
 
             imp_supplier_contract_name = add_arg(
-                args, "Import Supplier Contract", vals, 21
+                args, "Import Supplier Contract", vals, 23
             )
-            imp_supplier_account = add_arg(args, "Import Supplier Account", vals, 22)
+            imp_supplier_account = add_arg(args, "Import Supplier Account", vals, 24)
             imp_supplier_contract = Contract.get_supplier_by_name(
                 sess, imp_supplier_contract_name
             )
 
-        exp_supplier_contract = None
-        exp_sc = None
-        exp_llfc_code = None
-        exp_mpan_core = None
+        exp_supplier_contract = exp_sc = exp_llfc_code = exp_mpan_core = None
         exp_supplier_account = None
-        if len(vals) > 22:
-            exp_mpan_core = add_arg(args, "Export MPAN Core", vals, 23)
+        if len(vals) > 25:
+            exp_mpan_core = add_arg(args, "Export MPAN Core", vals, 25)
             if len(exp_mpan_core) == 0:
                 exp_mpan_core = None
             else:
                 exp_mpan_core = parse_mpan_core(exp_mpan_core)
 
             if exp_mpan_core is not None:
-                exp_llfc_code = add_arg(args, "Export LLFC", vals, 24)
-                exp_sc_str = add_arg(args, "Export Agreed Supply Capacity", vals, 25)
+                exp_llfc_code = add_arg(args, "Export LLFC", vals, 26)
+                exp_sc_str = add_arg(args, "Export Agreed Supply Capacity", vals, 27)
                 try:
                     exp_sc = int(exp_sc_str)
                 except ValueError as e:
                     raise BadRequest(
-                        "The export agreed supply capacity "
-                        + "must be an integer."
-                        + str(e)
+                        f"The export agreed supply capacity must be an integer. {e}"
                     )
 
                 exp_supplier_contract_name = add_arg(
-                    args, "Export Supplier Contract", vals, 26
+                    args, "Export Supplier Contract", vals, 28
                 )
                 exp_supplier_contract = Contract.get_supplier_by_name(
                     sess, exp_supplier_contract_name
                 )
                 exp_supplier_account = add_arg(
-                    args, "Export Supplier Account", vals, 27
+                    args, "Export Supplier Account", vals, 29
                 )
 
         supply = site.insert_e_supply(
@@ -1340,7 +1339,9 @@ def general_import_supply(sess, action, vals, args):
             pc,
             mtc_code,
             cop,
+            comm,
             ssc,
+            energisation_status,
             properties,
             imp_mpan_core,
             imp_llfc_code,

{chellow-1713170458.0.0 → chellow-1713268896.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-1713170458.0.0 → chellow-1713268896.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-1713170458.0.0 → chellow-1713268896.0.0}/chellow/templates/general_imports.html

@@ -89,6 +89,7 @@
 				<td>Profile Class</td>
 				<td>Meter Timeswitch Class</td>
 				<td>CoP</td>
+				<td>Comms Type</td>
 				<td>
 					Standard Settlement Configuration (blank for HH supplies)
 				</td>

{chellow-1713170458.0.0 → chellow-1713268896.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-1713170458.0.0 → chellow-1713268896.0.0}/test/test_general_import.py

@@ -682,3 +682,101 @@ def test_general_import_llfc_update_valid_to_no_change(sess):
     ]
     args = []
     chellow.general_import.general_import_llfc(sess, action, vals, args)
+
+
+def test_general_import_supply_insert(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.insert(sess, "00", "hh", 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"
+
+    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",
+        "00",
+        mtc_code,
+        cop_code,
+        comm_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-1713170458.0.0/VERSION

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