chellow 1716928285.0.0__tar.gz → 1716973778.0.0__tar.gz

{chellow-1716928285.0.0 → chellow-1716973778.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1716928285.0.0
+Version: 1716973778.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-1716973778.0.0/VERSION

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

{chellow-1716928285.0.0 → chellow-1716973778.0.0}/chellow/reports/report_219.py

@@ -15,8 +15,8 @@ from chellow.models import (
     Bill,
     BillType,
     Era,
+    RSession,
     RegisterRead,
-    Session,
     Supply,
     User,
 )
@@ -27,31 +27,33 @@ from chellow.views import chellow_redirect
 def content(year, month, months, supply_id, user_id):
     f = None
     try:
-        with Session() as sess:
+        with RSession() as sess:
             user = User.get_by_id(sess, user_id)
 
             f = open_file("register_reads.csv", user, mode="w", newline="")
             w = csv.writer(f, lineterminator="\n")
             titles = (
-                "Duration Start",
-                "Duration Finish",
-                "Supply Id",
-                "Import MPAN Core",
-                "Export MPAN Core",
-                "Batch Reference",
-                "Bill Id",
-                "Bill Reference",
-                "Bill Issue Date",
-                "Bill Type",
-                "Register Read Id",
-                "TPR",
-                "Coefficient",
-                "Previous Read Date",
-                "Previous Read Value",
-                "Previous Read Type",
-                "Present Read Date",
-                "Present Read Value",
-                "Present Read Type",
+                "duration_start",
+                "duration_finish",
+                "site_code",
+                "site_name",
+                "supply_id",
+                "imp_mpan_core",
+                "exp_mpan_core",
+                "batch_reference",
+                "bill_id",
+                "bill_reference",
+                "bill_issue_date",
+                "bill_type",
+                "register_read_id",
+                "tpr",
+                "coefficient",
+                "prev_read_date",
+                "prev_read_value",
+                "prev_read_type",
+                "pres_read_date",
+                "pres_read_value",
+                "pres_read_type",
             )
             w.writerow(titles)
 
@@ -118,6 +120,8 @@ def content(year, month, months, supply_id, user_id):
                         else:
                             era = eras[-1]
 
+                    site = era.get_physical_site(sess)
+
                     for read in (
                         sess.query(RegisterRead)
                         .filter(
@@ -139,28 +143,30 @@ def content(year, month, months, supply_id, user_id):
                             joinedload(RegisterRead.present_type),
                         )
                     ):
-                        vals = [
-                            start_date,
-                            finish_date,
-                            supply_id,
-                            era.imp_mpan_core,
-                            era.exp_mpan_core,
-                            batch.reference,
-                            bill.id,
-                            bill.reference,
-                            bill.issue_date,
-                            bill_type.code,
-                            read.id,
-                            "md" if read.tpr is None else read.tpr.code,
-                            read.coefficient,
-                            read.previous_date,
-                            read.previous_value,
-                            read.previous_type.code,
-                            read.present_date,
-                            read.present_value,
-                            read.present_type.code,
-                        ]
-                        w.writerow(csv_make_val(v) for v in vals)
+                        vals = {
+                            "duration_start": start_date,
+                            "duration_finish": finish_date,
+                            "site_code": site.code,
+                            "site_name": site.name,
+                            "supply_id": supply_id,
+                            "imp_mpan_core": era.imp_mpan_core,
+                            "exp_mpan_core": era.exp_mpan_core,
+                            "batch_reference": batch.reference,
+                            "bill_id": bill.id,
+                            "bill_reference": bill.reference,
+                            "bill_issue_date": bill.issue_date,
+                            "bill_type": bill_type.code,
+                            "register_read_id": read.id,
+                            "tpr": "md" if read.tpr is None else read.tpr.code,
+                            "coefficient": read.coefficient,
+                            "prev_read_date": read.previous_date,
+                            "prev_read_value": read.previous_value,
+                            "prev_read_type": read.previous_type.code,
+                            "pres_read_date": read.present_date,
+                            "pres_read_value": read.present_value,
+                            "pres_read_type": read.present_type.code,
+                        }
+                        w.writerow(csv_make_val(vals.get(t)) for t in titles)
 
                     # Avoid a long-running transaction
                     sess.rollback()

{chellow-1716928285.0.0 → chellow-1716973778.0.0}/test/reports/test_report_219.py

@@ -1,6 +1,9 @@
+import csv
 from decimal import Decimal
 from io import StringIO
 
+from utils import match_tables
+
 from chellow.models import (
     BillType,
     Comm,
@@ -37,57 +40,36 @@ from chellow.utils import ct_datetime, to_utc, utc_datetime
 
 
 def test_content(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", 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", 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,
-        {},
-    )
-    dno = participant.insert_party(
-        sess, market_role_R, "WPD", utc_datetime(2000, 1, 1), 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", utc_datetime(1996, 1, 1), None
+        sess, "Fusion Supplier 2000", participant, "", {}, vf, 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,
@@ -98,22 +80,15 @@ def test_content(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,
+        sess, "510", "PC 5-8 & HH HV", voltage_level, False, True, vf, None
     )
-    MtcLlfc.insert(sess, mtc_participant, llfc, valid_from, None)
+    MtcLlfc.insert(sess, mtc_participant, llfc, vf, None)
     insert_sources(sess)
     source = Source.get_by_code(sess, "net")
     insert_energisation_statuses(sess)
@@ -153,8 +128,10 @@ def test_content(mocker, sess):
         None,
         None,
     )
+    supply_id = supply.id
     editor = UserRole.insert(sess, "editor")
     user = User.insert(sess, "admin@example.com", "xxx", editor, None)
+    user_id = user.id
     batch = imp_supplier_contract.insert_batch(sess, "a", "batch")
 
     insert_bill_types(sess)
@@ -198,34 +175,38 @@ def test_content(mocker, sess):
     year = 2020
     month = 1
     months = 1
-    supply_id = supply.id
-    content(year, month, months, supply_id, user.id)
-    actual = mock_file.getvalue()
-    expected_lines = [
+    content(year, month, months, supply_id, user_id)
+    mock_file.seek(0)
+    actual = list(csv.reader(mock_file))
+    expected = [
         [
-            "Duration Start",
-            "Duration Finish",
-            "Supply Id",
-            "Import MPAN Core",
-            "Export MPAN Core",
-            "Batch Reference",
-            "Bill Id",
-            "Bill Reference",
-            "Bill Issue Date",
-            "Bill Type",
-            "Register Read Id",
-            "TPR",
-            "Coefficient",
-            "Previous Read Date",
-            "Previous Read Value",
-            "Previous Read Type",
-            "Present Read Date",
-            "Present Read Value",
-            "Present Read Type",
+            "duration_start",
+            "duration_finish",
+            "site_code",
+            "site_name",
+            "supply_id",
+            "imp_mpan_core",
+            "exp_mpan_core",
+            "batch_reference",
+            "bill_id",
+            "bill_reference",
+            "bill_issue_date",
+            "bill_type",
+            "register_read_id",
+            "tpr",
+            "coefficient",
+            "prev_read_date",
+            "prev_read_value",
+            "prev_read_type",
+            "pres_read_date",
+            "pres_read_value",
+            "pres_read_type",
         ],
         [
             "2020-01-01 00:00",
             "2020-01-31 23:30",
+            "CI017",
+            "Water Works",
             "1",
             "22 7867 6232 781",
             "",
@@ -245,5 +226,4 @@ def test_content(mocker, sess):
             "A",
         ],
     ]
-    expected = "\n".join(",".join(line) for line in expected_lines) + "\n"
-    assert actual == expected
+    match_tables(expected, actual)

chellow-1716928285.0.0/VERSION

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