Merge branch 'develop' into draft-import-resources

packages/server/src/services/Accounts/AccountTransactionTransformer.ts

@@ -1,6 +1,5 @@
 import { IAccountTransaction } from '@/interfaces';
 import { Transformer } from '@/lib/Transformer/Transformer';
-import { transaction } from 'objection';
 
 export default class AccountTransactionTransformer extends Transformer {
   /**

packages/server/src/services/Accounts/AccountTransform.ts

@@ -13,7 +13,7 @@ export class AccountTransformer extends Transformer {
    * @returns {Array}
    */
   public includeAttributes = (): string[] => {
-    return ['formattedAmount', 'flattenName'];
+    return ['formattedAmount', 'flattenName', 'bankBalanceFormatted'];
   };
 
   /**
@@ -34,13 +34,24 @@ export class AccountTransformer extends Transformer {
 
   /**
    * Retrieve formatted account amount.
-   * @param   {IAccount} invoice
+   * @param {IAccount} invoice
    * @returns {string}
    */
   protected formattedAmount = (account: IAccount): string => {
     return formatNumber(account.amount, { currencyCode: account.currencyCode });
   };
 
+  /**
+   * Retrieves the formatted bank balance.
+   * @param {IAccount} account
+   * @returns {string}
+   */
+  protected bankBalanceFormatted = (account: IAccount): string => {
+    return formatNumber(account.bankBalance, {
+      currencyCode: account.currencyCode,
+    });
+  };
+
   /**
    * Transformes the accounts collection to flat or nested array.
    * @param {IAccount[]}

packages/server/src/services/Accounts/AccountsApplication.ts

@@ -3,8 +3,10 @@ import {
   IAccount,
   IAccountCreateDTO,
   IAccountEditDTO,
+  IAccountResponse,
   IAccountsFilter,
   IAccountsTransactionsFilter,
+  IFilterMeta,
   IGetAccountTransactionPOJO,
 } from '@/interfaces';
 import { CreateAccount } from './CreateAccount';
@@ -14,6 +16,7 @@ import { ActivateAccount } from './ActivateAccount';
 import { GetAccounts } from './GetAccounts';
 import { GetAccount } from './GetAccount';
 import { GetAccountTransactions } from './GetAccountTransactions';
+
 @Service()
 export class AccountsApplication {
   @Inject()
@@ -113,19 +116,22 @@ export class AccountsApplication {
 
   /**
    * Retrieves the accounts list.
-   * @param   {number} tenantId
-   * @param   {IAccountsFilter} filterDTO
-   * @returns
+   * @param {number} tenantId
+   * @param {IAccountsFilter} filterDTO
+   * @returns {Promise<{ accounts: IAccountResponse[]; filterMeta: IFilterMeta }>}
    */
-  public getAccounts = (tenantId: number, filterDTO: IAccountsFilter) => {
+  public getAccounts = (
+    tenantId: number,
+    filterDTO: IAccountsFilter
+  ): Promise<{ accounts: IAccountResponse[]; filterMeta: IFilterMeta }> => {
     return this.getAccountsService.getAccountsList(tenantId, filterDTO);
   };
 
   /**
    * Retrieves the given account transactions.
-   * @param    {number} tenantId
-   * @param    {IAccountsTransactionsFilter} filter
-   * @returns  {Promise<IGetAccountTransactionPOJO[]>}
+   * @param {number} tenantId
+   * @param {IAccountsTransactionsFilter} filter
+   * @returns {Promise<IGetAccountTransactionPOJO[]>}
    */
   public getAccountsTransactions = (
     tenantId: number,

packages/server/src/services/Accounts/ActivateAccount.ts

@@ -5,7 +5,6 @@ import { IAccountEventActivatedPayload } from '@/interfaces';
 import events from '@/subscribers/events';
 import UnitOfWork from '@/services/UnitOfWork';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
-import { CommandAccountValidators } from './CommandAccountValidators';
 
 @Service()
 export class ActivateAccount {
@@ -18,9 +17,6 @@ export class ActivateAccount {
   @Inject()
   private uow: UnitOfWork;
 
-  @Inject()
-  private validator: CommandAccountValidators;
-
   /**
    * Activates/Inactivates the given account.
    * @param {number} tenantId