refactor(nestjs): banking modules

packages/server/src/modules/BankingMatching/BankingMatching.controller.ts

@@ -1,47 +1,48 @@
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { Body, Controller, Get, Param, Post, Query } from '@nestjs/common';
 import { BankingMatchingApplication } from './BankingMatchingApplication';
-import { GetMatchedTransactionsFilter, IMatchTransactionDTO } from './types';
+import { GetMatchedTransactionsFilter } from './types';
 import { MatchBankTransactionDto } from './dtos/MatchBankTransaction.dto';
 
 @Controller('banking/matching')
 @ApiTags('banking-transactions-matching')
 export class BankingMatchingController {
   constructor(
-    private readonly bankingMatchingApplication: BankingMatchingApplication
+    private readonly bankingMatchingApplication: BankingMatchingApplication,
   ) {}
 
   @Get('matched')
   @ApiOperation({ summary: 'Retrieves the matched transactions.' })
   async getMatchedTransactions(
     @Query('uncategorizedTransactionIds') uncategorizedTransactionIds: number[],
-    @Query() filter: GetMatchedTransactionsFilter
+    @Query() filter: GetMatchedTransactionsFilter,
   ) {
     return this.bankingMatchingApplication.getMatchedTransactions(
       uncategorizedTransactionIds,
-      filter
+      filter,
     );
   }
 
   @Post('/match/:uncategorizedTransactionId')
   @ApiOperation({ summary: 'Match the given uncategorized transaction.' })
   async matchTransaction(
-    @Param('uncategorizedTransactionId') uncategorizedTransactionId: number | number[],
-    @Body() matchedTransactions: MatchBankTransactionDto
+    @Param('uncategorizedTransactionId')
+    uncategorizedTransactionId: number | number[],
+    @Body() matchedTransactions: MatchBankTransactionDto,
   ) {
     return this.bankingMatchingApplication.matchTransaction(
       uncategorizedTransactionId,
-      matchedTransactions
+      matchedTransactions,
     );
   }
 
   @Post('/unmatch/:uncategorizedTransactionId')
   @ApiOperation({ summary: 'Unmatch the given uncategorized transaction.' })
   async unmatchMatchedTransaction(
-    @Param('uncategorizedTransactionId') uncategorizedTransactionId: number
+    @Param('uncategorizedTransactionId') uncategorizedTransactionId: number,
   ) {
     return this.bankingMatchingApplication.unmatchMatchedTransaction(
-      uncategorizedTransactionId
+      uncategorizedTransactionId,
     );
   }
 }

packages/server/src/modules/BankingMatching/queries/GetMatchedTransactionsByCashflow.ts

@@ -1,3 +1,4 @@
+import { Knex } from 'knex';
 import { GetMatchedTransactionsByType } from './GetMatchedTransactionsByType';
 import { GetMatchedTransactionCashflowTransformer } from './GetMatchedTransactionCashflowTransformer';
 import { GetMatchedTransactionsFilter } from '../types';

packages/server/src/modules/BankingMatching/queries/GetMatchedTransactionsByExpenses.ts

@@ -1,10 +1,13 @@
 import { Inject, Injectable } from '@nestjs/common';
-import { GetMatchedTransactionsFilter, MatchedTransactionPOJO } from '../types';
+import { GetMatchedTransactionsFilter, MatchedTransactionPOJO, MatchedTransactionsPOJO } from '../types';
 import { GetMatchedTransactionsByType } from './GetMatchedTransactionsByType';
 import { GetMatchedTransactionExpensesTransformer } from './GetMatchedTransactionExpensesTransformer';
 import { TransformerInjectable } from '@/modules/Transformer/TransformerInjectable.service';
 import { Expense } from '@/modules/Expenses/models/Expense.model';
 import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
+import { Knex } from 'knex';
+import { TENANCY_DB_CONNECTION } from '@/modules/Tenancy/TenancyDB/TenancyDB.constants';
+import { initialize } from 'objection';
 
 @Injectable()
 export class GetMatchedTransactionsByExpenses extends GetMatchedTransactionsByType {
@@ -13,17 +16,26 @@ export class GetMatchedTransactionsByExpenses extends GetMatchedTransactionsByTy
 
     @Inject(Expense.name)
     protected readonly expenseModel: TenantModelProxy<typeof Expense>,
+
+    @Inject(TENANCY_DB_CONNECTION)
+    private readonly tenantDb: () => Knex,
+
+    @Inject('TENANT_MODELS_INIT')
+    private readonly tenantModelsInit: () => Promise<boolean>,
+    
   ) {
     super();
   }
 
   /**
    * Retrieves the matched transactions of expenses.
-   * @param {number} tenantId
    * @param {GetMatchedTransactionsFilter} filter
    * @returns
    */
-  async getMatchedTransactions(filter: GetMatchedTransactionsFilter) {
+  async getMatchedTransactions(
+    filter: GetMatchedTransactionsFilter,
+  ): Promise<MatchedTransactionsPOJO> {
+    // await this.tenantModelsInit();
     // Retrieve the expense matches.
     const expenses = await this.expenseModel()
       .query()
@@ -49,6 +61,7 @@ export class GetMatchedTransactionsByExpenses extends GetMatchedTransactionsByTy
         }
         query.orderBy('paymentDate', 'DESC');
       });
+
     return this.transformer.transform(
       expenses,
       new GetMatchedTransactionExpensesTransformer(),

packages/server/src/modules/BankingMatching/queries/GetMatchedTransactionsByInvoices.service.ts

@@ -1,3 +1,4 @@
+import { Inject, Injectable } from '@nestjs/common';
 import { Knex } from 'knex';
 import { first } from 'lodash';
 import { GetMatchedTransactionInvoicesTransformer } from './GetMatchedTransactionInvoicesTransformer';
@@ -9,7 +10,6 @@ import {
 } from '../types';
 import { GetMatchedTransactionsByType } from './GetMatchedTransactionsByType';
 import { CreatePaymentReceivedService } from '@/modules/PaymentReceived/commands/CreatePaymentReceived.serivce';
-import { Inject, Injectable } from '@nestjs/common';
 import { SaleInvoice } from '@/modules/SaleInvoices/models/SaleInvoice';
 import { TransformerInjectable } from '@/modules/Transformer/TransformerInjectable.service';
 import { UncategorizedBankTransaction } from '@/modules/BankingTransactions/models/UncategorizedBankTransaction';
@@ -86,7 +86,6 @@ export class GetMatchedTransactionsByInvoices extends GetMatchedTransactionsByTy
 
   /**
    * Creates the common matched transaction.
-   * @param {number} tenantId
    * @param {Array<number>} uncategorizedTransactionIds
    * @param {IMatchTransactionDTO} matchTransactionDTO
    * @param {Knex.Transaction} trx

packages/server/src/modules/BankingMatching/queries/GetMatchedTransactionsByManualJournals.service.ts

@@ -1,10 +1,13 @@
+import { Knex } from 'knex';
 import { Inject, Injectable } from '@nestjs/common';
+import { initialize } from 'objection';
 import { GetMatchedTransactionManualJournalsTransformer } from './GetMatchedTransactionManualJournalsTransformer';
 import { GetMatchedTransactionsByType } from './GetMatchedTransactionsByType';
 import { GetMatchedTransactionsFilter } from '../types';
 import { ManualJournal } from '@/modules/ManualJournals/models/ManualJournal';
 import { TransformerInjectable } from '@/modules/Transformer/TransformerInjectable.service';
 import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
+import { TENANCY_DB_CONNECTION } from '@/modules/Tenancy/TenancyDB/TenancyDB.constants';
 
 @Injectable()
 export class GetMatchedTransactionsByManualJournals extends GetMatchedTransactionsByType {

packages/server/src/modules/BankingMatching/queries/GetMatchedTransactionsByType.ts

@@ -12,7 +12,7 @@ import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 
 export abstract class GetMatchedTransactionsByType {
   @Inject(MatchedBankTransaction.name)
-  private readonly matchedBankTransactionModel: TenantModelProxy<
+  matchedBankTransactionModel: TenantModelProxy<
     typeof MatchedBankTransaction
   >;