fix: recognize transactions on editing bank rule

packages/server/src/services/Banking/Rules/CreateBankRule.ts

@@ -62,6 +62,7 @@ export class CreateBankRuleService {
       await this.eventPublisher.emitAsync(events.bankRules.onCreated, {
         tenantId,
         createRuleDTO,
+        bankRule,
         trx,
       } as IBankRuleEventCreatedPayload);
 

packages/server/src/services/Banking/Rules/UnlinkBankRuleRecognizedTransactions.ts

@@ -1,54 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { Knex } from 'knex';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import UnitOfWork from '@/services/UnitOfWork';
-
-@Service()
-export class UnlinkBankRuleRecognizedTransactions {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  @Inject()
-  private uow: UnitOfWork;
-
-  /**
-   * Unlinks the given bank rule out of recognized transactions.
-   * @param {number} tenantId - Tenant id.
-   * @param {number} bankRuleId - Bank rule id.
-   * @param {Knex.Transaction} trx - Knex transaction.
-   * @returns {Promise<void>}
-   */
-  public async unlinkBankRuleOutRecognizedTransactions(
-    tenantId: number,
-    bankRuleId: number,
-    trx?: Knex.Transaction
-  ): Promise<void> {
-    const { UncategorizedCashflowTransaction, RecognizedBankTransaction } =
-      this.tenancy.models(tenantId);
-
-    return this.uow.withTransaction(
-      tenantId,
-      async (trx: Knex.Transaction) => {
-        // Retrieves all the recognized transactions of the banbk rule.
-        const recognizedTransactions = await RecognizedBankTransaction.query(
-          trx
-        ).where('bankRuleId', bankRuleId);
-
-        const uncategorizedTransactionIds = recognizedTransactions.map(
-          (r) => r.uncategorizedTransactionId
-        );
-        // Unlink the recongized transactions out of uncategorized transactions.
-        await UncategorizedCashflowTransaction.query(trx)
-          .whereIn('id', uncategorizedTransactionIds)
-          .patch({
-            recognizedTransactionId: null,
-          });
-        // Delete the recognized bank transactions that assocaited to bank rule.
-        await RecognizedBankTransaction.query(trx)
-          .where({ bankRuleId })
-          .delete();
-      },
-      trx
-    );
-  }
-}

packages/server/src/services/Banking/Rules/events/UnlinkBankRuleOnDeleteBankRule.ts

@@ -1,12 +1,12 @@
 import { Inject, Service } from 'typedi';
 import events from '@/subscribers/events';
-import { UnlinkBankRuleRecognizedTransactions } from '../UnlinkBankRuleRecognizedTransactions';
 import { IBankRuleEventDeletingPayload } from '../types';
+import { RevertRecognizedTransactions } from '../../RegonizeTranasctions/RevertRecognizedTransactions';
 
 @Service()
 export class UnlinkBankRuleOnDeleteBankRule {
   @Inject()
-  private unlinkBankRule: UnlinkBankRuleRecognizedTransactions;
+  private revertRecognizedTransactionsService: RevertRecognizedTransactions;
 
   /**
    * Constructor method.
@@ -26,7 +26,7 @@ export class UnlinkBankRuleOnDeleteBankRule {
     tenantId,
     ruleId,
   }: IBankRuleEventDeletingPayload) {
-    await this.unlinkBankRule.unlinkBankRuleOutRecognizedTransactions(
+    await this.revertRecognizedTransactionsService.revertRecognizedTransactions(
       tenantId,
       ruleId
     );

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

@@ -30,6 +30,7 @@ export enum BankRuleApplyIfTransactionType {
 }
 
 export interface IBankRule {
+  id?: number;
   name: string;
   order?: number;
   applyIfAccountId: number;
@@ -71,8 +72,6 @@ export interface IBankRuleCommonDTO {
   assignAccountId: number;
   assignPayee?: string;
   assignMemo?: string;
-
-  recognition?: boolean;
 }
 
 export interface ICreateBankRuleDTO extends IBankRuleCommonDTO {}
@@ -86,6 +85,7 @@ export interface IBankRuleEventCreatingPayload {
 export interface IBankRuleEventCreatedPayload {
   tenantId: number;
   createRuleDTO: ICreateBankRuleDTO;
+  bankRule: IBankRule;
   trx?: Knex.Transaction;
 }