From de04f8d29bcdde7677882630f82954c88762a229 Mon Sep 17 00:00:00 2001
From: Mark Veidemanis <m@zm.is>
Date: Wed, 8 Mar 2023 18:38:53 +0000
Subject: [PATCH] Add definitions for all Nordigen API calls

---
 core/clients/base.py                         |  1 -
 core/lib/schemas/nordigen_s.py               | 50 ++++++++++++++++++++
 core/templates/partials/aggregator-info.html |  2 +-
 core/views/aggregators.py                    |  4 --
 4 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/core/clients/base.py b/core/clients/base.py
index 55988a6..ade822c 100644
--- a/core/clients/base.py
+++ b/core/clients/base.py
@@ -131,7 +131,6 @@ class BaseClient(ABC):
             "headers": DEFAULT_HEADERS,
         }
 
-        print("TOKEN", self.token)
         # Use the token if it's set
         if self.token is not None:
             cast["headers"]["Authorization"] = f"Bearer {self.token}"
diff --git a/core/lib/schemas/nordigen_s.py b/core/lib/schemas/nordigen_s.py
index 00ac771..c50986c 100644
--- a/core/lib/schemas/nordigen_s.py
+++ b/core/lib/schemas/nordigen_s.py
@@ -75,3 +75,53 @@ RequisitionsPostSchema = {
     "account_selection": "account_selection",
     "redirect_immediate": "redirect_immediate",
 }
+
+
+class Requisition(BaseModel):
+    id: str
+    created: str
+    redirect: str
+    status: str
+    institution_id: str
+    agreement: str
+    reference: str
+    accounts: list[str]
+    link: str
+    ssn: str | None
+    account_selection: bool
+    redirect_immediate: bool
+
+
+RequisitionSchema = {
+    "id": "id",
+    "created": "created",
+    "redirect": "redirect",
+    "status": "status",
+    "institution_id": "institution_id",
+    "agreement": "agreement",
+    "reference": "reference",
+    "accounts": "accounts",
+    "link": "link",
+    "ssn": "ssn",
+    "account_selection": "account_selection",
+    "redirect_immediate": "redirect_immediate",
+}
+
+
+class AccountDetailsNested(BaseModel):
+    resourceId: str
+    currency: str
+    ownerName: str
+    cashAccountType: str
+    status: str
+    maskedPan: str | None
+    details: str
+
+
+class AccountDetails(BaseModel):
+    account: AccountDetailsNested
+
+
+AccountDetailsSchema = {
+    "account": "account",
+}
diff --git a/core/templates/partials/aggregator-info.html b/core/templates/partials/aggregator-info.html
index 1669b7e..28aa55b 100644
--- a/core/templates/partials/aggregator-info.html
+++ b/core/templates/partials/aggregator-info.html
@@ -25,7 +25,7 @@
       </td>
       <td>{{ item.created }}</td>
       <td>{{ item.institution_id }}</td>
-      <td>{{ item.accounts }}</td>
+      <td>{{ item.accounts|length }}</td>
       <td>
         <div class="buttons">
           <button
diff --git a/core/views/aggregators.py b/core/views/aggregators.py
index 4346f85..fc47d18 100644
--- a/core/views/aggregators.py
+++ b/core/views/aggregators.py
@@ -76,7 +76,6 @@ class ReqsList(LoginRequiredMixin, OTPRequiredMixin, ObjectList):
 
         run = synchronize_async_helper(NordigenClient(aggregator))
         reqs = synchronize_async_helper(run.get_requisitions())
-        print("REQS", reqs)
         return reqs
 
 
@@ -115,7 +114,6 @@ class AggregatorCountriesList(LoginRequiredMixin, OTPRequiredMixin, ObjectList):
         )
         run = synchronize_async_helper(NordigenClient(aggregator))
         countries = synchronize_async_helper(run.get_countries())
-        print("COUNTRIES", countries)
         self.extra_args = {"pk": pk}
         return countries
 
@@ -158,7 +156,6 @@ class AggregatorCountryBanksList(LoginRequiredMixin, OTPRequiredMixin, ObjectLis
         )
         run = synchronize_async_helper(NordigenClient(aggregator))
         banks = synchronize_async_helper(run.get_banks(country))
-        print("BANKS", banks)
         return banks
 
 
@@ -232,7 +229,6 @@ class ReqInfo(LoginRequiredMixin, OTPRequiredMixin, ObjectRead):
             return self.render_to_response(context)
         run = synchronize_async_helper(NordigenClient(aggregator))
         req = synchronize_async_helper(run.get_all_account_info(req_id))
-        print("REQ KEYS", req.keys())
         self.extra_context = {"pretty": list(req.keys())}
         return req