chellow 1714396467.0.0__tar.gz → 1714470909.0.0__tar.gz

{chellow-1714396467.0.0 → chellow-1714470909.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1714396467.0.0
+Version: 1714470909.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-1714470909.0.0/VERSION

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

{chellow-1714396467.0.0 → chellow-1714470909.0.0}/chellow/general_import.py

@@ -374,10 +374,14 @@ def general_import_era(sess, action, vals, args):
         ssc_code = add_arg(args, "Standard Settlement Configuration", vals, 12)
         if ssc_code == NO_CHANGE:
             ssc = existing_era.ssc
+            if ssc is None:
+                ssc_code = None
+            else:
+                ssc_code = ssc.code
         elif len(ssc_code) > 0:
-            ssc = Ssc.get_by_code(sess, ssc_code)
+            Ssc.get_by_code(sess, ssc_code)
         else:
-            ssc = None
+            ssc_code = None
 
         es_code = add_arg(args, "Energisation Status", vals, 13)
         if es_code == NO_CHANGE:
@@ -513,7 +517,7 @@ def general_import_era(sess, action, vals, args):
             mtc_code,
             cop,
             comm,
-            ssc,
+            ssc_code,
             energisation_status,
             properties,
             imp_mpan_core,

{chellow-1714396467.0.0 → chellow-1714470909.0.0}/chellow/reports/report_ecoes_comparison.py

@@ -436,8 +436,9 @@ def _process(
                     diffs.append("supplier")
 
                 dc_contract = era.dc_contract
-                if dc_contract is None:
-                    chellow_dc = ""
+                chellow_dc_props = dc_contract.make_properties()
+                if "nhh_participant" in chellow_dc_props:
+                    chellow_dc = chellow_dc_props["nhh_participant"]
                 else:
                     chellow_dc = dc_contract.party.participant.code
 

{chellow-1714396467.0.0 → chellow-1714470909.0.0}/test/test_general_import.py

@@ -501,42 +501,36 @@ def test_parse_breakdown():
 
 
 def test_general_import_era_insert(sess):
-    valid_from = to_utc(ct_datetime(1996, 1, 1))
+    vf = to_utc(ct_datetime(1996, 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", "", {}, valid_from, 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 Ltd", valid_from, None, None
-    )
-    participant.insert_party(sess, market_role_X, "Fusion Ltc", 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 Ltd", vf, None, None)
+    participant.insert_party(sess, market_role_X, "Fusion Ltc", vf, None, None)
+    participant.insert_party(sess, market_role_C, "Fusion DC", vf, None, None)
     mop_contract = Contract.insert_mop(
-        sess, "Fusion", participant, "", {}, valid_from, None, {}
+        sess, "Fusion", participant, "", {}, vf, None, {}
     )
     dc_contract = Contract.insert_dc(
-        sess, "Fusion DC 2000", participant, "", {}, valid_from, 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")
     exp_supplier_contract = Contract.insert_supplier(
-        sess, "Fusion Supplier 2000", participant, "", {}, valid_from, None, {}
+        sess, "Fusion Supplier 2000", participant, "", {}, vf, None, {}
     )
-    dno = participant.insert_party(sess, market_role_R, "WPD", valid_from, 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", valid_from, 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,
@@ -547,15 +541,15 @@ def test_general_import_era_insert(sess):
         meter_type,
         meter_payment_type,
         0,
-        valid_from,
+        vf,
         None,
     )
     insert_voltage_levels(sess)
     voltage_level = VoltageLevel.get_by_code(sess, "HV")
     llfc = dno.insert_llfc(
-        sess, "521", "Export (HV)", voltage_level, False, False, valid_from, None
+        sess, "521", "Export (HV)", voltage_level, False, False, 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)
@@ -634,6 +628,140 @@ def test_general_import_era_insert(sess):
     general_import_era(sess, action, vals, args)
 
 
+def test_general_import_era_insert_nhh(sess):
+    vf = to_utc(ct_datetime(1996, 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", 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 Ltd", vf, None, None)
+    participant.insert_party(sess, market_role_X, "Fusion Ltc", vf, None, None)
+    participant.insert_party(sess, market_role_C, "Fusion DC", vf, None, None)
+    mop_contract = Contract.insert_mop(
+        sess, "Fusion", participant, "", {}, vf, None, {}
+    )
+    dc_contract = Contract.insert_dc(
+        sess, "Fusion DC 2000", participant, "", {}, vf, None, {}
+    )
+    pc = Pc.insert(sess, "01", "nhh", vf, None)
+    insert_cops(sess)
+    cop = Cop.get_by_code(sess, "5")
+    insert_comms(sess)
+    comm = Comm.get_by_code(sess, "GSM")
+    exp_supplier_contract = Contract.insert_supplier(
+        sess, "Fusion Supplier 2000", participant, "", {}, vf, 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,
+        participant,
+        "HH COP5 And Above With Comms",
+        False,
+        True,
+        meter_type,
+        meter_payment_type,
+        0,
+        vf,
+        None,
+    )
+    insert_voltage_levels(sess)
+    voltage_level = VoltageLevel.get_by_code(sess, "HV")
+    llfc = dno.insert_llfc(
+        sess, "521", "Export (HV)", voltage_level, False, False, vf, None
+    )
+    MtcLlfc.insert(sess, mtc_participant, llfc, vf, None)
+    ssc_code = "0393"
+    ssc = Ssc.insert(sess, ssc_code, "All", True, vf, None)
+
+    mtc_ssc = MtcSsc.insert(sess, mtc_participant, ssc, vf, None)
+    mtc_llfc_ssc = MtcLlfcSsc.insert(sess, mtc_ssc, llfc, vf, None)
+    MtcLlfcSscPc.insert(sess, mtc_llfc_ssc, pc, vf, None)
+    insert_sources(sess)
+    source = Source.get_by_code(sess, "net")
+    insert_energisation_statuses(sess)
+    energisation_status = EnergisationStatus.get_by_code(sess, "E")
+    gsp_group = GspGroup.insert(sess, "_L", "South Western")
+    site.insert_e_supply(
+        sess,
+        source,
+        None,
+        "Bob",
+        utc_datetime(2000, 1, 1),
+        None,
+        gsp_group,
+        mop_contract,
+        "773",
+        dc_contract,
+        "ghyy3",
+        "hgjeyhuw",
+        dno,
+        pc,
+        "845",
+        cop,
+        comm,
+        ssc_code,
+        energisation_status,
+        {},
+        None,
+        None,
+        None,
+        None,
+        None,
+        "22 7867 6232 781",
+        "521",
+        exp_supplier_contract,
+        "7748",
+        361,
+    )
+
+    sess.commit()
+
+    action = "insert"
+    vals = [
+        "22 7867 6232 781",
+        "2020-10-01 00:00",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+        "{no change}",
+    ]
+    args = []
+    general_import_era(sess, action, vals, args)
+
+
 def test_general_import_era_update(mocker):
     MockSupply = mocker.patch("chellow.general_import.Supply", autospec=True)
 

chellow-1714396467.0.0/VERSION

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