chellow 1714406616.0.0__tar.gz → 1714484335.0.0__tar.gz

{chellow-1714406616.0.0 → chellow-1714484335.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1714406616.0.0
+Version: 1714484335.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-1714484335.0.0/VERSION

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

{chellow-1714406616.0.0 → chellow-1714484335.0.0}/chellow/e/views.py

@@ -1137,6 +1137,14 @@ def dc_contract_edit_get(dc_contract_id):
     )
 
 
+@e.route("/dc_contracts/<int:contract_id>/edit", methods=["DELETE"])
+def dc_contract_edit_delete(contract_id):
+    contract = Contract.get_dc_by_id(g.sess, contract_id)
+    contract.delete(g.sess)
+    g.sess.commit()
+    return hx_redirect("/dc_contracts", 303)
+
+
 @e.route("/dc_contracts/<int:contract_id>/edit", methods=["POST"])
 def dc_contract_edit_post(contract_id):
     contract = None
@@ -1161,10 +1169,6 @@ def dc_contract_edit_post(contract_id):
             )
             g.sess.commit()
             return chellow_redirect(f"/dc_contracts/{contract.id}", 303)
-        elif "delete" in request.form:
-            contract.delete(g.sess)
-            g.sess.commit()
-            return chellow_redirect("/dc_contracts", 303)
         else:
             party_id = req_int("party_id")
             name = req_str("name")
@@ -3059,6 +3063,14 @@ def mop_contract_edit_get(contract_id):
     )
 
 
+@e.route("/mop_contracts/<int:contract_id>/edit", methods=["DELETE"])
+def mop_contract_edit_delete(contract_id):
+    contract = Contract.get_mop_by_id(g.sess, contract_id)
+    contract.delete(g.sess)
+    g.sess.commit()
+    return hx_redirect("/mop_contracts", 303)
+
+
 @e.route("/mop_contracts/<int:contract_id>/edit", methods=["POST"])
 def mop_contract_edit_post(contract_id):
     try:
@@ -3082,10 +3094,6 @@ def mop_contract_edit_post(contract_id):
             )
             g.sess.commit()
             return chellow_redirect(f"/mop_contracts/{contract.id}", 303)
-        elif "delete" in request.form:
-            contract.delete(g.sess)
-            g.sess.commit()
-            return chellow_redirect("/mop_contracts", 303)
         else:
             party_id = req_int("party_id")
             name = req_str("name")

{chellow-1714406616.0.0 → chellow-1714484335.0.0}/chellow/general_import.py

@@ -374,10 +374,14 @@ def general_import_era(sess, action, vals, args):
         ssc_code = add_arg(args, "Standard Settlement Configuration", vals, 12)
         if ssc_code == NO_CHANGE:
             ssc = existing_era.ssc
+            if ssc is None:
+                ssc_code = None
+            else:
+                ssc_code = ssc.code
         elif len(ssc_code) > 0:
-            ssc = Ssc.get_by_code(sess, ssc_code)
+            Ssc.get_by_code(sess, ssc_code)
         else:
-            ssc = None
+            ssc_code = None
 
         es_code = add_arg(args, "Energisation Status", vals, 13)
         if es_code == NO_CHANGE:
@@ -513,7 +517,7 @@ def general_import_era(sess, action, vals, args):
             mtc_code,
             cop,
             comm,
-            ssc,
+            ssc_code,
             energisation_status,
             properties,
             imp_mpan_core,

{chellow-1714406616.0.0 → chellow-1714484335.0.0}/chellow/reports/report_ecoes_comparison.py

@@ -25,7 +25,7 @@ from chellow.models import (
     Supply,
     User,
 )
-from chellow.utils import req_bool
+from chellow.utils import csv_make_val, req_bool
 from chellow.views import chellow_redirect
 
 
@@ -236,25 +236,30 @@ def _process(
         "ecoes_pc",
         "chellow_pc",
         "ecoes_mtc",
+        "ecoes_mtc_date",
         "chellow_mtc",
         "ecoes_llfc",
+        "ecoes_llfc_from",
         "chellow_llfc",
         "ecoes_ssc",
         "chellow_ssc",
         "ecoes_es",
         "chellow_es",
         "ecoes_supplier",
+        "ecoes_supplier_registration_from",
         "chellow_supplier",
         "chellow_supplier_contract_name",
         "ecoes_dc",
         "chellow_dc",
         "ecoes_mop",
+        "ecoes_mop_appoint_date",
         "chellow_mop",
         "ecoes_gsp_group",
+        "ecoes_gsp_effective_from",
         "chellow_gsp_group",
         "ecoes_msn",
-        "chellow_msn",
         "ecoes_msn_install_date",
+        "chellow_msn",
         "ecoes_meter_type",
         "chellow_meter_type",
         "ignored",
@@ -493,8 +498,8 @@ def _process(
                 "ecoes_pc": ecoes["pc"],
                 "chellow_pc": chellow_pc,
                 "ecoes_mtc": ecoes["mtc"],
+                "ecoes_mtc_date": _parse_date(ecoes["mtc-date"]),
                 "chellow_mtc": chellow_mtc,
-                "chellow_mtc_date": _parse_date(ecoes["mtc-date"]),
                 "ecoes_llfc": ecoes["llfc"],
                 "ecoes_llfc_from": _parse_date(ecoes["llfc-from"]),
                 "chellow_llfc": chellow_llfc,
@@ -524,7 +529,7 @@ def _process(
                 "ignored": ignore,
                 "problem": problem,
             }
-            writer.writerow(values[t] for t in titles)
+            writer.writerow(csv_make_val(values[t]) for t in titles)
             values["chellow_supplier_contract_id"] = chellow_supplier_contract_id
             values["chellow_supply_id"] = chellow_supply_id
             values["diffs"] = diffs
@@ -563,21 +568,26 @@ def _process(
             "ecoes_pc": "",
             "chellow_pc": era.pc.code,
             "ecoes_mtc": "",
+            "ecoes_mtc_date": "",
             "chellow_mtc": era.mtc_participant.mtc.code,
             "ecoes_llfc": "",
+            "ecoes_llfc_from": "",
             "chellow_llfc": llfc.code,
             "ecoes_ssc": "",
             "chellow_ssc": ssc,
             "ecoes_es": "",
             "chellow_es": es,
             "ecoes_supplier": "",
+            "ecoes_supplier_registration_from": "",
             "chellow_supplier": supplier_contract.party.participant.code,
             "chellow_supplier_contract_name": supplier_contract.name,
             "ecoes_dc": "",
             "chellow_dc": dc,
             "ecoes_mop": "",
+            "ecoes_mop_appoint_date": "",
             "chellow_mop": mop,
             "ecoes_gsp_group": "",
+            "ecoes_gsp_effective_from": "",
             "chellow_gsp_group": supply.gsp_group.code,
             "ecoes_msn": "",
             "chellow_msn": msn,
@@ -587,7 +597,7 @@ def _process(
             "ignored": False,
             "problem": "In Chellow, but not in ECOES.",
         }
-        writer.writerow(values[t] for t in titles)
+        writer.writerow(csv_make_val(values[t]) for t in titles)
         values["chellow_supplier_contract_id"] = supplier_contract.id
         values["chellow_supply_id"] = era.supply.id
         values["diffs"] = []

chellow-1714484335.0.0/chellow/templates/e/dc_contract_edit.html

@@ -0,0 +1,62 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» DC Contracts » {{dc_contract.name}}
+{% endblock %}
+
+{% block nav %}
+	<a href="/e/dc_contracts">DC Contracts</a> &raquo;
+	<a href="/e/dc_contracts/{{dc_contract.id}}">{{dc_contract.name}}</a> &raquo;
+ 	Edit
+{% endblock %}
+
+{% block content %}
+	<form action="/e/dc_contracts/{{dc_contract.id}}/edit" method="post">
+		<fieldset>
+			<legend>Update Contract</legend>
+
+			<label>Party</label>
+			<select name="party_id">
+				{% for party in parties %}
+					{{ input_option(
+							'party_id', party.id,
+							party.participant.code + ' : ' + party.name,
+							dc_contract.party.id) }}
+				{% endfor %}
+			</select>
+
+			<label>Name</label> {{input_text('name', dc_contract.name)}}
+
+			<label>Charge script</label>
+			{{input_textarea(
+				'charge_script', dc_contract.charge_script, 40, 80)}}
+
+			<input type="submit" value="Update">
+		</fieldset>
+	</form>
+
+	<form action="/e/dc_contracts/{{dc_contract.id}}/edit" method="post">
+		<fieldset>
+			<legend>Update State</legend>
+			<label>State</label>
+			{{input_textarea('state', dc_contract.state, 40, 80)}}
+			<input type="submit" name="update_state" value="Update">
+		</fieldset>
+	</form>
+
+	<form hx-delete="/e/dc_contracts/{{dc_contract.id}}/edit"
+		hx-confirm="Are you sure you want to delete this contract?">
+		<fieldset>
+			<legend>Delete This Contract</legend>
+			<input type="submit" value="Delete">
+		</fieldset>
+	</form>
+
+	<form method="post" action="/e/dc_contracts/{{dc_contract.id}}/edit">
+		<fieldset>
+			<legend>Ignore all snags before</legend>
+			{{ input_date('ignore', initial_date) }}
+			<input type="submit" name="ignore_snags" value="Ignore">
+		</fieldset>
+	</form>
+{% endblock %}

chellow-1714484335.0.0/chellow/templates/e/mop_contract_edit.html

@@ -0,0 +1,59 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» MOP Contracts » {{contract.name}}
+{% endblock %}
+
+{% block nav %}
+	<a href="/e/mop_contracts">MOP Contracts</a> &raquo; 
+	<a href="/e/mop_contracts/{{contract.id}}">{{contract.name}}</a> &raquo; Edit
+{% endblock %}
+
+{% block content %}
+	<form method="post">
+		<fieldset>
+			<legend>Update Contract</legend>
+			<input type="hidden" name="mop_contract_id" value="{{contract.id}}">
+			<label>Party</label>
+			<select name="party_id">
+				{% for party in parties %}
+					{{input_option('party_id', party.id,
+							party.participant.code + ' : ' + party.name, contract.party.id) }}
+				{% endfor %}
+			</select>
+			<label>Name </label> {{input_text('name', contract.name)}}
+			<label>Charge script</label>
+			{{input_textarea('charge_script', contract.charge_script, 40, 80)}}
+			<label>Properties</label>
+			{{input_textarea('properties', contract.properties, 40, 80)}}
+			<label>Example</label>
+			<code><pre>
+has.importer=yes
+file.type=.df2
+hostname=example.com
+username=username
+password=password
+directory0=downloads1
+directory1=downloads2
+			</pre></code>
+			<input type="submit" value="Update">
+		</fieldset>
+	</form>						
+
+	<form action="/e/mop_contracts/{{contract.id}}/edit" method="post">
+		<fieldset>
+			<legend>Update State</legend>	
+			<label>State</label>
+			{{input_textarea('state', contract.state, 40, 80)}}
+			<input type="submit" name="update_state" value="Update">
+		</fieldset>
+	</form>
+
+	<form hx-delete="/e/mop_contracts/{{contract.id}}/edit"
+		hx-confirm="Are you sure you want to delete this contract?">
+		<fieldset>
+			<legend>Delete this contract</legend>
+			<input type="submit" value="Delete">
+		</fieldset>
+	</form>
+{% endblock %}

{chellow-1714406616.0.0 → chellow-1714484335.0.0}/test/e/test_e_views.py

@@ -538,6 +538,19 @@ def test_dc_auto_importer_post(mocker, sess, client):
     match(response, 303)
 
 
+def test_dc_contract_edit_delete(sess, client):
+    vf = to_utc(ct_datetime(2000, 1, 1))
+    market_role_C = MarketRole.insert(sess, "C", "DC")
+    participant = Participant.insert(sess, "CALB", "AK Industries")
+    participant.insert_party(sess, market_role_C, "DC Ltd.", vf, None, None)
+    contract = Contract.insert_dc(sess, "DC 2000", participant, "", {}, vf, None, {})
+    sess.commit()
+
+    response = client.delete(f"/e/dc_contracts/{contract.id}/edit")
+
+    match(response, 303)
+
+
 def test_dc_contract_edit_post(sess, client):
     market_role_C = MarketRole.insert(sess, "C", "DC")
     participant = Participant.insert(sess, "CALB", "AK Industries")
@@ -2190,6 +2203,19 @@ def test_mop_batch_upload_file_post(sess, client):
     assert batch_file.data == file_bytes
 
 
+def test_mop_contract_edit_delete(sess, client):
+    vf = to_utc(ct_datetime(2000, 1, 1))
+    market_role_M = MarketRole.insert(sess, "M", "MOP")
+    participant = Participant.insert(sess, "CALB", "AK Industries")
+    participant.insert_party(sess, market_role_M, "MOP Ltd.", vf, None, None)
+    contract = Contract.insert_mop(sess, "MOP 2000", participant, "", {}, vf, None, {})
+    sess.commit()
+
+    response = client.delete(f"/e/mop_contracts/{contract.id}/edit")
+
+    match(response, 303)
+
+
 def test_mop_batch_file_get(sess, client):
     vf = to_utc(ct_datetime(1996, 1, 1))
     participant = Participant.insert(sess, "hhak", "AK Industries")

{chellow-1714406616.0.0 → chellow-1714484335.0.0}/test/reports/test_report_ecoes_comparison.py

@@ -1,5 +1,8 @@
+import csv
 from io import StringIO
 
+from utils import match_tables
+
 from chellow.models import (
     Comm,
     Contract,
@@ -282,25 +285,30 @@ def test_process(mocker, sess):
             "ecoes_pc",
             "chellow_pc",
             "ecoes_mtc",
+            "ecoes_mtc_date",
             "chellow_mtc",
             "ecoes_llfc",
+            "ecoes_llfc_from",
             "chellow_llfc",
             "ecoes_ssc",
             "chellow_ssc",
             "ecoes_es",
             "chellow_es",
             "ecoes_supplier",
+            "ecoes_supplier_registration_from",
             "chellow_supplier",
             "chellow_supplier_contract_name",
             "ecoes_dc",
             "chellow_dc",
             "ecoes_mop",
+            "ecoes_mop_appoint_date",
             "chellow_mop",
             "ecoes_gsp_group",
+            "ecoes_gsp_effective_from",
             "chellow_gsp_group",
             "ecoes_msn",
-            "chellow_msn",
             "ecoes_msn_install_date",
+            "chellow_msn",
             "ecoes_meter_type",
             "chellow_meter_type",
             "ignored",
@@ -312,25 +320,30 @@ def test_process(mocker, sess):
             "pc",
             "00",
             "mtc",
+            "2022-10-12 00:00",
             "845",
             "llfc",
+            "2022-10-12 00:00",
             "510",
             "",
             "",
             "energisation-status",
             "E",
             "supplier",
+            "2022-10-12 00:00",
             "CALB",
             "Fusion Supplier 2000",
             "dc",
             "CALB",
             "mop",
+            "2022-10-12 00:00",
             "CALB",
             "gsp-group",
+            "2022-10-12 00:00",
             "_L",
             "msn",
-            "hgjeyhuw",
             "2022-10-12 00:00",
+            "hgjeyhuw",
             "meter-type",
             "H",
             "False",
@@ -346,25 +359,30 @@ def test_process(mocker, sess):
             "pc",
             "00",
             "mtc",
+            "2022-10-12 00:00",
             "845",
             "llfc",
+            "2022-10-12 00:00",
             "510",
             "",
             "",
             "energisation-status",
             "E",
             "supplier",
+            "2022-10-12 00:00",
             "CALB",
             "Fusion Supplier 2000",
             "dc",
             "CALB",
             "mop",
+            "2022-10-12 00:00",
             "CALB",
             "gsp-group",
+            "2022-10-12 00:00",
             "_L",
             "msn",
-            "hgjeyhuw",
             "2022-10-12 00:00",
+            "hgjeyhuw",
             "meter-type",
             "H",
             "False",
@@ -375,60 +393,43 @@ def test_process(mocker, sess):
             "match.",
         ],
     ]
-    expected = "\n".join(",".join(line) for line in expected) + "\n"
-    actual = f.getvalue()
-    assert actual == expected
+    f.seek(0)
+    actual = [line for line in csv.reader(f)]
+    match_tables(expected, actual)
 
 
 def test_process_in_chellow_not_ecoes(mocker, sess):
-    valid_from = to_utc(ct_datetime(2000, 1, 1))
+    vf = to_utc(ct_datetime(2000, 1, 1))
     site = Site.insert(sess, "CI017", "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", valid_from, 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,
-    )
+    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", valid_from, None, None)
-    participant.insert_party(sess, market_role_X, "Fusion Ltc", valid_from, None, None)
-    participant.insert_party(sess, market_role_C, "Fusion DC", valid_from, None, None)
+    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, {}
+        sess, "Fusion", participant, "", {}, vf, None, {}
     )
     dc_contract = Contract.insert_dc(
-        sess, "Fusion DC 2000", participant, "", {}, utc_datetime(2000, 1, 1), None, {}
+        sess, "Fusion DC 2000", participant, "", {}, vf, None, {}
     )
-    pc = Pc.insert(sess, "00", "hh", utc_datetime(2000, 1, 1), None)
+    pc = Pc.insert(sess, "00", "hh", vf, 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,
-        {},
+        sess, "Fusion Supplier 2000", participant, "", {}, vf, None, {}
     )
-    dno = participant.insert_party(sess, market_role_R, "WPD", valid_from, 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", valid_from, None)
-    mtc = Mtc.insert(sess, "845", False, True, valid_from, 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 = Mtc.insert(sess, "845", False, True, vf, None)
     mtc_participant = MtcParticipant.insert(
         sess,
         mtc,
@@ -439,32 +440,16 @@ def test_process_in_chellow_not_ecoes(mocker, sess):
         meter_type,
         meter_payment_type,
         0,
-        utc_datetime(1996, 1, 1),
+        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,
-        utc_datetime(1996, 1, 1),
-        None,
-    )
-    MtcLlfc.insert(sess, mtc_participant, llfc, valid_from, None)
-    dno.insert_llfc(
-        sess,
-        "521",
-        "Export (HV)",
-        voltage_level,
-        False,
-        False,
-        utc_datetime(1996, 1, 1),
-        None,
+        sess, "510", "PC 5-8 & HH HV", voltage_level, False, True, vf, None
     )
+    MtcLlfc.insert(sess, mtc_participant, llfc, vf, None)
+    dno.insert_llfc(sess, "521", "Export (HV)", voltage_level, False, False, vf, None)
     insert_sources(sess)
     source = Source.get_by_code(sess, "net")
     insert_energisation_statuses(sess)
@@ -534,25 +519,30 @@ def test_process_in_chellow_not_ecoes(mocker, sess):
             "ecoes_pc",
             "chellow_pc",
             "ecoes_mtc",
+            "ecoes_mtc_date",
             "chellow_mtc",
             "ecoes_llfc",
+            "ecoes_llfc_from",
             "chellow_llfc",
             "ecoes_ssc",
             "chellow_ssc",
             "ecoes_es",
             "chellow_es",
             "ecoes_supplier",
+            "ecoes_supplier_registration_from",
             "chellow_supplier",
             "chellow_supplier_contract_name",
             "ecoes_dc",
             "chellow_dc",
             "ecoes_mop",
+            "ecoes_mop_appoint_date",
             "chellow_mop",
             "ecoes_gsp_group",
+            "ecoes_gsp_effective_from",
             "chellow_gsp_group",
             "ecoes_msn",
-            "chellow_msn",
             "ecoes_msn_install_date",
+            "chellow_msn",
             "ecoes_meter_type",
             "chellow_meter_type",
             "ignored",
@@ -564,32 +554,39 @@ def test_process_in_chellow_not_ecoes(mocker, sess):
             "",
             "00",
             "",
+            "",
             "845",
             "",
+            "",
             "510",
             "",
             "",
             "",
             "E",
             "",
+            "",
             "CALB",
             "Fusion Supplier 2000",
             "",
             "CALB",
             "",
+            "",
             "CALB",
             "",
+            "",
             "_L",
             "",
-            "hgjeyhuw",
             "",
+            "hgjeyhuw",
             "",
             "H",
             "False",
-            '"In Chellow, but not in ECOES."',
+            "In Chellow, but not in ECOES.",
         ],
     ]
-    assert f.getvalue() == "\n".join(",".join(line) for line in expected) + "\n"
+    f.seek(0)
+    actual = list(csv.reader(f))
+    match_tables(expected, actual)
 
 
 def test_meter_type(mocker, sess):