Merge pull request #663 from bigcapitalhq/fix-uncategorize-bank-transaction

fix: Un-categorize bank transactions

packages/server/src/interfaces/CashflowService.ts

@@ -146,6 +146,7 @@ export interface ICashflowTransactionUncategorizedPayload {
   tenantId: number;
   uncategorizedTransactionId: number;
   uncategorizedTransactions: Array<IUncategorizedCashflowTransaction>;
+  oldMainUncategorizedTransaction: IUncategorizedCashflowTransaction;
   oldUncategorizedTransactions: Array<IUncategorizedCashflowTransaction>;
   trx: Knex.Transaction;
 }

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

@@ -33,22 +33,25 @@ export class UncategorizeCashflowTransaction {
   ): Promise<Array<number>> {
     const { UncategorizedCashflowTransaction } = this.tenancy.models(tenantId);
 
-    const oldUncategorizedTransaction =
+    const oldMainUncategorizedTransaction =
       await UncategorizedCashflowTransaction.query()
         .findById(uncategorizedTransactionId)
         .throwIfNotFound();
 
-    validateTransactionShouldBeCategorized(oldUncategorizedTransaction);
+    validateTransactionShouldBeCategorized(oldMainUncategorizedTransaction);
 
     const associatedUncategorizedTransactions =
       await UncategorizedCashflowTransaction.query()
-        .where('categorizeRefId', oldUncategorizedTransaction.categorizeRefId)
+        .where('categorizeRefId', oldMainUncategorizedTransaction.categorizeRefId)
         .where(
           'categorizeRefType',
-          oldUncategorizedTransaction.categorizeRefType
-        );
+          oldMainUncategorizedTransaction.categorizeRefType
+        )
+        // Exclude the main transaction.
+        .whereNot('id', uncategorizedTransactionId);
+
     const oldUncategorizedTransactions = [
-      oldUncategorizedTransaction,
+      oldMainUncategorizedTransaction,
       ...associatedUncategorizedTransactions,
     ];
     const oldUncategoirzedTransactionsIds = oldUncategorizedTransactions.map(
@@ -85,6 +88,7 @@ export class UncategorizeCashflowTransaction {
         {
           tenantId,
           uncategorizedTransactionId,
+          oldMainUncategorizedTransaction,
           uncategorizedTransactions,
           oldUncategorizedTransactions,
           trx,

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

@@ -22,32 +22,25 @@ export class DeleteCashflowTransactionOnUncategorize {
   };
 
   /**
-   * Deletes the cashflow transaction on uncategorize transaction.
+   * Deletes the cashflow transaction once uncategorize the bank transaction.
    * @param {ICashflowTransactionUncategorizedPayload} payload
    */
   public async deleteCashflowTransactionOnUncategorize({
     tenantId,
-    oldUncategorizedTransactions,
+    oldMainUncategorizedTransaction,
     trx,
   }: ICashflowTransactionUncategorizedPayload) {
-    const _oldUncategorizedTransactions = oldUncategorizedTransactions.filter(
-      (transaction) => transaction.categorizeRefType === 'CashflowTransaction'
-    );
-
-    // Deletes the cashflow transaction.
-    if (_oldUncategorizedTransactions.length > 0) {
-      const result = await PromisePool.withConcurrency(1)
-        .for(_oldUncategorizedTransactions)
-        .process(async (oldUncategorizedTransaction) => {
-          await this.deleteCashflowTransactionService.deleteCashflowTransaction(
-            tenantId,
-            oldUncategorizedTransaction.categorizeRefId,
-            trx
-          );
-        });
-      if (result.errors.length > 0) {
-        throw new ServiceError('SOMETHING_WRONG');
-      }
+    // Cannot continue if the main transaction does not reference to cashflow type.
+    if (
+      oldMainUncategorizedTransaction.categorizeRefType !==
+      'CashflowTransaction'
+    ) {
+      return;
     }
+    await this.deleteCashflowTransactionService.deleteCashflowTransaction(
+      tenantId,
+      oldMainUncategorizedTransaction.categorizeRefId,
+      trx
+    );
   }
 }