fix: matching transactions bugs

packages/server/src/services/Cashflow/CategorizeCashflowTransaction.ts

@@ -84,20 +84,23 @@ export class CategorizeCashflowTransaction {
           cashflowTransactionDTO
         );
       // Updates the uncategorized transaction as categorized.
-      await UncategorizedCashflowTransaction.query(trx).patchAndFetchById(
-        uncategorizedTransactionId,
-        {
-          categorized: true,
-          categorizeRefType: 'CashflowTransaction',
-          categorizeRefId: cashflowTransaction.id,
-        }
-      );
+      const uncategorizedTransaction =
+        await UncategorizedCashflowTransaction.query(trx).patchAndFetchById(
+          uncategorizedTransactionId,
+          {
+            categorized: true,
+            categorizeRefType: 'CashflowTransaction',
+            categorizeRefId: cashflowTransaction.id,
+          }
+        );
       // Triggers `onCashflowTransactionCategorized` event.
       await this.eventPublisher.emitAsync(
         events.cashflow.onTransactionCategorized,
         {
           tenantId,
-          // cashflowTransaction,
+          cashflowTransaction,
+          uncategorizedTransaction,
+          categorizeDTO,
           trx,
         } as ICashflowTransactionCategorizedPayload
       );

packages/server/src/services/Cashflow/UncategorizedTransactionsImportable.ts

@@ -1,6 +1,7 @@
 import { Inject, Service } from 'typedi';
 import { Knex } from 'knex';
 import * as yup from 'yup';
+import uniqid from 'uniqid';
 import { Importable } from '../Import/Importable';
 import { CreateUncategorizedTransaction } from './CreateUncategorizedTransaction';
 import { CreateUncategorizedTransactionDTO } from '@/interfaces';
@@ -15,6 +16,7 @@ export class UncategorizedTransactionsImportable extends Importable {
 
   @Inject()
   private tenancy: HasTenancyService;
+
   /**
    * Passing the sheet DTO to create uncategorized transaction.
    * @param {number} tenantId
@@ -43,6 +45,7 @@ export class UncategorizedTransactionsImportable extends Importable {
     return {
       ...createDTO,
       accountId: context.import.paramsParsed.accountId,
+      batch: context.import.paramsParsed.batch,
     };
   }
 
@@ -54,6 +57,9 @@ export class UncategorizedTransactionsImportable extends Importable {
     return BankTransactionsSampleData;
   }
 
+  // ------------------
+  // # Params
+  // ------------------
   /**
    * Params validation schema.
    * @returns {ValidationSchema[]}
@@ -79,4 +85,17 @@ export class UncategorizedTransactionsImportable extends Importable {
       await Account.query().findById(params.accountId).throwIfNotFound({});
     }
   }
+
+  /**
+   * Transformes the import params before storing them.
+   * @param {Record<string, any>} parmas
+   */
+  public transformParams(parmas: Record<string, any>) {
+    const batch = uniqid();
+
+    return {
+      ...parmas,
+      batch,
+    };
+  }
 }

packages/server/src/services/Cashflow/subscribers/DecrementUncategorizedTransactionOnCategorize.ts

@@ -0,0 +1,56 @@
+import { Inject, Service } from 'typedi';
+import events from '@/subscribers/events';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
+import {
+  ICashflowTransactionCategorizedPayload,
+  ICashflowTransactionUncategorizedPayload,
+} from '@/interfaces';
+
+@Service()
+export class DecrementUncategorizedTransactionOnCategorize {
+  @Inject()
+  private tenancy: HasTenancyService;
+  /**
+   * Constructor method.
+   */
+  public attach(bus) {
+    bus.subscribe(
+      events.cashflow.onTransactionCategorized,
+      this.decrementUnCategorizedTransactionsOnCategorized.bind(this)
+    );
+    bus.subscribe(
+      events.cashflow.onTransactionUncategorized,
+      this.incrementUnCategorizedTransactionsOnUncategorized.bind(this)
+    );
+  }
+
+  /**
+   * Decrement the uncategoirzed transactions on the account once categorizing.
+   * @param {ICashflowTransactionCategorizedPayload}
+   */
+  public async decrementUnCategorizedTransactionsOnCategorized({
+    tenantId,
+    uncategorizedTransaction,
+  }: ICashflowTransactionCategorizedPayload) {
+    const { Account } = this.tenancy.models(tenantId);
+
+    await Account.query()
+      .findById(uncategorizedTransaction.accountId)
+      .decrement('uncategorizedTransactions', 1);
+  }
+
+  /**
+   * Increment the uncategorized transaction on the given account on uncategorizing.
+   * @param {IManualJournalDeletingPayload}
+   */
+  public async incrementUnCategorizedTransactionsOnUncategorized({
+    tenantId,
+    uncategorizedTransaction,
+  }: ICashflowTransactionUncategorizedPayload) {
+    const { Account } = this.tenancy.models(tenantId);
+
+    await Account.query()
+      .findById(uncategorizedTransaction.accountId)
+      .increment('uncategorizedTransactions', 1);
+  }
+}