From 1aca6ff9640d25a14d2242c6ababea2ab6d12dbb Mon Sep 17 00:00:00 2001
From: "a.bouhuolia" <a.bouhuolia@live.com>
Date: Sun, 1 Aug 2021 18:01:03 +0200
Subject: [PATCH] fix: transactions by reference report.

---
 .../TransactionsByReference/index.ts          | 29 ++++++++++---------
 .../TransactionsByReferenceReport.ts          |  2 ++
 .../TransactionsByReference/index.ts          |  4 +--
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/server/src/api/controllers/FinancialStatements/TransactionsByReference/index.ts b/server/src/api/controllers/FinancialStatements/TransactionsByReference/index.ts
index af6b83fe4..59ee88e37 100644
--- a/server/src/api/controllers/FinancialStatements/TransactionsByReference/index.ts
+++ b/server/src/api/controllers/FinancialStatements/TransactionsByReference/index.ts
@@ -3,7 +3,7 @@ import { Router, Request, Response, NextFunction } from 'express';
 import { query, ValidationChain } from 'express-validator';
 import BaseController from 'api/controllers/BaseController';
 import TransactionsByReferenceService from 'services/FinancialStatements/TransactionsByReference';
-
+import { ITransactionsByReferenceTransaction } from 'interfaces';
 @Service()
 export default class TransactionsByReferenceController extends BaseController {
   @Inject()
@@ -61,27 +61,30 @@ export default class TransactionsByReferenceController extends BaseController {
     const filter = this.matchedQueryData(req);
 
     try {
-      const transactions =
+      const data =
         await this.transactionsByReferenceService.getTransactionsByReference(
           tenantId,
           filter
         );
-      const accept = this.accepts(req);
-      const acceptType = accept.types(['json']);
 
-      switch (acceptType) {
-        case 'json':
-        default:
-          return res
-            .status(200)
-            .send(this.transformToJsonResponse(transactions));
-      }
+      return res
+        .status(200)
+        .send(this.transformToJsonResponse(data.transactions));
     } catch (error) {
       next(error);
     }
   }
 
-  private transformToJsonResponse(transactions) {
-    return transactions;
+  /**
+   * Transformes the given report transaction to json response.
+   * @param transactions
+   * @returns
+   */
+  private transformToJsonResponse(
+    transactions: ITransactionsByReferenceTransaction[]
+  ) {
+    return {
+      transactions: this.transfromToResponse(transactions),
+    };
   }
 }
diff --git a/server/src/services/FinancialStatements/TransactionsByReference/TransactionsByReferenceReport.ts b/server/src/services/FinancialStatements/TransactionsByReference/TransactionsByReferenceReport.ts
index 54f4fdfc6..ae4a00f42 100644
--- a/server/src/services/FinancialStatements/TransactionsByReference/TransactionsByReferenceReport.ts
+++ b/server/src/services/FinancialStatements/TransactionsByReference/TransactionsByReferenceReport.ts
@@ -41,6 +41,8 @@ export default class TransactionsByReference extends FinancialSheet {
     transaction: IAccountTransaction
   ): ITransactionsByReferenceTransaction => {
     return {
+      date: this.getDateMeta(transaction.date),
+
       credit: this.getAmountMeta(transaction.credit, { money: true }),
       debit: this.getAmountMeta(transaction.debit, { money: true }),
 
diff --git a/server/src/services/FinancialStatements/TransactionsByReference/index.ts b/server/src/services/FinancialStatements/TransactionsByReference/index.ts
index d42d0a2dd..95e38a8ca 100644
--- a/server/src/services/FinancialStatements/TransactionsByReference/index.ts
+++ b/server/src/services/FinancialStatements/TransactionsByReference/index.ts
@@ -42,7 +42,7 @@ export default class TransactionsByReferenceService {
     tenantId: number,
     query: ITransactionsByReferenceQuery
   ): Promise<{
-    data: ITransactionsByReferenceTransaction[];
+    transactions: ITransactionsByReferenceTransaction[];
   }> {
     const filter = {
       ...this.defaultQuery,
@@ -71,7 +71,7 @@ export default class TransactionsByReferenceService {
     );
 
     return {
-      data: report.reportData(),
+      transactions: report.reportData(),
     };
   }
 }