Update to deposit

Author: erwindouna

importer2firefly.py

@@ -18,11 +18,11 @@
 class Import2Firefly:
     """Class to handle the import workflow."""
 
-    def __init__(self) -> None:
+    def __init__(self, truelayer: TrueLayerClient, firefly: FireflyClient) -> None:
         """Initialize the Import class."""
         self._config: Config = Config()
-        self._truelayer_client: TrueLayerClient = TrueLayerClient()
-        self._firefly_client: FireflyClient = FireflyClient()
+        self._truelayer_client = truelayer
+        self._firefly_client = firefly
 
         self.start_time = datetime.now()
         self.end_time = None
@@ -103,7 +103,6 @@ async def start_import(self) -> AsyncGenerator[Any, Any]:
             total_transactions = len(txns)
             for i, txn in enumerate(txns, start=1):
                 cp_iban = txn.get("meta", {}).get("counter_party_iban")
-                cp_name = txn.get("meta", {}).get("counter_party_preferred_name")
                 transaction_type = (
                     "debit" if txn["transaction_type"].lower() == "debit" else "credit"
                 )
@@ -122,30 +121,14 @@ async def start_import(self) -> AsyncGenerator[Any, Any]:
                         ):
                             continue
 
-                        # Check if the IBAN matches
                         if cp_iban == firefly_account["attributes"].get("iban"):
                             yield f"Matching account found via IBAN: {txn['description']} - {cp_iban}"
                             linked_account = firefly_account
                             matching += 1
                             break
 
-                        # Check if the name matches, as a final fallback
-                        # This is not prefered, but can be used if the IBAN is not available or when the  account uses multiple IBANs
-                        # Firefly doesn't allow to create multiple accounts with the same name, so this should be safe
-                        if cp_name is not None and cp_name == firefly_account[
-                            "attributes"
-                        ].get("name"):
-                            yield f"Matching account found via name: {txn['description']} - {cp_name}"
-                            linked_account = firefly_account
-                            matching += 1
-                            break
-
                     if linked_account is None:
-                        account_type = (
-                            "revenue" if transaction_type == "credit" else "Expense"
-                        )
-
-                        yield f"No match, still a valid IBAN. Creating a new account: {txn} - {cp_iban} - {account_type}"
+                        yield f"No match, still a valid IBAN. Creating a new account: {txn} - {cp_iban}"
                         response = await self._firefly_client.create_account(
                             {
                                 "name": txn.get("meta", {}).get(
@@ -160,21 +143,15 @@ async def start_import(self) -> AsyncGenerator[Any, Any]:
                                 ),
                             }
                         )
-
                         if response.status_code != 200:
                             yield f"Error creating account in Firefly: {response.text}"
                             continue
                         yield f"New account created: {txn.get('meta', {}).get('counter_party_preferred_name')} - {cp_iban}"
                         linked_account = response.json()["data"]
                         newly_created += 1
-
-                        yield "Firefly: Enforcing refresh accounts from Firefly"
-                        firefly_accounts = (
-                            await self._firefly_client.get_account_paginated()
-                        )
-                        yield f"Firefly: A total of {len(firefly_accounts)} account(s) found"
                 else:
                     unmatching += 1
+                    # TODO: find the unknown destination account
                     yield f"Transaction has no IBAN: {txn['description']}"
 
                 # Ensure the amount is always positive
@@ -190,8 +167,8 @@ async def start_import(self) -> AsyncGenerator[Any, Any]:
                             "date": txn["timestamp"],
                             "amount": amount,
                             "type": (
-                                "revenue"
-                                if transaction_type == "deposit"
+                                "deposit"
+                                if transaction_type == "credit"
                                 else "withdrawal"
                             ),
                             "destination_id": (
@@ -200,7 +177,7 @@ async def start_import(self) -> AsyncGenerator[Any, Any]:
                             "destination_name": (
                                 "(unknown revenue account)"
                                 if linked_account is None
-                                and transaction_type == "deposit"
+                                and transaction_type == "credit"
                                 else (
                                     "(unknown expense account)"
                                     if linked_account is None