chellow 1690534443.0.0__tar.gz → 1690962871.0.0__tar.gz

{chellow-1690534443.0.0 → chellow-1690962871.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chellow
-Version: 1690534443.0.0
+Version: 1690962871.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-1690962871.0.0/VERSION

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

{chellow-1690534443.0.0 → chellow-1690962871.0.0}/chellow/e/hh_importer.py

@@ -99,16 +99,19 @@ def start_hh_import_process(dc_contract_id, istream, file_name, file_size):
     return process
 
 
+lock = threading.RLock()
+
+
 class HhImportTask(threading.Thread):
     def __init__(self, contract_id):
         super().__init__(name=f"HH Automatic Import: contract {contract_id}")
-        self.lock = threading.RLock()
         self.messages = deque()
         self.contract_id = contract_id
         self.importer = None
         self.stopped = threading.Event()
         self.going = threading.Event()
         self.is_error = False
+        self.wait_seconds = 30 * 60
 
     def stop(self):
         self.stopped.set()
@@ -118,8 +121,8 @@ class HhImportTask(threading.Thread):
         self.going.set()
 
     def is_locked(self):
-        if self.lock.acquire(False):
-            self.lock.release()
+        if lock.acquire(False):
+            lock.release()
             return False
         else:
             return True
@@ -138,7 +141,6 @@ class HhImportTask(threading.Thread):
 
     def import_file(self, sess):
         found_new = False
-        self.wait_seconds = 30 * 60
 
         try:
             contract = Contract.get_dc_by_id(sess, self.contract_id)
@@ -173,7 +175,7 @@ class HhImportTask(threading.Thread):
         return found_new
 
     def import_now(self):
-        if self.lock.acquire(False):
+        if lock.acquire(False):
             sess = None
             try:
                 sess = Session()
@@ -185,7 +187,7 @@ class HhImportTask(threading.Thread):
             finally:
                 if sess is not None:
                     sess.close()
-                self.lock.release()
+                lock.release()
 
     def run(self):
         while not self.stopped.isSet():

{chellow-1690534443.0.0 → chellow-1690962871.0.0}/chellow/e/views.py

@@ -3950,23 +3950,30 @@ def supplier_batch_edit_get(batch_id):
     return render_template("supplier_batch_edit.html", batch=batch)
 
 
+@e.route("/supplier_batches/<int:batch_id>/edit", methods=["DELETE"])
+def supplier_batch_edit_delete(batch_id):
+    try:
+        batch = Batch.get_by_id(g.sess, batch_id)
+        contract_id = batch.contract.id
+        batch.delete(g.sess)
+        g.sess.commit()
+        return hx_redirect(f"/supplier_batches?supplier_contract_id={contract_id}", 303)
+    except BadRequest as e:
+        flash(e.description)
+        return make_response(
+            render_template("supplier_batch_edit.html", batch=batch), 400
+        )
+
+
 @e.route("/supplier_batches/<int:batch_id>/edit", methods=["POST"])
 def supplier_batch_edit_post(batch_id):
     try:
         batch = Batch.get_by_id(g.sess, batch_id)
-        if "update" in request.values:
-            reference = req_str("reference")
-            description = req_str("description")
-            batch.update(g.sess, reference, description)
-            g.sess.commit()
-            return chellow_redirect(f"/supplier_batches/{batch.id}", 303)
-        elif "delete" in request.values:
-            contract_id = batch.contract.id
-            batch.delete(g.sess)
-            g.sess.commit()
-            return chellow_redirect(
-                f"/supplier_batches?supplier_contract_id={contract_id}", 303
-            )
+        reference = req_str("reference")
+        description = req_str("description")
+        batch.update(g.sess, reference, description)
+        g.sess.commit()
+        return chellow_redirect(f"/supplier_batches/{batch.id}", 303)
     except BadRequest as e:
         flash(e.description)
         return make_response(

{chellow-1690534443.0.0 → chellow-1690962871.0.0}/chellow/models.py

@@ -29,6 +29,7 @@ from sqlalchemy import (
     Text,
     and_,
     create_engine,
+    delete,
     event,
     not_,
     null,
@@ -932,9 +933,7 @@ class Batch(Base, PersistentClass):
             )
 
     def delete(self, sess):
-        sess.execute(
-            "delete from bill where batch_id = :batch_id", {"batch_id": self.id}
-        )
+        sess.execute(delete(Bill).where(Bill.batch == self))
         sess.delete(self)
 
     def insert_bill(

chellow-1690962871.0.0/chellow/templates/e/supplier_batch_edit.html

@@ -0,0 +1,36 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» Supplier Contracts » {{batch.contract.name}} » Batches » 
+ 	{{batch.reference}}
+{% endblock %}
+
+{% block nav %}
+	<a href="/e/supplier_contracts">Supplier Contracts</a> &raquo; 
+	<a href="/e/supplier_contracts/{{batch.contract.id}}">{{batch.contract.name}}</a>
+	&raquo; 
+	<a href="/e/supplier_batches?supplier_contract_id={{batch.contract.id}}">Batches</a>
+	&raquo; 
+	<a href="/e/supplier_batches/{{batch.id}}">{{batch.reference}}</a>
+ 	&raquo; Edit
+{% endblock %}
+
+{% block content %}
+	
+<form action="/e/supplier_batches/{{batch.id}}/edit" method="post">
+		<fieldset>
+			<legend>Update batch</legend>
+			<label>Reference</label> {{input_text('reference', batch.reference)}}
+			<label>Description</label> {{input_text('description', batch.description)}}
+			<input type="submit" name="update" value="Update">
+		</fieldset>
+	</form>
+
+	<form hx-delete="/e/supplier_batches/{{batch.id}}/edit"
+			hx-confirm="Are you sure you want to delete this batch and all its bills?">
+		<fieldset>
+			<legend>Delete this batch</legend>
+			<input type="submit" name="confirm_delete" value="Delete">
+		</fieldset>
+	</form>
+{% endblock %}

{chellow-1690534443.0.0 → chellow-1690962871.0.0}/test/e/bill_parsers/test_bill_parser_haven_edi.py

@@ -377,7 +377,7 @@ def test_process_MHD(mocker):
         "kwh": Decimal("0"),
     }
     assert headers == expected_headers
-    assert type(headers["breakdown"]) == type(expected_headers)
+    assert type(headers["breakdown"]) is type(expected_headers)
 
 
 def test_process_CCD3(mocker):

{chellow-1690534443.0.0 → chellow-1690962871.0.0}/test/e/test_e_views.py

@@ -2254,6 +2254,28 @@ def test_supplier_batches_get(sess, client):
     match(response, 200)
 
 
+def test_supplier_batch_edit_delete(sess, client):
+    vf = to_utc(ct_datetime(1996, 1, 1))
+    participant = Participant.insert(sess, "hhak", "AK Industries")
+    market_role_X = MarketRole.insert(sess, "X", "Supplier")
+    participant.insert_party(sess, market_role_X, "Fusion Ltc", vf, None, None)
+    imp_supplier_contract = Contract.insert_supplier(
+        sess,
+        "Fusion Supplier 2000",
+        participant,
+        "",
+        {},
+        vf,
+        None,
+        {},
+    )
+    batch = imp_supplier_contract.insert_batch(sess, "b1", "batch 1")
+    sess.commit()
+
+    response = client.delete(f"/e/supplier_batches/{batch.id}/edit")
+    match(response, 303)
+
+
 def test_supplier_batch_get(sess, client):
     valid_from = to_utc(ct_datetime(1996, 1, 1))
     participant = Participant.insert(sess, "hhak", "AK Industries")

chellow-1690534443.0.0/VERSION

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

chellow-1690534443.0.0/chellow/templates/e/supplier_batch_edit.html

@@ -1,46 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}
-	» Supplier Contracts » {{batch.contract.name}} » Batches » 
- 	{{batch.reference}}
-{% endblock %}
-
-{% block nav %}
-	<a href="/e/supplier_contracts">Supplier Contracts</a> &raquo; 
-	<a href="/e/supplier_contracts/{{batch.contract.id}}">{{batch.contract.name}}</a>
-	&raquo; 
-	<a href="/e/supplier_batches?supplier_contract_id={{batch.contract.id}}">Batches</a>
-	&raquo; 
-	<a href="/e/supplier_batches/{{batch.id}}">{{batch.reference}}</a>
- 	&raquo; Edit
-{% endblock %}
-
-{% block content %}
-	{% if request.method == 'GET' and request.values.confirm_delete %}
-		<form method="post" action="">
-			<fieldset>
-				<legend>Are you sure you want to delete this batch and all its bills?</legend>	
-				<input type="submit" name="delete" value="Delete">
-				<a href="/e/supplier_batches/{{batch.id}}/edit">Cancel</a>
-			</fieldset>
-		</form>
-
-	{% else %}
-	
-		<form action="" method="post">
-			<fieldset>
-				<legend>Update batch</legend>	
-				<label>Reference</label> {{input_text('reference', batch.reference)}}
-				<label>Description</label> {{input_text('description', batch.description)}}
-				<input type="submit" name="update" value="Update">
-			</fieldset>
-		</form>
-
-		<form action="">
-			<fieldset>
-				<legend>Delete this batch</legend>	
-				<input type="submit" name="confirm_delete" value="Delete">
-			</fieldset>
-		</form>
-	{% endif %}
-{% endblock %}