[fix] refactor transactions into a separate class

grindsa · Dec 26, 2024 · 923085c · 923085c
1 parent 9fd2a50
commit 923085c
Show file tree

Hide file tree

Showing 9 changed files with 825 additions and 676 deletions.
diff --git a/dkb_robo/api.py b/dkb_robo/api.py
diff --git a/dkb_robo/dkb_robo.py b/dkb_robo/dkb_robo.py
@@ -3,8 +3,9 @@
 # -*- coding: utf-8 -*-
 from pathlib import Path
 import time
-from dkb_robo.standingorder import StandingOrder
 from dkb_robo.postbox import PostBox
+from dkb_robo.standingorder import StandingOrder
+from dkb_robo.transaction import Transaction
 from dkb_robo.utilities import logger_setup, validate_dates, get_dateformat
 from dkb_robo.api import Wrapper
 
@@ -89,8 +90,8 @@ def get_transactions(self, transaction_url, atype, date_from, date_to, transacti
         self.logger.debug('DKBRobo.get_transactions(%s/%s: %s/%s)\n', transaction_url, atype, date_from, date_to)
 
         (date_from, date_to) = validate_dates(self.logger, date_from, date_to)
-
-        transaction_list = self.wrapper.get_transactions(transaction_url, atype, date_from, date_to, transaction_type)
+        transaction = Transaction(client=self.wrapper.client, logger=self.logger)
+        transaction_list = transaction.get(transaction_url, atype, date_from, date_to, transaction_type)
 
         self.logger.debug('DKBRobo.get_transactions(): %s transactions returned\n', len(transaction_list))
         return transaction_list
@@ -104,7 +105,7 @@ def download(self, path: Path, download_all: bool, prepend_date: bool = False, m
         """ download postbox documents """
         if path is None:
             list_only = True
-        postbox = PostBox(client = self.wrapper.client, logger = self.logger)
+        postbox = PostBox(client=self.wrapper.client, logger=self.logger)
         documents = postbox.fetch_items()
 
         if not download_all:
@@ -123,7 +124,7 @@ def download(self, path: Path, download_all: bool, prepend_date: bool = False, m
 
             if not list_only:
                 self.logger.info("Downloading %s to %s...", doc.subject(), target)
-                if doc.download(self.wrapper.client, target/filename):
+                if doc.download(self.wrapper.client, target / filename):
                     if mark_read:
                         doc.mark_read(self.wrapper.client, True)
                     time.sleep(.5)

diff --git a/dkb_robo/standingorder.py b/dkb_robo/standingorder.py
@@ -15,7 +15,7 @@ def __init__(self, client: requests.Session, logger: logging.Logger, base_url: s
 
     def _filter(self, full_list: Dict[str, str]) -> List[Dict[str, str]]:
         """ filter standing orders """
-        self.logger.debug('api.StandingOrder._filter()\n')
+        self.logger.debug('standing.StandingOrder._filter()\n')
 
         so_list = []
         if 'data' in full_list:
@@ -36,12 +36,12 @@ def _filter(self, full_list: Dict[str, str]) -> List[Dict[str, str]]:
                     'interval': ele.get('attributes', {}).get('recurrence', None)}
                 so_list.append(_tmp_dic)
 
-        self.logger.debug('api.StandingOrder._filter() ended with: %s entries.', len(so_list))
+        self.logger.debug('standing.StandingOrder._filter() ended with: %s entries.', len(so_list))
         return so_list
 
     def fetch(self, uid) -> Dict:
         """ fetch standing orders """
-        self.logger.debug('api.Standorder.get()\n')
+        self.logger.debug('standing.StandingOrder.fetch()\n')
 
         so_list = []
         if uid:
@@ -50,7 +50,7 @@ def fetch(self, uid) -> Dict:
                 _so_list = response.json()
                 so_list = self._filter(_so_list)
         else:
-            raise DKBRoboError('get_standing_orders(): account-id is required')
+            raise DKBRoboError('account-id is required to fetch standing orders')
 
-        self.logger.debug('api.Wrapper.get_standing_orders() ended\n')
+        self.logger.debug('standing.StandingOrder.fetch() ended\n')
         return so_list