From 068198a02f9695f0218e1af76d295039f936be90 Mon Sep 17 00:00:00 2001
From: Philipp Kunz <gitlab@philkunz.com>
Date: Sat, 29 Oct 2022 17:16:44 +0200
Subject: [PATCH] fix(core): update

---
 test/test.nonci.ts                 |  1 -
 ts/00_commitinfo_data.ts           |  2 +-
 ts/tink.classes.bankaccount.ts     |  7 ++++---
 ts/tink.classes.banktransaction.ts | 23 +++++++++++++++++++----
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/test/test.nonci.ts b/test/test.nonci.ts
index a2b4b96..28243fe 100644
--- a/test/test.nonci.ts
+++ b/test/test.nonci.ts
@@ -50,7 +50,6 @@ tap.test('get bankaccounts', async (toolsArg) => {
     for (const transaction of transactions) {
       console.log(`=======================`)
       console.log(JSON.stringify(transaction));
-
     }
     await toolsArg.delayFor(10000);
   } 
diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts
index 41e5c64..ae44465 100644
--- a/ts/00_commitinfo_data.ts
+++ b/ts/00_commitinfo_data.ts
@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@mojoio/tink',
-  version: '3.1.1',
+  version: '3.1.2',
   description: 'an unofficial api abstraction for tink.com'
 }
diff --git a/ts/tink.classes.bankaccount.ts b/ts/tink.classes.bankaccount.ts
index bf4f2be..a36291c 100644
--- a/ts/tink.classes.bankaccount.ts
+++ b/ts/tink.classes.bankaccount.ts
@@ -4,7 +4,7 @@ import * as plugins from './tink.plugins.js';
 
 import * as tinkHelpers from './helpers/index.js';
 
-export interface IBankAccountData {
+export interface ITinkBankAccountData {
   balances: {
     booked: {
       amount: {
@@ -85,8 +85,8 @@ export class BankAccount {
 
   // INSTANCE
   tinkUserRef: TinkUser;
-  data: IBankAccountData;
-  constructor(tinkUserRefArg: TinkUser, dataArg: IBankAccountData) {
+  data: ITinkBankAccountData;
+  constructor(tinkUserRefArg: TinkUser, dataArg: ITinkBankAccountData) {
     this.tinkUserRef = tinkUserRefArg;
     this.data = dataArg;
   }
@@ -109,6 +109,7 @@ export class BankAccount {
    */
   public getNormalizedData() {
     return {
+      id: this.data.id,
       name: this.data.name,
       accountNumber:
         this.data.identifiers.iban?.iban ||
diff --git a/ts/tink.classes.banktransaction.ts b/ts/tink.classes.banktransaction.ts
index a34bc38..5625acd 100644
--- a/ts/tink.classes.banktransaction.ts
+++ b/ts/tink.classes.banktransaction.ts
@@ -1,7 +1,10 @@
 import { BankAccount } from './tink.classes.bankaccount.js';
 import * as plugins from './tink.plugins.js';
 
-export interface IBankTransactiondata {
+import * as tinkHelpers from './helpers/index.js';
+
+export interface ITinkBankTransactiondata {
+  id: string;
   accountId:string;
   amount: {
     currencyCode: string;
@@ -24,7 +27,6 @@ export interface IBankTransactiondata {
     display: string;
     original: string;
   };
-  id: string;
   identifiers: {
     providerTransactionId: string;
   };
@@ -87,10 +89,23 @@ export class BankTransaction {
 
   // INSTANCE
   bankAccountRef: BankAccount;
-  data: IBankTransactiondata;
+  data: ITinkBankTransactiondata;
 
-  constructor(bankAccountRefArg: BankAccount, dataArg: IBankTransactiondata) {
+  constructor(bankAccountRefArg: BankAccount, dataArg: ITinkBankTransactiondata) {
     this.bankAccountRef = bankAccountRefArg;
     this.data = dataArg;
   }
+
+  /**
+   * gets normalized data
+   */
+  public getNormalizedData() {
+    return {
+      id: this.data.id,
+      amount: tinkHelpers.getNormalizedAmount(this.data.amount),
+      name: this.data.descriptions.display,
+      description: this.data.descriptions.original
+    }
+
+  }
 }