refactor(nestjs): bank transactions matching

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

@@ -23,16 +23,12 @@ export class BankingMatchingController {
     );
   }
 
-  @Post('/match/:uncategorizedTransactionId')
+  @Post('/match')
   @ApiOperation({ summary: 'Match the given uncategorized transaction.' })
-  async matchTransaction(
-    @Param('uncategorizedTransactionId')
-    uncategorizedTransactionId: number | number[],
-    @Body() matchedTransactions: MatchBankTransactionDto,
-  ) {
+  async matchTransaction(@Body() matchedTransactions: MatchBankTransactionDto) {
     return this.bankingMatchingApplication.matchTransaction(
-      uncategorizedTransactionId,
-      matchedTransactions,
+      matchedTransactions.uncategorizedTransactions,
+      matchedTransactions.matchedTransactions,
     );
   }
 

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

@@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common';
 import { GetMatchedTransactions } from './queries/GetMatchedTransactions.service';
 import { MatchBankTransactions } from './commands/MatchTransactions';
 import { UnmatchMatchedBankTransaction } from './commands/UnmatchMatchedTransaction.service';
-import { GetMatchedTransactionsFilter, IMatchTransactionDTO } from './types';
-import { MatchBankTransactionDto } from './dtos/MatchBankTransaction.dto';
+import { GetMatchedTransactionsFilter } from './types';
+import { MatchTransactionEntryDto } from './dtos/MatchBankTransaction.dto';
 
 @Injectable()
 export class BankingMatchingApplication {
@@ -31,17 +31,18 @@ export class BankingMatchingApplication {
 
   /**
    * Matches the given uncategorized transaction with the given system transaction.
-   * @param {number} uncategorizedTransactionId
-   * @param {IMatchTransactionDTO} matchTransactionsDTO
+   * @param {IMatchBankTransactionDto} matchedTransactionsDTO
    * @returns {Promise<void>}
    */
   public matchTransaction(
     uncategorizedTransactionId: number | Array<number>,
-    matchedTransactions: MatchBankTransactionDto,
+    matchedTransactionsDto:
+      | MatchTransactionEntryDto
+      | Array<MatchTransactionEntryDto>,
   ): Promise<void> {
     return this.matchTransactionService.matchTransaction(
       uncategorizedTransactionId,
-      matchedTransactions,
+      matchedTransactionsDto,
     );
   }
 

packages/server/src/modules/BankingMatching/commands/MatchTransactions.ts

@@ -21,7 +21,7 @@ import { ServiceError } from '@/modules/Items/ServiceError';
 import { UncategorizedBankTransaction } from '@/modules/BankingTransactions/models/UncategorizedBankTransaction';
 import { events } from '@/common/events/events';
 import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
-import { MatchBankTransactionDto } from '../dtos/MatchBankTransaction.dto';
+import { MatchTransactionEntryDto } from '../dtos/MatchBankTransaction.dto';
 
 @Injectable()
 export class MatchBankTransactions {
@@ -107,16 +107,15 @@ export class MatchBankTransactions {
 
   /**
    * Matches the given uncategorized transaction to the given references.
-   * @param {number} tenantId
    * @param {number} uncategorizedTransactionId
    * @returns {Promise<void>}
    */
   public async matchTransaction(
     uncategorizedTransactionId: number | Array<number>,
-    matchedTransactionsDto: MatchBankTransactionDto,
+    matchedTransactionsDto: MatchTransactionEntryDto | Array<MatchTransactionEntryDto>,
   ): Promise<void> {
     const uncategorizedTransactionIds = castArray(uncategorizedTransactionId);
-    const matchedTransactions = matchedTransactionsDto.entries;
+    const matchedTransactions = castArray(matchedTransactionsDto);
 
     // Validates the given matching transactions DTO.
     await this.validate(uncategorizedTransactionIds, matchedTransactions);
@@ -131,7 +130,7 @@ export class MatchBankTransactions {
       // Matches the given transactions under promise pool concurrency controlling.
       await PromisePool.withConcurrency(10)
         .for(matchedTransactions)
-        .process(async (matchedTransaction) => {
+        .process(async (matchedTransaction: MatchTransactionEntryDto) => {
           const getMatchedTransactionsService =
             this.matchedBankTransactions.registry.get(
               matchedTransaction.referenceType,

packages/server/src/modules/BankingMatching/dtos/MatchBankTransaction.dto.ts

@@ -1,4 +1,5 @@
 import {
+  ArrayMinSize,
   IsArray,
   IsNotEmpty,
   IsNumber,
@@ -27,6 +28,10 @@ export class MatchTransactionEntryDto {
 }
 
 export class MatchBankTransactionDto {
+  @IsArray()
+  @ArrayMinSize(1)
+  uncategorizedTransactions: Array<number>
+
   @IsArray()
   @ValidateNested({ each: true })
   @Type(() => MatchTransactionEntryDto)
@@ -37,5 +42,5 @@ export class MatchBankTransactionDto {
       { referenceType: 'SaleInvoice', referenceId: 2 },
     ],
   })
-  entries: MatchTransactionEntryDto[];
+  matchedTransactions: MatchTransactionEntryDto[];
 }

packages/server/src/modules/BankingMatching/events/DecrementUncategorizedTransactionsOnMatch.ts

@@ -1,14 +1,14 @@
+import PromisePool from '@supercharge/promise-pool';
+import { OnEvent } from '@nestjs/event-emitter';
+import { Inject, Injectable } from '@nestjs/common';
 import {
   IBankTransactionMatchedEventPayload,
   IBankTransactionUnmatchedEventPayload,
 } from '../types';
-import PromisePool from '@supercharge/promise-pool';
-import { OnEvent } from '@nestjs/event-emitter';
 import { Account } from '@/modules/Accounts/models/Account.model';
-import { Inject, Injectable } from '@nestjs/common';
+import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 import { UncategorizedBankTransaction } from '@/modules/BankingTransactions/models/UncategorizedBankTransaction';
 import { events } from '@/common/events/events';
-import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 
 @Injectable()
 export class DecrementUncategorizedTransactionOnMatchingSubscriber {