chellow 1715329858.0.0__tar.gz → 1715858374.0.0__tar.gz

{chellow-1715329858.0.0 → chellow-1715858374.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1715329858.0.0
+Version: 1715858374.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-1715858374.0.0/VERSION

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

{chellow-1715329858.0.0 → chellow-1715858374.0.0}/chellow/reports/report_59.py

@@ -166,7 +166,7 @@ def _process_site(
                         "imp-mpan-core": "displaced",
                         "site-code": site.code,
                         "site-name": site.name,
-                        "associated-site-ids": set(),
+                        "associated-site-codes": set(),
                         "source": "displaced",
                         "supply-name": "displaced",
                     },
@@ -211,7 +211,7 @@ def _process_site(
                         "finish-date": main_ss.finish_date,
                         "site-code": site.code,
                         "site-name": site.name,
-                        "associated-site-ids": set(),
+                        "associated-site-codes": set(),
                     },
                 )
 
@@ -405,7 +405,7 @@ def _process_site(
 
             vals["imp-mpan-core"] = imp_mpan_core
             vals["exp-mpan-core"] = exp_mpan_core
-            vals["associated-site-ids"] = era_associates
+            vals["associated-site-codes"] = era_associates
             vals["era-start-date"] = sss.era.start_date
             vals["era-finish-date"] = sss.era.finish_date
             vals["imp-supplier-contract"] = imp_supplier_contract_name
@@ -435,7 +435,7 @@ def _process_site(
 
             supply_data["imp-mpan-core"] = imp_mpan_core
             supply_data["exp-mpan-core"] = exp_mpan_core
-            supply_data["associated-site-ids"].update(era_associates)
+            supply_data["associated-site-codes"].update(era_associates)
             supply_data["start-date"] = min(sss.start_date, supply_data["start-date"])
             supply_data["finish-date"] = max(
                 sss.finish_date, supply_data["finish-date"]
@@ -844,9 +844,9 @@ def content(
                 "finish-date",
                 "imp-mpan-core",
                 "exp-mpan-core",
-                "site-id",
+                "site-code",
                 "site-name",
-                "associated-site-ids",
+                "associated-site-codes",
                 "era-start-date",
                 "era-finish-date",
                 "imp-supplier-contract",
@@ -870,7 +870,7 @@ def content(
                 "exp-mpan-core",
                 "site-code",
                 "site-name",
-                "associated-site-ids",
+                "associated-site-codes",
                 "source",
                 "generator-type",
                 "supply-name",
@@ -881,9 +881,9 @@ def content(
             ]
             site_header_titles = [
                 "creation-date",
-                "site-id",
+                "site-code",
                 "site-name",
-                "associated-site-ids",
+                "associated-site-codes",
                 "start-date",
                 "finish-date",
                 "metering-type",

{chellow-1715329858.0.0 → chellow-1715858374.0.0}/test/reports/test_report_59.py

@@ -441,9 +441,9 @@ def displaced_virtual_bill(ds):
     site_expected = [
         [
             "creation-date",
-            "site-id",
+            "site-code",
             "site-name",
-            "associated-site-ids",
+            "associated-site-codes",
             "start-date",
             "finish-date",
             "metering-type",
@@ -522,7 +522,7 @@ def displaced_virtual_bill(ds):
             "exp-mpan-core",
             "site-code",
             "site-name",
-            "associated-site-ids",
+            "associated-site-codes",
             "source",
             "generator-type",
             "supply-name",
@@ -693,9 +693,9 @@ def displaced_virtual_bill(ds):
             "finish-date",
             "imp-mpan-core",
             "exp-mpan-core",
-            "site-id",
+            "site-code",
             "site-name",
-            "associated-site-ids",
+            "associated-site-codes",
             "era-start-date",
             "era-finish-date",
             "imp-supplier-contract",
@@ -757,7 +757,7 @@ def displaced_virtual_bill(ds):
             Datetime(2009, 2, 10, 23, 30),
             "22 7867 6232 781",
             None,
-            None,
+            "CI017",
             "Water Works",
             None,
             Datetime(2000, 1, 1, 0, 0),
@@ -821,7 +821,7 @@ def displaced_virtual_bill(ds):
             Datetime(2009, 2, 10, 23, 30),
             "22 7867 5232 780",
             None,
-            None,
+            "CI017",
             "Water Works",
             None,
             Datetime(2000, 1, 1, 0, 0),
@@ -885,7 +885,7 @@ def displaced_virtual_bill(ds):
             Datetime(2009, 1, 31, 23, 30),
             None,
             None,
-            None,
+            "CI017",
             "Water Works",
             None,
             None,
@@ -949,7 +949,7 @@ def displaced_virtual_bill(ds):
             Datetime(2009, 2, 10, 23, 30),
             None,
             None,
-            None,
+            "CI017",
             "Water Works",
             None,
             None,
@@ -1018,7 +1018,7 @@ def displaced_virtual_bill(ds):
             ), f"On row {i} column {j}, {expected_val} != {actual_val}"
 
 
-def test_associated_site_ids(mocker, sess):
+def test_associated_site_codes(mocker, sess):
     vf = to_utc(ct_datetime(1996, 1, 1))
     site = Site.insert(sess, "CI017", "Water Works")
     associated_site = Site.insert(sess, "J77y", "Sewage Works")
@@ -1255,9 +1255,9 @@ def virtual_bill(ds):
     site_expected = [
         [
             "creation-date",
-            "site-id",
+            "site-code",
             "site-name",
-            "associated-site-ids",
+            "associated-site-codes",
             "start-date",
             "finish-date",
             "metering-type",
@@ -1371,7 +1371,7 @@ def virtual_bill(ds):
             "exp-mpan-core",
             "site-code",
             "site-name",
-            "associated-site-ids",
+            "associated-site-codes",
             "source",
             "generator-type",
             "supply-name",
@@ -1455,9 +1455,9 @@ def virtual_bill(ds):
             "finish-date",
             "imp-mpan-core",
             "exp-mpan-core",
-            "site-id",
+            "site-code",
             "site-name",
-            "associated-site-ids",
+            "associated-site-codes",
             "era-start-date",
             "era-finish-date",
             "imp-supplier-contract",
@@ -1519,7 +1519,7 @@ def virtual_bill(ds):
             Datetime(2009, 2, 10, 23, 30),
             "22 7867 6232 781",
             None,
-            None,
+            "CI017",
             "Water Works",
             "J77y",
             Datetime(2000, 1, 1, 0, 0),

chellow-1715329858.0.0/VERSION

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