chellow 1725628177.0.0__py3-none-any.whl → 1726485186.0.0__py3-none-any.whl

chellow/e/mdd_importer.py

@@ -248,6 +248,10 @@ def _import_Market_Participant_Role(sess, rows, ctx):
         dno_code_str = values[14]
         dno_code = None if len(dno_code_str) == 0 else dno_code_str
 
+        if participant_code == "CIDC" and dno_code == "99":
+            # We already use 99 with CROW
+            continue
+
         if party is None:
             participant.insert_party(
                 sess,

chellow/models.py

@@ -7511,6 +7511,19 @@ def db_upgrade_49_to_50(sess, root_path):
     sess.flush()
 
 
+def db_upgrade_50_to_51(sess, root_path):
+    participant_cidc = Participant.get_by_code(sess, "CIDC")
+    dno_99 = sess.scalars(
+        select(Party).where(
+            Party.dno_code == "99", Party.participant == participant_cidc
+        )
+    ).one_or_none()
+    if dno_99 is not None:
+        sess.execute(delete(Llfc).where(Llfc.dno == dno_99))
+
+        sess.execute(delete(Party).where(Party.id == dno_99.id))
+
+
 upgrade_funcs = [None] * 18
 upgrade_funcs.extend(
     [
@@ -7546,6 +7559,7 @@ upgrade_funcs.extend(
         db_upgrade_47_to_48,
         db_upgrade_48_to_49,
         db_upgrade_49_to_50,
+        db_upgrade_50_to_51,
     ]
 )
 

{chellow-1725628177.0.0.dist-info → chellow-1726485186.0.0.dist-info}/METADATA

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

@@ -5,7 +5,7 @@ chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=dixp-O0MF2_mlwrnKx3D9DH09Qu05BjTo0rZfigTjR4,5534
 chellow/edi_lib.py,sha256=alu20x9ZX06iPfnNI9dEJzuP6RIf4We3Y_M_bl7RrcY,51789
 chellow/general_import.py,sha256=l3EHq9zG9Vfl5Ee6XTVrC1nusXo4YGGB4VBmZ_JaJR8,65798
-chellow/models.py,sha256=pBaFnTUIyThyg7iGIrbh4v8MW3LuEAwe1-4LAF4G7Q4,243491
+chellow/models.py,sha256=qq7YLv-FGTGE5ussQKMXGYwB7EuCyDk7nMeEUVYdfqw,243939
 chellow/national_grid.py,sha256=czwIZqzJndSGhEMQ5YzI6hRBhvjkM6VRVYXybf4_KXg,4377
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=fg-Pf_9Hk3bXmC9riPQNGQxBvLvBa_WtNYdwDCjnCSg,5678
@@ -30,7 +30,7 @@ chellow/e/hh_parser_df2.py,sha256=7gaVidyIqeqprm3zYPtHvRLLn08nph04N0cKlveNTV0,42
 chellow/e/hh_parser_simple_csv.py,sha256=RN4QOLvTQeoPrpvXvQ9hkOBZnR5piybLfjCiSJdjpjs,2112
 chellow/e/laf_import.py,sha256=aqkcbjnvfBPszBLSNg6getP7iW1uWiTVHy6N5Z5x39U,5514
 chellow/e/lcc.py,sha256=OkpynN8_iAdHRlu-yyU6BhRUqYYOZsUnl0HbHULYo_4,4670
-chellow/e/mdd_importer.py,sha256=wq5Fw-MSe17WNuPzeWdCmJvX0NKV3Y501t6z2tqd92Q,35638
+chellow/e/mdd_importer.py,sha256=NugJr2JhuzkPTsEMl_5UdQuw5K2p8lVJ-hyz4MK6Hfg,35762
 chellow/e/rcrc.py,sha256=92CA1uIotIHd1epQ_jEPdJKzXqDFV-AoJOJeRO6MEyA,4274
 chellow/e/ro.py,sha256=dZKZv_9wXSWuwcb3jiKavoD_9ot-PZseNVeEEe0siLo,596
 chellow/e/scenario.py,sha256=fBDZVOdrI1I3XQG-RdpB0-lDF9VYENBu_9bBXJxmvWk,23362
@@ -365,6 +365,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-1725628177.0.0.dist-info/METADATA,sha256=wHjj_Ouyy8wLs6Dv3TYkeiDOzc0SCVRSPCsUOjCnSoM,12204
-chellow-1725628177.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1725628177.0.0.dist-info/RECORD,,
+chellow-1726485186.0.0.dist-info/METADATA,sha256=A-SuyKUAjAIHqSedTnVcPU5whqX-d8hImIz4IW0ANfA,12204
+chellow-1726485186.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1726485186.0.0.dist-info/RECORD,,