tariochbctools 1.5.0__tar.gz → 1.5.1__tar.gz

{tariochbctools-1.5.0 → tariochbctools-1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tariochbctools
-Version: 1.5.0
+Version: 1.5.1
 Summary: Importers, plugins and price fetchers for Beancount
 Home-page: https://github.com/tarioch/beancounttools/
 Author: Patrick Ruckstuhl

{tariochbctools-1.5.0 → tariochbctools-1.5.1}/src/tariochbctools/importers/truelayer/importer.py

@@ -10,6 +10,8 @@ import yaml
 from beancount.core import amount, data
 from beancount.core.number import D
 
+from tariochbctools.importers.general.deduplication import ReferenceDuplicatesComparator
+
 # https://docs.truelayer.com/#retrieve-account-transactions
 
 TX_MANDATORY_ID_FIELDS = ("transaction_id",)
@@ -125,6 +127,17 @@ class Importer(beangulp.Importer):
                 logging.warning("Ignoring account ID %s", accountId)
                 continue
 
+            r = requests.get(
+                f"https://api.{self.domain}/data/v1/{endpoint}/{accountId}/balance",
+                headers=headers,
+            )
+            balances = r.json()["results"]
+
+            for balance in balances:
+                entries.extend(
+                    self._extract_balance(balance, local_account, invert_sign)
+                )
+
             r = requests.get(
                 f"https://api.{self.domain}/data/v1/{endpoint}/{accountId}/transactions",
                 headers=headers,
@@ -148,7 +161,7 @@ class Importer(beangulp.Importer):
         invert_sign: bool,
     ) -> data.Transaction:
         entries = []
-        metakv = {}
+        metakv: dict[str, Any] = {}
 
         id_meta_kvs = {
             k: trx["meta"][k] for k in TX_OPTIONAL_META_ID_FIELDS if trx["meta"].get(k)
@@ -193,37 +206,52 @@ class Importer(beangulp.Importer):
         )
         entries.append(entry)
 
-        if trx["transaction_id"] == transactions[-1]["transaction_id"]:
-            balDate = trxDate + timedelta(days=1)
-            metakv = {}
-            if self.existing is not None:
-                for exEntry in self.existing:
-                    if (
-                        isinstance(exEntry, data.Balance)
-                        and exEntry.date == balDate
-                        and exEntry.account == local_account
-                    ):
-                        metakv["__duplicate__"] = True
-
-            meta = data.new_metadata("", 0, metakv)
-
-            # Only if the 'balance' permission is present
-            if "running_balance" in trx:
-                tx_balance = D(str(trx["running_balance"]["amount"]))
-                # avoid pylint invalid-unary-operand-type
-                signed_balance = -1 * tx_balance if invert_sign else tx_balance
-
-                entries.append(
-                    data.Balance(
-                        meta,
-                        balDate,
-                        local_account,
-                        amount.Amount(
-                            signed_balance, trx["running_balance"]["currency"]
-                        ),
-                        None,
-                        None,
-                    )
+        return entries
+
+    def _extract_balance(
+        self,
+        result: dict[str, Any],
+        local_account: data.Account,
+        invert_sign: bool,
+    ) -> data.Transaction:
+        entries = []
+
+        meta = data.new_metadata("", 0)
+
+        balance = D(str(result["current"]))
+        # avoid pylint invalid-unary-operand-type
+        signed_balance = -1 * balance if invert_sign else balance
+        balance_date = dateutil.parser.parse(result["update_timestamp"]).date()
+
+        entries.append(
+            data.Balance(
+                meta,
+                balance_date + timedelta(days=1),
+                local_account,
+                amount.Amount(signed_balance, result["currency"]),
+                None,
+                None,
+            )
+        )
+
+        if "last_statement_balance" in result:
+            statement_balance = D(str(result["last_statement_balance"]))
+            signed_statement_balance = (
+                -1 * statement_balance if invert_sign else statement_balance
+            )
+            statement_date = dateutil.parser.parse(result["last_statement_date"]).date()
+
+            entries.append(
+                data.Balance(
+                    meta,
+                    statement_date,
+                    local_account,
+                    amount.Amount(signed_statement_balance, result["currency"]),
+                    None,
+                    None,
                 )
+            )
 
         return entries
+
+    cmp = ReferenceDuplicatesComparator(TX_MANDATORY_ID_FIELDS)

{tariochbctools-1.5.0 → tariochbctools-1.5.1}/src/tariochbctools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tariochbctools
-Version: 1.5.0
+Version: 1.5.1
 Summary: Importers, plugins and price fetchers for Beancount
 Home-page: https://github.com/tarioch/beancounttools/
 Author: Patrick Ruckstuhl

{tariochbctools-1.5.0 → tariochbctools-1.5.1}/tests/tariochbctools/importers/test_truelayer.py

@@ -1,5 +1,7 @@
 import json
+from datetime import timedelta
 
+import dateutil.parser
 import pytest
 import yaml
 from beancount.core.amount import Decimal as D
@@ -67,6 +69,28 @@ TEST_TRX_WITHOUT_IDS = b"""
 }
 """
 
+TEST_BALANCE_SIMPLE = b"""
+{
+  "currency": "GBP",
+  "current": 20.0,
+  "update_timestamp": "2017-02-24T17:29:24.740Z"
+}
+"""
+
+TEST_BALANCE_OPTIONAL = b"""
+{
+  "available": 3279.0,
+  "currency": "GBP",
+  "current": 20.0,
+  "credit_limit": 3300,
+  "last_statement_balance": 226,
+  "last_statement_date": "2017-01-28",
+  "payment_due": 5.0,
+  "payment_due_date": "2017-02-24",
+  "update_timestamp": "2017-02-24T17:29:24.740Z"
+}
+"""
+
 
 @pytest.fixture(name="tmp_config")
 def tmp_config_fixture(tmp_path):
@@ -114,15 +138,6 @@ def test_extract_transaction_simple(importer, tmp_trx):
     assert entries[0].postings[0].units.number == D(str(tmp_trx["amount"]))
 
 
-def test_extract_transaction_with_balance(importer, tmp_trx):
-    entries = importer._extract_transaction(
-        tmp_trx, "Assets:Other", [tmp_trx], invert_sign=False
-    )
-    # one entry, one balance
-    assert len(entries) == 2
-    assert entries[1].amount.number == D(str(tmp_trx["running_balance"]["amount"]))
-
-
 def test_extract_transaction_invert_sign(importer, tmp_trx):
     """Show that sign inversion works"""
     entries = importer._extract_transaction(
@@ -131,6 +146,32 @@ def test_extract_transaction_invert_sign(importer, tmp_trx):
     assert entries[0].postings[0].units.number == -D(str(tmp_trx["amount"]))
 
 
+def test_extract_balance(importer, tmp_trx):
+    tmp_balance = json.loads(TEST_BALANCE_SIMPLE)
+
+    entries = importer._extract_balance(tmp_balance, "Assets:Other", invert_sign=False)
+
+    assert len(entries) == 1
+    assert entries[-1].amount.number == D(str(tmp_balance["current"]))
+    assert (
+        entries[-1].date - timedelta(days=1)
+        == dateutil.parser.parse(tmp_balance["update_timestamp"]).date()
+    ), "balance date should be one day after update_timestamp"
+
+
+def test_extract_statement_balance(importer, tmp_trx):
+    tmp_balance = json.loads(TEST_BALANCE_OPTIONAL)
+
+    entries = importer._extract_balance(tmp_balance, "Assets:Other", invert_sign=False)
+
+    assert len(entries) == 2
+    assert entries[-1].amount.number == D(str(tmp_balance["last_statement_balance"]))
+    assert (
+        entries[-1].date
+        == dateutil.parser.parse(tmp_balance["last_statement_date"]).date()
+    )
+
+
 @pytest.mark.parametrize("id_field", tlimp.TX_MANDATORY_ID_FIELDS)
 def test_extract_transaction_has_transaction_id(importer, tmp_trx, id_field):
     """Ensure mandatory IDs are in extracted transactions."""