fix: improvements to bank matching transactions

packages/server/src/services/Banking/Matching/UnmatchMatchedTransaction.ts

@@ -31,6 +31,7 @@ export class UnmatchMatchedBankTransaction {
     return this.uow.withTransaction(tenantId, async (trx) => {
       await this.eventPublisher.emitAsync(events.bankMatch.onUnmatching, {
         tenantId,
+        uncategorizedTransactionId,
         trx,
       } as IBankTransactionUnmatchingEventPayload);
 
@@ -40,6 +41,7 @@ export class UnmatchMatchedBankTransaction {
 
       await this.eventPublisher.emitAsync(events.bankMatch.onUnmatched, {
         tenantId,
+        uncategorizedTransactionId,
         trx,
       } as IBankTransactionUnmatchingEventPayload);
     });

packages/server/src/services/Banking/Matching/ValidateTransactionsMatched.ts

@@ -1,6 +1,7 @@
+import { Knex } from 'knex';
+import { Inject, Service } from 'typedi';
 import { ServiceError } from '@/exceptions';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
-import { Inject, Service } from 'typedi';
 import { ERRORS } from './types';
 
 @Service()
@@ -18,12 +19,13 @@ export class ValidateTransactionMatched {
   public async validateTransactionNoMatchLinking(
     tenantId: number,
     referenceType: string,
-    referenceId: number
+    referenceId: number,
+    trx?: Knex.Transaction
   ) {
     const { MatchedBankTransaction } = this.tenancy.models(tenantId);
 
     const foundMatchedTransaction =
-      await MatchedBankTransaction.query().findOne({
+      await MatchedBankTransaction.query(trx).findOne({
         referenceType,
         referenceId,
       });

packages/server/src/services/Banking/Matching/events/DecrementUncategorizedTransactionsOnMatch.ts

@@ -0,0 +1,69 @@
+import { Inject, Service } from 'typedi';
+import events from '@/subscribers/events';
+import {
+  IBankTransactionMatchedEventPayload,
+  IBankTransactionUnmatchedEventPayload,
+} from '../types';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
+
+@Service()
+export class DecrementUncategorizedTransactionOnMatching {
+  @Inject()
+  private tenancy: HasTenancyService;
+  /**
+   * Constructor method.
+   */
+  public attach(bus) {
+    bus.subscribe(
+      events.bankMatch.onMatched,
+      this.decrementUnCategorizedTransactionsOnMatching.bind(this)
+    );
+    bus.subscribe(
+      events.bankMatch.onUnmatched,
+      this.incrementUnCategorizedTransactionsOnUnmatching.bind(this)
+    );
+  }
+
+  /**
+   * Validates the cashflow transaction whether matched with bank transaction on deleting.
+   * @param {IManualJournalDeletingPayload}
+   */
+  public async decrementUnCategorizedTransactionsOnMatching({
+    tenantId,
+    uncategorizedTransactionId,
+    matchTransactionsDTO,
+    trx,
+  }: IBankTransactionMatchedEventPayload) {
+    const { UncategorizedCashflowTransaction, Account } =
+      this.tenancy.models(tenantId);
+
+    const transaction = await UncategorizedCashflowTransaction.query().findById(
+      uncategorizedTransactionId
+    );
+    //
+    await Account.query(trx)
+      .findById(transaction.accountId)
+      .decrement('uncategorizedTransactions', 1);
+  }
+
+  /**
+   * Validates the cashflow transaction whether matched with bank transaction on deleting.
+   * @param {IManualJournalDeletingPayload}
+   */
+  public async incrementUnCategorizedTransactionsOnUnmatching({
+    tenantId,
+    uncategorizedTransactionId,
+    trx,
+  }: IBankTransactionUnmatchedEventPayload) {
+    const { UncategorizedCashflowTransaction, Account } =
+      this.tenancy.models(tenantId);
+
+    const transaction = await UncategorizedCashflowTransaction.query().findById(
+      uncategorizedTransactionId
+    );
+    //
+    await Account.query(trx)
+      .findById(transaction.accountId)
+      .decrement('uncategorizedTransactions', 1);
+  }
+}

packages/server/src/services/Banking/Matching/events/ValidateMatchingOnCashflowDelete.ts

@@ -1,5 +1,5 @@
 import { Inject, Service } from 'typedi';
-import { IManualJournalDeletingPayload } from '@/interfaces';
+import { ICommandCashflowDeletingPayload, IManualJournalDeletingPayload } from '@/interfaces';
 import events from '@/subscribers/events';
 import { ValidateTransactionMatched } from '../ValidateTransactionsMatched';
 
@@ -24,13 +24,14 @@ export class ValidateMatchingOnCashflowDelete {
    */
   public async validateMatchingOnCashflowDeleting({
     tenantId,
-    oldManualJournal,
+    oldCashflowTransaction,
     trx,
-  }: IManualJournalDeletingPayload) {
+  }: ICommandCashflowDeletingPayload) {
     await this.validateNoMatchingLinkedService.validateTransactionNoMatchLinking(
       tenantId,
-      'ManualJournal',
-      oldManualJournal.id
+      'CashflowTransaction',
+      oldCashflowTransaction.id,
+      trx
     );
   }
 }

packages/server/src/services/Banking/Matching/events/ValidateMatchingOnExpenseDelete.ts

@@ -30,7 +30,8 @@ export class ValidateMatchingOnExpenseDelete {
     await this.validateNoMatchingLinkedService.validateTransactionNoMatchLinking(
       tenantId,
       'Expense',
-      oldExpense.id
+      oldExpense.id,
+      trx
     );
   }
 }

packages/server/src/services/Banking/Matching/events/ValidateMatchingOnManualJournalDelete.ts

@@ -30,7 +30,8 @@ export class ValidateMatchingOnManualJournalDelete {
     await this.validateNoMatchingLinkedService.validateTransactionNoMatchLinking(
       tenantId,
       'ManualJournal',
-      oldManualJournal.id
+      oldManualJournal.id,
+      trx
     );
   }
 }

packages/server/src/services/Banking/Matching/events/ValidateMatchingOnPaymentMadeDelete.ts

@@ -33,7 +33,8 @@ export class ValidateMatchingOnPaymentMadeDelete {
     await this.validateNoMatchingLinkedService.validateTransactionNoMatchLinking(
       tenantId,
       'PaymentMade',
-      oldBillPayment.id
+      oldBillPayment.id,
+      trx
     );
   }
 }

packages/server/src/services/Banking/Matching/events/ValidateMatchingOnPaymentReceivedDelete.ts

@@ -30,7 +30,8 @@ export class ValidateMatchingOnPaymentReceivedDelete {
     await this.validateNoMatchingLinkedService.validateTransactionNoMatchLinking(
       tenantId,
       'PaymentReceive',
-      oldPaymentReceive.id
+      oldPaymentReceive.id,
+      trx
     );
   }
 }

packages/server/src/services/Banking/Matching/types.ts

@@ -16,10 +16,14 @@ export interface IBankTransactionMatchedEventPayload {
 
 export interface IBankTransactionUnmatchingEventPayload {
   tenantId: number;
+  uncategorizedTransactionId: number;
+  trx?: Knex.Transaction;
 }
 
 export interface IBankTransactionUnmatchedEventPayload {
   tenantId: number;
+  uncategorizedTransactionId: number;
+  trx?: Knex.Transaction;
 }
 
 export interface IMatchTransactionDTO {