chellow 1720006293.0.0__py3-none-any.whl → 1720526317.0.0__py3-none-any.whl

chellow/reports/report_429.py

@@ -102,6 +102,7 @@ def content(g_batch_id, g_bill_id, g_contract_id, start_date, finish_date, user_
                     _process_g_bill_ids(
                         sess,
                         report_context,
+                        g_contract,
                         g_bill_ids,
                         forecast_date,
                         bill_titles,
@@ -122,6 +123,7 @@ def content(g_batch_id, g_bill_id, g_contract_id, start_date, finish_date, user_
 def _process_g_bill_ids(
     sess,
     report_context,
+    g_contract,
     g_bill_ids,
     forecast_date,
     bill_titles,
@@ -132,15 +134,24 @@ def _process_g_bill_ids(
     g_bill_id = list(sorted(g_bill_ids))[0]
     g_bill_ids.remove(g_bill_id)
     g_bill = sess.query(GBill).filter(GBill.id == g_bill_id).one()
-    problem = ""
     g_supply = g_bill.g_supply
+    vals = {
+        "covered_vat_gbp": Decimal("0.00"),
+        "covered_net_gbp": Decimal("0.00"),
+        "covered_gross_gbp": Decimal("0.00"),
+        "covered_kwh": Decimal(0),
+        "covered_start": g_bill.start_date,
+        "covered_finish": g_bill.finish_date,
+        "covered_bill_ids": [],
+        "virtual_problem": "",
+    }
     read_dict = defaultdict(set)
     for g_read in g_bill.g_reads:
         if not all(
             g_read.msn == era.msn
             for era in g_supply.find_g_eras(sess, g_read.prev_date, g_read.pres_date)
         ):
-            problem += (
+            vals["virtual_problem"] += (
                 f"The MSN {g_read.msn} of the register read {g_read.id} doesn't match "
                 f"the MSN of all the relevant eras."
             )
@@ -152,17 +163,9 @@ def _process_g_bill_ids(
             typ_set = read_dict[str(dt) + "-" + g_read.msn]
             typ_set.add(typ)
             if len(typ_set) > 1:
-                problem += f" Reads taken on {dt} have differing read types."
-
-    vals = {
-        "covered_vat_gbp": Decimal("0.00"),
-        "covered_net_gbp": Decimal("0.00"),
-        "covered_gross_gbp": Decimal("0.00"),
-        "covered_kwh": Decimal(0),
-        "covered_start": g_bill.start_date,
-        "covered_finish": g_bill.finish_date,
-        "covered_bill_ids": [],
-    }
+                vals[
+                    "virtual_problem"
+                ] += f" Reads taken on {dt} have differing read types."
 
     covered_primary_bill = None
     enlarged = True
@@ -270,12 +273,19 @@ def _process_g_bill_ids(
             or_(GEra.finish_date == null(), GEra.finish_date >= vals["covered_start"]),
         )
     ).scalars():
+        if g_era.g_contract != g_contract:
+            vals[
+                "virtual_problem"
+            ] += "The contract of the bill is different from the contract of the era."
+            continue
         site = (
             sess.query(Site)
             .join(SiteGEra)
             .filter(SiteGEra.is_physical == true(), SiteGEra.g_era == g_era)
             .one()
         )
+        vals["site_code"] = site.code
+        vals["site_name"] = site.name
 
         chunk_start = hh_max(vals["covered_start"], g_era.start_date)
         chunk_finish = hh_min(vals["covered_finish"], g_era.finish_date)
@@ -314,8 +324,6 @@ def _process_g_bill_ids(
     vals["bill_finish_date"] = g_bill.finish_date
     vals["mprn"] = g_supply.mprn
     vals["supply_name"] = g_supply.name
-    vals["site_code"] = site.code
-    vals["site_name"] = site.name
 
     for k, v in vals.items():
         if k == "covered_bill_ids":
@@ -332,9 +340,7 @@ def _process_g_bill_ids(
             except KeyError:
                 vals[title] = None
 
-    csv_writer.writerow(
-        [(vals.get(k) if vals.get(k) is not None else "") for k in titles]
-    )
+    csv_writer.writerow([csv_make_val(vals.get(k)) for k in titles])
 
 
 def do_get(sess):

{chellow-1720006293.0.0.dist-info → chellow-1720526317.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1720006293.0.0
+Version: 1720526317.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-1720006293.0.0.dist-info → chellow-1720526317.0.0.dist-info}/RECORD

@@ -83,7 +83,7 @@ chellow/reports/report_291.py,sha256=rqBXy6s7hMeYWw-yNX6w_L5t2yz6rNEeos_4xO7wf90
 chellow/reports/report_33.py,sha256=laVz-itDbJTdvC6LxLEeuY0eKpYx43Un4adiExPTEEE,16730
 chellow/reports/report_387.py,sha256=kmBZopb0AOivcowO2nPjRj6LnV0_QjCDXLwqPL7IGVE,5672
 chellow/reports/report_41.py,sha256=QQeTshA1Og7N3wPaoZ8ynJzwsvZ1mgSFc7DDkVqIZoM,7447
-chellow/reports/report_429.py,sha256=0GCc0rQnOSG0fusw69yMMOCxnWApBd3P2sGWIg1py9M,12359
+chellow/reports/report_429.py,sha256=8WlLqyfMyvIF5Kc6CE0MKwcT5xwmR_Ao99Ef72yAOVc,12668
 chellow/reports/report_59.py,sha256=CCFPUspUFgoMt6sMFsdtLYW-inA9rN6D-6Kted6vskA,45458
 chellow/reports/report_81.py,sha256=f7sKPZUbl2VDbDHIg7B5rMDxcx_xnV1Y6PbjJyiTPLA,5609
 chellow/reports/report_87.py,sha256=j2gdBOapaVY1ZnlNlw14RPx58_k8eUkc3oRSnKuCsNA,7057
@@ -364,6 +364,6 @@ chellow/templates/g/supply_note_edit.html,sha256=b8mB6_ucBwoljp03iy6AgVaZUhGw3-1
 chellow/templates/g/supply_notes.html,sha256=6epNmZ3NKdXZz27fvmRUGeffg_oc1kmwuBeyRzQe3Rg,854
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1720006293.0.0.dist-info/METADATA,sha256=4Fg3yXTfYZ7JKwEwREZI72dTqsSTGAwudXblzYPbCUY,12205
-chellow-1720006293.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1720006293.0.0.dist-info/RECORD,,
+chellow-1720526317.0.0.dist-info/METADATA,sha256=iyZrZ95p6OGYA8F9VMGixtiqBwF6NGri0JHZNnUJL_Y,12205
+chellow-1720526317.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1720526317.0.0.dist-info/RECORD,,