From 87bf29f28c53330ba8d56f1010696e4cf6eb0da7 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Wed, 26 Jun 2024 22:25:37 +0200
Subject: [PATCH] fix(server): getting matched transaction transformer

---
 .../server/src/lib/Transformer/Transformer.ts |  4 +--
 .../GetMatchedTransactionBillsTransformer.ts  | 27 +++++++++++++++----
 ...etMatchedTransactionExpensesTransformer.ts |  5 ++--
 ...etMatchedTransactionInvoicesTransformer.ts |  7 ++---
 ...hedTransactionManualJournalsTransformer.ts |  6 +++--
 5 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/packages/server/src/lib/Transformer/Transformer.ts b/packages/server/src/lib/Transformer/Transformer.ts
index 185e09c16..20efb4415 100644
--- a/packages/server/src/lib/Transformer/Transformer.ts
+++ b/packages/server/src/lib/Transformer/Transformer.ts
@@ -169,8 +169,8 @@ export class Transformer {
    * @param number
    * @returns
    */
-  protected formatNumber(number) {
-    return formatNumber(number, { money: false });
+  protected formatNumber(number, props?) {
+    return formatNumber(number, { money: false, ...props });
   }
 
   /**
diff --git a/packages/server/src/services/Banking/Matching/GetMatchedTransactionBillsTransformer.ts b/packages/server/src/services/Banking/Matching/GetMatchedTransactionBillsTransformer.ts
index 1bb71ffa0..f5dd9eaa0 100644
--- a/packages/server/src/services/Banking/Matching/GetMatchedTransactionBillsTransformer.ts
+++ b/packages/server/src/services/Banking/Matching/GetMatchedTransactionBillsTransformer.ts
@@ -12,7 +12,7 @@ export class GetMatchedTransactionBillsTransformer extends Transformer {
       'amountFormatted',
       'transactionNo',
       'date',
-      'dateFromatted',
+      'dateFormatted',
       'transactionId',
       'transactionNo',
       'transactionType',
@@ -52,8 +52,9 @@ export class GetMatchedTransactionBillsTransformer extends Transformer {
    * @returns {string}
    */
   protected amountFormatted(bill) {
-    return this.formatNumber(bill.totalAmount, {
+    return this.formatNumber(bill.amount, {
       currencyCode: bill.currencyCode,
+      money: true,
     });
   }
 
@@ -63,7 +64,7 @@ export class GetMatchedTransactionBillsTransformer extends Transformer {
    * @returns {string}
    */
   protected date(bill) {
-    return bill.date;
+    return bill.billDate;
   }
 
   /**
@@ -71,8 +72,8 @@ export class GetMatchedTransactionBillsTransformer extends Transformer {
    * @param {Object} bill - The bill object.
    * @returns {string}
    */
-  protected dateFromatted(bill) {
-    return this.formatDate(bill.date);
+  protected dateFormatted(bill) {
+    return this.formatDate(bill.billDate);
   }
 
   /**
@@ -83,4 +84,20 @@ export class GetMatchedTransactionBillsTransformer extends Transformer {
   protected transactionId(bill) {
     return bill.id;
   }
+
+  /**
+   * Retrieve the manual journal transaction type.
+   * @returns {string}
+   */
+  protected transactionType() {
+    return 'Bill';
+  }
+
+  /**
+   * Retrieves the manual journal formatted transaction type.
+   * @returns {string}
+   */
+  protected transsactionTypeFormatted() {
+    return 'Bill';
+  }
 }
diff --git a/packages/server/src/services/Banking/Matching/GetMatchedTransactionExpensesTransformer.ts b/packages/server/src/services/Banking/Matching/GetMatchedTransactionExpensesTransformer.ts
index a00dd6d65..d6f71e705 100644
--- a/packages/server/src/services/Banking/Matching/GetMatchedTransactionExpensesTransformer.ts
+++ b/packages/server/src/services/Banking/Matching/GetMatchedTransactionExpensesTransformer.ts
@@ -12,7 +12,7 @@ export class GetMatchedTransactionExpensesTransformer extends Transformer {
       'amountFormatted',
       'transactionNo',
       'date',
-      'dateFromatted',
+      'dateFormatted',
       'transactionId',
       'transactionNo',
       'transactionType',
@@ -54,6 +54,7 @@ export class GetMatchedTransactionExpensesTransformer extends Transformer {
   protected amountFormatted(expense) {
     return this.formatNumber(expense.totalAmount, {
       currencyCode: expense.currencyCode,
+      money: true,
     });
   }
 
@@ -71,7 +72,7 @@ export class GetMatchedTransactionExpensesTransformer extends Transformer {
    * @param expense
    * @returns {string}
    */
-  protected dateFromatted(expense) {
+  protected dateFormatted(expense) {
     return this.formatDate(expense.paymentDate);
   }
 
diff --git a/packages/server/src/services/Banking/Matching/GetMatchedTransactionInvoicesTransformer.ts b/packages/server/src/services/Banking/Matching/GetMatchedTransactionInvoicesTransformer.ts
index dd49e3eba..ed2dcfaa2 100644
--- a/packages/server/src/services/Banking/Matching/GetMatchedTransactionInvoicesTransformer.ts
+++ b/packages/server/src/services/Banking/Matching/GetMatchedTransactionInvoicesTransformer.ts
@@ -12,7 +12,7 @@ export class GetMatchedTransactionInvoicesTransformer extends Transformer {
       'amountFormatted',
       'transactionNo',
       'date',
-      'dateFromatted',
+      'dateFormatted',
       'transactionId',
       'transactionNo',
       'transactionType',
@@ -52,6 +52,7 @@ export class GetMatchedTransactionInvoicesTransformer extends Transformer {
   protected formatAmount(invoice) {
     return this.formatNumber(invoice.dueAmount, {
       currencyCode: invoice.currencyCode,
+      money: true,
     });
   }
 
@@ -60,7 +61,7 @@ export class GetMatchedTransactionInvoicesTransformer extends Transformer {
    * @param invoice
    * @returns {Date}
    */
-  protected getDate(invoice) {
+  protected date(invoice) {
     return invoice.invoiceDate;
   }
 
@@ -69,7 +70,7 @@ export class GetMatchedTransactionInvoicesTransformer extends Transformer {
    * @param invoice
    * @returns {string}
    */
-  protected formatDate(invoice) {
+  protected dateFormatted(invoice) {
     return this.formatDate(invoice.invoiceDate);
   }
 
diff --git a/packages/server/src/services/Banking/Matching/GetMatchedTransactionManualJournalsTransformer.ts b/packages/server/src/services/Banking/Matching/GetMatchedTransactionManualJournalsTransformer.ts
index 60fda4226..9b19b01a0 100644
--- a/packages/server/src/services/Banking/Matching/GetMatchedTransactionManualJournalsTransformer.ts
+++ b/packages/server/src/services/Banking/Matching/GetMatchedTransactionManualJournalsTransformer.ts
@@ -12,7 +12,7 @@ export class GetMatchedTransactionManualJournalsTransformer extends Transformer
       'amountFormatted',
       'transactionNo',
       'date',
-      'dateFromatted',
+      'dateFormatted',
       'transactionId',
       'transactionNo',
       'transactionType',
@@ -54,6 +54,7 @@ export class GetMatchedTransactionManualJournalsTransformer extends Transformer
   protected amountFormatted(manualJournal) {
     return this.formatNumber(manualJournal.amount, {
       currencyCode: manualJournal.currencyCode,
+      money: true,
     });
   }
 
@@ -71,7 +72,7 @@ export class GetMatchedTransactionManualJournalsTransformer extends Transformer
    * @param manualJournal
    * @returns {string}
    */
-  protected dateFromatted(manualJournal) {
+  protected dateFormatted(manualJournal) {
     return this.formatDate(manualJournal.date);
   }
 
@@ -107,3 +108,4 @@ export class GetMatchedTransactionManualJournalsTransformer extends Transformer
     return 'Manual Journal';
   }
 }
+