feat: disable auto applying credit payments

.all-contributorsrc

@@ -132,24 +132,6 @@
       "contributions": [
         "bug"
       ]
-    },
-    {
-      "login": "oleynikd",
-      "name": "Denis",
-      "avatar_url": "https://avatars.githubusercontent.com/u/3976868?v=4",
-      "profile": "https://github.com/oleynikd",
-      "contributions": [
-        "bug"
-      ]
-    },
-    {
-      "login": "mittalsam98",
-      "name": "Sachin Mittal",
-      "avatar_url": "https://avatars.githubusercontent.com/u/42431274?v=4",
-      "profile": "https://myself.vercel.app/",
-      "contributions": [
-        "bug"
-      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -126,10 +126,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="http://vederis.id"><img src="https://avatars.githubusercontent.com/u/13505006?v=4?s=100" width="100px;" alt="Vederis Leunardus"/><br /><sub><b>Vederis Leunardus</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=cloudsbird" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://www.pivoten.com"><img src="https://avatars.githubusercontent.com/u/104120598?v=4?s=100" width="100px;" alt="Chris Cantrell"/><br /><sub><b>Chris Cantrell</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Accantrell72" title="Bug reports">🐛</a></td>
     </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/oleynikd"><img src="https://avatars.githubusercontent.com/u/3976868?v=4?s=100" width="100px;" alt="Denis"/><br /><sub><b>Denis</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Aoleynikd" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://myself.vercel.app/"><img src="https://avatars.githubusercontent.com/u/42431274?v=4?s=100" width="100px;" alt="Sachin Mittal"/><br /><sub><b>Sachin Mittal</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Amittalsam98" title="Bug reports">🐛</a></td>
-    </tr>
   </tbody>
 </table>
 

packages/server/src/api/controllers/Accounts.ts

@@ -103,20 +103,24 @@ export default class AccountsController extends BaseController {
       check('name')
         .exists()
         .isLength({ min: 3, max: DATATYPES_LENGTH.STRING })
-        .trim(),
+        .trim()
+        .escape(),
       check('code')
         .optional({ nullable: true })
         .isLength({ min: 3, max: 6 })
-        .trim(),
+        .trim()
+        .escape(),
       check('currency_code').optional(),
       check('account_type')
         .exists()
         .isLength({ min: 3, max: DATATYPES_LENGTH.STRING })
-        .trim(),
+        .trim()
+        .escape(),
       check('description')
         .optional({ nullable: true })
         .isLength({ max: DATATYPES_LENGTH.TEXT })
-        .trim(),
+        .trim()
+        .escape(),
       check('parent_account_id')
         .optional({ nullable: true })
         .isInt({ min: 0, max: DATATYPES_LENGTH.INT_10 })
@@ -132,19 +136,23 @@ export default class AccountsController extends BaseController {
       check('name')
         .exists()
         .isLength({ min: 3, max: DATATYPES_LENGTH.STRING })
-        .trim(),
+        .trim()
+        .escape(),
       check('code')
         .optional({ nullable: true })
         .isLength({ min: 3, max: 6 })
-        .trim(),
+        .trim()
+        .escape(),
       check('account_type')
         .exists()
         .isLength({ min: 3, max: DATATYPES_LENGTH.STRING })
-        .trim(),
+        .trim()
+        .escape(),
       check('description')
         .optional({ nullable: true })
         .isLength({ max: DATATYPES_LENGTH.TEXT })
-        .trim(),
+        .trim()
+        .escape(),
       check('parent_account_id')
         .optional({ nullable: true })
         .isInt({ min: 0, max: DATATYPES_LENGTH.INT_10 })

packages/server/src/api/controllers/Attachments/AttachmentsController.ts

@@ -250,12 +250,10 @@ export class AttachmentsController extends BaseController {
     res: Response,
     next: NextFunction
   ): Promise<Response | void> {
-    const { tenantId } = req;
     const { id: documentKey } = req.params;
 
     try {
       const presignedUrl = await this.attachmentsApplication.getPresignedUrl(
-        tenantId,
         documentKey
       );
       return res.status(200).send({ presignedUrl });

packages/server/src/api/controllers/Authentication.ts

@@ -90,23 +90,27 @@ export default class AuthenticationController extends BaseController {
         .exists()
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('last_name')
         .exists()
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('email')
         .exists()
         .isString()
         .isEmail()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('password')
         .exists()
         .isString()
         .isLength({ min: 6 })
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
     ];
   }
@@ -146,7 +150,7 @@ export default class AuthenticationController extends BaseController {
    * @returns {ValidationChain[]}
    */
   private get sendResetPasswordSchema(): ValidationChain[] {
-    return [check('email').exists().isEmail().trim()];
+    return [check('email').exists().isEmail().trim().escape()];
   }
 
   /**
@@ -154,11 +158,7 @@ export default class AuthenticationController extends BaseController {
    * @param {Request} req
    * @param {Response} res
    */
-  private async login(
-    req: Request,
-    res: Response,
-    next: Function
-  ): Promise<Response | null> {
+  private async login(req: Request, res: Response, next: Function): Response {
     const userDTO: ILoginDTO = this.matchedBodyData(req);
 
     try {

packages/server/src/api/controllers/Banking/BankAccountsController.ts

@@ -1,22 +1,14 @@
 import { Inject, Service } from 'typedi';
 import { NextFunction, Request, Response, Router } from 'express';
-import { param, query } from 'express-validator';
 import BaseController from '@/api/controllers/BaseController';
+import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';
 import { GetBankAccountSummary } from '@/services/Banking/BankAccounts/GetBankAccountSummary';
-import { BankAccountsApplication } from '@/services/Banking/BankAccounts/BankAccountsApplication';
-import { GetPendingBankAccountTransactions } from '@/services/Cashflow/GetPendingBankAccountTransaction';
 
 @Service()
 export class BankAccountsController extends BaseController {
   @Inject()
   private getBankAccountSummaryService: GetBankAccountSummary;
 
-  @Inject()
-  private bankAccountsApp: BankAccountsApplication;
-
-  @Inject()
-  private getPendingTransactionsService: GetPendingBankAccountTransactions;
-
   /**
    * Router constructor.
    */
@@ -24,33 +16,6 @@ export class BankAccountsController extends BaseController {
     const router = Router();
 
     router.get('/:bankAccountId/meta', this.getBankAccountSummary.bind(this));
-    router.get(
-      '/pending_transactions',
-      [
-        query('account_id').optional().isNumeric().toInt(),
-        query('page').optional().isNumeric().toInt(),
-        query('page_size').optional().isNumeric().toInt(),
-      ],
-      this.validationResult,
-      this.getBankAccountsPendingTransactions.bind(this)
-    );
-    router.post(
-      '/:bankAccountId/disconnect',
-      this.disconnectBankAccount.bind(this)
-    );
-    router.post('/:bankAccountId/update', this.refreshBankAccount.bind(this));
-    router.post(
-      '/:bankAccountId/pause_feeds',
-      [param('bankAccountId').exists().isNumeric().toInt()],
-      this.validationResult,
-      this.pauseBankAccountFeeds.bind(this)
-    );
-    router.post(
-      '/:bankAccountId/resume_feeds',
-      [param('bankAccountId').exists().isNumeric().toInt()],
-      this.validationResult,
-      this.resumeBankAccountFeeds.bind(this)
-    );
 
     return router;
   }
@@ -81,138 +46,4 @@ export class BankAccountsController extends BaseController {
       next(error);
     }
   }
-
-  /**
-   * Retrieves the bank account pending transactions.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  async getBankAccountsPendingTransactions(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const query = this.matchedQueryData(req);
-
-    try {
-      const data =
-        await this.getPendingTransactionsService.getPendingTransactions(
-          tenantId,
-          query
-        );
-      return res.status(200).send(data);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Disonnect the given bank account.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|null>}
-   */
-  async disconnectBankAccount(
-    req: Request<{ bankAccountId: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { bankAccountId } = req.params;
-    const { tenantId } = req;
-
-    try {
-      await this.bankAccountsApp.disconnectBankAccount(tenantId, bankAccountId);
-
-      return res.status(200).send({
-        id: bankAccountId,
-        message: 'The bank account has been disconnected.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Refresh the given bank account.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|null>}
-   */
-  async refreshBankAccount(
-    req: Request<{ bankAccountId: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { bankAccountId } = req.params;
-    const { tenantId } = req;
-
-    try {
-      await this.bankAccountsApp.refreshBankAccount(tenantId, bankAccountId);
-
-      return res.status(200).send({
-        id: bankAccountId,
-        message: 'The bank account has been disconnected.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Resumes the bank account feeds sync.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response | void>}
-   */
-  async resumeBankAccountFeeds(
-    req: Request<{ bankAccountId: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { bankAccountId } = req.params;
-    const { tenantId } = req;
-
-    try {
-      await this.bankAccountsApp.resumeBankAccount(tenantId, bankAccountId);
-
-      return res.status(200).send({
-        message: 'The bank account feeds syncing has been resumed.',
-        id: bankAccountId,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Pauses the bank account feeds sync.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response | void>}
-   */
-  async pauseBankAccountFeeds(
-    req: Request<{ bankAccountId: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { bankAccountId } = req.params;
-    const { tenantId } = req;
-
-    try {
-      await this.bankAccountsApp.pauseBankAccount(tenantId, bankAccountId);
-
-      return res.status(200).send({
-        message: 'The bank account feeds syncing has been paused.',
-        id: bankAccountId,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
 }

packages/server/src/api/controllers/Banking/BankTransactionsMatchingController.ts

@@ -1,8 +1,12 @@
 import { Inject, Service } from 'typedi';
-import { body, param } from 'express-validator';
 import { NextFunction, Request, Response, Router } from 'express';
 import BaseController from '@/api/controllers/BaseController';
 import { MatchBankTransactionsApplication } from '@/services/Banking/Matching/MatchBankTransactionsApplication';
+import { body, param } from 'express-validator';
+import {
+  GetMatchedTransactionsFilter,
+  IMatchTransactionsDTO,
+} from '@/services/Banking/Matching/types';
 
 @Service()
 export class BankTransactionsMatchingController extends BaseController {
@@ -16,17 +20,9 @@ export class BankTransactionsMatchingController extends BaseController {
     const router = Router();
 
     router.post(
-      '/unmatch/:transactionId',
-      [param('transactionId').exists()],
-      this.validationResult,
-      this.unmatchMatchedBankTransaction.bind(this)
-    );
-    router.post(
-      '/match',
+      '/:transactionId',
       [
-        body('uncategorizedTransactions').exists().isArray({ min: 1 }),
-        body('uncategorizedTransactions.*').isNumeric().toInt(),
-
+        param('transactionId').exists(),
         body('matchedTransactions').isArray({ min: 1 }),
         body('matchedTransactions.*.reference_type').exists(),
         body('matchedTransactions.*.reference_id').isNumeric().toInt(),
@@ -34,6 +30,12 @@ export class BankTransactionsMatchingController extends BaseController {
       this.validationResult,
       this.matchBankTransaction.bind(this)
     );
+    router.post(
+      '/unmatch/:transactionId',
+      [param('transactionId').exists()],
+      this.validationResult,
+      this.unmatchMatchedBankTransaction.bind(this)
+    );
     return router;
   }
 
@@ -48,21 +50,21 @@ export class BankTransactionsMatchingController extends BaseController {
     req: Request<{ transactionId: number }>,
     res: Response,
     next: NextFunction
-  ): Promise<Response | null> {
+  ) {
     const { tenantId } = req;
-    const bodyData = this.matchedBodyData(req);
-
-    const uncategorizedTransactions = bodyData?.uncategorizedTransactions;
-    const matchedTransactions = bodyData?.matchedTransactions;
+    const { transactionId } = req.params;
+    const matchTransactionDTO = this.matchedBodyData(
+      req
+    ) as IMatchTransactionsDTO;
 
     try {
       await this.bankTransactionsMatchingApp.matchTransaction(
         tenantId,
-        uncategorizedTransactions,
-        matchedTransactions
+        transactionId,
+        matchTransactionDTO
       );
       return res.status(200).send({
-        ids: uncategorizedTransactions,
+        id: transactionId,
         message: 'The bank transaction has been matched.',
       });
     } catch (error) {

packages/server/src/api/controllers/Banking/BankingController.ts

@@ -6,7 +6,6 @@ import { BankingRulesController } from './BankingRulesController';
 import { BankTransactionsMatchingController } from './BankTransactionsMatchingController';
 import { RecognizedTransactionsController } from './RecognizedTransactionsController';
 import { BankAccountsController } from './BankAccountsController';
-import { BankingUncategorizedController } from './BankingUncategorizedController';
 
 @Service()
 export class BankingController extends BaseController {
@@ -30,10 +29,6 @@ export class BankingController extends BaseController {
       '/bank_accounts',
       Container.get(BankAccountsController).router()
     );
-    router.use(
-      '/categorize',
-      Container.get(BankingUncategorizedController).router()
-    );
     return router;
   }
 }

packages/server/src/api/controllers/Banking/BankingRulesController.ts

@@ -34,15 +34,16 @@ export class BankingRulesController extends BaseController {
       body('conditions.*.comparator')
         .exists()
         .isIn(['equals', 'contains', 'not_contain'])
-        .default('contain')
-        .trim(),
-      body('conditions.*.value').exists().trim(),
+        .default('contain'),
+      body('conditions.*.value').exists(),
 
       // Assign
       body('assign_category').isString(),
       body('assign_account_id').isInt({ min: 0 }),
       body('assign_payee').isString().optional({ nullable: true }),
       body('assign_memo').isString().optional({ nullable: true }),
+
+      body('recognition').isBoolean().toBoolean().optional({ nullable: true }),
     ];
   }
 

packages/server/src/api/controllers/Banking/BankingUncategorizedController.ts

@@ -1,57 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { NextFunction, Request, Response, Router } from 'express';
-import { query } from 'express-validator';
-import BaseController from '../BaseController';
-import { GetAutofillCategorizeTransaction } from '@/services/Banking/RegonizeTranasctions/GetAutofillCategorizeTransaction';
-
-@Service()
-export class BankingUncategorizedController extends BaseController {
-  @Inject()
-  private getAutofillCategorizeTransactionService: GetAutofillCategorizeTransaction;
-
-  /**
-   * Router constructor.
-   */
-  router() {
-    const router = Router();
-
-    router.get(
-      '/autofill',
-      [
-        query('uncategorizedTransactionIds').isArray({ min: 1 }),
-        query('uncategorizedTransactionIds.*').isNumeric().toInt(),
-      ],
-      this.validationResult,
-      this.getAutofillCategorizeTransaction.bind(this)
-    );
-    return router;
-  }
-
-  /**
-   * Retrieves the autofill values of the categorize form of the given
-   * uncategorized transactions.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response | null>}
-   */
-  public async getAutofillCategorizeTransaction(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const uncategorizedTransactionIds = req.query.uncategorizedTransactionIds;
-
-    try {
-      const data =
-        await this.getAutofillCategorizeTransactionService.getAutofillCategorizeTransaction(
-          tenantId,
-          uncategorizedTransactionIds
-        );
-      return res.status(200).send({ data });
-    } catch (error) {
-      next(error);
-    }
-  }
-}

packages/server/src/api/controllers/Banking/ExcludeBankTransactionsController.ts

@@ -1,9 +1,8 @@
 import { Inject, Service } from 'typedi';
-import { body, param, query } from 'express-validator';
-import { NextFunction, Request, Response, Router } from 'express';
+import { param } from 'express-validator';
+import { NextFunction, Request, Response, Router, query } from 'express';
 import BaseController from '../BaseController';
 import { ExcludeBankTransactionsApplication } from '@/services/Banking/Exclude/ExcludeBankTransactionsApplication';
-import { map, parseInt, trim } from 'lodash';
 
 @Service()
 export class ExcludeBankTransactionsController extends BaseController {
@@ -16,21 +15,9 @@ export class ExcludeBankTransactionsController extends BaseController {
   public router() {
     const router = Router();
 
-    router.put(
-      '/transactions/exclude',
-      [body('ids').exists()],
-      this.validationResult,
-      this.excludeBulkBankTransactions.bind(this)
-    );
-    router.put(
-      '/transactions/unexclude',
-      [body('ids').exists()],
-      this.validationResult,
-      this.unexcludeBulkBankTransactins.bind(this)
-    );
     router.put(
       '/transactions/:transactionId/exclude',
-      [param('transactionId').exists().toInt()],
+      [param('transactionId').exists()],
       this.validationResult,
       this.excludeBankTransaction.bind(this)
     );
@@ -42,11 +29,7 @@ export class ExcludeBankTransactionsController extends BaseController {
     );
     router.get(
       '/excluded',
-      [
-        query('account_id').optional().isNumeric().toInt(),
-        query('page').optional().isNumeric().toInt(),
-        query('page_size').optional().isNumeric().toInt(),
-      ],
+      [],
       this.validationResult,
       this.getExcludedBankTransactions.bind(this)
     );
@@ -111,63 +94,6 @@ export class ExcludeBankTransactionsController extends BaseController {
     }
   }
 
-  /**
-   * Exclude bank transactions in bulk.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async excludeBulkBankTransactions(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { ids } = this.matchedBodyData(req);
-
-    try {
-      await this.excludeBankTransactionApp.excludeBankTransactions(
-        tenantId,
-        ids
-      );
-      return res.status(200).send({
-        message: 'The given bank transactions have been excluded',
-        ids,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Unexclude the given bank transactions in bulk.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response | null>}
-   */
-  private async unexcludeBulkBankTransactins(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | null> {
-    const { tenantId } = req;
-    const { ids } = this.matchedBodyData(req);
-
-    try {
-      await this.excludeBankTransactionApp.unexcludeBankTransactions(
-        tenantId,
-        ids
-      );
-      return res.status(200).send({
-        message: 'The given bank transactions have been excluded',
-        ids,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
   /**
    * Retrieves the excluded uncategorized bank transactions.
    * @param {Request} req
@@ -181,8 +107,9 @@ export class ExcludeBankTransactionsController extends BaseController {
     next: NextFunction
   ): Promise<Response | void> {
     const { tenantId } = req;
-    const filter = this.matchedQueryData(req);
+    const filter = this.matchedBodyData(req);
 
+    console.log('123');
     try {
       const data =
         await this.excludeBankTransactionApp.getExcludedBankTransactions(

packages/server/src/api/controllers/Banking/RecognizedTransactionsController.ts

@@ -1,6 +1,5 @@
 import { Inject, Service } from 'typedi';
 import { NextFunction, Request, Response, Router } from 'express';
-import { query } from 'express-validator';
 import BaseController from '@/api/controllers/BaseController';
 import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';
 
@@ -15,16 +14,7 @@ export class RecognizedTransactionsController extends BaseController {
   router() {
     const router = Router();
 
-    router.get(
-      '/',
-      [
-        query('page').optional().isNumeric().toInt(),
-        query('page_size').optional().isNumeric().toInt(),
-        query('account_id').optional().isNumeric().toInt(),
-      ],
-      this.validationResult,
-      this.getRecognizedTransactions.bind(this)
-    );
+    router.get('/', this.getRecognizedTransactions.bind(this));
     router.get(
       '/transactions/:uncategorizedTransactionId',
       this.getRecognizedTransaction.bind(this)

packages/server/src/api/controllers/Cashflow/GetCashflowTransaction.ts

@@ -1,6 +1,6 @@
 import { Service, Inject } from 'typedi';
 import { Router, Request, Response, NextFunction } from 'express';
-import { param, query } from 'express-validator';
+import { param } from 'express-validator';
 import BaseController from '../BaseController';
 import { ServiceError } from '@/exceptions';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
@@ -24,12 +24,7 @@ export default class GetCashflowAccounts extends BaseController {
     const router = Router();
 
     router.get(
-      '/transactions/matches',
-      [
-        query('uncategorizeTransactionsIds').exists().isArray({ min: 1 }),
-        query('uncategorizeTransactionsIds.*').exists().isNumeric().toInt(),
-      ],
-      this.validationResult,
+      '/transactions/:transactionId/matches',
       this.getMatchedTransactions.bind(this)
     );
     router.get(
@@ -49,7 +44,7 @@ export default class GetCashflowAccounts extends BaseController {
    * @param {NextFunction} next
    */
   private getCashflowTransaction = async (
-    req: Request<{ transactionId: number }>,
+    req: Request,
     res: Response,
     next: NextFunction
   ) => {
@@ -76,24 +71,19 @@ export default class GetCashflowAccounts extends BaseController {
    * @param {NextFunction} next
    */
   private async getMatchedTransactions(
-    req: Request<
-      { transactionId: number },
-      null,
-      null,
-      { uncategorizeTransactionsIds: Array<number> }
-    >,
+    req: Request<{ transactionId: number }>,
     res: Response,
     next: NextFunction
   ) {
     const { tenantId } = req;
-    const uncategorizeTransactionsIds = req.query.uncategorizeTransactionsIds;
+    const { transactionId } = req.params;
     const filter = this.matchedQueryData(req) as GetMatchedTransactionsFilter;
 
     try {
       const data =
         await this.bankTransactionsMatchingApp.getMatchedTransactions(
           tenantId,
-          uncategorizeTransactionsIds,
+          transactionId,
           filter
         );
       return res.status(200).send(data);

packages/server/src/api/controllers/Cashflow/NewCashflowTransaction.ts

@@ -1,15 +1,10 @@
 import { Service, Inject } from 'typedi';
-import { ValidationChain, body, check, param, query } from 'express-validator';
+import { ValidationChain, check, param, query } from 'express-validator';
 import { Router, Request, Response, NextFunction } from 'express';
-import { omit } from 'lodash';
 import BaseController from '../BaseController';
 import { ServiceError } from '@/exceptions';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import {
-  AbilitySubject,
-  CashflowAction,
-  ICategorizeCashflowTransactioDTO,
-} from '@/interfaces';
+import { AbilitySubject, CashflowAction } from '@/interfaces';
 import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';
 
 @Service()
@@ -43,23 +38,13 @@ export default class NewCashflowTransactionController extends BaseController {
       this.asyncMiddleware(this.newCashflowTransaction),
       this.catchServiceErrors
     );
-    router.post(
-      '/transactions/uncategorize/bulk',
-      [
-        body('ids').isArray({ min: 1 }),
-        body('ids.*').exists().isNumeric().toInt(),
-      ],
-      this.validationResult,
-      this.uncategorizeBulkTransactions.bind(this),
-      this.catchServiceErrors
-    );
     router.post(
       '/transactions/:id/uncategorize',
       this.revertCategorizedCashflowTransaction,
       this.catchServiceErrors
     );
     router.post(
-      '/transactions/categorize',
+      '/transactions/:id/categorize',
       this.categorizeCashflowTransactionValidationSchema,
       this.validationResult,
       this.categorizeCashflowTransaction,
@@ -104,7 +89,6 @@ export default class NewCashflowTransactionController extends BaseController {
    */
   public get categorizeCashflowTransactionValidationSchema() {
     return [
-      check('uncategorized_transaction_ids').exists().isArray({ min: 1 }),
       check('date').exists().isISO8601().toDate(),
       check('credit_account_id').exists().isInt().toInt(),
       check('transaction_number').optional(),
@@ -122,11 +106,12 @@ export default class NewCashflowTransactionController extends BaseController {
   public get newTransactionValidationSchema() {
     return [
       check('date').exists().isISO8601().toDate(),
-      check('reference_no').optional({ nullable: true }).trim(),
+      check('reference_no').optional({ nullable: true }).trim().escape(),
       check('description')
         .optional({ nullable: true })
         .isLength({ min: 3 })
-        .trim(),
+        .trim()
+        .escape(),
       check('transaction_type').exists(),
 
       check('amount').exists().isFloat().toFloat(),
@@ -176,7 +161,7 @@ export default class NewCashflowTransactionController extends BaseController {
    * @param {NextFunction} next
    */
   private revertCategorizedCashflowTransaction = async (
-    req: Request<{ id: number }>,
+    req: Request,
     res: Response,
     next: NextFunction
   ) => {
@@ -194,34 +179,6 @@ export default class NewCashflowTransactionController extends BaseController {
     }
   };
 
-  /**
-   * Uncategorize the given transactions in bulk.
-   * @param {Request<{}>} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response | null>}
-   */
-  private uncategorizeBulkTransactions = async (
-    req: Request<{}>,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { ids: uncategorizedTransactionIds } = this.matchedBodyData(req);
-
-    try {
-      await this.cashflowApplication.uncategorizeTransactions(
-        tenantId,
-        uncategorizedTransactionIds
-      );
-      return res.status(200).send({
-        message: 'The given transactions have been uncategorized successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  };
-
   /**
    * Categorize the cashflow transaction.
    * @param {Request} req
@@ -234,19 +191,14 @@ export default class NewCashflowTransactionController extends BaseController {
     next: NextFunction
   ) => {
     const { tenantId } = req;
-    const matchedObject = this.matchedBodyData(req);
-    const categorizeDTO = omit(matchedObject, [
-      'uncategorizedTransactionIds',
-    ]) as ICategorizeCashflowTransactioDTO;
-
-    const uncategorizedTransactionIds =
-      matchedObject.uncategorizedTransactionIds;
+    const { id: cashflowTransactionId } = req.params;
+    const cashflowTransaction = this.matchedBodyData(req);
 
     try {
       await this.cashflowApplication.categorizeTransaction(
         tenantId,
-        uncategorizedTransactionIds,
-        categorizeDTO
+        cashflowTransactionId,
+        cashflowTransaction
       );
       return res.status(200).send({
         message: 'The cashflow transaction has been created successfully.',
@@ -317,7 +269,7 @@ export default class NewCashflowTransactionController extends BaseController {
    * @param {NextFunction} next
    */
   public getUncategorizedCashflowTransactions = async (
-    req: Request<{ id: number }>,
+    req: Request,
     res: Response,
     next: NextFunction
   ) => {

packages/server/src/api/controllers/Contacts/Contacts.ts

@@ -56,7 +56,7 @@ export default class ContactsController extends BaseController {
    */
   get autocompleteQuerySchema() {
     return [
-      query('column_sort_by').optional().trim(),
+      query('column_sort_by').optional().trim().escape(),
       query('sort_order').optional().isIn(['desc', 'asc']),
 
       query('stringified_filter_roles').optional().isJSON(),
@@ -122,27 +122,32 @@ export default class ContactsController extends BaseController {
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('first_name')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('last_name')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('company_name')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
 
       check('display_name')
         .exists()
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
 
       check('email')
@@ -160,101 +165,120 @@ export default class ContactsController extends BaseController {
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('personal_phone')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
 
       check('billing_address_1')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('billing_address_2')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('billing_address_city')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('billing_address_country')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('billing_address_email')
         .optional({ nullable: true })
         .isString()
         .isEmail()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('billing_address_postcode')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('billing_address_phone')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('billing_address_state')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
 
       check('shipping_address_1')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('shipping_address_2')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('shipping_address_city')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('shipping_address_country')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('shipping_address_email')
         .optional({ nullable: true })
         .isString()
         .isEmail()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('shipping_address_postcode')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('shipping_address_phone')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('shipping_address_state')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
 
       check('note')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.TEXT }),
       check('active').optional().isBoolean().toBoolean(),
     ];

packages/server/src/api/controllers/Contacts/Customers.ts

@@ -106,7 +106,11 @@ export default class CustomersController extends ContactsController {
    */
   get customerDTOSchema() {
     return [
-      check('customer_type').exists().isIn(['business', 'individual']).trim(),
+      check('customer_type')
+        .exists()
+        .isIn(['business', 'individual'])
+        .trim()
+        .escape(),
     ];
   }
 
@@ -119,6 +123,7 @@ export default class CustomersController extends ContactsController {
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: 3 }),
     ];
   }
@@ -128,7 +133,7 @@ export default class CustomersController extends ContactsController {
    */
   get validateListQuerySchema() {
     return [
-      query('column_sort_by').optional().trim(),
+      query('column_sort_by').optional().trim().escape(),
       query('sort_order').optional().isIn(['desc', 'asc']),
 
       query('page').optional().isNumeric().toInt(),

packages/server/src/api/controllers/Contacts/Vendors.ts

@@ -106,6 +106,7 @@ export default class VendorsController extends ContactsController {
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ min: 3, max: 3 }),
     ];
   }

packages/server/src/api/controllers/Currencies.ts

@@ -67,7 +67,7 @@ export default class CurrenciesController extends BaseController {
   }
 
   get currencyParamSchema(): ValidationChain[] {
-    return [param('currency_code').exists().trim()];
+    return [param('currency_code').exists().trim().escape()];
   }
 
   get listSchema(): ValidationChain[] {
@@ -187,13 +187,11 @@ export default class CurrenciesController extends BaseController {
       }
       if (error.errorType === 'currency_code_exists') {
         return res.boom.badRequest(null, {
-          errors: [
-            {
-              type: 'CURRENCY_CODE_EXISTS',
-              message: 'The given currency code is already exists.',
-              code: 200,
-            },
-          ],
+          errors: [{
+            type: 'CURRENCY_CODE_EXISTS',
+            message: 'The given currency code is already exists.',
+            code: 200,
+           }],
         });
       }
       if (error.errorType === 'CANNOT_DELETE_BASE_CURRENCY') {

packages/server/src/api/controllers/Expenses/Expenses.ts

@@ -89,6 +89,7 @@ export class ExpensesController extends BaseController {
       check('reference_no')
         .optional({ nullable: true })
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('payment_date').exists().isISO8601().toDate(),
       check('payment_account_id')
@@ -122,6 +123,7 @@ export class ExpensesController extends BaseController {
       check('categories.*.description')
         .optional()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('categories.*.landed_cost').optional().isBoolean().toBoolean(),
       check('categories.*.project_id')
@@ -142,6 +144,7 @@ export class ExpensesController extends BaseController {
       check('reference_no')
         .optional({ nullable: true })
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('payment_date').exists().isISO8601().toDate(),
       check('payment_account_id')
@@ -176,6 +179,7 @@ export class ExpensesController extends BaseController {
       check('categories.*.description')
         .optional()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('categories.*.landed_cost').optional().isBoolean().toBoolean(),
       check('categories.*.project_id')

packages/server/src/api/controllers/FinancialStatements/BaseFinancialReportController.ts

@@ -1,7 +1,9 @@
 import { query } from 'express-validator';
-import BaseController from '../BaseController';
+import BaseController from "../BaseController";
 
 export default class BaseFinancialReportController extends BaseController {
+
+
   get sheetNumberFormatValidationSchema() {
     return [
       query('number_format.precision')
@@ -17,7 +19,8 @@ export default class BaseFinancialReportController extends BaseController {
       query('number_format.negative_format')
         .optional()
         .isIn(['parentheses', 'mines'])
-        .trim(),
+        .trim()
+        .escape(),
     ];
   }
-}
+}

packages/server/src/api/controllers/FinancialStatements/InventoryDetails/index.ts

@@ -51,7 +51,8 @@ export default class InventoryDetailsController extends BaseController {
       query('number_format.negative_format')
         .optional()
         .isIn(['parentheses', 'mines'])
-        .trim(),
+        .trim()
+        .escape(),
       query('from_date').optional(),
       query('to_date').optional(),
 

packages/server/src/api/controllers/FinancialStatements/JournalSheet.ts

@@ -36,7 +36,7 @@ export default class JournalSheetController extends BaseFinancialReportControlle
     return [
       query('from_date').optional().isISO8601(),
       query('to_date').optional().isISO8601(),
-      query('transaction_type').optional().trim(),
+      query('transaction_type').optional().trim().escape(),
       query('transaction_id').optional().isInt().toInt(),
       oneOf(
         [

packages/server/src/api/controllers/FinancialStatements/TransactionsByReference/index.ts

@@ -40,7 +40,8 @@ export default class TransactionsByReferenceController extends BaseController {
       query('number_format.negative_format')
         .optional()
         .isIn(['parentheses', 'mines'])
-        .trim(),
+        .trim()
+        .escape(),
     ];
   }
 

packages/server/src/api/controllers/Inventory/InventoryAdjustments.ts

@@ -86,7 +86,7 @@ export default class InventoryAdjustmentsController extends BaseController {
    */
   get validateListQuerySchema() {
     return [
-      query('column_sort_by').optional().trim(),
+      query('column_sort_by').optional().trim().escape(),
       query('sort_order').optional().isIn(['desc', 'asc']),
 
       query('page').optional().isNumeric().toInt(),

packages/server/src/api/controllers/InviteUsers.ts

@@ -25,7 +25,7 @@ export default class InviteUsersController extends BaseController {
     router.post(
       '/send',
       [
-        body('email').exists().trim(),
+        body('email').exists().trim().escape(),
         body('role_id').exists().isNumeric().toInt(),
       ],
       this.validationResult,
@@ -57,7 +57,7 @@ export default class InviteUsersController extends BaseController {
     );
     router.get(
       '/invited/:token',
-      [param('token').exists().trim()],
+      [param('token').exists().trim().escape()],
       this.validationResult,
       asyncMiddleware(this.invited.bind(this)),
       this.handleServicesError
@@ -72,10 +72,10 @@ export default class InviteUsersController extends BaseController {
    */
   private get inviteUserDTO() {
     return [
-      check('first_name').exists().trim(),
-      check('last_name').exists().trim(),
-      check('password').exists().trim().isLength({ min: 5 }),
-      param('token').exists().trim(),
+      check('first_name').exists().trim().escape(),
+      check('last_name').exists().trim().escape(),
+      check('password').exists().trim().escape().isLength({ min: 5 }),
+      param('token').exists().trim().escape(),
     ];
   }
 

packages/server/src/api/controllers/ItemCategories.ts

@@ -73,11 +73,13 @@ export default class ItemsCategoriesController extends BaseController {
       check('name')
         .exists()
         .trim()
+        .escape()
         .isLength({ min: 0, max: DATATYPES_LENGTH.STRING }),
       check('description')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.TEXT }),
       check('sell_account_id')
         .optional({ nullable: true })
@@ -99,8 +101,9 @@ export default class ItemsCategoriesController extends BaseController {
    */
   get categoriesListValidationSchema() {
     return [
-      query('column_sort_by').optional().trim(),
-      query('sort_order').optional().trim().isIn(['desc', 'asc']),
+      query('column_sort_by').optional().trim().escape(),
+      query('sort_order').optional().trim().escape().isIn(['desc', 'asc']),
+
       query('stringified_filter_roles').optional().isJSON(),
     ];
   }
@@ -204,12 +207,14 @@ export default class ItemsCategoriesController extends BaseController {
     };
 
     try {
-      const { itemCategories, filterMeta } =
-        await this.itemCategoriesService.getItemCategoriesList(
-          tenantId,
-          itemCategoriesFilter,
-          user
-        );
+      const {
+        itemCategories,
+        filterMeta,
+      } = await this.itemCategoriesService.getItemCategoriesList(
+        tenantId,
+        itemCategoriesFilter,
+        user
+      );
       return res.status(200).send({
         item_categories: itemCategories,
         filter_meta: this.transfromToResponse(filterMeta),

packages/server/src/api/controllers/Items/Items.ts

@@ -96,11 +96,13 @@ export default class ItemsController extends BaseController {
         .exists()
         .isString()
         .trim()
+        .escape()
         .isIn(['service', 'non-inventory', 'inventory']),
       check('code')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       // Purchase attributes.
       check('purchasable').optional().isBoolean().toBoolean(),
@@ -139,11 +141,13 @@ export default class ItemsController extends BaseController {
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.TEXT }),
       check('purchase_description')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.TEXT }),
       check('sell_tax_rate_id').optional({ nullable: true }).isInt().toInt(),
       check('purchase_tax_rate_id')
@@ -158,6 +162,7 @@ export default class ItemsController extends BaseController {
         .optional()
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.TEXT }),
       check('active').optional().isBoolean().toBoolean(),
 
@@ -179,7 +184,7 @@ export default class ItemsController extends BaseController {
    */
   private get validateListQuerySchema() {
     return [
-      query('column_sort_by').optional().trim(),
+      query('column_sort_by').optional().trim().escape(),
       query('sort_order').optional().isIn(['desc', 'asc']),
 
       query('page').optional().isNumeric().toInt(),

packages/server/src/api/controllers/ManualJournals.ts

@@ -94,21 +94,25 @@ export default class ManualJournalsController extends BaseController {
         .optional()
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('journal_type')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('reference')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('description')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.TEXT }),
       check('branch_id').optional({ nullable: true }).isNumeric().toInt(),
       check('publish').optional().isBoolean().toBoolean(),
@@ -159,7 +163,7 @@ export default class ManualJournalsController extends BaseController {
       query('page_size').optional().isNumeric().toInt(),
       query('custom_view_id').optional().isNumeric().toInt(),
 
-      query('column_sort_by').optional().trim(),
+      query('column_sort_by').optional().trim().escape(),
       query('sort_order').optional().isIn(['desc', 'asc']),
 
       query('stringified_filter_roles').optional().isJSON(),

packages/server/src/api/controllers/Media.ts

@@ -61,14 +61,15 @@ export default class MediaController extends BaseController {
 
   get uploadValidationSchema() {
     return [
-      check('model_name').optional().trim(),
-      check('model_id').optional().isNumeric(),
+      // check('attachment'),
+      check('model_name').optional().trim().escape(),
+      check('model_id').optional().isNumeric().toInt(),
     ];
   }
 
   get linkValidationSchema() {
     return [
-      check('model_name').exists().trim(),
+      check('model_name').exists().trim().escape(),
       check('model_id').exists().isNumeric().toInt(),
     ]
   }

packages/server/src/api/controllers/Organization.ts

@@ -62,7 +62,7 @@ export default class OrganizationController extends BaseController {
   private get commonOrganizationValidationSchema(): ValidationChain[] {
     return [
       check('name').exists().trim(),
-      check('industry').optional({ nullable: true }).isString().trim(),
+      check('industry').optional({ nullable: true }).isString().trim().escape(),
       check('location').exists().isString().isISO31661Alpha2(),
       check('base_currency').exists().isISO4217(),
       check('timezone').exists().isIn(moment.tz.names()),
@@ -87,7 +87,11 @@ export default class OrganizationController extends BaseController {
   private get updateOrganizationValidationSchema(): ValidationChain[] {
     return [
       ...this.commonOrganizationValidationSchema,
-      check('tax_number').optional({ nullable: true }).isString().trim(),
+      check('tax_number')
+        .optional({ nullable: true })
+        .isString()
+        .trim()
+        .escape(),
     ];
   }
 

packages/server/src/api/controllers/Purchases/Bills.ts

@@ -100,8 +100,8 @@ export default class BillsController extends BaseController {
    */
   private get billValidationSchema() {
     return [
-      check('bill_number').exists().trim(),
-      check('reference_no').optional().trim(),
+      check('bill_number').exists().trim().escape(),
+      check('reference_no').optional().trim().escape(),
       check('bill_date').exists().isISO8601(),
       check('due_date').optional().isISO8601(),
 
@@ -112,7 +112,7 @@ export default class BillsController extends BaseController {
       check('branch_id').optional({ nullable: true }).isNumeric().toInt(),
       check('project_id').optional({ nullable: true }).isNumeric().toInt(),
 
-      check('note').optional().trim(),
+      check('note').optional().trim().escape(),
       check('open').default(false).isBoolean().toBoolean(),
 
       check('is_inclusive_tax').default(false).isBoolean().toBoolean(),
@@ -126,7 +126,10 @@ export default class BillsController extends BaseController {
         .optional({ nullable: true })
         .isNumeric()
         .toFloat(),
-      check('entries.*.description').optional({ nullable: true }).trim(),
+      check('entries.*.description')
+        .optional({ nullable: true })
+        .trim()
+        .escape(),
       check('entries.*.landed_cost')
         .optional({ nullable: true })
         .isBoolean()
@@ -138,6 +141,7 @@ export default class BillsController extends BaseController {
       check('entries.*.tax_code')
         .optional({ nullable: true })
         .trim()
+        .escape()
         .isString(),
       check('entries.*.tax_rate_id')
         .optional({ nullable: true })
@@ -154,8 +158,8 @@ export default class BillsController extends BaseController {
    */
   private get billEditValidationSchema() {
     return [
-      check('bill_number').optional().trim(),
-      check('reference_no').optional().trim(),
+      check('bill_number').optional().trim().escape(),
+      check('reference_no').optional().trim().escape(),
       check('bill_date').exists().isISO8601(),
       check('due_date').optional().isISO8601(),
 
@@ -166,7 +170,7 @@ export default class BillsController extends BaseController {
       check('branch_id').optional({ nullable: true }).isNumeric().toInt(),
       check('project_id').optional({ nullable: true }).isNumeric().toInt(),
 
-      check('note').optional().trim(),
+      check('note').optional().trim().escape(),
       check('open').default(false).isBoolean().toBoolean(),
 
       check('entries').isArray({ min: 1 }),
@@ -180,7 +184,10 @@ export default class BillsController extends BaseController {
         .optional({ nullable: true })
         .isNumeric()
         .toFloat(),
-      check('entries.*.description').optional({ nullable: true }).trim(),
+      check('entries.*.description')
+        .optional({ nullable: true })
+        .trim()
+        .escape(),
       check('entries.*.landed_cost')
         .optional({ nullable: true })
         .isBoolean()
@@ -215,8 +222,8 @@ export default class BillsController extends BaseController {
 
   private get dueBillsListingValidationSchema() {
     return [
-      query('vendor_id').optional().trim(),
-      query('payment_made_id').optional().trim(),
+      query('vendor_id').optional().trim().escape(),
+      query('payment_made_id').optional().trim().escape(),
     ];
   }
 

packages/server/src/api/controllers/Purchases/BillsPayments.ts

@@ -113,10 +113,10 @@ export default class BillsPayments extends BaseController {
 
       check('amount').exists().isNumeric().toFloat(),
       check('payment_account_id').exists().isNumeric().toInt(),
-      check('payment_number').optional({ nullable: true }).trim(),
+      check('payment_number').optional({ nullable: true }).trim().escape(),
       check('payment_date').exists(),
-      check('statement').optional().trim(),
-      check('reference').optional().trim(),
+      check('statement').optional().trim().escape(),
+      check('reference').optional().trim().escape(),
       check('branch_id').optional({ nullable: true }).isNumeric().toInt(),
 
       check('entries').exists().isArray(),
@@ -126,6 +126,8 @@ export default class BillsPayments extends BaseController {
 
       check('attachments').isArray().optional(),
       check('attachments.*.key').exists().isString(),
+
+      check('prepard_expenses_account_id').optional().isNumeric().toInt(),
     ];
   }
 

packages/server/src/api/controllers/Purchases/VendorCredit.ts

@@ -156,10 +156,13 @@ export default class VendorCreditController extends BaseController {
       check('vendor_id').exists().isNumeric().toInt(),
       check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
 
-      check('vendor_credit_number').optional({ nullable: true }).trim(),
-      check('reference_no').optional().trim(),
+      check('vendor_credit_number')
+        .optional({ nullable: true })
+        .trim()
+        .escape(),
+      check('reference_no').optional().trim().escape(),
       check('vendor_credit_date').exists().isISO8601().toDate(),
-      check('note').optional().trim(),
+      check('note').optional().trim().escape(),
       check('open').default(false).isBoolean().toBoolean(),
 
       check('warehouse_id').optional({ nullable: true }).isNumeric().toInt(),
@@ -175,7 +178,10 @@ export default class VendorCreditController extends BaseController {
         .optional({ nullable: true })
         .isNumeric()
         .toFloat(),
-      check('entries.*.description').optional({ nullable: true }).trim(),
+      check('entries.*.description')
+        .optional({ nullable: true })
+        .trim()
+        .escape(),
       check('entries.*.warehouse_id')
         .optional({ nullable: true })
         .isNumeric()
@@ -196,10 +202,13 @@ export default class VendorCreditController extends BaseController {
       check('vendor_id').exists().isNumeric().toInt(),
       check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
 
-      check('vendor_credit_number').optional({ nullable: true }).trim(),
-      check('reference_no').optional().trim(),
+      check('vendor_credit_number')
+        .optional({ nullable: true })
+        .trim()
+        .escape(),
+      check('reference_no').optional().trim().escape(),
       check('vendor_credit_date').exists().isISO8601().toDate(),
-      check('note').optional().trim(),
+      check('note').optional().trim().escape(),
 
       check('warehouse_id').optional({ nullable: true }).isNumeric().toInt(),
       check('branch_id').optional({ nullable: true }).isNumeric().toInt(),
@@ -214,7 +223,10 @@ export default class VendorCreditController extends BaseController {
         .optional({ nullable: true })
         .isNumeric()
         .toFloat(),
-      check('entries.*.description').optional({ nullable: true }).trim(),
+      check('entries.*.description')
+        .optional({ nullable: true })
+        .trim()
+        .escape(),
       check('entries.*.warehouse_id')
         .optional({ nullable: true })
         .isNumeric()

packages/server/src/api/controllers/Resources.ts

@@ -18,7 +18,9 @@ export default class ResourceController extends BaseController {
 
     router.get(
       '/:resource_model/meta',
-      [param('resource_model').exists().trim()],
+      [
+        param('resource_model').exists().trim().escape()
+      ],
       this.asyncMiddleware(this.resourceMeta.bind(this)),
       this.handleServiceErrors
     );
@@ -46,7 +48,9 @@ export default class ResourceController extends BaseController {
         resourceModel
       );
       return res.status(200).send({
-        resource_meta: this.transfromToResponse(resourceMeta),
+        resource_meta: this.transfromToResponse(
+          resourceMeta,
+        ),
       });
     } catch (error) {
       next(error);

packages/server/src/api/controllers/Sales/CreditNotes.ts

@@ -210,9 +210,9 @@ export default class PaymentReceivesController extends BaseController {
 
       check('credit_note_date').exists().isISO8601().toDate(),
       check('reference_no').optional(),
-      check('credit_note_number').optional({ nullable: true }).trim(),
-      check('note').optional().trim(),
-      check('terms_conditions').optional().trim(),
+      check('credit_note_number').optional({ nullable: true }).trim().escape(),
+      check('note').optional().trim().escape(),
+      check('terms_conditions').optional().trim().escape(),
       check('open').default(false).isBoolean().toBoolean(),
 
       check('warehouse_id').optional({ nullable: true }).isNumeric().toInt(),
@@ -228,7 +228,10 @@ export default class PaymentReceivesController extends BaseController {
         .optional({ nullable: true })
         .isNumeric()
         .toFloat(),
-      check('entries.*.description').optional({ nullable: true }).trim(),
+      check('entries.*.description')
+        .optional({ nullable: true })
+        .trim()
+        .escape(),
       check('entries.*.warehouse_id')
         .optional({ nullable: true })
         .isNumeric()

packages/server/src/api/controllers/Sales/PaymentReceives.ts

@@ -150,16 +150,18 @@ export default class PaymentReceivesController extends BaseController {
       check('customer_id').exists().isNumeric().toInt(),
       check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
 
-      check('amount').exists().isNumeric().toFloat(),
       check('payment_date').exists(),
+      check('amount').exists().isNumeric().toFloat(),
+
       check('reference_no').optional(),
       check('deposit_account_id').exists().isNumeric().toInt(),
-      check('payment_receive_no').optional({ nullable: true }).trim(),
-      check('statement').optional().trim(),
+      check('payment_receive_no').optional({ nullable: true }).trim().escape(),
+      check('statement').optional().trim().escape(),
 
       check('branch_id').optional({ nullable: true }).isNumeric().toInt(),
 
-      check('entries').isArray({}),
+      check('entries').isArray(),
+
       check('entries.*.id').optional({ nullable: true }).isNumeric().toInt(),
       check('entries.*.index').optional().isNumeric().toInt(),
       check('entries.*.invoice_id').exists().isNumeric().toInt(),
@@ -167,6 +169,11 @@ export default class PaymentReceivesController extends BaseController {
 
       check('attachments').isArray().optional(),
       check('attachments.*.key').exists().isString(),
+
+      check('unearned_revenue_account_id')
+        .optional({ nullable: true })
+        .isNumeric()
+        .toInt(),
     ];
   }
 
@@ -176,6 +183,7 @@ export default class PaymentReceivesController extends BaseController {
   private get validatePaymentReceiveList(): ValidationChain[] {
     return [
       query('stringified_filter_roles').optional().isJSON(),
+
       query('view_slug').optional({ nullable: true }).isString().trim(),
 
       query('column_sort_by').optional(),

packages/server/src/api/controllers/Sales/SalesEstimates.ts

@@ -155,7 +155,7 @@ export default class SalesEstimatesController extends BaseController {
       check('estimate_date').exists().isISO8601().toDate(),
       check('expiration_date').exists().isISO8601().toDate(),
       check('reference').optional(),
-      check('estimate_number').optional().trim(),
+      check('estimate_number').optional().trim().escape(),
       check('delivered').default(false).isBoolean().toBoolean(),
 
       check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
@@ -170,7 +170,8 @@ export default class SalesEstimatesController extends BaseController {
       check('entries.*.rate').exists().isNumeric().toFloat(),
       check('entries.*.description')
         .optional({ nullable: true })
-        .trim(),
+        .trim()
+        .escape(),
       check('entries.*.discount')
         .optional({ nullable: true })
         .isNumeric()
@@ -180,9 +181,9 @@ export default class SalesEstimatesController extends BaseController {
         .isNumeric()
         .toInt(),
 
-      check('note').optional().trim(),
-      check('terms_conditions').optional().trim(),
-      check('send_to_email').optional().trim(),
+      check('note').optional().trim().escape(),
+      check('terms_conditions').optional().trim().escape(),
+      check('send_to_email').optional().trim().escape(),
 
       check('attachments').isArray().optional(),
       check('attachments.*.key').exists().isString(),

packages/server/src/api/controllers/Sales/SalesInvoices.ts

@@ -200,12 +200,12 @@ export default class SaleInvoicesController extends BaseController {
       check('customer_id').exists().isNumeric().toInt(),
       check('invoice_date').exists().isISO8601().toDate(),
       check('due_date').exists().isISO8601().toDate(),
-      check('invoice_no').optional().trim(),
-      check('reference_no').optional().trim(),
+      check('invoice_no').optional().trim().escape(),
+      check('reference_no').optional().trim().escape(),
       check('delivered').default(false).isBoolean().toBoolean(),
 
-      check('invoice_message').optional().trim(),
-      check('terms_conditions').optional().trim(),
+      check('invoice_message').optional().trim().escape(),
+      check('terms_conditions').optional().trim().escape(),
 
       check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
 
@@ -226,10 +226,12 @@ export default class SaleInvoicesController extends BaseController {
         .toFloat(),
       check('entries.*.description')
         .optional({ nullable: true })
-        .trim(),
+        .trim()
+        .escape(),
       check('entries.*.tax_code')
         .optional({ nullable: true })
         .trim()
+        .escape()
         .isString(),
       check('entries.*.tax_rate_id')
         .optional({ nullable: true })

packages/server/src/api/controllers/Sales/SalesReceipts.ts

@@ -130,8 +130,8 @@ export default class SalesReceiptsController extends BaseController {
 
       check('deposit_account_id').exists().isNumeric().toInt(),
       check('receipt_date').exists().isISO8601(),
-      check('receipt_number').optional().trim(),
-      check('reference_no').optional().trim(),
+      check('receipt_number').optional().trim().escape(),
+      check('reference_no').optional().trim().escape(),
       check('closed').default(false).isBoolean().toBoolean(),
 
       check('warehouse_id').optional({ nullable: true }).isNumeric().toInt(),
@@ -150,13 +150,14 @@ export default class SalesReceiptsController extends BaseController {
         .toInt(),
       check('entries.*.description')
         .optional({ nullable: true })
-        .trim(),
+        .trim()
+        .escape(),
       check('entries.*.warehouse_id')
         .optional({ nullable: true })
         .isNumeric()
         .toInt(),
-      check('receipt_message').optional().trim(),
-      check('statement').optional().trim(),
+      check('receipt_message').optional().trim().escape(),
+      check('statement').optional().trim().escape(),
       check('attachments').isArray().optional(),
       check('attachments.*.key').exists().isString(),
     ];

packages/server/src/api/controllers/Settings/Settings.ts

@@ -52,7 +52,10 @@ export default class SettingsController extends BaseController {
    * Retrieve the application options from the storage.
    */
   private get getSettingsSchema() {
-    return [query('key').optional().trim(), query('group').optional().trim()];
+    return [
+      query('key').optional().trim().escape(),
+      query('group').optional().trim().escape(),
+    ];
   }
 
   /**

packages/server/src/api/controllers/Subscription/SubscriptionController.ts

@@ -8,7 +8,6 @@ import SubscriptionService from '@/services/Subscription/SubscriptionService';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseController from '../BaseController';
 import { LemonSqueezyService } from '@/services/Subscription/LemonSqueezyService';
-import { SubscriptionApplication } from '@/services/Subscription/SubscriptionApplication';
 
 @Service()
 export class SubscriptionController extends BaseController {
@@ -18,9 +17,6 @@ export class SubscriptionController extends BaseController {
   @Inject()
   private lemonSqueezyService: LemonSqueezyService;
 
-  @Inject()
-  private subscriptionApp: SubscriptionApplication;
-
   /**
    * Router constructor.
    */
@@ -37,14 +33,6 @@ export class SubscriptionController extends BaseController {
       this.validationResult,
       this.getCheckoutUrl.bind(this)
     );
-    router.post('/cancel', asyncMiddleware(this.cancelSubscription.bind(this)));
-    router.post('/resume', asyncMiddleware(this.resumeSubscription.bind(this)));
-    router.post(
-      '/change',
-      [body('variant_id').exists().trim()],
-      this.validationResult,
-      asyncMiddleware(this.changeSubscriptionPlan.bind(this))
-    );
     router.get('/', asyncMiddleware(this.getSubscriptions.bind(this)));
 
     return router;
@@ -97,84 +85,4 @@ export class SubscriptionController extends BaseController {
       next(error);
     }
   }
-
-  /**
-   * Cancels the subscription of the current organization.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|null>}
-   */
-  private async cancelSubscription(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-
-    try {
-      await this.subscriptionApp.cancelSubscription(tenantId, '455610');
-
-      return res.status(200).send({
-        status: 200,
-        message: 'The organization subscription has been canceled.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Resumes the subscription of the current organization.
-   * @param {Request} req 
-   * @param {Response} res 
-   * @param {NextFunction} next 
-   * @returns {Promise<Response | null>}
-   */
-  private async resumeSubscription(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-
-    try {
-      await this.subscriptionApp.resumeSubscription(tenantId);
-
-      return res.status(200).send({
-        status: 200,
-        message: 'The organization subscription has been resumed.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Changes the main subscription plan of the current organization.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response | null>}
-   */
-  public async changeSubscriptionPlan(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const body = this.matchedBodyData(req);
-
-    try {
-      await this.subscriptionApp.changeSubscriptionPlan(
-        tenantId,
-        body.variantId
-      );
-      return res.status(200).send({
-        message: 'The subscription plan has been changed.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
 }

packages/server/src/api/controllers/Views.ts

@@ -32,7 +32,7 @@ export default class ViewsController extends BaseController {
    * Custom views list validation schema.
    */
   get viewsListSchemaValidation() {
-    return [param('resource_model').exists().trim()];
+    return [param('resource_model').exists().trim().escape()];
   }
 
   /**

packages/server/src/config/index.ts

@@ -236,13 +236,5 @@ module.exports = {
     secretAccessKey: process.env.S3_SECRET_ACCESS_KEY,
     endpoint: process.env.S3_ENDPOINT,
     bucket: process.env.S3_BUCKET || 'bigcapital-documents',
-    forcePathStyle: parseBoolean(
-      defaultTo(process.env.S3_FORCE_PATH_STYLE, false),
-      false
-    ),
-  },
-
-  loops: {
-    apiKey: process.env.LOOPS_API_KEY,
   },
 };

packages/server/src/database/migrations/20240716114732_add_plaid_item_id_to_accounts_table.js

@@ -1,11 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.table('accounts', (table) => {
-    table.string('plaid_item_id').nullable();
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.table('accounts', (table) => {
-    table.dropColumn('plaid_item_id');
-  });
-};

packages/server/src/database/migrations/20240722085204_amount_applied_column_to_payments_received_table.js

@@ -0,0 +1,17 @@
+exports.up = function (knex) {
+  return knex.schema.table('payment_receives', (table) => {
+    table.decimal('applied_amount', 13, 3).defaultTo(0);
+    table
+      .integer('unearned_revenue_account_id')
+      .unsigned()
+      .references('id')
+      .inTable('accounts');
+  });
+};
+
+exports.down = function (knex) {
+  return knex.schema.table('payment_receives', (table) => {
+    table.dropColumn('applied_amount');
+    table.dropColumn('unearned_revenue_account_id');
+  });
+};

packages/server/src/database/migrations/20240723231630_amount_applied_column_to_payments_made_table.js

@@ -0,0 +1,17 @@
+exports.up = function (knex) {
+  return knex.schema.table('bills_payments', (table) => {
+    table.decimal('applied_amount', 13, 3).defaultTo(0);
+    table
+      .integer('prepard_expenses_account_id')
+      .unsigned()
+      .references('id')
+      .inTable('accounts');
+  });
+};
+
+exports.down = function (knex) {
+  return knex.schema.table('bills_payments', (table) => {
+    table.dropColumn('applied_amount');
+    table.dropColumn('prepard_expenses_account_id');
+  });
+};

packages/server/src/database/migrations/20240729172403_add_is_syncing_owner_to_accounts_table.js

@@ -1,19 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema
-    .table('accounts', (table) => {
-      table
-        .boolean('is_syncing_owner')
-        .defaultTo(false)
-        .after('is_feeds_active');
-    })
-    .then(() => {
-      return knex('accounts')
-        .whereNotNull('plaid_item_id')
-        .orWhereNotNull('plaid_account_id')
-        .update('is_syncing_owner', true);
-    });
-};
-
-exports.down = function (knex) {
-  table.dropColumn('is_syncing_owner');
-};

packages/server/src/database/migrations/20240801130829_change_tax_amount_withheld_column_precision_in_bills_and_sales_invoices_tables.js

@@ -1,18 +0,0 @@
-// This migration changes the precision of the tax_amount_withheld column in the bills and sales_invoices tables from 8, 2 to 13, 2.
-// This migration is necessary to allow tax_amount_withheld filed to store values bigger than 999,999.99.
-
-exports.up = function(knex) {
-  return knex.schema.alterTable('bills', function (table) {
-    table.decimal('tax_amount_withheld', 13, 2).alter();
-  }).alterTable('sales_invoices', function (table) {
-    table.decimal('tax_amount_withheld', 13, 2).alter();
-  });
-};
-
-exports.down = function(knex) {
-  return knex.schema.alterTable('bills', function (table) {
-    table.decimal('tax_amount_withheld', 8, 2).alter();
-  }).alterTable('sales_invoices', function (table) {
-    table.decimal('tax_amount_withheld', 8, 2).alter();
-  });
-};

packages/server/src/database/migrations/20240804084709_create_paused_at_column_to_plaid_items_table.js

@@ -1,11 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.table('plaid_items', (table) => {
-    table.datetime('paused_at');
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.table('plaid_items', (table) => {
-    table.dropColumn('paused_at');
-  });
-};

packages/server/src/database/migrations/20240811121028_add_pending_column_to_uncategorized_transactions_table.js

@@ -1,13 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.table('uncategorized_cashflow_transactions', (table) => {
-    table.boolean('pending').defaultTo(false);
-    table.string('pending_plaid_transaction_id').nullable();
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.table('uncategorized_cashflow_transactions', (table) => {
-    table.dropColumn('pending');
-    table.dropColumn('pending_plaid_transaction_id');
-  });
-};

packages/server/src/interfaces/Account.ts

@@ -15,7 +15,6 @@ export interface IAccountDTO {
 export interface IAccountCreateDTO extends IAccountDTO {
   currencyCode?: string;
   plaidAccountId?: string;
-  plaidItemId?: string;
 }
 
 export interface IAccountEditDTO extends IAccountDTO {}
@@ -38,8 +37,6 @@ export interface IAccount {
   accountNormal: string;
   accountParentType: string;
   bankBalance: string;
-  plaidItemId: number | null
-  lastFeedsUpdatedAt: Date;
 }
 
 export enum AccountNormal {

packages/server/src/interfaces/Bill.ts

@@ -166,3 +166,10 @@ export interface IBillOpenedPayload {
   oldBill: IBill;
   tenantId: number;
 }
+
+
+export interface IBillPrepardExpensesAppliedEventPayload {
+  tenantId: number;
+  billId: number;
+  trx?: Knex.Transaction;
+}

packages/server/src/interfaces/BillPayment.ts

@@ -29,6 +29,9 @@ export interface IBillPayment {
 
   localAmount?: number;
   branchId?: number;
+
+  prepardExpensesAccountId?: number;
+  isPrepardExpense: boolean;
 }
 
 export interface IBillPaymentEntryDTO {
@@ -38,6 +41,7 @@ export interface IBillPaymentEntryDTO {
 
 export interface IBillPaymentDTO {
   vendorId: number;
+  amount: number;
   paymentAccountId: number;
   paymentNumber?: string;
   paymentDate: Date;
@@ -47,6 +51,7 @@ export interface IBillPaymentDTO {
   entries: IBillPaymentEntryDTO[];
   branchId?: number;
   attachments?: AttachmentLinkDTO[];
+  prepardExpensesAccountId?: number;
 }
 
 export interface IBillReceivePageEntry {
@@ -119,3 +124,11 @@ export enum IPaymentMadeAction {
   Delete = 'Delete',
   View = 'View',
 }
+
+export interface IPaymentPrepardExpensesAppliedEventPayload {
+  tenantId: number;
+  billPaymentId: number;
+  billId: number;
+  appliedAmount: number;
+  trx?: Knex.Transaction;
+}

packages/server/src/interfaces/CashFlow.ts

@@ -236,7 +236,6 @@ export interface ICashflowTransactionSchema {
 export interface ICashflowTransactionInput extends ICashflowTransactionSchema {}
 
 export interface ICategorizeCashflowTransactioDTO {
-  date: Date;
   creditAccountId: number;
   referenceNo: string;
   transactionNumber: string;
@@ -268,8 +267,6 @@ export interface CreateUncategorizedTransactionDTO {
   description?: string;
   referenceNo?: string | null;
   plaidTransactionId?: string | null;
-  pending?: boolean;
-  pendingPlaidTransactionId?: string | null;
   batch?: string;
 }
 
@@ -285,17 +282,3 @@ export interface IUncategorizedTransactionCreatedEventPayload {
   createUncategorizedTransactionDTO: CreateUncategorizedTransactionDTO;
   trx: Knex.Transaction;
 }
-
-export interface IPendingTransactionRemovingEventPayload {
-  tenantId: number;
-  uncategorizedTransactionId: number;
-  pendingTransaction: IUncategorizedCashflowTransaction;
-  trx?: Knex.Transaction;
-}
-
-export interface IPendingTransactionRemovedEventPayload {
-  tenantId: number;
-  uncategorizedTransactionId: number;
-  pendingTransaction: IUncategorizedCashflowTransaction;
-  trx?: Knex.Transaction;
-}

packages/server/src/interfaces/CashflowService.ts

@@ -130,23 +130,20 @@ export interface ICommandCashflowDeletedPayload {
 
 export interface ICashflowTransactionCategorizedPayload {
   tenantId: number;
-  uncategorizedTransactions: Array<IUncategorizedCashflowTransaction>;
+  uncategorizedTransaction: any;
   cashflowTransaction: ICashflowTransaction;
-  oldUncategorizedTransactions: Array<IUncategorizedCashflowTransaction>;
   categorizeDTO: any;
   trx: Knex.Transaction;
 }
 export interface ICashflowTransactionUncategorizingPayload {
   tenantId: number;
-  uncategorizedTransactionId: number;
-  oldUncategorizedTransactions: Array<IUncategorizedCashflowTransaction>;
+  uncategorizedTransaction: IUncategorizedCashflowTransaction;
   trx: Knex.Transaction;
 }
 export interface ICashflowTransactionUncategorizedPayload {
   tenantId: number;
-  uncategorizedTransactionId: number;
-  uncategorizedTransactions: Array<IUncategorizedCashflowTransaction>;
-  oldUncategorizedTransactions: Array<IUncategorizedCashflowTransaction>;
+  uncategorizedTransaction: IUncategorizedCashflowTransaction;
+  oldUncategorizedTransaction: IUncategorizedCashflowTransaction;
   trx: Knex.Transaction;
 }
 

packages/server/src/interfaces/PaymentReceive.ts

@@ -25,8 +25,13 @@ export interface IPaymentReceive {
   updatedAt: Date;
   localAmount?: number;
   branchId?: number;
+  unearnedRevenueAccountId?: number;
 }
-export interface IPaymentReceiveCreateDTO {
+
+interface IPaymentReceivedCommonDTO {
+  unearnedRevenueAccountId?: number;
+}
+export interface IPaymentReceiveCreateDTO extends IPaymentReceivedCommonDTO {
   customerId: number;
   paymentDate: Date;
   amount: number;
@@ -41,7 +46,7 @@ export interface IPaymentReceiveCreateDTO {
   attachments?: AttachmentLinkDTO[];
 }
 
-export interface IPaymentReceiveEditDTO {
+export interface IPaymentReceiveEditDTO extends IPaymentReceivedCommonDTO {
   customerId: number;
   paymentDate: Date;
   amount: number;
@@ -184,3 +189,11 @@ export interface PaymentReceiveMailPresendEvent {
   paymentReceiveId: number;
   messageOptions: PaymentReceiveMailOptsDTO;
 }
+
+export interface PaymentReceiveUnearnedRevenueAppliedEventPayload {
+  tenantId: number;
+  paymentReceiveId: number;
+  saleInvoiceId: number;
+  appliedAmount: number;
+  trx?: Knex.Transaction;
+}

packages/server/src/interfaces/SaleInvoice.ts

@@ -216,3 +216,9 @@ export interface ISaleInvoiceMailSent {
   saleInvoiceId: number;
   messageOptions: SendInvoiceMailDTO;
 }
+
+export interface SaleInvoiceAppliedUnearnedRevenueOnCreatedEventPayload {
+  tenantId: number;
+  saleInvoiceId: number;
+  trx?: Knex.Transaction;
+}

packages/server/src/lib/Plaid/Plaid.ts

@@ -1,12 +1,69 @@
+import { forEach } from 'lodash';
 import { Configuration, PlaidApi, PlaidEnvironments } from 'plaid';
+import { createPlaidApiEvent } from './PlaidApiEventsDBSync';
 import config from '@/config';
 
+const OPTIONS = { clientApp: 'Plaid-Pattern' };
+
+// We want to log requests to / responses from the Plaid API (via the Plaid client), as this data
+// can be useful for troubleshooting.
+
+/**
+ * Logging function for Plaid client methods that use an access_token as an argument. Associates
+ * the Plaid API event log entry with the item and user the request is for.
+ *
+ * @param {string} clientMethod the name of the Plaid client method called.
+ * @param {Array} clientMethodArgs the arguments passed to the Plaid client method.
+ * @param {Object} response the response from the Plaid client.
+ */
+const defaultLogger = async (clientMethod, clientMethodArgs, response) => {
+  const accessToken = clientMethodArgs[0].access_token;
+  // const { id: itemId, user_id: userId } = await retrieveItemByPlaidAccessToken(
+  //   accessToken
+  // );
+  // await createPlaidApiEvent(1, 1, clientMethod, clientMethodArgs, response);
+
+  // console.log(response);
+};
+
+/**
+ * Logging function for Plaid client methods that do not use access_token as an argument. These
+ * Plaid API event log entries will not be associated with an item or user.
+ *
+ * @param {string} clientMethod the name of the Plaid client method called.
+ * @param {Array} clientMethodArgs the arguments passed to the Plaid client method.
+ * @param {Object} response the response from the Plaid client.
+ */
+const noAccessTokenLogger = async (
+  clientMethod,
+  clientMethodArgs,
+  response
+) => {
+  // console.log(response);
+
+  // await createPlaidApiEvent(
+  //   undefined,
+  //   undefined,
+  //   clientMethod,
+  //   clientMethodArgs,
+  //   response
+  // );
+};
+
+// Plaid client methods used in this app, mapped to their appropriate logging functions.
+const clientMethodLoggingFns = {
+  accountsGet: defaultLogger,
+  institutionsGet: noAccessTokenLogger,
+  institutionsGetById: noAccessTokenLogger,
+  itemPublicTokenExchange: noAccessTokenLogger,
+  itemRemove: defaultLogger,
+  linkTokenCreate: noAccessTokenLogger,
+  transactionsSync: defaultLogger,
+  sandboxItemResetLogin: defaultLogger,
+};
 // Wrapper for the Plaid client. This allows us to easily log data for all Plaid client requests.
 export class PlaidClientWrapper {
-  private static instance: PlaidClientWrapper;
-  private client: PlaidApi;
-
-  private constructor() {
+  constructor() {
     // Initialize the Plaid client.
     const configuration = new Configuration({
       basePath: PlaidEnvironments[config.plaid.env],
@@ -18,13 +75,26 @@ export class PlaidClientWrapper {
         },
       },
     });
+
     this.client = new PlaidApi(configuration);
+
+    // Wrap the Plaid client methods to add a logging function.
+    forEach(clientMethodLoggingFns, (logFn, method) => {
+      this[method] = this.createWrappedClientMethod(method, logFn);
+    });
   }
 
-  public static getClient(): PlaidApi {
-    if (!PlaidClientWrapper.instance) {
-      PlaidClientWrapper.instance = new PlaidClientWrapper();
-    }
-    return PlaidClientWrapper.instance.client;
+  // Allows us to log API request data for troubleshooting purposes.
+  createWrappedClientMethod(clientMethod, log) {
+    return async (...args) => {
+      try {
+        const res = await this.client[clientMethod](...args);
+        await log(clientMethod, args, res);
+        return res;
+      } catch (err) {
+        await log(clientMethod, args, err?.response?.data);
+        throw err;
+      }
+    };
   }
 }

packages/server/src/lib/S3/S3.ts

@@ -8,5 +8,4 @@ export const s3 = new S3Client({
     secretAccessKey: config.s3.secretAccessKey,
   },
   endpoint: config.s3.endpoint,
-  forcePathStyle: config.s3.forcePathStyle,
 });

packages/server/src/loaders/eventEmitter.ts

@@ -113,8 +113,8 @@ import { UnlinkBankRuleOnDeleteBankRule } from '@/services/Banking/Rules/events/
 import { DecrementUncategorizedTransactionOnMatching } from '@/services/Banking/Matching/events/DecrementUncategorizedTransactionsOnMatch';
 import { DecrementUncategorizedTransactionOnExclude } from '@/services/Banking/Exclude/events/DecrementUncategorizedTransactionOnExclude';
 import { DecrementUncategorizedTransactionOnCategorize } from '@/services/Cashflow/subscribers/DecrementUncategorizedTransactionOnCategorize';
-import { DisconnectPlaidItemOnAccountDeleted } from '@/services/Banking/BankAccounts/events/DisconnectPlaidItemOnAccountDeleted';
-import { LoopsEventsSubscriber } from '@/services/Loops/LoopsEventsSubscriber';
+import { AutoApplyUnearnedRevenueOnInvoiceCreated } from '@/services/Sales/PaymentReceives/events/AutoApplyUnearnedRevenueOnInvoiceCreated';
+import { AutoApplyPrepardExpensesOnBillCreated } from '@/services/Purchases/Bills/events/AutoApplyPrepardExpensesOnBillCreated';
 
 export default () => {
   return new EventPublisher();
@@ -276,9 +276,5 @@ export const susbcribers = () => {
 
     // Plaid
     RecognizeSyncedBankTranasctions,
-    DisconnectPlaidItemOnAccountDeleted,
-
-    // Loops
-    LoopsEventsSubscriber
   ];
 };

packages/server/src/loaders/jobs.ts

@@ -13,9 +13,7 @@ import { PaymentReceiveMailNotificationJob } from '@/services/Sales/PaymentRecei
 import { PlaidFetchTransactionsJob } from '@/services/Banking/Plaid/PlaidFetchTransactionsJob';
 import { ImportDeleteExpiredFilesJobs } from '@/services/Import/jobs/ImportDeleteExpiredFilesJob';
 import { SendVerifyMailJob } from '@/services/Authentication/jobs/SendVerifyMailJob';
-import { ReregonizeTransactionsJob } from '@/services/Banking/RegonizeTranasctions/jobs/RerecognizeTransactionsJob';
-import { RegonizeTransactionsJob } from '@/services/Banking/RegonizeTranasctions/jobs/RecognizeTransactionsJob';
-import { RevertRegonizeTransactionsJob } from '@/services/Banking/RegonizeTranasctions/jobs/RevertRecognizedTransactionsJob';
+import { RegonizeTransactionsJob } from '@/services/Banking/RegonizeTranasctions/RecognizeTransactionsJob';
 
 export default ({ agenda }: { agenda: Agenda }) => {
   new ResetPasswordMailJob(agenda);
@@ -33,8 +31,6 @@ export default ({ agenda }: { agenda: Agenda }) => {
   new ImportDeleteExpiredFilesJobs(agenda);
   new SendVerifyMailJob(agenda);
   new RegonizeTransactionsJob(agenda);
-  new ReregonizeTransactionsJob(agenda);
-  new RevertRegonizeTransactionsJob(agenda);
 
   agenda.start().then(() => {
     agenda.every('1 hours', 'delete-expired-imported-files', {});

packages/server/src/models/Account.ts

@@ -197,7 +197,6 @@ export default class Account extends mixin(TenantModel, [
     const ExpenseEntry = require('models/ExpenseCategory');
     const ItemEntry = require('models/ItemEntry');
     const UncategorizedTransaction = require('models/UncategorizedCashflowTransaction');
-    const PlaidItem = require('models/PlaidItem');
 
     return {
       /**
@@ -322,18 +321,6 @@ export default class Account extends mixin(TenantModel, [
           query.where('categorized', false);
         },
       },
-
-      /**
-       * Account model may belongs to a Plaid item.
-       */
-      plaidItem: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: PlaidItem.default,
-        join: {
-          from: 'accounts.plaidItemId',
-          to: 'plaid_items.plaidItemId',
-        },
-      },
     };
   }
 

packages/server/src/models/BillPayment.ts

@@ -11,6 +11,8 @@ export default class BillPayment extends mixin(TenantModel, [
   CustomViewBaseModel,
   ModelSearchable,
 ]) {
+  prepardExpensesAccountId: number;
+
   /**
    * Table name
    */
@@ -47,6 +49,14 @@ export default class BillPayment extends mixin(TenantModel, [
     return BillPaymentSettings;
   }
 
+  /**
+   * Detarmines whether the payment is prepard expense.
+   * @returns {boolean}
+   */
+  get isPrepardExpense() {
+    return !!this.prepardExpensesAccountId;
+  }
+
   /**
    * Relationship mapping.
    */

packages/server/src/models/PlaidItem.ts

@@ -1,8 +1,6 @@
 import TenantModel from 'models/TenantModel';
 
 export default class PlaidItem extends TenantModel {
-  pausedAt: Date;
-
   /**
    * Table name.
    */
@@ -23,19 +21,4 @@ export default class PlaidItem extends TenantModel {
   static get relationMappings() {
     return {};
   }
-
-  /**
-   * Virtual attributes.
-   */
-  static get virtualAttributes() {
-    return ['isPaused'];
-  }
-
-  /**
-   * Detarmines whether the Plaid item feeds syncing is paused.
-   * @return {boolean}
-   */
-  get isPaused() {
-    return !!this.pausedAt;
-  }
 }

packages/server/src/models/TaxRate.settings.ts

@@ -1,69 +0,0 @@
-export default {
-  defaultSort: {
-    sortOrder: 'DESC',
-    sortField: 'created_at',
-  },
-  exportable: true,
-  importable: true,
-  print: {
-    pageTitle: 'Tax Rates',
-  },
-  columns: {
-    name: {
-      name: 'Tax Rate Name',
-      type: 'text',
-      accessor: 'name',
-    },
-    code: {
-      name: 'Code',
-      type: 'text',
-      accessor: 'code',
-    },
-    rate: {
-      name: 'Rate',
-      type: 'text',
-    },
-    description: {
-      name: 'Description',
-      type: 'text',
-    },
-    isNonRecoverable: {
-      name: 'Is Non Recoverable',
-      type: 'boolean',
-    },
-    active: {
-      name: 'Active',
-      type: 'boolean',
-    },
-  },
-  field: {},
-  fields2: {
-    name: {
-      name: 'Tax name',
-      fieldType: 'name',
-      required: true,
-    },
-    code: {
-      name: 'Code',
-      fieldType: 'code',
-      required: true,
-    },
-    rate: {
-      name: 'Rate',
-      fieldType: 'number',
-      required: true,
-    },
-    description: {
-      name: 'Description',
-      fieldType: 'text',
-    },
-    isNonRecoverable: {
-      name: 'Is Non Recoverable',
-      fieldType: 'boolean',
-    },
-    active: {
-      name: 'Active',
-      fieldType: 'boolean',
-    },
-  },
-};

packages/server/src/models/TaxRate.ts

@@ -2,13 +2,8 @@ import { mixin, Model, raw } from 'objection';
 import TenantModel from 'models/TenantModel';
 import ModelSearchable from './ModelSearchable';
 import SoftDeleteQueryBuilder from '@/collection/SoftDeleteQueryBuilder';
-import TaxRateMeta from './TaxRate.settings';
-import ModelSetting from './ModelSetting';
 
-export default class TaxRate extends mixin(TenantModel, [
-  ModelSetting,
-  ModelSearchable,
-]) {
+export default class TaxRate extends mixin(TenantModel, [ModelSearchable]) {
   /**
    * Table name
    */
@@ -30,13 +25,6 @@ export default class TaxRate extends mixin(TenantModel, [
     return ['createdAt', 'updatedAt'];
   }
 
-  /**
-   * Retrieves the tax rate meta.
-   */
-  static get meta() {
-    return TaxRateMeta;
-  }
-
   /**
    * Virtual attributes.
    */

packages/server/src/models/UncategorizedCashflowTransaction.ts

@@ -20,8 +20,6 @@ export default class UncategorizedCashflowTransaction extends mixin(
   description!: string;
   plaidTransactionId!: string;
   recognizedTransactionId!: number;
-  excludedAt: Date;
-  pending: boolean;
 
   /**
    * Table name.
@@ -33,7 +31,7 @@ export default class UncategorizedCashflowTransaction extends mixin(
   /**
    * Timestamps columns.
    */
-  get timestamps() {
+  static get timestamps() {
     return ['createdAt', 'updatedAt'];
   }
 
@@ -47,8 +45,6 @@ export default class UncategorizedCashflowTransaction extends mixin(
       'isDepositTransaction',
       'isWithdrawalTransaction',
       'isRecognized',
-      'isExcluded',
-      'isPending',
     ];
   }
 
@@ -93,22 +89,6 @@ export default class UncategorizedCashflowTransaction extends mixin(
     return !!this.recognizedTransactionId;
   }
 
-  /**
-   * Detarmines whether the transaction is excluded.
-   * @returns {boolean}
-   */
-  public get isExcluded(): boolean {
-    return !!this.excludedAt;
-  }
-
-  /**
-   * Detarmines whether the transaction is pending.
-   * @returns {boolean}
-   */
-  public get isPending(): boolean {
-    return !!this.pending;
-  }
-
   /**
    * Model modifiers.
    */
@@ -153,20 +133,6 @@ export default class UncategorizedCashflowTransaction extends mixin(
         query.whereNull('categorizeRefType');
         query.whereNull('categorizeRefId');
       },
-
-      /**
-       * Filters the not pending transactions.
-       */
-      notPending(query) {
-        query.where('pending', false);
-      },
-
-      /**
-       * Filters the pending transactions.
-       */
-      pending(query) {
-        query.where('pending', true);
-      },
     };
   }
 

packages/server/src/services/Accounts/AccountTransform.ts

@@ -13,21 +13,7 @@ export class AccountTransformer extends Transformer {
    * @returns {Array}
    */
   public includeAttributes = (): string[] => {
-    return [
-      'formattedAmount',
-      'flattenName',
-      'bankBalanceFormatted',
-      'lastFeedsUpdatedAtFormatted',
-      'isFeedsPaused',
-    ];
-  };
-
-  /**
-   * Exclude attributes.
-   * @returns {string[]}
-   */
-  public excludeAttributes = (): string[] => {
-    return ['plaidItem'];
+    return ['formattedAmount', 'flattenName', 'bankBalanceFormatted'];
   };
 
   /**
@@ -66,24 +52,6 @@ export class AccountTransformer extends Transformer {
     });
   };
 
-  /**
-   * Retrieves the formatted last feeds update at.
-   * @param {IAccount} account
-   * @returns {string}
-   */
-  protected lastFeedsUpdatedAtFormatted = (account: IAccount): string => {
-    return this.formatDate(account.lastFeedsUpdatedAt);
-  };
-
-  /**
-   * Detarmines whether the bank account connection is paused.
-   * @param account
-   * @returns {boolean}
-   */
-  protected isFeedsPaused = (account: any): boolean => {
-    return account.plaidItem?.isPaused || false;
-  };
-
   /**
    * Transformes the accounts collection to flat or nested array.
    * @param {IAccount[]}

packages/server/src/services/Accounts/CreateAccount.ts

@@ -96,11 +96,6 @@ export class CreateAccount {
       ...createAccountDTO,
       slug: kebabCase(createAccountDTO.name),
       currencyCode: createAccountDTO.currencyCode || baseCurrency,
-
-      // Mark the account is Plaid owner since Plaid item/account is defined on creating.
-      isSyncingOwner: Boolean(
-        createAccountDTO.plaidAccountId || createAccountDTO.plaidItemId
-      ),
     };
   };
 
@@ -122,7 +117,12 @@ export class CreateAccount {
     const tenantMeta = await TenantMetadata.query().findOne({ tenantId });
 
     // Authorize the account creation.
-    await this.authorize(tenantId, accountDTO, tenantMeta.baseCurrency, params);
+    await this.authorize(
+      tenantId,
+      accountDTO,
+      tenantMeta.baseCurrency,
+      params
+    );
     // Transformes the DTO to model.
     const accountInputModel = this.transformDTOToModel(
       accountDTO,
@@ -157,3 +157,4 @@ export class CreateAccount {
     );
   };
 }
+

packages/server/src/services/Accounts/GetAccount.ts

@@ -25,10 +25,7 @@ export class GetAccount {
     const { accountRepository } = this.tenancy.repositories(tenantId);
 
     // Find the given account or throw not found error.
-    const account = await Account.query()
-      .findById(accountId)
-      .withGraphFetched('plaidItem')
-      .throwIfNotFound();
+    const account = await Account.query().findById(accountId).throwIfNotFound();
 
     const accountsGraph = await accountRepository.getDependencyGraph();
 

packages/server/src/services/Attachments/AttachmentsApplication.ts

@@ -96,11 +96,10 @@ export class AttachmentsApplication {
 
   /**
    * Retrieves the presigned url of the given attachment key.
-   * @param {number} tenantId
    * @param {string} key
    * @returns {Promise<string>}
    */
-  public getPresignedUrl(tenantId: number, key: string): Promise<string> {
-    return this.getPresignedUrlService.getPresignedUrl(tenantId, key);
+  public getPresignedUrl(key: string): Promise<string> {
+    return this.getPresignedUrlService.getPresignedUrl(key);
   }
 }

packages/server/src/services/Attachments/GetAttachmentPresignedUrl.ts

@@ -1,34 +1,20 @@
-import { Inject, Service } from 'typedi';
+import { Service } from 'typedi';
 import { GetObjectCommand } from '@aws-sdk/client-s3';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { s3 } from '@/lib/S3/S3';
 import config from '@/config';
-import HasTenancyService from '../Tenancy/TenancyService';
 
 @Service()
 export class getAttachmentPresignedUrl {
-  @Inject()
-  private tenancy: HasTenancyService;
-
   /**
-   * Retrieves the presigned url of the given attachment key with the original filename.
-   * @param {number} tenantId
+   * Retrieves the presigned url of the given attachment key.
    * @param {string} key
-   * @returns {string}
+   * @returns {Promise<string?>}
    */
-  async getPresignedUrl(tenantId: number, key: string) {
-    const { Document } = this.tenancy.models(tenantId);
-    const foundDocument = await Document.query().findOne({ key });
-
-    let ResponseContentDisposition = 'attachment';
-    if (foundDocument && foundDocument.originName) {
-      ResponseContentDisposition += `; filename="${foundDocument.originName}"`;
-    }
-
+  async getPresignedUrl(key: string) {
     const command = new GetObjectCommand({
       Bucket: config.s3.bucket,
       Key: key,
-      ResponseContentDisposition,
     });
     const signedUrl = await getSignedUrl(s3, command, { expiresIn: 300 });
 

packages/server/src/services/Banking/BankAccounts/BankAccountsApplication.tsx

@@ -1,72 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { DisconnectBankAccount } from './DisconnectBankAccount';
-import { RefreshBankAccountService } from './RefreshBankAccount';
-import { PauseBankAccountFeeds } from './PauseBankAccountFeeds';
-import { ResumeBankAccountFeeds } from './ResumeBankAccountFeeds';
-
-@Service()
-export class BankAccountsApplication {
-  @Inject()
-  private disconnectBankAccountService: DisconnectBankAccount;
-
-  @Inject()
-  private refreshBankAccountService: RefreshBankAccountService;
-
-  @Inject()
-  private resumeBankAccountFeedsService: ResumeBankAccountFeeds;
-
-  @Inject()
-  private pauseBankAccountFeedsService: PauseBankAccountFeeds;
-
-  /**
-   * Disconnects the given bank account.
-   * @param {number} tenantId
-   * @param {number} bankAccountId
-   * @returns {Promise<void>}
-   */
-  async disconnectBankAccount(tenantId: number, bankAccountId: number) {
-    return this.disconnectBankAccountService.disconnectBankAccount(
-      tenantId,
-      bankAccountId
-    );
-  }
-
-  /**
-   * Refresh the bank transactions of the given bank account.
-   * @param {number} tenantId
-   * @param {number} bankAccountId
-   * @returns {Promise<void>}
-   */
-  async refreshBankAccount(tenantId: number, bankAccountId: number) {
-    return this.refreshBankAccountService.refreshBankAccount(
-      tenantId,
-      bankAccountId
-    );
-  }
-
-  /**
-   * Pauses the feeds sync of the given bank account.
-   * @param {number} tenantId
-   * @param {number} bankAccountId
-   * @returns {Promise<void>}
-   */
-  async pauseBankAccount(tenantId: number, bankAccountId: number) {
-    return this.pauseBankAccountFeedsService.pauseBankAccountFeeds(
-      tenantId,
-      bankAccountId
-    );
-  }
-
-  /**
-   * Resumes the feeds sync of the given bank account.
-   * @param {number} tenantId
-   * @param {number} bankAccountId
-   * @returns {Promise<void>}
-   */
-  async resumeBankAccount(tenantId: number, bankAccountId: number) {
-    return this.resumeBankAccountFeedsService.resumeBankAccountFeeds(
-      tenantId,
-      bankAccountId
-    );
-  }
-}

packages/server/src/services/Banking/BankAccounts/DisconnectBankAccount.tsx

@@ -1,78 +0,0 @@
-import { Knex } from 'knex';
-import { Inject, Service } from 'typedi';
-import { ServiceError } from '@/exceptions';
-import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
-import { PlaidClientWrapper } from '@/lib/Plaid';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import UnitOfWork from '@/services/UnitOfWork';
-import events from '@/subscribers/events';
-import {
-  ERRORS,
-  IBankAccountDisconnectedEventPayload,
-  IBankAccountDisconnectingEventPayload,
-} from './types';
-import { ACCOUNT_TYPE } from '@/data/AccountTypes';
-
-@Service()
-export class DisconnectBankAccount {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  @Inject()
-  private eventPublisher: EventPublisher;
-
-  @Inject()
-  private uow: UnitOfWork;
-
-  /**
-   * Disconnects the given bank account.
-   * @param {number} tenantId
-   * @param {number} bankAccountId
-   * @returns {Promise<void>}
-   */
-  public async disconnectBankAccount(tenantId: number, bankAccountId: number) {
-    const { Account, PlaidItem } = this.tenancy.models(tenantId);
-
-    // Retrieve the bank account or throw not found error.
-    const account = await Account.query()
-      .findById(bankAccountId)
-      .whereIn('account_type', [ACCOUNT_TYPE.CASH, ACCOUNT_TYPE.BANK])
-      .withGraphFetched('plaidItem')
-      .throwIfNotFound();
-
-    const oldPlaidItem = account.plaidItem;
-
-    if (!oldPlaidItem) {
-      throw new ServiceError(ERRORS.BANK_ACCOUNT_NOT_CONNECTED);
-    }
-    const plaidInstance = PlaidClientWrapper.getClient();
-
-    return this.uow.withTransaction(tenantId, async (trx: Knex.Transaction) => {
-      // Triggers `onBankAccountDisconnecting` event.
-      await this.eventPublisher.emitAsync(events.bankAccount.onDisconnecting, {
-        tenantId,
-        bankAccountId,
-      } as IBankAccountDisconnectingEventPayload);
-
-      // Remove the Plaid item from the system.
-      await PlaidItem.query(trx).findById(account.plaidItemId).delete();
-
-      // Remove the plaid item association to the bank account.
-      await Account.query(trx).findById(bankAccountId).patch({
-        plaidAccountId: null,
-        plaidItemId: null,
-        isFeedsActive: false,
-      });
-      // Remove the Plaid item.
-      await plaidInstance.itemRemove({
-        access_token: oldPlaidItem.plaidAccessToken,
-      });
-      // Triggers `onBankAccountDisconnected` event.
-      await this.eventPublisher.emitAsync(events.bankAccount.onDisconnected, {
-        tenantId,
-        bankAccountId,
-        trx,
-      } as IBankAccountDisconnectedEventPayload);
-    });
-  }
-}

packages/server/src/services/Banking/BankAccounts/GetBankAccountSummary.ts

@@ -1,7 +1,6 @@
 import { Inject, Service } from 'typedi';
 import { initialize } from 'objection';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
-import { UncategorizedTransactionTransformer } from '@/services/Cashflow/UncategorizedTransactionTransformer';
 
 @Service()
 export class GetBankAccountSummary {
@@ -32,85 +31,46 @@ export class GetBankAccountSummary {
       .findById(bankAccountId)
       .throwIfNotFound();
 
-    const commonQuery = (q) => {
-      // Include just the given account.
-      q.where('accountId', bankAccountId);
-
-      // Only the not excluded.
-      q.modify('notExcluded');
-
-      // Only the not categorized.
-      q.modify('notCategorized');
-    };
-
     // Retrieves the uncategorized transactions count of the given bank account.
     const uncategorizedTranasctionsCount =
       await UncategorizedCashflowTransaction.query().onBuild((q) => {
-        commonQuery(q);
+        // Include just the given account.
+        q.where('accountId', bankAccountId);
+
+        // Only the not excluded.
+        q.modify('notExcluded');
+
+        // Only the not categorized.
+        q.modify('notCategorized');
 
         // Only the not matched bank transactions.
         q.withGraphJoined('matchedBankTransactions');
         q.whereNull('matchedBankTransactions.id');
 
-        // Exclude the pending transactions.
-        q.modify('notPending');
-
         // Count the results.
         q.count('uncategorized_cashflow_transactions.id as total');
         q.first();
       });
 
-    // Retrives the recognized transactions count.
-    const recognizedTransactionsCount =
-      await UncategorizedCashflowTransaction.query().onBuild((q) => {
-        commonQuery(q);
-
-        q.withGraphJoined('recognizedTransaction');
-        q.whereNotNull('recognizedTransaction.id');
-
-        // Exclude the pending transactions.
-        q.modify('notPending');
-
-        // Count the results.
-        q.count('uncategorized_cashflow_transactions.id as total');
-        q.first();
-      });
-    // Retrieves excluded transactions count.
-    const excludedTransactionsCount =
-      await UncategorizedCashflowTransaction.query().onBuild((q) => {
-        q.where('accountId', bankAccountId);
-        q.modify('excluded');
-
-        // Exclude the pending transactions.
-        q.modify('notPending');
-
-        // Count the results.
-        q.count('uncategorized_cashflow_transactions.id as total');
-        q.first();
-      });
-    // Retrieves the pending transactions count.
-    const pendingTransactionsCount =
-      await UncategorizedCashflowTransaction.query().onBuild((q) => {
-        q.where('accountId', bankAccountId);
-        q.modify('pending');
-
-        // Count the results.
-        q.count('uncategorized_cashflow_transactions.id as total');
-        q.first();
-      });
+    // Retrieves the recognized transactions count of the given bank account.
+    const recognizedTransactionsCount = await RecognizedBankTransaction.query()
+      .whereExists(
+        UncategorizedCashflowTransaction.query().where(
+          'accountId',
+          bankAccountId
+        )
+      )
+      .count('id as total')
+      .first();
 
     const totalUncategorizedTransactions =
       uncategorizedTranasctionsCount?.total || 0;
     const totalRecognizedTransactions = recognizedTransactionsCount?.total || 0;
-    const totalExcludedTransactions = excludedTransactionsCount?.total || 0;
-    const totalPendingTransactions = pendingTransactionsCount?.total || 0;
 
     return {
       name: bankAccount.name,
       totalUncategorizedTransactions,
       totalRecognizedTransactions,
-      totalExcludedTransactions,
-      totalPendingTransactions,
     };
   }
 }

packages/server/src/services/Banking/BankAccounts/PauseBankAccountFeeds.tsx

@@ -1,44 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { Knex } from 'knex';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import UnitOfWork from '@/services/UnitOfWork';
-import { ServiceError } from '@/exceptions';
-import { ERRORS } from './types';
-
-@Service()
-export class PauseBankAccountFeeds {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  @Inject()
-  private uow: UnitOfWork;
-
-  /**
-   * Pauses the bankfeed syncing of the given bank account.
-   * @param {number} tenantId
-   * @param {number} bankAccountId
-   * @returns {Promise<void>}
-   */
-  public async pauseBankAccountFeeds(tenantId: number, bankAccountId: number) {
-    const { Account, PlaidItem } = this.tenancy.models(tenantId);
-
-    const oldAccount = await Account.query()
-      .findById(bankAccountId)
-      .withGraphFetched('plaidItem')
-      .throwIfNotFound();
-
-    // Can't continue if the bank account is not connected.
-    if (!oldAccount.plaidItem) {
-      throw new ServiceError(ERRORS.BANK_ACCOUNT_NOT_CONNECTED);
-    }
-    // Cannot continue if the bank account feeds is already paused.
-    if (oldAccount.plaidItem.isPaused) {
-      throw new ServiceError(ERRORS.BANK_ACCOUNT_FEEDS_ALREADY_PAUSED);
-    }
-    return this.uow.withTransaction(tenantId, async (trx: Knex.Transaction) => {
-      await PlaidItem.query(trx).findById(oldAccount.plaidItem.id).patch({
-        pausedAt: new Date(),
-      });
-    });
-  }
-}

packages/server/src/services/Banking/BankAccounts/RefreshBankAccount.tsx

@@ -1,36 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { ServiceError } from '@/exceptions';
-import { PlaidClientWrapper } from '@/lib/Plaid';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import { ERRORS } from './types';
-
-@Service()
-export class RefreshBankAccountService {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  /**
-   * Asks Plaid to trigger syncing the given bank account.
-   * @param {number} tenantId
-   * @param {number} bankAccountId
-   * @returns {Promise<void>}
-   */
-  public async refreshBankAccount(tenantId: number, bankAccountId: number) {
-    const { Account } = this.tenancy.models(tenantId);
-
-    const bankAccount = await Account.query()
-      .findById(bankAccountId)
-      .withGraphFetched('plaidItem')
-      .throwIfNotFound();
-
-    // Can't continue if the given account is not linked with Plaid item.
-    if (!bankAccount.plaidItem) {
-      throw new ServiceError(ERRORS.BANK_ACCOUNT_NOT_CONNECTED);
-    }
-    const plaidInstance = PlaidClientWrapper.getClient();
-
-    await plaidInstance.transactionsRefresh({
-      access_token: bankAccount.plaidItem.plaidAccessToken,
-    });
-  }
-}

packages/server/src/services/Banking/BankAccounts/ResumeBankAccountFeeds.tsx

@@ -1,43 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { Knex } from 'knex';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import UnitOfWork from '@/services/UnitOfWork';
-import { ServiceError } from '@/exceptions';
-import { ERRORS } from './types';
-
-@Service()
-export class ResumeBankAccountFeeds {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  @Inject()
-  private uow: UnitOfWork;
-
-  /**
-   * Resumes the bank feeds syncing of the bank account.
-   * @param {number} tenantId
-   * @param {number} bankAccountId
-   * @returns {Promise<void>}
-   */
-  public async resumeBankAccountFeeds(tenantId: number, bankAccountId: number) {
-    const { Account, PlaidItem } = this.tenancy.models(tenantId);
-
-    const oldAccount = await Account.query()
-      .findById(bankAccountId)
-      .withGraphFetched('plaidItem');
-
-    // Can't continue if the bank account is not connected.
-    if (!oldAccount.plaidItem) {
-      throw new ServiceError(ERRORS.BANK_ACCOUNT_NOT_CONNECTED);
-    }
-    // Cannot continue if the bank account feeds is already paused.
-    if (!oldAccount.plaidItem.isPaused) {
-      throw new ServiceError(ERRORS.BANK_ACCOUNT_FEEDS_ALREADY_RESUMED);
-    }
-    return this.uow.withTransaction(tenantId, async (trx: Knex.Transaction) => {
-      await PlaidItem.query(trx).findById(oldAccount.plaidItem.id).patch({
-        pausedAt: null,
-      });
-    });
-  }
-}

packages/server/src/services/Banking/BankAccounts/events/DisconnectPlaidItemOnAccountDeleted.ts

@@ -1,63 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { IAccountEventDeletedPayload } from '@/interfaces';
-import { PlaidClientWrapper } from '@/lib/Plaid';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import events from '@/subscribers/events';
-
-@Service()
-export class DisconnectPlaidItemOnAccountDeleted {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  /**
-   * Constructor method.
-   */
-  public attach(bus) {
-    bus.subscribe(
-      events.accounts.onDeleted,
-      this.handleDisconnectPlaidItemOnAccountDelete.bind(this)
-    );
-  }
-
-  /**
-   * Deletes Plaid item from the system and Plaid once the account deleted.
-   * @param {IAccountEventDeletedPayload} payload
-   * @returns {Promise<void>}
-   */
-  private async handleDisconnectPlaidItemOnAccountDelete({
-    tenantId,
-    oldAccount,
-    trx,
-  }: IAccountEventDeletedPayload) {
-    const { PlaidItem, Account } = this.tenancy.models(tenantId);
-
-    // Can't continue if the deleted account is not linked to Plaid item.
-    if (!oldAccount.plaidItemId) return;
-
-    // Retrieves the Plaid item that associated to the deleted account.
-    const oldPlaidItem = await PlaidItem.query(trx).findOne(
-      'plaidItemId',
-      oldAccount.plaidItemId
-    );
-    // Unlink the Plaid item from all account before deleting it.
-    await Account.query(trx)
-      .where('plaidItemId', oldAccount.plaidItemId)
-      .patch({
-        plaidAccountId: null,
-        plaidItemId: null,
-      });
-    // Remove the Plaid item from the system.
-    await PlaidItem.query(trx)
-      .findOne('plaidItemId', oldAccount.plaidItemId)
-      .delete();
-
-    if (oldPlaidItem) {
-      const plaidInstance = PlaidClientWrapper.getClient();
-
-      // Remove the Plaid item.
-      await plaidInstance.itemRemove({
-        access_token: oldPlaidItem.plaidAccessToken,
-      });
-    }
-  }
-}

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

@@ -1,19 +0,0 @@
-import { Knex } from 'knex';
-
-export interface IBankAccountDisconnectingEventPayload {
-  tenantId: number;
-  bankAccountId: number;
-  trx: Knex.Transaction;
-}
-
-export interface IBankAccountDisconnectedEventPayload {
-  tenantId: number;
-  bankAccountId: number;
-  trx: Knex.Transaction;
-}
-
-export const ERRORS = {
-  BANK_ACCOUNT_NOT_CONNECTED: 'BANK_ACCOUNT_NOT_CONNECTED',
-  BANK_ACCOUNT_FEEDS_ALREADY_PAUSED: 'BANK_ACCOUNT_FEEDS_ALREADY_PAUSED',
-  BANK_ACCOUNT_FEEDS_ALREADY_RESUMED: 'BANK_ACCOUNT_FEEDS_ALREADY_RESUMED',
-};

packages/server/src/services/Banking/Exclude/ExcludeBankTransaction.ts

@@ -1,11 +1,7 @@
-import { Knex } from 'knex';
-import { Inject, Service } from 'typedi';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import UnitOfWork from '@/services/UnitOfWork';
-import {
-  validateTransactionNotCategorized,
-  validateTransactionNotExcluded,
-} from './utils';
+import { Inject, Service } from 'typedi';
+import { validateTransactionNotCategorized } from './utils';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 import events from '@/subscribers/events';
 import {
@@ -41,13 +37,9 @@ export class ExcludeBankTransaction {
         .findById(uncategorizedTransactionId)
         .throwIfNotFound();
 
-    // Validate the transaction shouldn't be excluded.
-    validateTransactionNotExcluded(oldUncategorizedTransaction);
-
-    // Validate the transaction shouldn't be categorized.
     validateTransactionNotCategorized(oldUncategorizedTransaction);
 
-    return this.uow.withTransaction(tenantId, async (trx: Knex.Transaction) => {
+    return this.uow.withTransaction(tenantId, async (trx) => {
       await this.eventPublisher.emitAsync(events.bankTransactions.onExcluding, {
         tenantId,
         uncategorizedTransactionId,

packages/server/src/services/Banking/Exclude/ExcludeBankTransactions.ts

@@ -1,32 +0,0 @@
-import { Inject, Service } from 'typedi';
-import PromisePool from '@supercharge/promise-pool';
-import { castArray, uniq } from 'lodash';
-import { ExcludeBankTransaction } from './ExcludeBankTransaction';
-
-@Service()
-export class ExcludeBankTransactions {
-  @Inject()
-  private excludeBankTransaction: ExcludeBankTransaction;
-
-  /**
-   * Exclude bank transactions in bulk.
-   * @param {number} tenantId
-   * @param {number} bankTransactionIds
-   * @returns {Promise<void>}
-   */
-  public async excludeBankTransactions(
-    tenantId: number,
-    bankTransactionIds: Array<number> | number
-  ) {
-    const _bankTransactionIds = uniq(castArray(bankTransactionIds));
-
-    await PromisePool.withConcurrency(1)
-      .for(_bankTransactionIds)
-      .process((bankTransactionId: number) => {
-        return this.excludeBankTransaction.excludeBankTransaction(
-          tenantId,
-          bankTransactionId
-        );
-      });
-  }
-}

packages/server/src/services/Banking/Exclude/ExcludeBankTransactionsApplication.ts

@@ -3,8 +3,6 @@ import { ExcludeBankTransaction } from './ExcludeBankTransaction';
 import { UnexcludeBankTransaction } from './UnexcludeBankTransaction';
 import { GetExcludedBankTransactionsService } from './GetExcludedBankTransactions';
 import { ExcludedBankTransactionsQuery } from './_types';
-import { UnexcludeBankTransactions } from './UnexcludeBankTransactions';
-import { ExcludeBankTransactions } from './ExcludeBankTransactions';
 
 @Service()
 export class ExcludeBankTransactionsApplication {
@@ -17,12 +15,6 @@ export class ExcludeBankTransactionsApplication {
   @Inject()
   private getExcludedBankTransactionsService: GetExcludedBankTransactionsService;
 
-  @Inject()
-  private excludeBankTransactionsService: ExcludeBankTransactions;
-
-  @Inject()
-  private unexcludeBankTransactionsService: UnexcludeBankTransactions;
-
   /**
    * Marks a bank transaction as excluded.
    * @param {number} tenantId - The ID of the tenant.
@@ -64,36 +56,4 @@ export class ExcludeBankTransactionsApplication {
       filter
     );
   }
-
-  /**
-   * Exclude the given bank transactions in bulk.
-   * @param {number} tenantId
-   * @param {Array<number> | number} bankTransactionIds
-   * @returns {Promise<void>}
-   */
-  public excludeBankTransactions(
-    tenantId: number,
-    bankTransactionIds: Array<number> | number
-  ): Promise<void> {
-    return this.excludeBankTransactionsService.excludeBankTransactions(
-      tenantId,
-      bankTransactionIds
-    );
-  }
-
-  /**
-   * Exclude the given bank transactions in bulk.
-   * @param {number} tenantId
-   * @param {Array<number> | number} bankTransactionIds
-   * @returns {Promise<void>}
-   */
-  public unexcludeBankTransactions(
-    tenantId: number,
-    bankTransactionIds: Array<number> | number
-  ): Promise<void> {
-    return this.unexcludeBankTransactionsService.unexcludeBankTransactions(
-      tenantId,
-      bankTransactionIds
-    );
-  }
 }

packages/server/src/services/Banking/Exclude/UnexcludeBankTransaction.ts

@@ -1,11 +1,7 @@
-import { Knex } from 'knex';
-import { Inject, Service } from 'typedi';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import UnitOfWork from '@/services/UnitOfWork';
-import {
-  validateTransactionNotCategorized,
-  validateTransactionShouldBeExcluded,
-} from './utils';
+import { Inject, Service } from 'typedi';
+import { validateTransactionNotCategorized } from './utils';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 import events from '@/subscribers/events';
 import {
@@ -41,13 +37,9 @@ export class UnexcludeBankTransaction {
         .findById(uncategorizedTransactionId)
         .throwIfNotFound();
 
-    // Validate the transaction should be excludded.
-    validateTransactionShouldBeExcluded(oldUncategorizedTransaction);
-
-    // Validate the transaction shouldn't be categorized.
     validateTransactionNotCategorized(oldUncategorizedTransaction);
 
-    return this.uow.withTransaction(tenantId, async (trx: Knex.Transaction) => {
+    return this.uow.withTransaction(tenantId, async (trx) => {
       await this.eventPublisher.emitAsync(
         events.bankTransactions.onUnexcluding,
         {

packages/server/src/services/Banking/Exclude/UnexcludeBankTransactions.ts

@@ -1,31 +0,0 @@
-import { Inject, Service } from 'typedi';
-import PromisePool from '@supercharge/promise-pool';
-import { UnexcludeBankTransaction } from './UnexcludeBankTransaction';
-import { castArray, uniq } from 'lodash';
-
-@Service()
-export class UnexcludeBankTransactions {
-  @Inject()
-  private unexcludeBankTransaction: UnexcludeBankTransaction;
-
-  /**
-   * Unexclude bank transactions in bulk.
-   * @param {number} tenantId
-   * @param {number} bankTransactionIds
-   */
-  public async unexcludeBankTransactions(
-    tenantId: number,
-    bankTransactionIds: Array<number> | number
-  ) {
-    const _bankTransactionIds = uniq(castArray(bankTransactionIds));
-
-    await PromisePool.withConcurrency(1)
-      .for(_bankTransactionIds)
-      .process((bankTransactionId: number) => {
-        return this.unexcludeBankTransaction.unexcludeBankTransaction(
-          tenantId,
-          bankTransactionId
-        );
-      });
-  }
-}

packages/server/src/services/Banking/Exclude/utils.ts

@@ -3,8 +3,6 @@ import UncategorizedCashflowTransaction from '@/models/UncategorizedCashflowTran
 
 const ERRORS = {
   TRANSACTION_ALREADY_CATEGORIZED: 'TRANSACTION_ALREADY_CATEGORIZED',
-  TRANSACTION_ALREADY_EXCLUDED: 'TRANSACTION_ALREADY_EXCLUDED',
-  TRANSACTION_NOT_EXCLUDED: 'TRANSACTION_NOT_EXCLUDED',
 };
 
 export const validateTransactionNotCategorized = (
@@ -14,19 +12,3 @@ export const validateTransactionNotCategorized = (
     throw new ServiceError(ERRORS.TRANSACTION_ALREADY_CATEGORIZED);
   }
 };
-
-export const validateTransactionNotExcluded = (
-  transaction: UncategorizedCashflowTransaction
-) => {
-  if (transaction.isExcluded) {
-    throw new ServiceError(ERRORS.TRANSACTION_ALREADY_EXCLUDED);
-  }
-};
-
-export const validateTransactionShouldBeExcluded = (
-  transaction: UncategorizedCashflowTransaction
-) => {
-  if (!transaction.isExcluded) {
-    throw new ServiceError(ERRORS.TRANSACTION_NOT_EXCLUDED);
-  }
-};

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

@@ -1,7 +1,6 @@
 import { Inject, Service } from 'typedi';
 import * as R from 'ramda';
 import moment from 'moment';
-import { first, sumBy } from 'lodash';
 import { PromisePool } from '@supercharge/promise-pool';
 import { GetMatchedTransactionsFilter, MatchedTransactionsPOJO } from './types';
 import { GetMatchedTransactionsByExpenses } from './GetMatchedTransactionsByExpenses';
@@ -48,24 +47,21 @@ export class GetMatchedTransactions {
   /**
    * Retrieves the matched transactions.
    * @param {number} tenantId -
-   * @param {Array<number>} uncategorizedTransactionIds - Uncategorized transactions ids.
    * @param {GetMatchedTransactionsFilter} filter -
    * @returns {Promise<MatchedTransactionsPOJO>}
    */
   public async getMatchedTransactions(
     tenantId: number,
-    uncategorizedTransactionIds: Array<number>,
+    uncategorizedTransactionId: number,
     filter: GetMatchedTransactionsFilter
   ): Promise<MatchedTransactionsPOJO> {
     const { UncategorizedCashflowTransaction } = this.tenancy.models(tenantId);
 
-    const uncategorizedTransactions =
+    const uncategorizedTransaction =
       await UncategorizedCashflowTransaction.query()
-        .whereIn('id', uncategorizedTransactionIds)
+        .findById(uncategorizedTransactionId)
         .throwIfNotFound();
 
-    const totalPending = sumBy(uncategorizedTransactions, 'amount');
-
     const filtered = filter.transactionType
       ? this.registered.filter((item) => item.type === filter.transactionType)
       : this.registered;
@@ -75,14 +71,14 @@ export class GetMatchedTransactions {
       .process(async ({ type, service }) => {
         return service.getMatchedTransactions(tenantId, filter);
       });
+
     const { perfectMatches, possibleMatches } = this.groupMatchedResults(
-      uncategorizedTransactions,
+      uncategorizedTransaction,
       matchedTransactions
     );
     return {
       perfectMatches,
       possibleMatches,
-      totalPending,
     };
   }
 
@@ -94,20 +90,20 @@ export class GetMatchedTransactions {
    * @returns {MatchedTransactionsPOJO}
    */
   private groupMatchedResults(
-    uncategorizedTransactions: Array<any>,
+    uncategorizedTransaction,
     matchedTransactions
   ): MatchedTransactionsPOJO {
     const results = R.compose(R.flatten)(matchedTransactions?.results);
 
-    const firstUncategorized = first(uncategorizedTransactions);
-    const amount = sumBy(uncategorizedTransactions, 'amount');
-    const date = firstUncategorized.date;
-
     // Sort the results based on amount, date, and transaction type
-    const closestResullts = sortClosestMatchTransactions(amount, date, results);
+    const closestResullts = sortClosestMatchTransactions(
+      uncategorizedTransaction,
+      results
+    );
     const perfectMatches = R.filter(
       (match) =>
-        match.amount === amount && moment(match.date).isSame(date, 'day'),
+        match.amount === uncategorizedTransaction.amount &&
+        moment(match.date).isSame(uncategorizedTransaction.date, 'day'),
       closestResullts
     );
     const possibleMatches = R.difference(closestResullts, perfectMatches);

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

@@ -7,7 +7,6 @@ import {
   MatchedTransactionsPOJO,
 } from './types';
 import { Inject, Service } from 'typedi';
-import PromisePool from '@supercharge/promise-pool';
 
 export abstract class GetMatchedTransactionsByType {
   @Inject()
@@ -44,28 +43,24 @@ export abstract class GetMatchedTransactionsByType {
   }
 
   /**
-   * Creates the common matched transaction.
+   *
    * @param {number} tenantId
-   * @param {Array<number>} uncategorizedTransactionIds
+   * @param {number} uncategorizedTransactionId
    * @param {IMatchTransactionDTO} matchTransactionDTO
    * @param {Knex.Transaction} trx
    */
   public async createMatchedTransaction(
     tenantId: number,
-    uncategorizedTransactionIds: Array<number>,
+    uncategorizedTransactionId: number,
     matchTransactionDTO: IMatchTransactionDTO,
     trx?: Knex.Transaction
   ) {
     const { MatchedBankTransaction } = this.tenancy.models(tenantId);
 
-    await PromisePool.withConcurrency(2)
-      .for(uncategorizedTransactionIds)
-      .process(async (uncategorizedTransactionId) => {
-        await MatchedBankTransaction.query(trx).insert({
-          uncategorizedTransactionId,
-          referenceType: matchTransactionDTO.referenceType,
-          referenceId: matchTransactionDTO.referenceId,
-        });
-      });
+    await MatchedBankTransaction.query(trx).insert({
+      uncategorizedTransactionId,
+      referenceType: matchTransactionDTO.referenceType,
+      referenceId: matchTransactionDTO.referenceId,
+    });
   }
 }

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

@@ -2,7 +2,7 @@ import { Inject, Service } from 'typedi';
 import { GetMatchedTransactions } from './GetMatchedTransactions';
 import { MatchBankTransactions } from './MatchTransactions';
 import { UnmatchMatchedBankTransaction } from './UnmatchMatchedTransaction';
-import { GetMatchedTransactionsFilter, IMatchTransactionDTO } from './types';
+import { GetMatchedTransactionsFilter, IMatchTransactionsDTO } from './types';
 
 @Service()
 export class MatchBankTransactionsApplication {
@@ -23,12 +23,12 @@ export class MatchBankTransactionsApplication {
    */
   public getMatchedTransactions(
     tenantId: number,
-    uncategorizedTransactionsIds: Array<number>,
+    uncategorizedTransactionId: number,
     filter: GetMatchedTransactionsFilter
   ) {
     return this.getMatchedTransactionsService.getMatchedTransactions(
       tenantId,
-      uncategorizedTransactionsIds,
+      uncategorizedTransactionId,
       filter
     );
   }
@@ -42,13 +42,13 @@ export class MatchBankTransactionsApplication {
    */
   public matchTransaction(
     tenantId: number,
-    uncategorizedTransactionId: number | Array<number>,
-    matchedTransactions: Array<IMatchTransactionDTO>
+    uncategorizedTransactionId: number,
+    matchTransactionsDTO: IMatchTransactionsDTO
   ): Promise<void> {
     return this.matchTransactionService.matchTransaction(
       tenantId,
       uncategorizedTransactionId,
-      matchedTransactions
+      matchTransactionsDTO
     );
   }
 

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

@@ -1,4 +1,4 @@
-import { castArray } from 'lodash';
+import { isEmpty } from 'lodash';
 import { Knex } from 'knex';
 import { Inject, Service } from 'typedi';
 import { PromisePool } from '@supercharge/promise-pool';
@@ -10,16 +10,11 @@ import {
   ERRORS,
   IBankTransactionMatchedEventPayload,
   IBankTransactionMatchingEventPayload,
-  IMatchTransactionDTO,
+  IMatchTransactionsDTO,
 } from './types';
 import { MatchTransactionsTypes } from './MatchTransactionsTypes';
 import { ServiceError } from '@/exceptions';
-import {
-  sumMatchTranasctions,
-  sumUncategorizedTransactions,
-  validateUncategorizedTransactionsExcluded,
-  validateUncategorizedTransactionsNotMatched,
-} from './_utils';
+import { sumMatchTranasctions } from './_utils';
 
 @Service()
 export class MatchBankTransactions {
@@ -44,25 +39,27 @@ export class MatchBankTransactions {
    */
   async validate(
     tenantId: number,
-    uncategorizedTransactionId: number | Array<number>,
-    matchedTransactions: Array<IMatchTransactionDTO>
+    uncategorizedTransactionId: number,
+    matchTransactionsDTO: IMatchTransactionsDTO
   ) {
     const { UncategorizedCashflowTransaction } = this.tenancy.models(tenantId);
-    const uncategorizedTransactionIds = castArray(uncategorizedTransactionId);
+    const { matchedTransactions } = matchTransactionsDTO;
 
     // Validates the uncategorized transaction existance.
-    const uncategorizedTransactions =
+    const uncategorizedTransaction =
       await UncategorizedCashflowTransaction.query()
-        .whereIn('id', uncategorizedTransactionIds)
+        .findById(uncategorizedTransactionId)
         .withGraphFetched('matchedBankTransactions')
         .throwIfNotFound();
 
     // Validates the uncategorized transaction is not already matched.
-    validateUncategorizedTransactionsNotMatched(uncategorizedTransactions);
-
+    if (!isEmpty(uncategorizedTransaction.matchedBankTransactions)) {
+      throw new ServiceError(ERRORS.TRANSACTION_ALREADY_MATCHED);
+    }
     // Validate the uncategorized transaction is not excluded.
-    validateUncategorizedTransactionsExcluded(uncategorizedTransactions);
-
+    if (uncategorizedTransaction.excluded) {
+      throw new ServiceError(ERRORS.CANNOT_MATCH_EXCLUDED_TRANSACTION);
+    }
     // Validates the given matched transaction.
     const validateMatchedTransaction = async (matchedTransaction) => {
       const getMatchedTransactionsService =
@@ -97,12 +94,9 @@ export class MatchBankTransactions {
     const totalMatchedTranasctions = sumMatchTranasctions(
       validatationResult.results
     );
-    const totalUncategorizedTransactions = sumUncategorizedTransactions(
-      uncategorizedTransactions
-    );
     // Validates the total given matching transcations whether is not equal
     // uncategorized transaction amount.
-    if (totalUncategorizedTransactions !== totalMatchedTranasctions) {
+    if (totalMatchedTranasctions !== uncategorizedTransaction.amount) {
       throw new ServiceError(ERRORS.TOTAL_MATCHING_TRANSACTIONS_INVALID);
     }
   }
@@ -115,23 +109,23 @@ export class MatchBankTransactions {
    */
   public async matchTransaction(
     tenantId: number,
-    uncategorizedTransactionId: number | Array<number>,
-    matchedTransactions: Array<IMatchTransactionDTO>
+    uncategorizedTransactionId: number,
+    matchTransactionsDTO: IMatchTransactionsDTO
   ): Promise<void> {
-    const uncategorizedTransactionIds = castArray(uncategorizedTransactionId);
+    const { matchedTransactions } = matchTransactionsDTO;
 
     // Validates the given matching transactions DTO.
     await this.validate(
       tenantId,
-      uncategorizedTransactionIds,
-      matchedTransactions
+      uncategorizedTransactionId,
+      matchTransactionsDTO
     );
     return this.uow.withTransaction(tenantId, async (trx: Knex.Transaction) => {
       // Triggers the event `onBankTransactionMatching`.
       await this.eventPublisher.emitAsync(events.bankMatch.onMatching, {
         tenantId,
-        uncategorizedTransactionIds,
-        matchedTransactions,
+        uncategorizedTransactionId,
+        matchTransactionsDTO,
         trx,
       } as IBankTransactionMatchingEventPayload);
 
@@ -145,16 +139,17 @@ export class MatchBankTransactions {
             );
           await getMatchedTransactionsService.createMatchedTransaction(
             tenantId,
-            uncategorizedTransactionIds,
+            uncategorizedTransactionId,
             matchedTransaction,
             trx
           );
         });
+
       // Triggers the event `onBankTransactionMatched`.
       await this.eventPublisher.emitAsync(events.bankMatch.onMatched, {
         tenantId,
-        uncategorizedTransactionIds,
-        matchedTransactions,
+        uncategorizedTransactionId,
+        matchTransactionsDTO,
         trx,
       } as IBankTransactionMatchedEventPayload);
     });

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

@@ -1,23 +1,22 @@
 import moment from 'moment';
 import * as R from 'ramda';
 import UncategorizedCashflowTransaction from '@/models/UncategorizedCashflowTransaction';
-import { ERRORS, MatchedTransactionPOJO } from './types';
-import { isEmpty, sumBy } from 'lodash';
-import { ServiceError } from '@/exceptions';
+import { MatchedTransactionPOJO } from './types';
 
 export const sortClosestMatchTransactions = (
-  amount: number,
-  date: Date,
+  uncategorizedTransaction: UncategorizedCashflowTransaction,
   matches: MatchedTransactionPOJO[]
 ) => {
   return R.sortWith([
     // Sort by amount difference (closest to uncategorized transaction amount first)
     R.ascend((match: MatchedTransactionPOJO) =>
-      Math.abs(match.amount - amount)
+      Math.abs(match.amount - uncategorizedTransaction.amount)
     ),
     // Sort by date difference (closest to uncategorized transaction date first)
     R.ascend((match: MatchedTransactionPOJO) =>
-      Math.abs(moment(match.date).diff(moment(date), 'days'))
+      Math.abs(
+        moment(match.date).diff(moment(uncategorizedTransaction.date), 'days')
+      )
     ),
   ])(matches);
 };
@@ -30,36 +29,3 @@ export const sumMatchTranasctions = (transactions: Array<any>) => {
     0
   );
 };
-
-export const sumUncategorizedTransactions = (
-  uncategorizedTransactions: Array<any>
-) => {
-  return sumBy(uncategorizedTransactions, 'amount');
-};
-
-export const validateUncategorizedTransactionsNotMatched = (
-  uncategorizedTransactions: any
-) => {
-  const matchedTransactions = uncategorizedTransactions.filter(
-    (trans) => !isEmpty(trans.matchedBankTransactions)
-  );
-  //
-  if (matchedTransactions.length > 0) {
-    throw new ServiceError(ERRORS.TRANSACTION_ALREADY_MATCHED, '', {
-      matchedTransactionsIds: matchedTransactions?.map((m) => m.id),
-    });
-  }
-};
-
-export const validateUncategorizedTransactionsExcluded = (
-  uncategorizedTransactions: any
-) => {
-  const excludedTransactions = uncategorizedTransactions.filter(
-    (trans) => trans.excluded
-  );
-  if (excludedTransactions.length > 0) {
-    throw new ServiceError(ERRORS.CANNOT_MATCH_EXCLUDED_TRANSACTION, '', {
-      excludedTransactionsIds: excludedTransactions.map((e) => e.id),
-    });
-  }
-};

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

@@ -5,7 +5,6 @@ import {
   IBankTransactionUnmatchedEventPayload,
 } from '../types';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
-import PromisePool from '@supercharge/promise-pool';
 
 @Service()
 export class DecrementUncategorizedTransactionOnMatching {
@@ -31,24 +30,18 @@ export class DecrementUncategorizedTransactionOnMatching {
    */
   public async decrementUnCategorizedTransactionsOnMatching({
     tenantId,
-    uncategorizedTransactionIds,
+    uncategorizedTransactionId,
     trx,
   }: IBankTransactionMatchedEventPayload) {
     const { UncategorizedCashflowTransaction, Account } =
       this.tenancy.models(tenantId);
 
-    const uncategorizedTransactions =
-      await UncategorizedCashflowTransaction.query().whereIn(
-        'id',
-        uncategorizedTransactionIds
-      );
-    await PromisePool.withConcurrency(1)
-      .for(uncategorizedTransactions)
-      .process(async (transaction) => {
-        await Account.query(trx)
-          .findById(transaction.accountId)
-          .decrement('uncategorizedTransactions', 1);
-      });
+    const transaction = await UncategorizedCashflowTransaction.query().findById(
+      uncategorizedTransactionId
+    );
+    await Account.query(trx)
+      .findById(transaction.accountId)
+      .decrement('uncategorizedTransactions', 1);
   }
 
   /**

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

@@ -2,15 +2,15 @@ import { Knex } from 'knex';
 
 export interface IBankTransactionMatchingEventPayload {
   tenantId: number;
-  uncategorizedTransactionIds: Array<number>;
-  matchedTransactions: Array<IMatchTransactionDTO>;
+  uncategorizedTransactionId: number;
+  matchTransactionsDTO: IMatchTransactionsDTO;
   trx?: Knex.Transaction;
 }
 
 export interface IBankTransactionMatchedEventPayload {
   tenantId: number;
-  uncategorizedTransactionIds: Array<number>;
-  matchedTransactions: Array<IMatchTransactionDTO>;
+  uncategorizedTransactionId: number;
+  matchTransactionsDTO: IMatchTransactionsDTO;
   trx?: Knex.Transaction;
 }
 
@@ -32,7 +32,6 @@ export interface IMatchTransactionDTO {
 }
 
 export interface IMatchTransactionsDTO {
-  uncategorizedTransactionIds: Array<number>;
   matchedTransactions: Array<IMatchTransactionDTO>;
 }
 
@@ -58,7 +57,6 @@ export interface MatchedTransactionPOJO {
 export type MatchedTransactionsPOJO = {
   perfectMatches: Array<MatchedTransactionPOJO>;
   possibleMatches: Array<MatchedTransactionPOJO>;
-  totalPending: number;
 };
 
 export const ERRORS = {

packages/server/src/services/Banking/Plaid/PlaidItem.ts

@@ -28,7 +28,7 @@ export class PlaidItemService {
     const { PlaidItem } = this.tenancy.models(tenantId);
     const { publicToken, institutionId } = itemDTO;
 
-    const plaidInstance = PlaidClientWrapper.getClient();
+    const plaidInstance = new PlaidClientWrapper();
 
     // Exchange the public token for a private access token and store with the item.
     const response = await plaidInstance.itemPublicTokenExchange({

packages/server/src/services/Banking/Plaid/PlaidLinkToken.ts

@@ -26,7 +26,7 @@ export class PlaidLinkTokenService {
       webhook: config.plaid.linkWebhook,
       access_token: accessToken,
     };
-    const plaidInstance = PlaidClientWrapper.getClient();
+    const plaidInstance = new PlaidClientWrapper();
     const createResponse = await plaidInstance.linkTokenCreate(linkTokenParams);
 
     return createResponse.data;

packages/server/src/services/Banking/Plaid/PlaidSyncDB.ts

@@ -2,11 +2,6 @@ import * as R from 'ramda';
 import { Inject, Service } from 'typedi';
 import bluebird from 'bluebird';
 import { entries, groupBy } from 'lodash';
-import {
-  AccountBase as PlaidAccountBase,
-  Item as PlaidItem,
-  Institution as PlaidInstitution,
-} from 'plaid';
 import { CreateAccount } from '@/services/Accounts/CreateAccount';
 import {
   IAccountCreateDTO,
@@ -25,7 +20,6 @@ import { Knex } from 'knex';
 import uniqid from 'uniqid';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 import events from '@/subscribers/events';
-import { RemovePendingUncategorizedTransaction } from '@/services/Cashflow/RemovePendingUncategorizedTransaction';
 
 const CONCURRENCY_ASYNC = 10;
 
@@ -41,7 +35,7 @@ export class PlaidSyncDb {
   private cashflowApp: CashflowApplication;
 
   @Inject()
-  private removePendingTransaction: RemovePendingUncategorizedTransaction;
+  private deleteCashflowTransactionService: DeleteCashflowTransaction;
 
   @Inject()
   private eventPublisher: EventPublisher;
@@ -59,7 +53,6 @@ export class PlaidSyncDb {
     trx?: Knex.Transaction
   ) {
     const { Account } = this.tenancy.models(tenantId);
-
     const plaidAccount = await Account.query().findOne(
       'plaidAccountId',
       createBankAccountDTO.plaidAccountId
@@ -84,15 +77,13 @@ export class PlaidSyncDb {
    */
   public async syncBankAccounts(
     tenantId: number,
-    plaidAccounts: PlaidAccountBase[],
-    institution: PlaidInstitution,
-    item: PlaidItem,
+    plaidAccounts: PlaidAccount[],
+    institution: any,
     trx?: Knex.Transaction
   ): Promise<void> {
-    const transformToPlaidAccounts = transformPlaidAccountToCreateAccount(
-      item,
-      institution
-    );
+    const transformToPlaidAccounts =
+      transformPlaidAccountToCreateAccount(institution);
+
     const accountCreateDTOs = R.map(transformToPlaidAccounts)(plaidAccounts);
 
     await bluebird.map(
@@ -186,22 +177,21 @@ export class PlaidSyncDb {
     plaidTransactionsIds: string[],
     trx?: Knex.Transaction
   ) {
-    const { UncategorizedCashflowTransaction } = this.tenancy.models(tenantId);
+    const { CashflowTransaction } = this.tenancy.models(tenantId);
 
-    const uncategorizedTransactions =
-      await UncategorizedCashflowTransaction.query(trx).whereIn(
-        'plaidTransactionId',
-        plaidTransactionsIds
-      );
-    const uncategorizedTransactionsIds = uncategorizedTransactions.map(
+    const cashflowTransactions = await CashflowTransaction.query(trx).whereIn(
+      'plaidTransactionId',
+      plaidTransactionsIds
+    );
+    const cashflowTransactionsIds = cashflowTransactions.map(
       (trans) => trans.id
     );
     await bluebird.map(
-      uncategorizedTransactionsIds,
-      (uncategorizedTransactionId: number) =>
-        this.removePendingTransaction.removePendingTransaction(
+      cashflowTransactionsIds,
+      (transactionId: number) =>
+        this.deleteCashflowTransactionService.deleteCashflowTransaction(
           tenantId,
-          uncategorizedTransactionId,
+          transactionId,
           trx
         ),
       { concurrency: CONCURRENCY_ASYNC }

packages/server/src/services/Banking/Plaid/PlaidUpdateTransactions.ts

@@ -53,7 +53,7 @@ export class PlaidUpdateTransactions {
       await this.fetchTransactionUpdates(tenantId, plaidItemId);
 
     const request = { access_token: accessToken };
-    const plaidInstance = PlaidClientWrapper.getClient();
+    const plaidInstance = new PlaidClientWrapper();
     const {
       data: { accounts, item },
     } = await plaidInstance.accountsGet(request);
@@ -66,19 +66,7 @@ export class PlaidUpdateTransactions {
       country_codes: ['US', 'UK'],
     });
     // Sync bank accounts.
-    await this.plaidSync.syncBankAccounts(
-      tenantId,
-      accounts,
-      institution,
-      item,
-      trx
-    );
-    // Sync removed transactions.
-    await this.plaidSync.syncRemoveTransactions(
-      tenantId,
-      removed?.map((r) => r.transaction_id),
-      trx
-    );
+    await this.plaidSync.syncBankAccounts(tenantId, accounts, institution, trx);
     // Sync bank account transactions.
     await this.plaidSync.syncAccountsTransactions(
       tenantId,
@@ -153,7 +141,7 @@ export class PlaidUpdateTransactions {
           cursor: cursor,
           count: batchSize,
         };
-        const plaidInstance = PlaidClientWrapper.getClient();
+        const plaidInstance = new PlaidClientWrapper();
         const response = await plaidInstance.transactionsSync(request);
         const data = response.data;
         // Add this page of results

packages/server/src/services/Banking/Plaid/PlaidWebhooks.ts

@@ -1,15 +1,11 @@
 import { Inject, Service } from 'typedi';
 import { PlaidUpdateTransactions } from './PlaidUpdateTransactions';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
 
 @Service()
 export class PlaidWebooks {
   @Inject()
   private updateTransactionsService: PlaidUpdateTransactions;
 
-  @Inject()
-  private tenancy: HasTenancyService;
-
   /**
    * Listens to Plaid webhooks
    * @param {number} tenantId - Tenant Id.
@@ -65,7 +61,7 @@ export class PlaidWebooks {
     plaidItemId: string
   ): void {
     console.log(
-      `PLAID WEBHOOK: TRANSACTIONS: ${webhookCode}: Plaid_item_id ${plaidItemId}: ${additionalInfo}`
+      `WEBHOOK: TRANSACTIONS: ${webhookCode}: Plaid_item_id ${plaidItemId}: ${additionalInfo}`
     );
   }
 
@@ -82,22 +78,8 @@ export class PlaidWebooks {
     plaidItemId: string,
     webhookCode: string
   ): Promise<void> {
-    const { PlaidItem } = this.tenancy.models(tenantId);
-
-    const plaidItem = await PlaidItem.query()
-      .findOne({ plaidItemId })
-      .throwIfNotFound();
-
     switch (webhookCode) {
       case 'SYNC_UPDATES_AVAILABLE': {
-        if (plaidItem.isPaused) {
-          this.serverLogAndEmitSocket(
-            'Plaid item syncing is paused.',
-            webhookCode,
-            plaidItemId
-          );
-          return;
-        }
         // Fired when new transactions data becomes available.
         const { addedCount, modifiedCount, removedCount } =
           await this.updateTransactionsService.updateTransactions(

packages/server/src/services/Banking/Plaid/subscribers/RecognizeSyncedBankTransactions.ts

@@ -35,8 +35,7 @@ export class RecognizeSyncedBankTranasctions extends EventSubscriber {
     runAfterTransaction(trx, async () => {
       await this.recognizeTranasctionsService.recognizeTransactions(
         tenantId,
-        null,
-        { batch }
+        batch
       );
     });
   };

packages/server/src/services/Banking/Plaid/utils.ts

@@ -1,28 +1,18 @@
 import * as R from 'ramda';
-import {
-  Item as PlaidItem,
-  Institution as PlaidInstitution,
-  AccountBase as PlaidAccount,
-  TransactionBase as PlaidTransactionBase,
-} from 'plaid';
 import {
   CreateUncategorizedTransactionDTO,
   IAccountCreateDTO,
+  PlaidAccount,
+  PlaidTransaction,
 } from '@/interfaces';
 
 /**
  * Transformes the Plaid account to create cashflow account DTO.
- * @param {PlaidItem} item -
- * @param {PlaidInstitution} institution -
- * @param {PlaidAccount} plaidAccount -
+ * @param {PlaidAccount} plaidAccount
  * @returns {IAccountCreateDTO}
  */
 export const transformPlaidAccountToCreateAccount = R.curry(
-  (
-    item: PlaidItem,
-    institution: PlaidInstitution,
-    plaidAccount: PlaidAccount
-  ): IAccountCreateDTO => {
+  (institution: any, plaidAccount: PlaidAccount): IAccountCreateDTO => {
     return {
       name: `${institution.name} - ${plaidAccount.name}`,
       code: '',
@@ -30,10 +20,9 @@ export const transformPlaidAccountToCreateAccount = R.curry(
       currencyCode: plaidAccount.balances.iso_currency_code,
       accountType: 'cash',
       active: true,
+      plaidAccountId: plaidAccount.account_id,
       bankBalance: plaidAccount.balances.current,
       accountMask: plaidAccount.mask,
-      plaidAccountId: plaidAccount.account_id,
-      plaidItemId: item.item_id,
     };
   }
 );
@@ -48,7 +37,7 @@ export const transformPlaidAccountToCreateAccount = R.curry(
 export const transformPlaidTrxsToCashflowCreate = R.curry(
   (
     cashflowAccountId: number,
-    plaidTranasction: PlaidTransactionBase
+    plaidTranasction: PlaidTransaction
   ): CreateUncategorizedTransactionDTO => {
     return {
       date: plaidTranasction.date,
@@ -64,8 +53,6 @@ export const transformPlaidTrxsToCashflowCreate = R.curry(
       accountId: cashflowAccountId,
       referenceNo: plaidTranasction.payment_meta?.reference_number,
       plaidTransactionId: plaidTranasction.transaction_id,
-      pending: plaidTranasction.pending,
-      pendingPlaidTransactionId: plaidTranasction.pending_transaction_id,
     };
   }
 );