From 06ea631732daa6e2885aff85e228c9115e9d30b2 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Sun, 18 Aug 2024 19:38:15 +0200
Subject: [PATCH] fix: making pagination more readable

---
 packages/server/src/models/Pagination.ts      | 22 ++++++++++++++-----
 .../DisconnectPlaidItemOnAccountDeleted.ts    | 18 ++++++---------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/packages/server/src/models/Pagination.ts b/packages/server/src/models/Pagination.ts
index 378839eb7..5d308e90e 100644
--- a/packages/server/src/models/Pagination.ts
+++ b/packages/server/src/models/Pagination.ts
@@ -17,7 +17,12 @@ export default class PaginationQueryBuilder extends Model.QueryBuilder {
     });
   }
 
-  queryAndThrowIfHasRelations = ({ type, message, excludeRelations = [], includedRelations = [] }) => {
+  queryAndThrowIfHasRelations = ({
+    type,
+    message,
+    excludeRelations = [],
+    includedRelations = [],
+  }) => {
     const _excludeRelations = castArray(excludeRelations);
     const _includedRelations = castArray(includedRelations);
 
@@ -29,10 +34,17 @@ export default class PaginationQueryBuilder extends Model.QueryBuilder {
         ) !== -1
     );
     const relations = model.secureDeleteRelations || modelRelations;
-    const filteredRelations = !isEmpty(_includedRelations) ?
-      relations.filter(r => _includedRelations.includes(r)) :
-      !isEmpty(_excludeRelations) ? relations.filter(r => !excludeRelations.includes(r)) : relations;
-
+    const filteredByIncluded = relations.filter((r) =>
+      _includedRelations.includes(r)
+    );
+    const filteredByExcluded = relations.filter(
+      (r) => !excludeRelations.includes(r)
+    );
+    const filteredRelations = !isEmpty(_includedRelations)
+      ? filteredByIncluded
+      : !isEmpty(_excludeRelations)
+      ? filteredByExcluded
+      : relations;
 
     this.runAfter((model, query) => {
       const nonEmptyRelations = filteredRelations.filter(
diff --git a/packages/server/src/services/Banking/BankAccounts/events/DisconnectPlaidItemOnAccountDeleted.ts b/packages/server/src/services/Banking/BankAccounts/events/DisconnectPlaidItemOnAccountDeleted.ts
index dfba3b7a9..4ecf71e81 100644
--- a/packages/server/src/services/Banking/BankAccounts/events/DisconnectPlaidItemOnAccountDeleted.ts
+++ b/packages/server/src/services/Banking/BankAccounts/events/DisconnectPlaidItemOnAccountDeleted.ts
@@ -2,7 +2,6 @@ import { Inject, Service } from 'typedi';
 import { IAccountEventDeletedPayload } from '@/interfaces';
 import { PlaidClientWrapper } from '@/lib/Plaid';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
-import { runAfterTransaction } from '@/services/UnitOfWork/TransactionsHooks';
 import events from '@/subscribers/events';
 
 @Service()
@@ -53,16 +52,13 @@ export class DisconnectPlaidItemOnAccountDeleted {
       .delete();
 
     // Remove Plaid item once the transaction resolve.
-    runAfterTransaction(trx, async () => {
-      if (oldPlaidItem) {
-        const plaidInstance = PlaidClientWrapper.getClient();
-
-        // Remove the Plaid item.
-        await plaidInstance.itemRemove({
-          access_token: oldPlaidItem.plaidAccessToken,
-        });
-      }
-    })
+    if (oldPlaidItem) {
+      const plaidInstance = PlaidClientWrapper.getClient();
 
+      // Remove the Plaid item.
+      await plaidInstance.itemRemove({
+        access_token: oldPlaidItem.plaidAccessToken,
+      });
+    }
   }
 }