Use the Python logger instead of the Twisted one

handler/sinks/__init__.py

@@ -1,6 +1,3 @@
-# Twisted/Klein imports
-from twisted.logger import Logger
-
 # Other library imports
 # import requests
 # from json import dumps
@@ -10,15 +7,16 @@ from twisted.logger import Logger
 import sinks.fidor
 import sinks.nordigen
 import sinks.truelayer
+import util
 
 
-class Sinks(object):
+class Sinks(util.Base):
     """
     Class to manage calls to various sinks.
     """
 
     def __init__(self):
-        self.log = Logger("sinks")
+        super().__init__()
         self.fidor = sinks.fidor.Fidor()
         self.nordigen = sinks.nordigen.Nordigen()
         self.truelayer = sinks.truelayer.TrueLayer()

handler/sinks/fidor.py

@@ -1,5 +1,4 @@
 # Twisted/Klein imports
-from twisted.logger import Logger
 
 # Other library imports
 # import requests
@@ -7,16 +6,14 @@ from twisted.logger import Logger
 
 # Project imports
 # from settings import settings
+import util
 
 
-class Fidor(object):
+class Fidor(util.Base):
     """
     Class to manage calls to the Fidor API.
     """
 
-    def __init__(self):
-        self.log = Logger("fidor")
-
     def authorize(self):
         """
         Perform initial authorization against Fidor API.

handler/sinks/nordigen.py

@@ -1,6 +1,3 @@
-# Twisted/Klein imports
-from twisted.logger import Logger
-
 # Other library imports
 import requests
 from json import dumps
@@ -8,15 +5,16 @@ from simplejson.errors import JSONDecodeError
 
 # Project imports
 from settings import settings
+import util
 
 
-class Nordigen(object):
+class Nordigen(util.Base):
     """
     Class to manage calls to Open Banking APIs through Nordigen.
     """
 
     def __init__(self):
-        self.log = Logger("nordigen")
+        super().__init__()
         self.token = None
         self.get_access_token()
 
@@ -36,11 +34,11 @@ class Nordigen(object):
         try:
             parsed = r.json()
         except JSONDecodeError:
-            self.log.error("Error parsing access token response: {content}", content=r.content)
+            self.log.error(f"Error parsing access token response: {r.content}")
             return False
         if "access" in parsed:
             self.token = parsed["access"]
-            self.log.info("Refreshed access token - Nordigen")
+            self.log.info("Refreshed access token")
 
     def get_institutions(self, country, filter_name=None):
         """
@@ -58,7 +56,7 @@ class Nordigen(object):
         try:
             parsed = r.json()
         except JSONDecodeError:
-            self.log.error("Error parsing institutions response: {content}", content=r.content)
+            self.log.error(f"Error parsing institutions response: {r.content}")
             return False
         new_list = []
         if filter_name:

handler/sinks/truelayer.py

@@ -1,5 +1,4 @@
 # Twisted/Klein imports
-from twisted.logger import Logger
 from twisted.internet.task import LoopingCall
 
 # Other library imports
@@ -10,15 +9,16 @@ import urllib
 
 # Project imports
 from settings import settings
+import util
 
 
-class TrueLayer(object):
+class TrueLayer(util.Base):
     """
     Class to manage calls to Open Banking APIs through TrueLayer.
     """
 
     def __init__(self):
-        self.log = Logger("truelayer")
+        super().__init__()
         self.token = None
         self.lc = LoopingCall(self.get_new_token)
         self.lc.start(int(settings.TrueLayer.RefreshSec))
@@ -58,7 +58,7 @@ class TrueLayer(object):
         settings.TrueLayer.AuthCode = authcode
         settings.write()
         self.token = parsed["access_token"]
-        self.log.info("Retrieved access/refresh tokens - TrueLayer")
+        self.log.info("Retrieved access/refresh tokens")
 
     def get_new_token(self):
         """
@@ -81,7 +81,7 @@ class TrueLayer(object):
         if r.status_code == 200:
             if "access_token" in parsed.keys():
                 self.token = parsed["access_token"]
-                self.log.info("Refreshed access token - TrueLayer")
+                self.log.info("Refreshed access token")
                 return True
             else:
                 self.log.error(f"Token refresh didn't contain access token: {parsed}", parsed=parsed)
@@ -100,7 +100,25 @@ class TrueLayer(object):
         try:
             parsed = r.json()
         except JSONDecodeError:
-            self.log.error("Error parsing institutions response: {content}", content=r.content)
+            self.log.error("Error parsing accounts response: {content}", content=r.content)
             return False
 
         return parsed
+
+    def get_transactions(self, account_id):
+        """
+        Get a list of transactions from an account.
+        :param account_id: account to fetch transactions for
+        :return: list of transactions
+        :rtype: dict
+        """
+        headers = {"Authorization": f"Bearer {self.token}"}
+        path = f"{settings.TrueLayer.DataBase}/accounts/{account_id}/transactions"
+        r = requests.get(path, headers=headers)
+        try:
+            parsed = r.json()
+        except JSONDecodeError:
+            self.log.error("Error parsing transactions response: {content}", content=r.content)
+            return False
+
+        return parsed["results"]