chellow 1744121701.0.0__tar.gz → 1744710468.0.0__tar.gz

{chellow-1744121701.0.0 → chellow-1744710468.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1744121701.0.0
+Version: 1744710468.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-1744710468.0.0/VERSION

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

{chellow-1744121701.0.0 → chellow-1744710468.0.0}/chellow/e/bill_parsers/mm.py

@@ -93,7 +93,10 @@ CHARGE_UNITS_LOOKUP = {
 
 ELEMENT_LOOKUP = {
     "1ANNUAL": {"UNIT": "duos-red"},
-    "2ANNUAL": {"UNIT": "duos-amber"},
+    "2ANNUAL": {
+        "UNIT": "duos-amber",
+        "LOADU": "triad",
+    },
     "3ANNUAL": {"UNIT": "duos-green"},
     "20RS0108": {"UNIT": "single"},
     "10ANNUAL": {

{chellow-1744121701.0.0 → chellow-1744710468.0.0}/chellow/general_import.py

@@ -381,7 +381,7 @@ def general_import_era(sess, action, vals, args):
             else:
                 ssc_code = ssc.code
         elif len(ssc_code) > 0:
-            Ssc.get_by_code(sess, ssc_code)
+            Ssc.get_by_code(sess, ssc_code, start_date)
         else:
             ssc_code = None
 

{chellow-1744121701.0.0 → chellow-1744710468.0.0}/test/test_general_import.py

@@ -632,7 +632,7 @@ def test_general_import_era_insert(sess):
     general_import_era(sess, action, vals, args)
 
 
-def test_general_import_era_insert_nhh(sess):
+def test_general_import_era_insert_nhh_no_change(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")
@@ -768,6 +768,142 @@ def test_general_import_era_insert_nhh(sess):
     general_import_era(sess, action, vals, args)
 
 
+def test_general_import_era_insert_nhh_change(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, "grid")
+    insert_energisation_statuses(sess)
+    energisation_status = EnergisationStatus.get_by_code(sess, "E")
+    gsp_group = GspGroup.insert(sess, "_L", "South Western")
+    insert_dtc_meter_types(sess)
+    dtc_meter_type = DtcMeterType.get_by_code(sess, "H")
+    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,
+        dtc_meter_type,
+        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}",
+        ssc_code,
+        "{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_hh(sess):
     vf = to_utc(ct_datetime(1996, 1, 1))
     site = Site.insert(sess, "CI017", "Water Works")

chellow-1744121701.0.0/VERSION

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