tariochbctools 0.37__tar.gz → 0.38.1__tar.gz

{tariochbctools-0.37/src/tariochbctools.egg-info → tariochbctools-0.38.1}/PKG-INFO

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

{tariochbctools-0.37 → tariochbctools-0.38.1}/src/tariochbctools/importers/nordigen/importer.py

@@ -57,9 +57,13 @@ class Importer(importer.ImporterProtocol):
                 r.json()["transactions"]["booked"], key=lambda trx: trx["bookingDate"]
             )
             for trx in transactions:
-                metakv = {
-                    "nordref": trx["transactionId"],
-                }
+                if "transactionId" in trx:
+                    metakv = {
+                        "nordref": trx["transactionId"],
+                    }
+                else:
+                    metakv = {}
+
                 if "creditorName" in trx:
                     metakv["creditorName"] = trx["creditorName"]
                 if "debtorName" in trx:

{tariochbctools-0.37 → tariochbctools-0.38.1}/src/tariochbctools/importers/revolut/importer.py

@@ -4,7 +4,7 @@ from datetime import timedelta
 from io import StringIO
 
 from beancount.core import amount, data
-from beancount.core.number import D
+from beancount.core.number import ZERO, D
 from beancount.ingest import importer
 from beancount.ingest.importers.mixins import identifier
 from dateutil.parser import parse
@@ -13,10 +13,11 @@ from dateutil.parser import parse
 class Importer(identifier.IdentifyMixin, importer.ImporterProtocol):
     """An importer for Revolut CSV files."""
 
-    def __init__(self, regexps, account, currency):
+    def __init__(self, regexps, account, currency, fee=None):
         identifier.IdentifyMixin.__init__(self, matchers=[("filename", regexps)])
         self.account = account
         self.currency = currency
+        self._fee = fee
 
     def name(self):
         return super().name() + self.account
@@ -46,6 +47,7 @@ class Importer(identifier.IdentifyMixin, importer.ImporterProtocol):
                 skipinitialspace=True,
             )
             next(reader)
+            is_fee_mode = self._fee is not None
             for row in reader:
                 try:
                     bal = D(row["Balance"].replace("'", "").strip())
@@ -53,37 +55,58 @@ class Importer(identifier.IdentifyMixin, importer.ImporterProtocol):
                     amt = amount.Amount(amount_raw, row["Currency"])
                     balance = amount.Amount(bal, self.currency)
                     book_date = parse(row["Completed Date"].strip()).date()
+                    fee_amt_raw = D(row["Fee"].replace("'", "").strip())
+                    fee = amount.Amount(-fee_amt_raw, row["Currency"])
                 except Exception as e:
                     logging.warning(e)
                     continue
 
+                if is_fee_mode and fee_amt_raw == ZERO:
+                    continue
+
+                postings = [
+                    data.Posting(self.account, amt, None, None, None, None),
+                ]
+                description = row["Description"].strip()
+                if is_fee_mode:
+                    postings = [
+                        data.Posting(self.account, fee, None, None, None, None),
+                        data.Posting(
+                            self._fee["account"], -fee, None, None, None, None
+                        ),
+                    ]
+                    description = f"Fees for {description}"
+
+                assert isinstance(
+                    description, str
+                ), "Actual type of description is " + str(type(description))
+
                 entry = data.Transaction(
                     data.new_metadata(file.name, 0, {}),
                     book_date,
                     "*",
                     "",
-                    row["Description"].strip(),
+                    description,
                     data.EMPTY_SET,
                     data.EMPTY_SET,
-                    [
-                        data.Posting(self.account, amt, None, None, None, None),
-                    ],
+                    postings,
                 )
                 entries.append(entry)
 
-            # only add balance after the last (newest) transaction
-            try:
-                book_date = book_date + timedelta(days=1)
-                entry = data.Balance(
-                    data.new_metadata(file.name, 0, {}),
-                    book_date,
-                    self.account,
-                    balance,
-                    None,
-                    None,
-                )
-                entries.append(entry)
-            except NameError:
-                pass
+            if not is_fee_mode:
+                # only add balance after the last (newest) transaction
+                try:
+                    book_date = book_date + timedelta(days=1)
+                    entry = data.Balance(
+                        data.new_metadata(file.name, 0, {}),
+                        book_date,
+                        self.account,
+                        balance,
+                        None,
+                        None,
+                    )
+                    entries.append(entry)
+                except NameError:
+                    pass
 
         return entries

{tariochbctools-0.37 → tariochbctools-0.38.1/src/tariochbctools.egg-info}/PKG-INFO

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