chellow 1755614564.0.0__py3-none-any.whl → 1759155233.0.0__py3-none-any.whl

chellow/e/bill_parsers/haven_edi_tprs.py

@@ -3,9 +3,9 @@ from decimal import Decimal
 
 from werkzeug.exceptions import BadRequest
 
-from chellow.edi_lib import parse_edi, to_ct_date, to_date, to_decimal, to_finish_date
-from chellow.models import Era, Session
-from chellow.utils import HH, ct_datetime, parse_mpan_core
+from chellow.edi_lib import parse_edi, to_date, to_decimal, to_finish_date
+from chellow.models import Session
+from chellow.utils import parse_mpan_core
 
 
 read_type_map = {
@@ -35,14 +35,39 @@ def _process_BCD(elements, headers):
 
     sumo = elements["SUMO"]
     headers["start_date"] = to_date(sumo[0])
-    headers["is_ebatch"] = to_ct_date(sumo[1]) in (
-        ct_datetime(2020, 4, 1),
-        ct_datetime(2020, 3, 16),
-    )
-    if headers["is_ebatch"]:
-        headers["finish_date"] = to_date(sumo[1]) - HH
-    else:
-        headers["finish_date"] = to_finish_date(sumo[1])
+    headers["finish_date"] = to_finish_date(sumo[1])
+
+
+def _process_BTL(elements, headers):
+    uvlt = elements["UVLT"]
+    utva = elements["UTVA"]
+    tbtl = elements["TBTL"]
+
+    dup_reads = set()
+    new_reads = []
+    for r in headers["reads"]:
+        k = tuple(v for n, v in sorted(r.items()))
+        if k in dup_reads:
+            continue
+        dup_reads.add(k)
+        new_reads.append(r)
+
+    return {
+        "bill_type_code": headers["bill_type_code"],
+        "account": headers["account"],
+        "mpan_core": headers["mpan_core"],
+        "reference": headers["reference"],
+        "issue_date": headers["issue_date"],
+        "start_date": headers["start_date"],
+        "finish_date": headers["finish_date"],
+        "kwh": headers["kwh"],
+        "net": Decimal("0.00") + to_decimal(uvlt) / Decimal("100"),
+        "vat": Decimal("0.00") + to_decimal(utva) / Decimal("100"),
+        "gross": Decimal("0.00") + to_decimal(tbtl) / Decimal("100"),
+        "breakdown": headers["breakdown"],
+        "reads": new_reads,
+        "elements": headers["elements"],
+    }
 
 
 def _process_MHD(elements, headers):
@@ -52,6 +77,7 @@ def _process_MHD(elements, headers):
         headers.clear()
         headers["kwh"] = Decimal("0")
         headers["reads"] = []
+        headers["elements"] = []
         headers["breakdown"] = defaultdict(int, {"raw-lines": []})
         headers["bill_elements"] = []
         headers["errors"] = []
@@ -83,7 +109,6 @@ def _process_CCD1(elements, headers):
 
     mpan = mloc[0]
     mpan_core = parse_mpan_core(f"{mpan[:2]}{mpan[2:6]}{mpan[6:10]}{mpan[10:13]}")
-    headers["mpan_core"] = mpan_core
     mpan = f"{mpan[13:15]} {mpan[15:18]} {mpan[18:]} {mpan_core}"
 
     prrd = elements["PRRD"]
@@ -199,7 +224,7 @@ def _decimal(elements, element_name):
 
 
 def _process_CCD3(elements, headers):
-    breakdown = headers["breakdown"]
+    breakdown = {}
 
     tcod = elements["TCOD"]
     tcod0 = tcod[1]
@@ -234,28 +259,45 @@ def _process_CCD3(elements, headers):
 
     if not ignore_kwh and "NUCT" in elements and len(elements["NUCT"][0]) > 0:
         kwh = _decimal(elements, "NUCT") / Decimal("1000")
-        breakdown[f"{prefix}-kwh"] += kwh
+        breakdown["kwh"] = kwh
         if prefix == tmod0:
             headers["kwh"] += kwh
 
     if not ignore_rate and "CPPU" in elements and len(elements["CPPU"][0]) > 0:
-        rate_key = f"{prefix}-rate"
-        if rate_key not in breakdown:
-            breakdown[rate_key] = set()
-        breakdown[rate_key].add(_decimal(elements, "CPPU") / Decimal("100000"))
+        breakdown["rate"] = {_decimal(elements, "CPPU") / Decimal("100000")}
 
+    net = Decimal("0.00")
     if "CTOT" in elements:
-        breakdown[f"{prefix}-gbp"] += _decimal(elements, "CTOT") / Decimal("100")
+        net += _decimal(elements, "CTOT") / Decimal("100")
+
+    headers["elements"].append(
+        {
+            "name": prefix,
+            "start_date": to_date(elements["CSDT"][0]),
+            "finish_date": to_finish_date(elements["CEDT"][0]),
+            "net": net,
+            "breakdown": breakdown,
+        }
+    )
 
 
 def _process_CCD4(elements, headers):
     ndrp = elements["NDRP"]
-    breakdown = headers["breakdown"]
+    breakdown = {}
     if len(ndrp[0]) > 0:
-        breakdown["standing-days"] += to_decimal(ndrp)
+        breakdown["days"] += to_decimal(ndrp)
     ctot = elements["CTOT"]
+    net = Decimal("0.00")
     if len(ctot[0]) > 0:
-        breakdown["standing-gbp"] += to_decimal(ctot) / Decimal("100")
+        net += to_decimal(ctot) / Decimal("100")
+
+    headers["elements"].append(
+        {
+            "name": "standing",
+            "net": net,
+            "breakdown": breakdown,
+        }
+    )
 
 
 def _process_CLO(elements, headers):
@@ -264,54 +306,12 @@ def _process_CLO(elements, headers):
 
 
 def _process_MTR(elements, headers):
-    if headers["message_type"] == "UTLBIL":
-        if headers["mpan_core"] is None:
-            sess = headers["sess"]
-            era = (
-                sess.query(Era)
-                .filter(Era.imp_supplier_account == headers["account"])
-                .first()
-            )
-            if era is not None:
-                headers["mpan_core"] = era.imp_mpan_core
-            sess.close()
-
-        reads = headers["reads"]
-        if headers["is_ebatch"]:
-            for r in headers["reads"]:
-                if r["pres_type_code"] == "C":
-                    r["pres_type_code"] = "E"
-
-        dup_reads = set()
-        new_reads = []
-        for r in reads:
-            k = tuple(v for n, v in sorted(r.items()))
-            if k in dup_reads:
-                continue
-            dup_reads.add(k)
-            new_reads.append(r)
-
-        raw_bill = {
-            "bill_type_code": headers["bill_type_code"],
-            "account": headers["account"],
-            "mpan_core": headers["mpan_core"],
-            "reference": headers["reference"],
-            "issue_date": headers["issue_date"],
-            "start_date": headers["start_date"],
-            "finish_date": headers["finish_date"],
-            "kwh": headers["kwh"],
-            "net": headers["net"],
-            "vat": headers["vat"],
-            "gross": headers["gross"],
-            "breakdown": headers["breakdown"],
-            "reads": new_reads,
-        }
-        return raw_bill
+    pass
 
 
 def _process_MAN(elements, headers):
     madn = elements["MADN"]
-    headers["mpan_core"] = parse_mpan_core("".join((madn[0], madn[1], madn[2])))
+    headers["mpan_core"] = parse_mpan_core("".join(madn[:3]))
 
 
 def _process_VAT(elements, headers):
@@ -354,7 +354,7 @@ def _process_NOOP(elements, headers):
 
 CODE_FUNCS = {
     "BCD": _process_BCD,
-    "BTL": _process_NOOP,
+    "BTL": _process_BTL,
     "CCD1": _process_CCD1,
     "CCD2": _process_CCD2,
     "CCD3": _process_CCD3,

chellow/e/bill_parsers/nonsettlement_dc_stark_xlsx.py

@@ -1,16 +1,22 @@
 from decimal import Decimal, InvalidOperation
 
 from openpyxl import load_workbook
+from openpyxl.utils.datetime import from_excel
 
 from werkzeug.exceptions import BadRequest
 
 from chellow.e.computer import hh_rate
 from chellow.models import Session
-from chellow.utils import ct_datetime, parse_mpan_core, to_utc
+from chellow.utils import ct_datetime, parse_mpan_core, to_ct, to_utc
 
 
 def get_ct_date(title_row, row, name):
-    return get_value(title_row, row, name)
+    val_raw = get_value(title_row, row, name)
+    if isinstance(val_raw, int):
+        val = from_excel(val_raw)
+    else:
+        val = val_raw
+    return to_ct(val)
 
 
 def get_start_date(title_row, row, name):
@@ -56,6 +62,69 @@ def get_int(title_row, row, name):
     return int(get_value(title_row, row, name))
 
 
+def _process_row(caches, sess, title_row, row):
+    msn = str(get_value(title_row, row, "meter")).strip()
+    mpan_core = parse_mpan_core(str(get_int(title_row, row, "mpan ref")))
+    start_date_ct = get_ct_date(title_row, row, "start")
+    start_date = to_utc(start_date_ct)
+    issue_date = start_date
+    finish_date_ct = get_ct_date(title_row, row, "end")
+    finish_date = to_utc(
+        ct_datetime(
+            finish_date_ct.year, finish_date_ct.month, finish_date_ct.day, 23, 30
+        )
+    )
+    rates = hh_rate(sess, caches, 0, start_date)
+    meter_rate = rates["annual_rates"]["non_settlement"]["*"]["IP"]["*"][
+        "gbp_per_meter"
+    ]
+    months = (finish_date_ct.year - start_date_ct.year) * 12 + (
+        finish_date_ct.month - start_date_ct.month + 1
+    )
+    net = round(Decimal(float(meter_rate) / 12 * months), 2)
+    vat = round(net * Decimal("0.2"), 2)
+    elements = [
+        {
+            "name": "meter",
+            "start_date": start_date,
+            "finish_date": finish_date,
+            "net": net,
+            "breakdown": {
+                "rate": {meter_rate},
+                "months": months,
+                "settlement-status": {"non_settlement"},
+                "comm": {"IP"},
+            },
+        }
+    ]
+
+    breakdown = {"raw_lines": [], "cop": ["5"], "msn": [msn]}
+
+    return {
+        "bill_type_code": "N",
+        "kwh": Decimal(0),
+        "vat": vat,
+        "net": net,
+        "gross": net + vat,
+        "reads": [],
+        "breakdown": breakdown,
+        "account": mpan_core,
+        "issue_date": issue_date,
+        "start_date": start_date,
+        "finish_date": finish_date,
+        "mpan_core": mpan_core,
+        "reference": "_".join(
+            (
+                start_date_ct.strftime("%Y%m%d"),
+                finish_date_ct.strftime("%Y%m%d"),
+                start_date_ct.strftime("%Y%m%d"),
+                mpan_core,
+            )
+        ),
+        "elements": elements,
+    }
+
+
 class Parser:
     def __init__(self, f):
         self.book = load_workbook(f)
@@ -88,72 +157,12 @@ class Parser:
                     val = get_value(title_row, row, "mpan ref")
                     if val is None or val == "":
                         break
+                    if get_str(title_row, row, "check") != "Billed":
+                        continue
 
                     self._set_last_line(row_index, val)
-                    msn = str(get_value(title_row, row, "meter")).strip()
-                    mpan_core = parse_mpan_core(
-                        str(get_int(title_row, row, "mpan ref"))
-                    )
-                    start_date_ct = get_ct_date(title_row, row, "start")
-                    start_date = to_utc(start_date_ct)
-                    issue_date = start_date
-                    finish_date_ct = get_ct_date(title_row, row, "end")
-                    finish_date = to_utc(
-                        ct_datetime(
-                            finish_date_ct.year,
-                            finish_date_ct.month,
-                            finish_date_ct.day,
-                            23,
-                            30,
-                        )
-                    )
-                    check = get_str(title_row, row, "check")
-                    if check != "Billed":
-                        continue
-                    rates = hh_rate(sess, caches, 0, start_date)
-                    meter_rate = rates["annual_rates"]["non_settlement"]["*"]["IP"][
-                        "*"
-                    ]["gbp_per_meter"]
-                    months = (finish_date_ct.year - start_date_ct.year) * 12 + (
-                        finish_date_ct.month - start_date_ct.month + 1
-                    )
-                    net = round(Decimal(float(meter_rate) / 12 * months), 2)
-                    vat = round(net * Decimal("0.2"), 2)
-
-                    breakdown = {
-                        "raw_lines": [],
-                        "cop": ["5"],
-                        "settlement-status": ["non_settlement"],
-                        "msn": [msn],
-                        "meter-rate": [meter_rate],
-                        "months": months,
-                        "meter-gbp": net,
-                    }
-
-                    bills.append(
-                        {
-                            "bill_type_code": "N",
-                            "kwh": Decimal(0),
-                            "vat": vat,
-                            "net": net,
-                            "gross": net + vat,
-                            "reads": [],
-                            "breakdown": breakdown,
-                            "account": mpan_core,
-                            "issue_date": issue_date,
-                            "start_date": start_date,
-                            "finish_date": finish_date,
-                            "mpan_core": mpan_core,
-                            "reference": "_".join(
-                                (
-                                    start_date.strftime("%Y%m%d"),
-                                    finish_date.strftime("%Y%m%d"),
-                                    issue_date.strftime("%Y%m%d"),
-                                    mpan_core,
-                                )
-                            ),
-                        }
-                    )
+                    bill = _process_row(caches, sess, title_row, row)
+                    bills.append(bill)
                     sess.rollback()
         except BadRequest as e:
             raise BadRequest(f"Row number: {row_index} {e.description}")