feat: organize Plaid env variables for sandbox and development envs.

.env.example

@@ -75,16 +75,37 @@ PLAID_ENV=sandbox
 # Your Plaid keys, which can be found in the Plaid Dashboard.
 # https://dashboard.plaid.com/account/keys
 PLAID_CLIENT_ID=
-PLAID_SECRET=
+PLAID_SECRET_DEVELOPMENT=
+PLAID_SECRET_SANDBOX=
+
 PLAID_LINK_WEBHOOK=
 
+# (Optional) Redirect URI settings section
+# Only required for OAuth redirect URI testing (not common on desktop):
+# Sandbox Mode:
+# Set the PLAID_SANDBOX_REDIRECT_URI below to 'http://localhost:3001/oauth-link'.
+# The OAuth redirect flow requires an endpoint on the developer's website
+# that the bank website should redirect to. You will also need to configure
+# this redirect URI for your client ID through the Plaid developer dashboard
+# at https://dashboard.plaid.com/team/api.
+# Development mode:
+# When running in development mode, you must use an https:// url.
+# You will need to configure this https:// redirect URI in the Plaid developer dashboard.
+# Instructions to create a self-signed certificate for localhost can be found at
+# https://github.com/plaid/pattern/blob/master/README.md#testing-oauth.
+# If your system is not set up to run localhost with https://, you will be unable to test
+# the OAuth in development and should leave the PLAID_DEVELOPMENT_REDIRECT_URI blank.
+
+PLAID_SANDBOX_REDIRECT_URI=
+PLAID_DEVELOPMENT_REDIRECT_URI=
+
 # https://docs.lemonsqueezy.com/guides/developer-guide/getting-started#create-an-api-key
 LEMONSQUEEZY_API_KEY=
 LEMONSQUEEZY_STORE_ID=
 LEMONSQUEEZY_WEBHOOK_SECRET=
 
 # S3 documents and attachments 
-S3_REGION=US
+S3_REGION=
 S3_ACCESS_KEY_ID=
 S3_SECRET_ACCESS_KEY=
 S3_ENDPOINT=

CHANGELOG.md

@@ -2,49 +2,6 @@
 
 All notable changes to Bigcapital server-side will be in this file.
 
-## [v0.17.5] - 17-06-2024
-
-* fix: Balance sheet and P/L nested accounts by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/501
-* fix: add space between buttons on floating actions bar by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/508
-* feat: Migrating to Envoy proxy instead of Nginx by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/509
-* fix: Disable email confirmation does not work with invited users by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/497
-* feat: Setting up the date format in the whole system dates by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/506
-
-## [0.17.0] - 04-06-2024
-
-### New
-
-* feat: Upload and attach documents by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/461
-* feat: Export resource tables to pdf by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/460
-* feat: Build and deploy develop Docker container by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/476
-* feat: Internal docker virtual network by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/478
-
-### Fixes
-
-* fix: Skip send confirmation email if disabled by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/459
-* fix: Lemon Squeezy redirect to base url by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/479
-* fix: Organize Plaid env variables for development and sandbox envs by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/480
-* fix: Plaid syncs deposit imports as withdrawals by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/481
-* fix: Validate the s3 configures exist by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/482
-* fix: Run migrations only for initialized tenants by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/484
-
-## [0.16.16] - 
-
-* feat: handle http exceptions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/456
-* feat: add the missing Newrelic env vars to docker-compose.prod file by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/457
-* fix: add the signup email confirmation env var by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/458
-
-## [0.16.14] - 
-
-* fix: Typo in setup wizard by @ccantrell72 in https://github.com/bigcapitalhq/bigcapital/pull/440
-* fix: Showing the real mail address on email confirmation view by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/445
-* fix: Auto-increment setting parsing by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/453
-
-## [0.16.12] - 
-
-* feat: Create a manifest list for `webapp` Docker image and push it to DockerHub. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/436
-* feat: Combine arm64 and amd64 in one Github action runner by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/437
-
 ## [0.16.11] - 06-05-2024
 
 ### improvements

docker-compose.prod.yml

@@ -3,27 +3,30 @@
 version: '3.3'
 
 services:
-  proxy:
+  nginx:
-    image: envoyproxy/envoy:v1.30-latest
+    container_name: bigcapital-nginx-gateway
-    depends_on:
+    build:
-      - server
+      context: ./docker/nginx
-      - webapp
+      args:
+        - SERVER_PROXY_PORT=3000
+        - WEB_SSL=false
+        - SELF_SIGNED=false
+    volumes:
+      - ./data/logs/nginx/:/var/log/nginx
+      - ./docker/certbot/certs/:/var/certs
     ports:
       - '${PUBLIC_PROXY_PORT:-80}:80'
       - '${PUBLIC_PROXY_SSL_PORT:-443}:443'
     tty: true
-    volumes:
+    depends_on:
-      - ./docker/envoy/envoy.yaml:/etc/envoy/envoy.yaml
+      - server
+      - webapp
     restart: on-failure
-    networks:
-      - bigcapital_network
 
   webapp:
     container_name: bigcapital-webapp
     image: bigcapitalhq/webapp:latest
     restart: on-failure
-    networks:
-      - bigcapital_network
 
   server:
     container_name: bigcapital-server
@@ -39,8 +42,6 @@ services:
       - mongo
       - redis
     restart: on-failure
-    networks:
-      - bigcapital_network
     environment:
       # Mail
       - MAIL_HOST=${MAIL_HOST}
@@ -88,17 +89,14 @@ services:
       - GOTENBERG_URL=${GOTENBERG_URL}
       - GOTENBERG_DOCS_URL=${GOTENBERG_DOCS_URL}
 
-      # Exchange Rate
-      - EXCHANGE_RATE_SERVICE=${EXCHANGE_RATE_SERVICE}
-      - OPEN_EXCHANGE_RATE_APP_ID-${OPEN_EXCHANGE_RATE_APP_ID}
-
       # Bank Sync
       - BANKING_CONNECT=${BANKING_CONNECT}
 
       # Plaid
       - PLAID_ENV=${PLAID_ENV}
       - PLAID_CLIENT_ID=${PLAID_CLIENT_ID}
-      - PLAID_SECRET=${PLAID_SECRET}
+      - PLAID_SECRET_DEVELOPMENT=${PLAID_SECRET_DEVELOPMENT}
+      - PLAID_SECRET_SANDBOX=${b8cf42b441e110451e2f69ad7e1e9f}
       - PLAID_LINK_WEBHOOK=${PLAID_LINK_WEBHOOK}
 
       # Lemon Squeez
@@ -139,8 +137,6 @@ services:
       - TENANT_DB_NAME_PERFIX=${TENANT_DB_NAME_PERFIX}
     depends_on:
       - mysql
-    networks:
-      - bigcapital_network
 
   mysql:
     container_name: bigcapital-mysql
@@ -156,8 +152,6 @@ services:
       - mysql:/var/lib/mysql
     expose:
       - '3306'
-    networks:
-      - bigcapital_network
 
   mongo:
     container_name: bigcapital-mongo
@@ -167,8 +161,6 @@ services:
       - '27017'
     volumes:
       - mongo:/var/lib/mongodb
-    networks:
-      - bigcapital_network
 
   redis:
     container_name: bigcapital-redis
@@ -179,15 +171,11 @@ services:
       - '6379'
     volumes:
       - redis:/data
-    networks:
-      - bigcapital_network
 
   gotenberg:
     image: gotenberg/gotenberg:7
     expose:
       - '9000'
-    networks:
-      - bigcapital_network
 
 # Volumes
 volumes:
@@ -202,8 +190,3 @@ volumes:
   redis:
     name: bigcapital_prod_redis
     driver: local
-
-# Networks
-networks:
-  bigcapital_network:
-    driver: bridge

docker/envoy/envoy.yaml

@@ -1,62 +0,0 @@
-static_resources:
-  listeners:
-    - name: listener_0
-      address:
-        socket_address:
-          address: 0.0.0.0
-          port_value: 80
-      filter_chains:
-        - filters:
-            - name: envoy.filters.network.http_connection_manager
-              typed_config:
-                '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
-                stat_prefix: ingress_http
-                route_config:
-                  name: local_route
-                  virtual_hosts:
-                    - name: backend
-                      domains: ['*']
-                      routes:
-                        - match:
-                            prefix: '/api'
-                          route:
-                            cluster: dynamic_server
-                        - match:
-                            prefix: '/'
-                          route:
-                            cluster: webapp
-                http_filters:
-                  - name: envoy.filters.http.router
-                    typed_config:
-                      "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
-
-  clusters:
-    - name: dynamic_server
-      connect_timeout: 0.25s
-      type: STRICT_DNS
-      dns_lookup_family: V4_ONLY
-      lb_policy: ROUND_ROBIN
-      load_assignment:
-        cluster_name: dynamic_server
-        endpoints:
-          - lb_endpoints:
-              - endpoint:
-                  address:
-                    socket_address:
-                      address: server
-                      port_value: 3000
-
-    - name: webapp
-      connect_timeout: 0.25s
-      type: STRICT_DNS
-      dns_lookup_family: V4_ONLY
-      lb_policy: ROUND_ROBIN
-      load_assignment:
-        cluster_name: webapp
-        endpoints:
-          - lb_endpoints:
-              - endpoint:
-                  address:
-                    socket_address:
-                      address: webapp
-                      port_value: 80

docker/nginx/Dockerfile

@@ -0,0 +1,21 @@
+FROM nginx:1.11
+
+RUN mkdir /etc/nginx/sites-available && rm /etc/nginx/conf.d/default.conf
+ADD nginx.conf /etc/nginx/
+
+COPY scripts /root/scripts/
+COPY certs /etc/ssl/
+
+COPY sites /etc/nginx/templates
+
+ARG SERVER_PROXY_PORT=3000
+ARG WEB_SSL=false
+ARG SELF_SIGNED=false
+
+ENV SERVER_PROXY_PORT=$SERVER_PROXY_PORT
+ENV WEB_SSL=$WEB_SSL
+ENV SELF_SIGNED=$SELF_SIGNED
+
+RUN /bin/bash /root/scripts/build-nginx.sh
+
+CMD nginx

docker/nginx/nginx.conf

@@ -0,0 +1,33 @@
+user www-data;
+worker_processes auto;
+pid /run/nginx.pid;
+daemon off;
+
+events {
+  worker_connections  2048;
+  use epoll;
+}
+
+http {
+  server_tokens off;
+  sendfile on;
+  tcp_nopush on;
+  tcp_nodelay on;
+  keepalive_timeout 15;
+  types_hash_max_size 2048;
+  client_max_body_size 20M;
+  open_file_cache max=100;
+  gzip on;
+  gzip_disable "msie6";
+
+  ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+  ssl_ciphers 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS';
+
+  include /etc/nginx/mime.types;
+  default_type application/octet-stream;
+
+  include /etc/nginx/conf.d/*.conf;
+  include /etc/nginx/sites-available/*;
+  access_log /var/log/nginx/access.log;
+  error_log /var/log/nginx/error.log;
+}

docker/nginx/scripts/build-nginx.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+for conf in /etc/nginx/templates/*.conf; do
+  mv $conf "/etc/nginx/sites-available/"$(basename $conf) > /dev/null
+done
+
+for template in /etc/nginx/templates/*.template; do
+  envsubst < $template > "/etc/nginx/sites-available/"$(basename $template)".conf"
+done

docker/nginx/sites/server.template

@@ -0,0 +1,16 @@
+server {
+  listen 80 default_server;
+
+  location /api {
+    proxy_pass http://server:${SERVER_PROXY_PORT};
+  }
+
+  location / {
+    proxy_pass http://webapp;
+  }
+
+  location /.well-known/acme-challenge/ {
+    root /var/www/letsencrypt/;
+    log_not_found off;
+  }
+}

packages/server/package.json

@@ -25,7 +25,6 @@
     "@casl/ability": "^5.4.3",
     "@hapi/boom": "^7.4.3",
     "@lemonsqueezy/lemonsqueezy.js": "^2.2.0",
-    "@supercharge/promise-pool": "^3.2.0",
     "@types/express": "^4.17.21",
     "@types/i18n": "^0.8.7",
     "@types/knex": "^0.16.1",

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

@@ -4,16 +4,12 @@ import { Router, Response, NextFunction, Request } from 'express';
 import { body, param } from 'express-validator';
 import BaseController from '@/api/controllers/BaseController';
 import { AttachmentsApplication } from '@/services/Attachments/AttachmentsApplication';
-import { AttachmentUploadPipeline } from '@/services/Attachments/S3UploadPipeline';
 
 @Service()
 export class AttachmentsController extends BaseController {
   @Inject()
   private attachmentsApplication: AttachmentsApplication;
 
-  @Inject()
-  private uploadPipelineService: AttachmentUploadPipeline;
-
   /**
    * Router constructor.
    */
@@ -22,8 +18,7 @@ export class AttachmentsController extends BaseController {
 
     router.post(
       '/',
-      this.uploadPipelineService.validateS3Configured,
+      this.attachmentsApplication.uploadPipeline.single('file'),
-      this.uploadPipelineService.uploadPipeline().single('file'),
       this.validateUploadedFileExistance,
       this.uploadAttachment.bind(this)
     );

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

@@ -1,49 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { NextFunction, Request, Response, Router } from 'express';
-import BaseController from '@/api/controllers/BaseController';
-import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';
-import { GetBankAccountSummary } from '@/services/Banking/BankAccounts/GetBankAccountSummary';
-
-@Service()
-export class BankAccountsController extends BaseController {
-  @Inject()
-  private getBankAccountSummaryService: GetBankAccountSummary;
-
-  /**
-   * Router constructor.
-   */
-  router() {
-    const router = Router();
-
-    router.get('/:bankAccountId/meta', this.getBankAccountSummary.bind(this));
-
-    return router;
-  }
-
-  /**
-   * Retrieves the bank account meta summary.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|null>}
-   */
-  async getBankAccountSummary(
-    req: Request<{ bankAccountId: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { bankAccountId } = req.params;
-    const { tenantId } = req;
-
-    try {
-      const data =
-        await this.getBankAccountSummaryService.getBankAccountSummary(
-          tenantId,
-          bankAccountId
-        );
-      return res.status(200).send({ data });
-    } catch (error) {
-      next(error);
-    }
-  }
-}

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

@@ -1,103 +0,0 @@
-import { Inject, Service } from 'typedi';
-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 {
-  @Inject()
-  private bankTransactionsMatchingApp: MatchBankTransactionsApplication;
-
-  /**
-   * Router constructor.
-   */
-  public router() {
-    const router = Router();
-
-    router.post(
-      '/:transactionId',
-      [
-        param('transactionId').exists(),
-        body('matchedTransactions').isArray({ min: 1 }),
-        body('matchedTransactions.*.reference_type').exists(),
-        body('matchedTransactions.*.reference_id').isNumeric().toInt(),
-      ],
-      this.validationResult,
-      this.matchBankTransaction.bind(this)
-    );
-    router.post(
-      '/unmatch/:transactionId',
-      [param('transactionId').exists()],
-      this.validationResult,
-      this.unmatchMatchedBankTransaction.bind(this)
-    );
-    return router;
-  }
-
-  /**
-   * Matches the given bank transaction.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|null>}
-   */
-  private async matchBankTransaction(
-    req: Request<{ transactionId: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { transactionId } = req.params;
-    const matchTransactionDTO = this.matchedBodyData(
-      req
-    ) as IMatchTransactionsDTO;
-
-    try {
-      await this.bankTransactionsMatchingApp.matchTransaction(
-        tenantId,
-        transactionId,
-        matchTransactionDTO
-      );
-      return res.status(200).send({
-        id: transactionId,
-        message: 'The bank transaction has been matched.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Unmatches the matched bank transaction.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|null>}
-   */
-  private async unmatchMatchedBankTransaction(
-    req: Request<{ transactionId: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { transactionId } = req.params;
-
-    try {
-      await this.bankTransactionsMatchingApp.unmatchMatchedTransaction(
-        tenantId,
-        transactionId
-      );
-      return res.status(200).send({
-        id: transactionId,
-        message: 'The bank matched transaction has been unmatched.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-}

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

@@ -2,33 +2,17 @@ import Container, { Inject, Service } from 'typedi';
 import { Router } from 'express';
 import BaseController from '@/api/controllers/BaseController';
 import { PlaidBankingController } from './PlaidBankingController';
-import { BankingRulesController } from './BankingRulesController';
-import { BankTransactionsMatchingController } from './BankTransactionsMatchingController';
-import { RecognizedTransactionsController } from './RecognizedTransactionsController';
-import { BankAccountsController } from './BankAccountsController';
 
 @Service()
 export class BankingController extends BaseController {
   /**
    * Router constructor.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.use('/plaid', Container.get(PlaidBankingController).router());
-    router.use('/rules', Container.get(BankingRulesController).router());
+
-    router.use(
-      '/matches',
-      Container.get(BankTransactionsMatchingController).router()
-    );
-    router.use(
-      '/recognized',
-      Container.get(RecognizedTransactionsController).router()
-    );
-    router.use(
-      '/bank_accounts',
-      Container.get(BankAccountsController).router()
-    );
     return router;
   }
 }

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

@@ -1,214 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { NextFunction, Request, Response, Router } from 'express';
-import BaseController from '@/api/controllers/BaseController';
-import { BankRulesApplication } from '@/services/Banking/Rules/BankRulesApplication';
-import { body, param } from 'express-validator';
-import {
-  ICreateBankRuleDTO,
-  IEditBankRuleDTO,
-} from '@/services/Banking/Rules/types';
-
-@Service()
-export class BankingRulesController extends BaseController {
-  @Inject()
-  private bankRulesApplication: BankRulesApplication;
-
-  /**
-   * Bank rule DTO validation schema.
-   */
-  private get bankRuleValidationSchema() {
-    return [
-      body('name').isString().exists(),
-      body('order').isInt({ min: 0 }),
-
-      // Apply to if transaction is.
-      body('apply_if_account_id')
-        .isInt({ min: 0 })
-        .optional({ nullable: true }),
-      body('apply_if_transaction_type').isIn(['deposit', 'withdrawal']),
-
-      // Conditions
-      body('conditions_type').isString().isIn(['and', 'or']).default('and'),
-      body('conditions').isArray({ min: 1 }),
-      body('conditions.*.field').exists().isIn(['description', 'amount']),
-      body('conditions.*.comparator')
-        .exists()
-        .isIn(['equals', 'contains', 'not_contain'])
-        .default('contain'),
-      body('conditions.*.value').exists(),
-
-      // Assign
-      body('assign_category')
-        .isString()
-        .isIn([
-          'interest_income',
-          'other_income',
-          'deposit',
-          'expense',
-          'owner_drawings',
-        ]),
-      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 }),
-    ];
-  }
-
-  /**
-   * Router constructor.
-   */
-  public router() {
-    const router = Router();
-
-    router.post(
-      '/',
-      [...this.bankRuleValidationSchema],
-      this.validationResult,
-      this.createBankRule.bind(this)
-    );
-    router.post(
-      '/:id',
-      [param('id').toInt().exists(), ...this.bankRuleValidationSchema],
-      this.validationResult,
-      this.editBankRule.bind(this)
-    );
-    router.delete(
-      '/:id',
-      [param('id').toInt().exists()],
-      this.validationResult,
-      this.deleteBankRule.bind(this)
-    );
-    router.get(
-      '/:id',
-      [param('id').toInt().exists()],
-      this.validationResult,
-      this.getBankRule.bind(this)
-    );
-    router.get(
-      '/',
-      [param('id').toInt().exists()],
-      this.validationResult,
-      this.getBankRules.bind(this)
-    );
-    return router;
-  }
-
-  /**
-   * Creates a new bank rule.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async createBankRule(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const createBankRuleDTO = this.matchedBodyData(req) as ICreateBankRuleDTO;
-
-    try {
-      const bankRule = await this.bankRulesApplication.createBankRule(
-        tenantId,
-        createBankRuleDTO
-      );
-      return res.status(200).send({
-        id: bankRule.id,
-        message: 'The bank rule has been created successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Edits the given bank rule.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async editBankRule(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
-    const { id: ruleId } = req.params;
-    const editBankRuleDTO = this.matchedBodyData(req) as IEditBankRuleDTO;
-
-    try {
-      await this.bankRulesApplication.editBankRule(
-        tenantId,
-        ruleId,
-        editBankRuleDTO
-      );
-      return res.status(200).send({
-        id: ruleId,
-        message: 'The bank rule has been updated successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Deletes the given bank rule.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async deleteBankRule(
-    req: Request<{ id: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { id: ruleId } = req.params;
-    const { tenantId } = req;
-
-    try {
-      await this.bankRulesApplication.deleteBankRule(tenantId, ruleId);
-
-      return res
-        .status(200)
-        .send({ message: 'The bank rule has been deleted.', id: ruleId });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retrieve the given bank rule.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async getBankRule(req: Request, res: Response, next: NextFunction) {
-    const { id: ruleId } = req.params;
-    const { tenantId } = req;
-
-    try {
-      const bankRule = await this.bankRulesApplication.getBankRule(
-        tenantId,
-        ruleId
-      );
-
-      return res.status(200).send({ bankRule });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retrieves the bank rules.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async getBankRules(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
-
-    try {
-      const bankRules = await this.bankRulesApplication.getBankRules(tenantId);
-      return res.status(200).send({ bankRules });
-    } catch (error) {
-      next(error);
-    }
-  }
-}

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

@@ -1,124 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { param } from 'express-validator';
-import { NextFunction, Request, Response, Router, query } from 'express';
-import BaseController from '../BaseController';
-import { ExcludeBankTransactionsApplication } from '@/services/Banking/Exclude/ExcludeBankTransactionsApplication';
-
-@Service()
-export class ExcludeBankTransactionsController extends BaseController {
-  @Inject()
-  private excludeBankTransactionApp: ExcludeBankTransactionsApplication;
-
-  /**
-   * Router constructor.
-   */
-  public router() {
-    const router = Router();
-
-    router.put(
-      '/transactions/:transactionId/exclude',
-      [param('transactionId').exists()],
-      this.validationResult,
-      this.excludeBankTransaction.bind(this)
-    );
-    router.put(
-      '/transactions/:transactionId/unexclude',
-      [param('transactionId').exists()],
-      this.validationResult,
-      this.unexcludeBankTransaction.bind(this)
-    );
-    router.get(
-      '/excluded',
-      [],
-      this.validationResult,
-      this.getExcludedBankTransactions.bind(this)
-    );
-    return router;
-  }
-
-  /**
-   * Marks a bank transaction as excluded.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns
-   */
-  private async excludeBankTransaction(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { transactionId } = req.params;
-
-    try {
-      await this.excludeBankTransactionApp.excludeBankTransaction(
-        tenantId,
-        transactionId
-      );
-      return res.status(200).send({
-        message: 'The bank transaction has been excluded.',
-        id: transactionId,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Marks a bank transaction as not excluded.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async unexcludeBankTransaction(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { transactionId } = req.params;
-
-    try {
-      await this.excludeBankTransactionApp.unexcludeBankTransaction(
-        tenantId,
-        transactionId
-      );
-      return res.status(200).send({
-        message: 'The bank transaction has been unexcluded.',
-        id: transactionId,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retrieves the excluded uncategorized bank transactions.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|null>}
-   */
-  private async getExcludedBankTransactions(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const filter = this.matchedBodyData(req);
-
-    console.log('123');
-    try {
-      const data =
-        await this.excludeBankTransactionApp.getExcludedBankTransactions(
-          tenantId,
-          filter
-        );
-      return res.status(200).send(data);
-    } catch (error) {
-      next(error);
-    }
-  }
-}

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

@@ -1,77 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { NextFunction, Request, Response, Router } from 'express';
-import BaseController from '@/api/controllers/BaseController';
-import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';
-
-@Service()
-export class RecognizedTransactionsController extends BaseController {
-  @Inject()
-  private cashflowApplication: CashflowApplication;
-
-  /**
-   * Router constructor.
-   */
-  router() {
-    const router = Router();
-
-    router.get('/', this.getRecognizedTransactions.bind(this));
-    router.get(
-      '/transactions/:uncategorizedTransactionId',
-      this.getRecognizedTransaction.bind(this)
-    );
-
-    return router;
-  }
-
-  /**
-   * Retrieves the recognized bank transactions.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|null>}
-   */
-  async getRecognizedTransactions(
-    req: Request<{ accountId: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const filter = this.matchedQueryData(req);
-    const { tenantId } = req;
-
-    try {
-      const data = await this.cashflowApplication.getRecognizedTransactions(
-        tenantId,
-        filter
-      );
-      return res.status(200).send(data);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retrieves the recognized transaction of the ginen uncategorized transaction.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|null>}
-   */
-  async getRecognizedTransaction(
-    req: Request<{ uncategorizedTransactionId: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { uncategorizedTransactionId } = req.params;
-
-    try {
-      const data = await this.cashflowApplication.getRecognizedTransaction(
-        tenantId,
-        uncategorizedTransactionId
-      );
-      return res.status(200).send({ data });
-    } catch (error) {
-      next(error);
-    }
-  }
-}

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

@@ -4,7 +4,6 @@ import CommandCashflowTransaction from './NewCashflowTransaction';
 import DeleteCashflowTransaction from './DeleteCashflowTransaction';
 import GetCashflowTransaction from './GetCashflowTransaction';
 import GetCashflowAccounts from './GetCashflowAccounts';
-import { ExcludeBankTransactionsController } from '../Banking/ExcludeBankTransactionsController';
 
 @Service()
 export default class CashflowController {
@@ -15,7 +14,6 @@ export default class CashflowController {
     const router = Router();
 
     router.use(Container.get(CommandCashflowTransaction).router());
-    router.use(Container.get(ExcludeBankTransactionsController).router());
     router.use(Container.get(GetCashflowTransaction).router());
     router.use(Container.get(GetCashflowAccounts).router());
     router.use(Container.get(DeleteCashflowTransaction).router());

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

@@ -31,6 +31,7 @@ export default class GetCashflowAccounts extends BaseController {
         query('search_keyword').optional({ nullable: true }).isString().trim(),
       ],
       this.asyncMiddleware(this.getCashflowAccounts),
+      this.catchServiceErrors
     );
     return router;
   }
@@ -66,4 +67,22 @@ export default class GetCashflowAccounts extends BaseController {
       next(error);
     }
   };
+
+  /**
+   * Catches the service errors.
+   * @param {Error} error - Error.
+   * @param {Request} req - Request.
+   * @param {Response} res - Response.
+   * @param {NextFunction} next -
+   */
+  private catchServiceErrors(
+    error,
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
+    if (error instanceof ServiceError) {
+    }
+    next(error);
+  }
 }

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

@@ -6,27 +6,18 @@ import { ServiceError } from '@/exceptions';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { AbilitySubject, CashflowAction } from '@/interfaces';
 import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';
-import { GetMatchedTransactionsFilter } from '@/services/Banking/Matching/types';
-import { MatchBankTransactionsApplication } from '@/services/Banking/Matching/MatchBankTransactionsApplication';
 
 @Service()
 export default class GetCashflowAccounts extends BaseController {
   @Inject()
   private cashflowApplication: CashflowApplication;
 
-  @Inject()
-  private bankTransactionsMatchingApp: MatchBankTransactionsApplication;
-
   /**
    * Controller router.
    */
   public router() {
     const router = Router();
 
-    router.get(
-      '/transactions/:transactionId/matches',
-      this.getMatchedTransactions.bind(this)
-    );
     router.get(
       '/transactions/:transactionId',
       CheckPolicies(CashflowAction.View, AbilitySubject.Cashflow),
@@ -56,6 +47,7 @@ export default class GetCashflowAccounts extends BaseController {
         tenantId,
         transactionId
       );
+
       return res.status(200).send({
         cashflow_transaction: this.transfromToResponse(cashflowTransaction),
       });
@@ -64,34 +56,6 @@ export default class GetCashflowAccounts extends BaseController {
     }
   };
 
-  /**
-   * Retrieves the matched transactions.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async getMatchedTransactions(
-    req: Request<{ transactionId: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { transactionId } = req.params;
-    const filter = this.matchedQueryData(req) as GetMatchedTransactionsFilter;
-
-    try {
-      const data =
-        await this.bankTransactionsMatchingApp.getMatchedTransactions(
-          tenantId,
-          transactionId,
-          filter
-        );
-      return res.status(200).send(data);
-    } catch (error) {
-      next(error);
-    }
-  }
-
   /**
    * Catches the service errors.
    * @param {Error} error - Error.

packages/server/src/api/controllers/Dashboard/index.ts

@@ -5,7 +5,7 @@ import DashboardService from '@/services/Dashboard/DashboardService';
 @Service()
 export default class DashboardMetaController {
   @Inject()
-  private dashboardService: DashboardService;
+  dashboardService: DashboardService;
 
   /**
    * Constructor router.

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

@@ -1,6 +1,7 @@
-import { NextFunction, Router, Request, Response } from 'express';
+import { Router } from 'express';
-import { Inject, Service } from 'typedi';
 import { PlaidApplication } from '@/services/Banking/Plaid/PlaidApplication';
+import { Request, Response } from 'express';
+import { Inject, Service } from 'typedi';
 import BaseController from '../BaseController';
 import { LemonSqueezyWebhooks } from '@/services/Subscription/LemonSqueezyWebhooks';
 import { PlaidWebhookTenantBootMiddleware } from '@/services/Banking/Plaid/PlaidWebhookTenantBootMiddleware';
@@ -33,7 +34,7 @@ export class Webhooks extends BaseController {
    * @param {Response} res
    * @returns {Response}
    */
-  public async lemonWebhooks(req: Request, res: Response, next: NextFunction) {
+  public async lemonWebhooks(req: Request, res: Response, next: any) {
     const data = req.body;
     const signature = req.headers['x-signature'] ?? '';
     const rawBody = req.rawBody;
@@ -56,10 +57,8 @@ export class Webhooks extends BaseController {
    * @param {Response} res
    * @returns {Response}
    */
-  public async plaidWebhooks(req: Request, res: Response, next: NextFunction) {
+  public async plaidWebhooks(req: Request, res: Response) {
     const { tenantId } = req;
-
-    try {
     const {
       webhook_type: webhookType,
       webhook_code: webhookCode,
@@ -73,8 +72,5 @@ export class Webhooks extends BaseController {
       webhookCode
     );
     return res.status(200).send({ code: 200, message: 'ok' });
-    } catch (error) {
-      next(error);
-    }
   }
 }

packages/server/src/commands/bigcapital.ts

@@ -4,7 +4,6 @@ import color from 'colorette';
 import argv from 'getopts';
 import Knex from 'knex';
 import { knexSnakeCaseMappers } from 'objection';
-import { PromisePool } from '@supercharge/promise-pool';
 import '../before';
 import config from '../config';
 
@@ -29,7 +28,7 @@ function initSystemKnex() {
   });
 }
 
-function initTenantKnex(organizationId: string = '') {
+function initTenantKnex(organizationId) {
   return Knex({
     client: config.tenant.db_client,
     connection: {
@@ -72,12 +71,6 @@ function getAllSystemTenants(knex) {
   return knex('tenants');
 }
 
-function getAllInitializedTenants(knex) {
-  return knex('tenants').whereNotNull('initializedAt');
-}
-
-const MIGRATION_CONCURRENCY = 10;
-
 // module.exports = {
 //   log,
 //   success,
@@ -94,7 +87,6 @@ const MIGRATION_CONCURRENCY = 10;
 // - bigcapital tenants:migrate:make
 // - bigcapital system:migrate:make
 // - bigcapital tenants:list
-// - bigcapital tenants:list --all
 
 commander
   .command('system:migrate:rollback')
@@ -153,13 +145,10 @@ commander
 commander
   .command('tenants:list')
   .description('Retrieve a list of all system tenants databases.')
-  .option('-a, --all', 'All tenants even are not initialized.')
   .action(async (cmd) => {
     try {
       const sysKnex = await initSystemKnex();
-      const tenants = cmd?.all
+      const tenants = await getAllSystemTenants(sysKnex);
-        ? await getAllSystemTenants(sysKnex)
-        : await getAllInitializedTenants(sysKnex);
 
       tenants.forEach((tenant) => {
         const dbName = `${config.tenant.db_name_prefix}${tenant.organizationId}`;
@@ -190,20 +179,18 @@ commander
 commander
   .command('tenants:migrate:latest')
   .description('Migrate all tenants or the given tenant id.')
-  .option(
+  .option('-t, --tenant_id [tenant_id]', 'Which tenant id do you migrate.')
-    '-t, --tenant_id [tenant_id]',
-    'Which organization id do you migrate.'
-  )
   .action(async (cmd) => {
     try {
       const sysKnex = await initSystemKnex();
-      const tenants = await getAllInitializedTenants(sysKnex);
+      const tenants = await getAllSystemTenants(sysKnex);
       const tenantsOrgsIds = tenants.map((tenant) => tenant.organizationId);
 
       if (cmd.tenant_id && tenantsOrgsIds.indexOf(cmd.tenant_id) === -1) {
         exit(`The given tenant id ${cmd.tenant_id} is not exists.`);
       }
       // Validate the tenant id exist first of all.
+      const migrateOpers = [];
       const migrateTenant = async (organizationId) => {
         try {
           const tenantKnex = await initTenantKnex(organizationId);
@@ -225,17 +212,18 @@ commander
         }
       };
       if (!cmd.tenant_id) {
-        await PromisePool.withConcurrency(MIGRATION_CONCURRENCY)
+        tenants.forEach((tenant) => {
-          .for(tenants)
+          const oper = migrateTenant(tenant.organizationId);
-          .process((tenant, index, pool) => {
+          migrateOpers.push(oper);
-            return migrateTenant(tenant.organizationId);
-          })
-          .then(() => {
-            success('All tenants are migrated.');
         });
       } else {
-        await migrateTenant(cmd.tenant_id);
+        const oper = migrateTenant(cmd.tenant_id);
+        migrateOpers.push(oper);
       }
+
+      Promise.all(migrateOpers).then(() => {
+        success('All tenants are migrated.');
+      });
     } catch (error) {
       exit(error);
     }
@@ -244,21 +232,19 @@ commander
 commander
   .command('tenants:migrate:rollback')
   .description('Rollback the last batch of tenants migrations.')
-  .option(
+  .option('-t, --tenant_id [tenant_id]', 'Which tenant id do you migrate.')
-    '-t, --tenant_id [tenant_id]',
-    'Which organization id do you migrate.'
-  )
   .action(async (cmd) => {
     try {
       const sysKnex = await initSystemKnex();
-      const tenants = await getAllInitializedTenants(sysKnex);
+      const tenants = await getAllSystemTenants(sysKnex);
       const tenantsOrgsIds = tenants.map((tenant) => tenant.organizationId);
 
       if (cmd.tenant_id && tenantsOrgsIds.indexOf(cmd.tenant_id) === -1) {
         exit(`The given tenant id ${cmd.tenant_id} is not exists.`);
       }
 
-      const migrateTenant = async (organizationId: string) => {
+      const migrateOpers = [];
+      const migrateTenant = async (organizationId) => {
         try {
           const tenantKnex = await initTenantKnex(organizationId);
           const [batchNo, _log] = await tenantKnex.migrate.rollback();
@@ -279,18 +265,19 @@ commander
       };
 
       if (!cmd.tenant_id) {
-        await PromisePool.withConcurrency(MIGRATION_CONCURRENCY)
+        tenants.forEach((tenant) => {
-          .for(tenants)
+          const oper = migrateTenant(tenant.organizationId);
-          .process((tenant, index, pool) => {
+          migrateOpers.push(oper);
-            return migrateTenant(tenant.organizationId);
-          })
-          .then(() => {
-            success('All tenants are rollbacked.');
         });
       } else {
-        await migrateTenant(cmd.tenant_id);
+        const oper = migrateTenant(cmd.tenant_id);
+        migrateOpers.push(oper);
       }
+      Promise.all(migrateOpers).then(() => {
+        success('All tenants are rollbacked.');
+      });
     } catch (error) {
       exit(error);
     }
   });
+

packages/server/src/config/index.ts

@@ -235,6 +235,6 @@ module.exports = {
     accessKeyId: process.env.S3_ACCESS_KEY_ID,
     secretAccessKey: process.env.S3_SECRET_ACCESS_KEY,
     endpoint: process.env.S3_ENDPOINT,
-    bucket: process.env.S3_BUCKET || 'bigcapital-documents',
+    bucket: process.env.S3_BUCKET,
   },
 };

packages/server/src/database/migrations/20231108170207_create_storage_table.js

@@ -1,14 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.createTable('storage', (table) => {
-    table.increments('id').primary();
-    table.string('key').notNullable();
-    table.string('path').notNullable();
-    table.string('extension').notNullable();
-    table.integer('expire_in');
-    table.timestamps();
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.dropTableIfExists('storage');
-};

packages/server/src/database/migrations/20240604153938_drop_storage_table.js

@@ -1,5 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.dropTableIfExists('storage');
-};
-
-exports.down = function (knex) {};

packages/server/src/database/migrations/20240618100137_create_bank_rules_table.js

@@ -1,45 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema
-    .createTable('bank_rules', (table) => {
-      table.increments('id').primary();
-      table.string('name');
-      table.integer('order').unsigned();
-
-      table
-        .integer('apply_if_account_id')
-        .unsigned()
-        .references('id')
-        .inTable('accounts');
-      table.string('apply_if_transaction_type');
-
-      table.string('assign_category');
-      table
-        .integer('assign_account_id')
-        .unsigned()
-        .references('id')
-        .inTable('accounts');
-      table.string('assign_payee');
-      table.string('assign_memo');
-
-      table.string('conditions_type');
-
-      table.timestamps();
-    })
-    .createTable('bank_rule_conditions', (table) => {
-      table.increments('id').primary();
-      table
-        .integer('rule_id')
-        .unsigned()
-        .references('id')
-        .inTable('bank_rules');
-      table.string('field');
-      table.string('comparator');
-      table.string('value');
-    });
-};
-
-exports.down = function (knex) {
-  return knex.schema
-    .dropTableIfExists('bank_rules')
-    .dropTableIfExists('bank_rule_conditions');
-};

packages/server/src/database/migrations/20240618171553_create_recognized_bank_transactions_table.js

@@ -1,30 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.createTable('recognized_bank_transactions', (table) => {
-    table.increments('id');
-    table
-      .integer('uncategorized_transaction_id')
-      .unsigned()
-      .references('id')
-      .inTable('uncategorized_cashflow_transactions');
-    table
-      .integer('bank_rule_id')
-      .unsigned()
-      .references('id')
-      .inTable('bank_rules');
-
-    table.string('assigned_category');
-    table
-      .integer('assigned_account_id')
-      .unsigned()
-      .references('id')
-      .inTable('accounts');
-    table.string('assigned_payee');
-    table.string('assigned_memo');
-
-    table.timestamps();
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.dropTableIfExists('recognized_bank_transactions');
-};

packages/server/src/database/migrations/20240618175241_add_recognized_transaction_id_to_uncategorized_transactins_table.js

@@ -1,11 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.table('uncategorized_cashflow_transactions', (table) => {
-    table.integer('recognized_transaction_id').unsigned();
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.table('uncategorized_cashflow_transactions', (table) => {
-    table.dropColumn('recognized_transaction_id');
-  });
-};

packages/server/src/database/migrations/20240619133733_create_matched_bank_transactions_table.js

@@ -1,14 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.createTable('matched_bank_transactions', (table) => {
-    table.increments('id');
-    table.integer('uncategorized_transaction_id').unsigned();
-    table.string('reference_type');
-    table.integer('reference_id').unsigned();
-    table.decimal('amount');
-    table.timestamps();
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.dropTableIfExists('matched_bank_transactions');
-};

packages/server/src/database/migrations/20240620111308_add_excluded_column_to_uncategorized_cashflow_transactions_table.js

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

packages/server/src/database/migrations/20240623154149_add_batch_column_to_uncategorized_cashflow_transactions_table.js

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

packages/server/src/database/migrations/20240704064858_change_settings_value_to_text.js

@@ -1,11 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.table('settings', (table) => {
-    table.text('value').alter();
-  });
-};
-
-exports.down = (knex) => {
-  return knex.schema.table('settings', (table) => {
-    table.string('value').alter();
-  });
-};

packages/server/src/interfaces/Account.ts

@@ -164,7 +164,3 @@ export enum TaxRateAction {
   DELETE = 'Delete',
   VIEW = 'View',
 }
-
-export interface CreateAccountParams {
-  ignoreUniqueName: boolean;
-}

packages/server/src/interfaces/CashFlow.ts

@@ -267,5 +267,4 @@ export interface CreateUncategorizedTransactionDTO {
   description?: string;
   referenceNo?: string | null;
   plaidTransactionId?: string | null;
-  batch?: string;
 }

packages/server/src/interfaces/CashflowService.ts

@@ -164,10 +164,3 @@ export interface IGetUncategorizedTransactionsQuery {
   page?: number;
   pageSize?: number;
 }
-
-
-export interface IGetRecognizedTransactionsQuery {
-  page?: number;
-  pageSize?: number;
-  accountId?: number;
-}

packages/server/src/interfaces/GeneralLedgerSheet.ts

@@ -56,8 +56,6 @@ export interface IGeneralLedgerSheetAccount {
   transactions: IGeneralLedgerSheetAccountTransaction[];
   openingBalance: IGeneralLedgerSheetAccountBalance;
   closingBalance: IGeneralLedgerSheetAccountBalance;
-  closingBalanceSubaccounts?: IGeneralLedgerSheetAccountBalance;
-  children?: IGeneralLedgerSheetAccount[];
 }
 
 export type IGeneralLedgerSheetData = IGeneralLedgerSheetAccount[];

packages/server/src/interfaces/Plaid.ts

@@ -1,5 +1,3 @@
-import { Knex } from "knex";
-
 export interface IPlaidItemCreatedEventPayload {
   tenantId: number;
   plaidAccessToken: string;
@@ -56,10 +54,3 @@ export interface SyncAccountsTransactionsTask {
   plaidAccountId: number;
   plaidTransactions: PlaidTransaction[];
 }
-
-export interface IPlaidTransactionsSyncedEventPayload {
-  tenantId: number;
-  plaidAccountId: number;
-  batch: string;
-  trx?: Knex.Transaction
-}

packages/server/src/lib/Transformer/Transformer.ts

@@ -149,19 +149,13 @@ export class Transformer {
     return this.excludeAttributes().length > 0;
   };
 
-  private dateFormat = 'YYYY MMM DD';
-
-  setDateFormat(format: string) {
-    this.dateFormat = format;
-  }
-
   /**
    *
    * @param date
    * @returns
    */
   protected formatDate(date) {
-    return date ? moment(date).format(this.dateFormat) : '';
+    return date ? moment(date).format('YYYY/MM/DD') : '';
   }
 
   /**
@@ -169,8 +163,8 @@ export class Transformer {
    * @param number
    * @returns
    */
-  protected formatNumber(number, props?) {
+  protected formatNumber(number) {
-    return formatNumber(number, { money: false, ...props });
+    return formatNumber(number, { money: false });
   }
 
   /**
@@ -199,7 +193,6 @@ export class Transformer {
   ) {
     transformer.setOptions(options);
     transformer.setContext(this.context);
-    transformer.setDateFormat(this.dateFormat);
 
     return transformer.work(obj);
   }

packages/server/src/lib/Transformer/TransformerInjectable.ts

@@ -24,17 +24,6 @@ export class TransformerInjectable {
     };
   }
 
-  /**
-   * Retrieves the given tenatn date format.
-   * @param {number} tenantId
-   * @returns {string}
-   */
-  async getTenantDateFormat(tenantId: number) {
-    const metadata = await TenantMetadata.query().findOne('tenantId', tenantId);
-
-    return metadata.dateFormat;
-  }
-
   /**
    * Transformes the given transformer after inject the tenant context.
    * @param   {number} tenantId
@@ -52,11 +41,7 @@ export class TransformerInjectable {
     if (!isNull(tenantId)) {
       const context = await this.getApplicationContext(tenantId);
       transformer.setContext(context);
-
-      const dateFormat = await this.getTenantDateFormat(tenantId);
-      transformer.setDateFormat(dateFormat);
     }
-
     transformer.setOptions(options);
 
     return transformer.work(object);

packages/server/src/loaders/eventEmitter.ts

@@ -102,14 +102,6 @@ import { AttachmentsOnVendorCredits } from '@/services/Attachments/events/Attach
 import { AttachmentsOnCreditNote } from '@/services/Attachments/events/AttachmentsOnCreditNote';
 import { AttachmentsOnBillPayments } from '@/services/Attachments/events/AttachmentsOnPaymentsMade';
 import { AttachmentsOnSaleEstimates } from '@/services/Attachments/events/AttachmentsOnSaleEstimates';
-import { TriggerRecognizedTransactions } from '@/services/Banking/RegonizeTranasctions/events/TriggerRecognizedTransactions';
-import { ValidateMatchingOnExpenseDelete } from '@/services/Banking/Matching/events/ValidateMatchingOnExpenseDelete';
-import { ValidateMatchingOnManualJournalDelete } from '@/services/Banking/Matching/events/ValidateMatchingOnManualJournalDelete';
-import { ValidateMatchingOnPaymentReceivedDelete } from '@/services/Banking/Matching/events/ValidateMatchingOnPaymentReceivedDelete';
-import { ValidateMatchingOnPaymentMadeDelete } from '@/services/Banking/Matching/events/ValidateMatchingOnPaymentMadeDelete';
-import { ValidateMatchingOnCashflowDelete } from '@/services/Banking/Matching/events/ValidateMatchingOnCashflowDelete';
-import { RecognizeSyncedBankTranasctions } from '@/services/Banking/Plaid/subscribers/RecognizeSyncedBankTransactions';
-import { UnlinkBankRuleOnDeleteBankRule } from '@/services/Banking/Rules/events/UnlinkBankRuleOnDeleteBankRule';
 
 export default () => {
   return new EventPublisher();
@@ -254,19 +246,5 @@ export const susbcribers = () => {
     AttachmentsOnBillPayments,
     AttachmentsOnManualJournals,
     AttachmentsOnExpenses,
-
-    // Bank Rules
-    TriggerRecognizedTransactions,
-    UnlinkBankRuleOnDeleteBankRule,
-
-    // Validate matching
-    ValidateMatchingOnCashflowDelete,
-    ValidateMatchingOnExpenseDelete,
-    ValidateMatchingOnManualJournalDelete,
-    ValidateMatchingOnPaymentReceivedDelete,
-    ValidateMatchingOnPaymentMadeDelete,
-
-    // Plaid 
-    RecognizeSyncedBankTranasctions,
   ];
 };

packages/server/src/loaders/jobs.ts

@@ -13,7 +13,6 @@ 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 { RegonizeTransactionsJob } from '@/services/Banking/RegonizeTranasctions/RecognizeTransactionsJob';
 
 export default ({ agenda }: { agenda: Agenda }) => {
   new ResetPasswordMailJob(agenda);
@@ -30,7 +29,6 @@ export default ({ agenda }: { agenda: Agenda }) => {
   new PlaidFetchTransactionsJob(agenda);
   new ImportDeleteExpiredFilesJobs(agenda);
   new SendVerifyMailJob(agenda);
-  new RegonizeTransactionsJob(agenda);
 
   agenda.start().then(() => {
     agenda.every('1 hours', 'delete-expired-imported-files', {});

packages/server/src/loaders/tenantModels.ts

@@ -64,10 +64,6 @@ import PlaidItem from 'models/PlaidItem';
 import UncategorizedCashflowTransaction from 'models/UncategorizedCashflowTransaction';
 import Document from '@/models/Document';
 import DocumentLink from '@/models/DocumentLink';
-import { BankRule } from '@/models/BankRule';
-import { BankRuleCondition } from '@/models/BankRuleCondition';
-import { RecognizedBankTransaction } from '@/models/RecognizedBankTransaction';
-import { MatchedBankTransaction } from '@/models/MatchedBankTransaction';
 
 export default (knex) => {
   const models = {
@@ -135,10 +131,6 @@ export default (knex) => {
     DocumentLink,
     PlaidItem,
     UncategorizedCashflowTransaction,
-    BankRule,
-    BankRuleCondition,
-    RecognizedBankTransaction,
-    MatchedBankTransaction,
   };
   return mapValues(models, (model) => model.bindKnex(knex));
 };

packages/server/src/models/BankRule.ts

@@ -1,70 +0,0 @@
-import TenantModel from 'models/TenantModel';
-import { Model } from 'objection';
-
-export class BankRule extends TenantModel {
-  id!: number;
-  name!: string;
-  order!: number;
-  applyIfAccountId!: number;
-  applyIfTransactionType!: string;
-  assignCategory!: string;
-  assignAccountId!: number;
-  assignPayee!: string;
-  assignMemo!: string;
-  conditionsType!: string;
-
-  /**
-   * Table name
-   */
-  static get tableName() {
-    return 'bank_rules';
-  }
-
-  /**
-   * Timestamps columns.
-   */
-  get timestamps() {
-    return ['created_at', 'updated_at'];
-  }
-
-  /**
-   * Virtual attributes.
-   */
-  static get virtualAttributes() {
-    return [];
-  }
-
-  /**
-   * Relationship mapping.
-   */
-  static get relationMappings() {
-    const { BankRuleCondition } = require('models/BankRuleCondition');
-    const Account = require('models/Account');
-
-    return {
-      /**
-       * Sale invoice associated entries.
-       */
-      conditions: {
-        relation: Model.HasManyRelation,
-        modelClass: BankRuleCondition,
-        join: {
-          from: 'bank_rules.id',
-          to: 'bank_rule_conditions.ruleId',
-        },
-      },
-
-      /**
-       * Bank rule may associated to the assign account.
-       */
-      assignAccount: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: Account.default,
-        join: {
-          from: 'bank_rules.assignAccountId',
-          to: 'accounts.id',
-        },
-      },
-    };
-  }
-}

packages/server/src/models/BankRuleCondition.ts

@@ -1,24 +0,0 @@
-import TenantModel from 'models/TenantModel';
-
-export class BankRuleCondition extends TenantModel {
-  /**
-   * Table name.
-   */
-  static get tableName() {
-    return 'bank_rule_conditions';
-  }
-
-  /**
-   * Timestamps columns.
-   */
-  get timestamps() {
-    return [];
-  }
-
-  /**
-   * Virtual attributes.
-   */
-  static get virtualAttributes() {
-    return [];
-  }
-}

packages/server/src/models/Bill.ts

@@ -404,7 +404,6 @@ export default class Bill extends mixin(TenantModel, [
     const Branch = require('models/Branch');
     const TaxRateTransaction = require('models/TaxRateTransaction');
     const Document = require('models/Document');
-    const { MatchedBankTransaction } = require('models/MatchedBankTransaction');
 
     return {
       vendor: {
@@ -486,21 +485,6 @@ export default class Bill extends mixin(TenantModel, [
           query.where('model_ref', 'Bill');
         },
       },
-
-      /**
-       * Bill may belongs to matched bank transaction.
-       */
-      matchedBankTransaction: {
-        relation: Model.HasManyRelation,
-        modelClass: MatchedBankTransaction,
-        join: {
-          from: 'bills.id',
-          to: 'matched_bank_transactions.referenceId',
-        },
-        filter(query) {
-          query.where('reference_type', 'Bill');
-        },
-      },
     };
   }
 

packages/server/src/models/CashflowTransaction.ts

@@ -102,7 +102,6 @@ export default class CashflowTransaction extends TenantModel {
     const CashflowTransactionLine = require('models/CashflowTransactionLine');
     const AccountTransaction = require('models/AccountTransaction');
     const Account = require('models/Account');
-    const { MatchedBankTransaction } = require('models/MatchedBankTransaction');
 
     return {
       /**
@@ -159,22 +158,6 @@ export default class CashflowTransaction extends TenantModel {
           to: 'accounts.id',
         },
       },
-
-      /**
-       * Cashflow transaction may belongs to matched bank transaction.
-       */
-      matchedBankTransaction: {
-        relation: Model.HasManyRelation,
-        modelClass: MatchedBankTransaction,
-        join: {
-          from: 'cashflow_transactions.id',
-          to: 'matched_bank_transactions.referenceId',
-        },
-        filter: (query) => {
-          const referenceTypes = getCashflowAccountTransactionsTypes();
-          query.whereIn('reference_type', referenceTypes);
-        },
-      },
     };
   }
 }

packages/server/src/models/Expense.ts

@@ -182,7 +182,6 @@ export default class Expense extends mixin(TenantModel, [
     const ExpenseCategory = require('models/ExpenseCategory');
     const Document = require('models/Document');
     const Branch = require('models/Branch');
-    const { MatchedBankTransaction } = require('models/MatchedBankTransaction');
 
     return {
       paymentAccount: {
@@ -235,21 +234,6 @@ export default class Expense extends mixin(TenantModel, [
           query.where('model_ref', 'Expense');
         },
       },
-
-      /**
-       * Expense may belongs to matched bank transaction.
-       */
-      matchedBankTransaction: {
-        relation: Model.HasManyRelation,
-        modelClass: MatchedBankTransaction,
-        join: {
-          from: 'expenses_transactions.id',
-          to: 'matched_bank_transactions.referenceId',
-        },
-        filter(query) {
-          query.where('reference_type', 'Expense');
-        },
-      },
     };
   }
 

packages/server/src/models/ManualJournal.ts

@@ -97,7 +97,6 @@ export default class ManualJournal extends mixin(TenantModel, [
     const AccountTransaction = require('models/AccountTransaction');
     const ManualJournalEntry = require('models/ManualJournalEntry');
     const Document = require('models/Document');
-    const { MatchedBankTransaction } = require('models/MatchedBankTransaction');
 
     return {
       entries: {
@@ -141,21 +140,6 @@ export default class ManualJournal extends mixin(TenantModel, [
           query.where('model_ref', 'ManualJournal');
         },
       },
-
-      /**
-       * Manual journal may belongs to matched bank transaction.
-       */
-      matchedBankTransaction: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: MatchedBankTransaction,
-        join: {
-          from: 'manual_journals.id',
-          to: 'matched_bank_transactions.referenceId',
-        },
-        filter(query) {
-          query.where('reference_type', 'ManualJournal');
-        },
-      },
     };
   }
 

packages/server/src/models/MatchedBankTransaction.ts

@@ -1,32 +0,0 @@
-import TenantModel from 'models/TenantModel';
-import { Model } from 'objection';
-
-export class MatchedBankTransaction extends TenantModel {
-  /**
-   * Table name.
-   */
-  static get tableName() {
-    return 'matched_bank_transactions';
-  }
-
-  /**
-   * Timestamps columns.
-   */
-  get timestamps() {
-    return ['createdAt', 'updatedAt'];
-  }
-
-  /**
-   * Virtual attributes.
-   */
-  static get virtualAttributes() {
-    return [];
-  }
-
-  /**
-   * Relationship mapping.
-   */
-  static get relationMappings() {
-    return {};
-  }
-}

packages/server/src/models/RecognizedBankTransaction.ts

@@ -1,72 +0,0 @@
-import TenantModel from 'models/TenantModel';
-import { Model } from 'objection';
-
-export class RecognizedBankTransaction extends TenantModel {
-  /**
-   * Table name.
-   */
-  static get tableName() {
-    return 'recognized_bank_transactions';
-  }
-
-  /**
-   * Timestamps columns.
-   */
-  get timestamps() {
-    return [];
-  }
-
-  /**
-   * Virtual attributes.
-   */
-  static get virtualAttributes() {
-    return [];
-  }
-
-  /**
-   * Relationship mapping.
-   */
-  static get relationMappings() {
-    const UncategorizedCashflowTransaction = require('./UncategorizedCashflowTransaction');
-    const Account = require('./Account');
-    const { BankRule } = require('./BankRule');
-
-    return {
-      /**
-       * Recognized bank transaction may belongs to uncategorized transactions.
-       */
-      uncategorizedTransactions: {
-        relation: Model.HasManyRelation,
-        modelClass: UncategorizedCashflowTransaction.default,
-        join: {
-          from: 'recognized_bank_transactions.uncategorizedTransactionId',
-          to: 'uncategorized_cashflow_transactions.id',
-        },
-      },
-
-      /**
-       * Recognized bank transaction may belongs to assign account.
-       */
-      assignAccount: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: Account.default,
-        join: {
-          from: 'recognized_bank_transactions.assignedAccountId',
-          to: 'accounts.id',
-        },
-      },
-
-      /**
-       * Recognized bank transaction may belongs to bank rule.
-       */
-      bankRule: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: BankRule,
-        join: {
-          from: 'recognized_bank_transactions.bankRuleId',
-          to: 'bank_rules.id',
-        },
-      },
-    };
-  }
-}

packages/server/src/models/SaleInvoice.ts

@@ -411,7 +411,6 @@ export default class SaleInvoice extends mixin(TenantModel, [
     const Account = require('models/Account');
     const TaxRateTransaction = require('models/TaxRateTransaction');
     const Document = require('models/Document');
-    const { MatchedBankTransaction } = require('models/MatchedBankTransaction');
 
     return {
       /**
@@ -544,21 +543,6 @@ export default class SaleInvoice extends mixin(TenantModel, [
           query.where('model_ref', 'SaleInvoice');
         },
       },
-
-      /**
-       * Sale invocie may belongs to matched bank transaction.
-       */
-      matchedBankTransaction: {
-        relation: Model.HasManyRelation,
-        modelClass: MatchedBankTransaction,
-        join: {
-          from: 'sales_invoices.id',
-          to: "matched_bank_transactions.referenceId",
-        },
-        filter(query) {
-          query.where('reference_type', 'SaleInvoice');
-        },
-      },
     };
   }
 

packages/server/src/models/UncategorizedCashflowTransaction.ts

@@ -11,15 +11,9 @@ export default class UncategorizedCashflowTransaction extends mixin(
   [ModelSettings]
 ) {
   id!: number;
-  date!: Date | string;
   amount!: number;
   categorized!: boolean;
   accountId!: number;
-  referenceNo!: string;
-  payee!: string;
-  description!: string;
-  plaidTransactionId!: string;
-  recognizedTransactionId!: number;
 
   /**
    * Table name.
@@ -44,7 +38,6 @@ export default class UncategorizedCashflowTransaction extends mixin(
       'deposit',
       'isDepositTransaction',
       'isWithdrawalTransaction',
-      'isRecognized',
     ];
   }
 
@@ -82,43 +75,11 @@ export default class UncategorizedCashflowTransaction extends mixin(
     return 0 < this.withdrawal;
   }
 
-  /**
-   * Detarmines whether the transaction is recognized.
-   */
-  public get isRecognized(): boolean {
-    return !!this.recognizedTransactionId;
-  }
-
-  /**
-   * Model modifiers.
-   */
-  static get modifiers() {
-    return {
-      /**
-       * Filters the not excluded transactions.
-       */
-      notExcluded(query) {
-        query.whereNull('excluded_at');
-      },
-
-      /**
-       * Filters the excluded transactions.
-       */
-      excluded(query) {
-        query.whereNotNull('excluded_at')
-      }
-    };
-  }
-
   /**
    * Relationship mapping.
    */
   static get relationMappings() {
     const Account = require('models/Account');
-    const {
-      RecognizedBankTransaction,
-    } = require('models/RecognizedBankTransaction');
-    const { MatchedBankTransaction } = require('models/MatchedBankTransaction');
 
     return {
       /**
@@ -132,30 +93,6 @@ export default class UncategorizedCashflowTransaction extends mixin(
           to: 'accounts.id',
         },
       },
-
-      /**
-       * Transaction may has association to recognized transaction.
-       */
-      recognizedTransaction: {
-        relation: Model.HasOneRelation,
-        modelClass: RecognizedBankTransaction,
-        join: {
-          from: 'uncategorized_cashflow_transactions.recognizedTransactionId',
-          to: 'recognized_bank_transactions.id',
-        },
-      },
-
-      /**
-       * Uncategorized transaction may has association to matched transaction.
-       */
-      matchedBankTransactions: {
-        relation: Model.HasManyRelation,
-        modelClass: MatchedBankTransaction,
-        join: {
-          from: 'uncategorized_cashflow_transactions.id',
-          to: 'matched_bank_transactions.uncategorizedTransactionId',
-        },
-      },
     };
   }
 
@@ -167,10 +104,10 @@ export default class UncategorizedCashflowTransaction extends mixin(
    */
   private async updateUncategorizedTransactionCount(
     queryContext: QueryContext,
-    increment: boolean,
+    increment: boolean
-    amount: number = 1
   ) {
     const operation = increment ? 'increment' : 'decrement';
+    const amount = increment ? 1 : -1;
 
     await Account.query(queryContext.transaction)
       .findById(this.accountId)

packages/server/src/services/Accounting/Ledger.ts

@@ -274,14 +274,4 @@ export default class Ledger implements ILedger {
     const entries = Ledger.mappingTransactions(transactions);
     return new Ledger(entries);
   }
-
-  /**
-   * Retrieve the transaction amount.
-   * @param {number} credit - Credit amount.
-   * @param {number} debit - Debit amount.
-   * @param {string} normal - Credit or debit.
-   */
-  static getAmount(credit: number, debit: number, normal: string) {
-    return normal === 'credit' ? credit - debit : debit - credit;
-  }
 }

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

@@ -7,7 +7,6 @@ import {
   IAccountEventCreatedPayload,
   IAccountEventCreatingPayload,
   IAccountCreateDTO,
-  CreateAccountParams,
 } from '@/interfaces';
 import events from '@/subscribers/events';
 import UnitOfWork from '@/services/UnitOfWork';
@@ -37,16 +36,13 @@ export class CreateAccount {
   private authorize = async (
     tenantId: number,
     accountDTO: IAccountCreateDTO,
-    baseCurrency: string,
+    baseCurrency: string
-    params?: CreateAccountParams
   ) => {
     // Validate account name uniquiness.
-    if (!params.ignoreUniqueName) {
     await this.validator.validateAccountNameUniquiness(
       tenantId,
       accountDTO.name
     );
-    }
     // Validate the account code uniquiness.
     if (accountDTO.code) {
       await this.validator.isAccountCodeUniqueOrThrowError(
@@ -108,8 +104,7 @@ export class CreateAccount {
   public createAccount = async (
     tenantId: number,
     accountDTO: IAccountCreateDTO,
-    trx?: Knex.Transaction,
+    trx?: Knex.Transaction
-    params: CreateAccountParams = { ignoreUniqueName: false }
   ): Promise<IAccount> => {
     const { Account } = this.tenancy.models(tenantId);
 
@@ -117,12 +112,8 @@ export class CreateAccount {
     const tenantMeta = await TenantMetadata.query().findOne({ tenantId });
 
     // Authorize the account creation.
-    await this.authorize(
+    await this.authorize(tenantId, accountDTO, tenantMeta.baseCurrency);
-      tenantId,
+
-      accountDTO,
-      tenantMeta.baseCurrency,
-      params
-    );
     // Transformes the DTO to model.
     const accountInputModel = this.transformDTOToModel(
       accountDTO,
@@ -157,4 +148,3 @@ export class CreateAccount {
     );
   };
 }
-

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

@@ -2,9 +2,11 @@ import { Inject, Service } from 'typedi';
 import { UploadDocument } from './UploadDocument';
 import { DeleteAttachment } from './DeleteAttachment';
 import { GetAttachment } from './GetAttachment';
+import { AttachmentUploadPipeline } from './S3UploadPipeline';
 import { LinkAttachment } from './LinkAttachment';
 import { UnlinkAttachment } from './UnlinkAttachment';
 import { getAttachmentPresignedUrl } from './GetAttachmentPresignedUrl';
+import type { Multer } from 'multer';
 
 @Service()
 export class AttachmentsApplication {
@@ -17,6 +19,9 @@ export class AttachmentsApplication {
   @Inject()
   private getDocumentService: GetAttachment;
 
+  @Inject()
+  private uploadPipelineService: AttachmentUploadPipeline;
+
   @Inject()
   private linkDocumentService: LinkAttachment;
 
@@ -26,6 +31,14 @@ export class AttachmentsApplication {
   @Inject()
   private getPresignedUrlService: getAttachmentPresignedUrl;
 
+  /**
+   * Express middleware for uploading attachments to an S3 bucket.
+   * @returns {Multer}
+   */
+  get uploadPipeline(): Multer {
+    return this.uploadPipelineService.uploadPipeline();
+  }
+
   /**
    * Saves the metadata of uploaded document to S3 on database.
    * @param {number} tenantId

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

@@ -1,38 +1,12 @@
 import multer from 'multer';
-import type { Multer } from 'multer';
+import type { Multer } from 'multer'
 import multerS3 from 'multer-s3';
 import { s3 } from '@/lib/S3/S3';
 import { Service } from 'typedi';
 import config from '@/config';
-import { NextFunction, Request, Response } from 'express';
 
 @Service()
 export class AttachmentUploadPipeline {
-  /**
-   * Middleware to ensure that S3 configuration is properly set before proceeding.
-   * This function checks if the necessary S3 configuration keys are present and throws an error if any are missing.
-   *
-   * @param req The HTTP request object.
-   * @param res The HTTP response object.
-   * @param next The callback to pass control to the next middleware function.
-   */
-  public validateS3Configured(req: Request, res: Response, next: NextFunction) {
-    if (
-      !config.s3.region ||
-      !config.s3.accessKeyId ||
-      !config.s3.secretAccessKey
-    ) {
-      const missingKeys = [];
-      if (!config.s3.region) missingKeys.push('region');
-      if (!config.s3.accessKeyId) missingKeys.push('accessKeyId');
-      if (!config.s3.secretAccessKey) missingKeys.push('secretAccessKey');
-      const missing = missingKeys.join(', ');
-
-      throw new Error(`S3 configuration error: Missing ${missing}`);
-    }
-    next();
-  }
-
   /**
    * Express middleware for uploading attachments to an S3 bucket.
    * It utilizes the multer middleware for handling multipart/form-data, specifically for file uploads.

packages/server/src/services/Authentication/AuthSignin.ts

@@ -1,6 +1,6 @@
 import { Container, Inject } from 'typedi';
 import { cloneDeep } from 'lodash';
-import { SystemUser, Tenant } from '@/system/models';
+import { Tenant } from '@/system/models';
 import {
   IAuthSignedInEventPayload,
   IAuthSigningInEventPayload,
@@ -64,9 +64,7 @@ export class AuthSigninService {
     const { systemUserRepository } = this.sysRepositories;
 
     // Finds the user of the given email address.
-    const user = await SystemUser.query()
+    const user = await systemUserRepository.findOneByEmail(email);
-      .findOne('email', email)
-      .modify('inviteAccepted');
 
     // Validate the given email and password.
     await this.validateSignIn(user, email, password);

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

@@ -1,55 +0,0 @@
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import { Server } from 'socket.io';
-import { Inject, Service } from 'typedi';
-
-@Service()
-export class GetBankAccountSummary {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  /**
-   * Retrieves the bank account meta summary
-   * @param {number} tenantId
-   * @param {number} bankAccountId
-   * @returns
-   */
-  public async getBankAccountSummary(tenantId: number, bankAccountId: number) {
-    const {
-      Account,
-      UncategorizedCashflowTransaction,
-      RecognizedBankTransaction,
-    } = this.tenancy.models(tenantId);
-
-    const bankAccount = await Account.query()
-      .findById(bankAccountId)
-      .throwIfNotFound();
-
-    // Retrieves the uncategorized transactions count of the given bank account.
-    const uncategorizedTranasctionsCount =
-      await UncategorizedCashflowTransaction.query()
-        .where('accountId', bankAccountId)
-        .count('id as total')
-        .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;
-    const totalRecognizedTransactions = recognizedTransactionsCount?.total;
-
-    return {
-      name: bankAccount.name,
-      totalUncategorizedTransactions,
-      totalRecognizedTransactions,
-    };
-  }
-}

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

@@ -1,41 +0,0 @@
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import UnitOfWork from '@/services/UnitOfWork';
-import { Inject, Service } from 'typedi';
-import { validateTransactionNotCategorized } from './utils';
-
-@Service()
-export class ExcludeBankTransaction {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  @Inject()
-  private uow: UnitOfWork;
-
-  /**
-   * Marks the given bank transaction as excluded.
-   * @param {number} tenantId
-   * @param {number} bankTransactionId
-   * @returns {Promise<void>}
-   */
-  public async excludeBankTransaction(
-    tenantId: number,
-    uncategorizedTransactionId: number
-  ) {
-    const { UncategorizedCashflowTransaction } = this.tenancy.models(tenantId);
-
-    const oldUncategorizedTransaction =
-      await UncategorizedCashflowTransaction.query()
-        .findById(uncategorizedTransactionId)
-        .throwIfNotFound();
-
-    validateTransactionNotCategorized(oldUncategorizedTransaction);
-
-    return this.uow.withTransaction(tenantId, async (trx) => {
-      await UncategorizedCashflowTransaction.query(trx)
-        .findById(uncategorizedTransactionId)
-        .patch({
-          excludedAt: new Date(),
-        });
-    });
-  }
-}

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

@@ -1,59 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { ExcludeBankTransaction } from './ExcludeBankTransaction';
-import { UnexcludeBankTransaction } from './UnexcludeBankTransaction';
-import { GetExcludedBankTransactionsService } from './GetExcludedBankTransactions';
-import { ExcludedBankTransactionsQuery } from './_types';
-
-@Service()
-export class ExcludeBankTransactionsApplication {
-  @Inject()
-  private excludeBankTransactionService: ExcludeBankTransaction;
-
-  @Inject()
-  private unexcludeBankTransactionService: UnexcludeBankTransaction;
-
-  @Inject()
-  private getExcludedBankTransactionsService: GetExcludedBankTransactionsService;
-
-  /**
-   * Marks a bank transaction as excluded.
-   * @param {number} tenantId - The ID of the tenant.
-   * @param {number} bankTransactionId - The ID of the bank transaction to exclude.
-   * @returns {Promise<void>}
-   */
-  public excludeBankTransaction(tenantId: number, bankTransactionId: number) {
-    return this.excludeBankTransactionService.excludeBankTransaction(
-      tenantId,
-      bankTransactionId
-    );
-  }
-
-  /**
-   * Marks a bank transaction as not excluded.
-   * @param {number} tenantId - The ID of the tenant.
-   * @param {number} bankTransactionId - The ID of the bank transaction to exclude.
-   * @returns {Promise<void>}
-   */
-  public unexcludeBankTransaction(tenantId: number, bankTransactionId: number) {
-    return this.unexcludeBankTransactionService.unexcludeBankTransaction(
-      tenantId,
-      bankTransactionId
-    );
-  }
-
-  /**
-   * Retrieves the excluded bank transactions.
-   * @param {number} tenantId
-   * @param {ExcludedBankTransactionsQuery} filter
-   * @returns {}
-   */
-  public getExcludedBankTransactions(
-    tenantId: number,
-    filter: ExcludedBankTransactionsQuery
-  ) {
-    return this.getExcludedBankTransactionsService.getExcludedBankTransactions(
-      tenantId,
-      filter
-    );
-  }
-}

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

@@ -1,52 +0,0 @@
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import { Inject, Service } from 'typedi';
-import { ExcludedBankTransactionsQuery } from './_types';
-import { UncategorizedTransactionTransformer } from '@/services/Cashflow/UncategorizedTransactionTransformer';
-import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
-
-@Service()
-export class GetExcludedBankTransactionsService {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  @Inject()
-  private transformer: TransformerInjectable;
-
-  /**
-   * Retrieves the excluded uncategorized bank transactions.
-   * @param {number} tenantId
-   * @param {ExcludedBankTransactionsQuery} filter
-   * @returns
-   */
-  public async getExcludedBankTransactions(
-    tenantId: number,
-    filter: ExcludedBankTransactionsQuery
-  ) {
-    const { UncategorizedCashflowTransaction } = this.tenancy.models(tenantId);
-
-    // Parsed query with default values.
-    const _query = {
-      page: 1,
-      pageSize: 20,
-      ...filter,
-    };
-    const { results, pagination } =
-      await UncategorizedCashflowTransaction.query()
-        .onBuild((q) => {
-          q.modify('excluded');
-          q.orderBy('date', 'DESC');
-
-          if (_query.accountId) {
-            q.where('account_id', _query.accountId);
-          }
-        })
-        .pagination(_query.page - 1, _query.pageSize);
-
-    const data = await this.transformer.transform(
-      tenantId,
-      results,
-      new UncategorizedTransactionTransformer()
-    );
-    return { data, pagination };
-  }
-}

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

@@ -1,41 +0,0 @@
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import UnitOfWork from '@/services/UnitOfWork';
-import { Inject, Service } from 'typedi';
-import { validateTransactionNotCategorized } from './utils';
-
-@Service()
-export class UnexcludeBankTransaction {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  @Inject()
-  private uow: UnitOfWork;
-
-  /**
-   * Marks the given bank transaction as excluded.
-   * @param {number} tenantId
-   * @param {number} bankTransactionId
-   * @returns {Promise<void>}
-   */
-  public async unexcludeBankTransaction(
-    tenantId: number,
-    uncategorizedTransactionId: number
-  ) {
-    const { UncategorizedCashflowTransaction } = this.tenancy.models(tenantId);
-
-    const oldUncategorizedTransaction =
-      await UncategorizedCashflowTransaction.query()
-        .findById(uncategorizedTransactionId)
-        .throwIfNotFound();
-
-    validateTransactionNotCategorized(oldUncategorizedTransaction);
-
-    return this.uow.withTransaction(tenantId, async (trx) => {
-      await UncategorizedCashflowTransaction.query(trx)
-        .findById(uncategorizedTransactionId)
-        .patch({
-          excludedAt: null,
-        });
-    });
-  }
-}

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

@@ -1,6 +0,0 @@
-
-export interface ExcludedBankTransactionsQuery {
-  page?: number;
-  pageSize?: number;
-  accountId?: number;
-}

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

@@ -1,14 +0,0 @@
-import { ServiceError } from '@/exceptions';
-import UncategorizedCashflowTransaction from '@/models/UncategorizedCashflowTransaction';
-
-const ERRORS = {
-  TRANSACTION_ALREADY_CATEGORIZED: 'TRANSACTION_ALREADY_CATEGORIZED',
-};
-
-export const validateTransactionNotCategorized = (
-  transaction: UncategorizedCashflowTransaction
-) => {
-  if (transaction.categorized) {
-    throw new ServiceError(ERRORS.TRANSACTION_ALREADY_CATEGORIZED);
-  }
-};

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

@@ -1,103 +0,0 @@
-import { Transformer } from '@/lib/Transformer/Transformer';
-
-export class GetMatchedTransactionBillsTransformer extends Transformer {
-  /**
-   * Include these attributes to sale credit note object.
-   * @returns {Array}
-   */
-  public includeAttributes = (): string[] => {
-    return [
-      'referenceNo',
-      'amount',
-      'amountFormatted',
-      'transactionNo',
-      'date',
-      'dateFormatted',
-      'transactionId',
-      'transactionNo',
-      'transactionType',
-      'transsactionTypeFormatted',
-    ];
-  };
-
-  /**
-   * Exclude all attributes.
-   * @returns {Array<string>}
-   */
-  public excludeAttributes = (): string[] => {
-    return ['*'];
-  };
-
-  /**
-   * Retrieve the reference number of the bill.
-   * @param {Object} bill - The bill object.
-   * @returns {string}
-   */
-  protected referenceNo(bill) {
-    return bill.referenceNo;
-  }
-
-  /**
-   * Retrieve the amount of the bill.
-   * @param {Object} bill - The bill object.
-   * @returns {number}
-   */
-  protected amount(bill) {
-    return bill.amount;
-  }
-
-  /**
-   * Retrieve the formatted amount of the bill.
-   * @param {Object} bill - The bill object.
-   * @returns {string}
-   */
-  protected amountFormatted(bill) {
-    return this.formatNumber(bill.amount, {
-      currencyCode: bill.currencyCode,
-      money: true,
-    });
-  }
-
-  /**
-   * Retrieve the date of the bill.
-   * @param {Object} bill - The bill object.
-   * @returns {string}
-   */
-  protected date(bill) {
-    return bill.billDate;
-  }
-
-  /**
-   * Retrieve the formatted date of the bill.
-   * @param {Object} bill - The bill object.
-   * @returns {string}
-   */
-  protected dateFormatted(bill) {
-    return this.formatDate(bill.billDate);
-  }
-
-  /**
-   * Retrieve the transcation id of the bill.
-   * @param {Object} bill - The bill object.
-   * @returns {number}
-   */
-  protected transactionId(bill) {
-    return bill.id;
-  }
-
-  /**
-   * Retrieve the manual journal transaction type.
-   * @returns {string}
-   */
-  protected transactionType() {
-    return 'Bill';
-  }
-
-  /**
-   * Retrieves the manual journal formatted transaction type.
-   * @returns {string}
-   */
-  protected transsactionTypeFormatted() {
-    return 'Bill';
-  }
-}

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

@@ -1,114 +0,0 @@
-import { Transformer } from '@/lib/Transformer/Transformer';
-
-export class GetMatchedTransactionExpensesTransformer extends Transformer {
-  /**
-   * Include these attributes to sale credit note object.
-   * @returns {Array}
-   */
-  public includeAttributes = (): string[] => {
-    return [
-      'referenceNo',
-      'amount',
-      'amountFormatted',
-      'transactionNo',
-      'date',
-      'dateFormatted',
-      'transactionId',
-      'transactionNo',
-      'transactionType',
-      'transsactionTypeFormatted',
-    ];
-  };
-
-  /**
-   * Exclude all attributes.
-   * @returns {Array<string>}
-   */
-  public excludeAttributes = (): string[] => {
-    return ['*'];
-  };
-
-  /**
-   * Retrieves the expense reference number.
-   * @param expense
-   * @returns {string}
-   */
-  protected referenceNo(expense) {
-    return expense.referenceNo;
-  }
-
-  /**
-   * Retrieves the expense amount.
-   * @param expense
-   * @returns {number}
-   */
-  protected amount(expense) {
-    return expense.totalAmount;
-  }
-
-  /**
-   * Formats the amount of the expense.
-   * @param expense
-   * @returns {string}
-   */
-  protected amountFormatted(expense) {
-    return this.formatNumber(expense.totalAmount, {
-      currencyCode: expense.currencyCode,
-      money: true,
-    });
-  }
-
-  /**
-   * Retrieves the date of the expense.
-   * @param expense
-   * @returns {Date}
-   */
-  protected date(expense) {
-    return expense.paymentDate;
-  }
-
-  /**
-   * Formats the date of the expense.
-   * @param expense
-   * @returns {string}
-   */
-  protected dateFormatted(expense) {
-    return this.formatDate(expense.paymentDate);
-  }
-
-  /**
-   * Retrieves the transaction ID of the expense.
-   * @param expense
-   * @returns {number}
-   */
-  protected transactionId(expense) {
-    return expense.id;
-  }
-
-  /**
-   * Retrieves the expense transaction number.
-   * @param expense
-   * @returns {string}
-   */
-  protected transactionNo(expense) {
-    return expense.expenseNo;
-  }
-
-  /**
-   * Retrieves the expense transaction type.
-   * @param expense
-   * @returns {String}
-   */
-  protected transactionType() {
-    return 'Expense';
-  }
-
-  /**
-   * Retrieves the formatted transaction type of the expense.
-   * @param expense
-   * @returns {string}
-   */
-  protected transsactionTypeFormatted() {
-    return 'Expense';
-  }
-}

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

@@ -1,111 +0,0 @@
-import { Transformer } from '@/lib/Transformer/Transformer';
-
-export class GetMatchedTransactionInvoicesTransformer extends Transformer {
-  /**
-   * Include these attributes to sale credit note object.
-   * @returns {Array}
-   */
-  public includeAttributes = (): string[] => {
-    return [
-      'referenceNo',
-      'amount',
-      'amountFormatted',
-      'transactionNo',
-      'date',
-      'dateFormatted',
-      'transactionId',
-      'transactionNo',
-      'transactionType',
-      'transsactionTypeFormatted',
-    ];
-  };
-
-  /**
-   * Exclude all attributes.
-   * @returns {Array<string>}
-   */
-  public excludeAttributes = (): string[] => {
-    return ['*'];
-  };
-
-  /**
-   * Retrieve the invoice reference number.
-   * @returns {string}
-   */
-  protected referenceNo(invoice) {
-    return invoice.referenceNo;
-  }
-
-  /**
-   * Retrieve the invoice amount.
-   * @param invoice
-   * @returns {number}
-   */
-  protected amount(invoice) {
-    return invoice.dueAmount;
-  }
-  /**
-   * Format the amount of the invoice.
-   * @param invoice
-   * @returns {string}
-   */
-  protected formatAmount(invoice) {
-    return this.formatNumber(invoice.dueAmount, {
-      currencyCode: invoice.currencyCode,
-      money: true,
-    });
-  }
-
-  /**
-   * Retrieve the date of the invoice.
-   * @param invoice
-   * @returns {Date}
-   */
-  protected date(invoice) {
-    return invoice.invoiceDate;
-  }
-
-  /**
-   * Format the date of the invoice.
-   * @param invoice
-   * @returns {string}
-   */
-  protected dateFormatted(invoice) {
-    return this.formatDate(invoice.invoiceDate);
-  }
-
-  /**
-   * Retrieve the transaction ID of the invoice.
-   * @param invoice
-   * @returns {number}
-   */
-  protected getTransactionId(invoice) {
-    return invoice.id;
-  }
-  /**
-   * Retrieve the invoice transaction number.
-   * @param invoice
-   * @returns {string}
-   */
-  protected transactionNo(invoice) {
-    return invoice.invoiceNo;
-  }
-
-  /**
-   * Retrieve the invoice transaction type.
-   * @param invoice
-   * @returns {String}
-   */
-  protected transactionType(invoice) {
-    return 'SaleInvoice';
-  }
-
-  /**
-   * Retrieve the invoice formatted transaction type.
-   * @param invoice
-   * @returns {string}
-   */
-  protected transsactionTypeFormatted(invoice) {
-    return 'Sale invoice';
-  }
-}

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

@@ -1,111 +0,0 @@
-import { Transformer } from '@/lib/Transformer/Transformer';
-
-export class GetMatchedTransactionManualJournalsTransformer extends Transformer {
-  /**
-   * Include these attributes to sale credit note object.
-   * @returns {Array}
-   */
-  public includeAttributes = (): string[] => {
-    return [
-      'referenceNo',
-      'amount',
-      'amountFormatted',
-      'transactionNo',
-      'date',
-      'dateFormatted',
-      'transactionId',
-      'transactionNo',
-      'transactionType',
-      'transsactionTypeFormatted',
-    ];
-  };
-
-  /**
-   * Exclude all attributes.
-   * @returns {Array<string>}
-   */
-  public excludeAttributes = (): string[] => {
-    return ['*'];
-  };
-
-  /**
-   * Retrieves the manual journal reference no.
-   * @param manualJournal
-   * @returns {string}
-   */
-  protected referenceNo(manualJournal) {
-    return manualJournal.referenceNo;
-  }
-
-  /**
-   * Retrieves the manual journal amount.
-   * @param manualJournal
-   * @returns {number}
-   */
-  protected amount(manualJournal) {
-    return manualJournal.amount;
-  }
-
-  /**
-   * Retrieves the manual journal formatted amount.
-   * @param manualJournal
-   * @returns {string}
-   */
-  protected amountFormatted(manualJournal) {
-    return this.formatNumber(manualJournal.amount, {
-      currencyCode: manualJournal.currencyCode,
-      money: true,
-    });
-  }
-
-  /**
-   * Retreives the manual journal date.
-   * @param manualJournal
-   * @returns {Date}
-   */
-  protected date(manualJournal) {
-    return manualJournal.date;
-  }
-
-  /**
-   * Retrieves the manual journal formatted date.
-   * @param manualJournal
-   * @returns {string}
-   */
-  protected dateFormatted(manualJournal) {
-    return this.formatDate(manualJournal.date);
-  }
-
-  /**
-   * Retrieve the manual journal transaction id.
-   * @returns {number}
-   */
-  protected transactionId(manualJournal) {
-    return manualJournal.id;
-  }
-
-  /**
-   * Retrieve the manual journal transaction number.
-   * @param manualJournal
-   */
-  protected transactionNo(manualJournal) {
-    return manualJournal.journalNumber;
-  }
-
-  /**
-   * Retrieve the manual journal transaction type.
-   * @returns {string}
-   */
-  protected transactionType() {
-    return 'ManualJournal';
-  }
-
-  /**
-   * Retrieves the manual journal formatted transaction type.
-   * @returns {string}
-   */
-  protected transsactionTypeFormatted() {
-    return 'Manual Journal';
-  }
-}
-

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

@@ -1,107 +0,0 @@
-import { Inject, Service } from 'typedi';
-import * as R from 'ramda';
-import moment from 'moment';
-import { PromisePool } from '@supercharge/promise-pool';
-import { GetMatchedTransactionsFilter, MatchedTransactionsPOJO } from './types';
-import { GetMatchedTransactionsByExpenses } from './GetMatchedTransactionsByExpenses';
-import { GetMatchedTransactionsByBills } from './GetMatchedTransactionsByBills';
-import { GetMatchedTransactionsByManualJournals } from './GetMatchedTransactionsByManualJournals';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import { sortClosestMatchTransactions } from './_utils';
-
-@Service()
-export class GetMatchedTransactions {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  @Inject()
-  private getMatchedInvoicesService: GetMatchedTransactionsByExpenses;
-
-  @Inject()
-  private getMatchedBillsService: GetMatchedTransactionsByBills;
-
-  @Inject()
-  private getMatchedManualJournalService: GetMatchedTransactionsByManualJournals;
-
-  @Inject()
-  private getMatchedExpensesService: GetMatchedTransactionsByExpenses;
-
-  /**
-   * Registered matched transactions types.
-   */
-  get registered() {
-    return [
-      { type: 'SaleInvoice', service: this.getMatchedInvoicesService },
-      { type: 'Bill', service: this.getMatchedBillsService },
-      { type: 'Expense', service: this.getMatchedExpensesService },
-      { type: 'ManualJournal', service: this.getMatchedManualJournalService },
-    ];
-  }
-
-  /**
-   * Retrieves the matched transactions.
-   * @param {number} tenantId -
-   * @param {GetMatchedTransactionsFilter} filter -
-   * @returns {Promise<MatchedTransactionsPOJO>}
-   */
-  public async getMatchedTransactions(
-    tenantId: number,
-    uncategorizedTransactionId: number,
-    filter: GetMatchedTransactionsFilter
-  ): Promise<MatchedTransactionsPOJO> {
-    const { UncategorizedCashflowTransaction } = this.tenancy.models(tenantId);
-
-    const uncategorizedTransaction =
-      await UncategorizedCashflowTransaction.query()
-        .findById(uncategorizedTransactionId)
-        .throwIfNotFound();
-
-    const filtered = filter.transactionType
-      ? this.registered.filter((item) => item.type === filter.transactionType)
-      : this.registered;
-
-    const matchedTransactions = await PromisePool.withConcurrency(2)
-      .for(filtered)
-      .process(async ({ type, service }) => {
-        return service.getMatchedTransactions(tenantId, filter);
-      });
-
-    const { perfectMatches, possibleMatches } = this.groupMatchedResults(
-      uncategorizedTransaction,
-      matchedTransactions
-    );
-    return {
-      perfectMatches,
-      possibleMatches,
-    };
-  }
-
-  /**
-   * Groups the given results for getting perfect and possible matches
-   * based on the given uncategorized transaction.
-   * @param uncategorizedTransaction
-   * @param matchedTransactions
-   * @returns {MatchedTransactionsPOJO}
-   */
-  private groupMatchedResults(
-    uncategorizedTransaction,
-    matchedTransactions
-  ): MatchedTransactionsPOJO {
-    const results = R.compose(R.flatten)(matchedTransactions?.results);
-
-    // Sort the results based on amount, date, and transaction type
-    const closestResullts = sortClosestMatchTransactions(
-      uncategorizedTransaction,
-      results
-    );
-    const perfectMatches = R.filter(
-      (match) =>
-        match.amount === uncategorizedTransaction.amount &&
-        moment(match.date).isSame(uncategorizedTransaction.date, 'day'),
-      closestResullts
-    );
-    const possibleMatches = R.difference(closestResullts, perfectMatches);
-
-    return { perfectMatches, possibleMatches };
-  }
-}

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

@@ -1,58 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
-import { GetMatchedTransactionBillsTransformer } from './GetMatchedTransactionBillsTransformer';
-import { GetMatchedTransactionsFilter, MatchedTransactionPOJO } from './types';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import { GetMatchedTransactionsByType } from './GetMatchedTransactionsByType';
-
-@Service()
-export class GetMatchedTransactionsByBills extends GetMatchedTransactionsByType {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  @Inject()
-  private transformer: TransformerInjectable;
-
-  /**
-   * Retrieves the matched transactions.
-   * @param {number} tenantId -
-   * @param {GetMatchedTransactionsFilter} filter -
-   */
-  public async getMatchedTransactions(
-    tenantId: number,
-    filter: GetMatchedTransactionsFilter
-  ) {
-    const { Bill } = this.tenancy.models(tenantId);
-
-    const bills = await Bill.query().onBuild((q) => {
-      q.whereNotExists(Bill.relatedQuery('matchedBankTransaction'));
-    });
-
-    return this.transformer.transform(
-      tenantId,
-      bills,
-      new GetMatchedTransactionBillsTransformer()
-    );
-  }
-
-  /**
-   * Retrieves the given bill matched transaction.
-   * @param {number} tenantId
-   * @param {number} transactionId
-   * @returns {Promise<MatchedTransactionPOJO>}
-   */
-  public async getMatchedTransaction(
-    tenantId: number,
-    transactionId: number
-  ): Promise<MatchedTransactionPOJO> {
-    const { Bill } = this.tenancy.models(tenantId);
-
-    const bill = await Bill.query().findById(transactionId).throwIfNotFound();
-
-    return this.transformer.transform(
-      tenantId,
-      bill,
-      new GetMatchedTransactionBillsTransformer()
-    );
-  }
-}

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

@@ -1,72 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { GetMatchedTransactionsFilter, MatchedTransactionPOJO } from './types';
-import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import { GetMatchedTransactionsByType } from './GetMatchedTransactionsByType';
-import { GetMatchedTransactionExpensesTransformer } from './GetMatchedTransactionExpensesTransformer';
-
-@Service()
-export class GetMatchedTransactionsByExpenses extends GetMatchedTransactionsByType {
-  @Inject()
-  protected tenancy: HasTenancyService;
-
-  @Inject()
-  protected transformer: TransformerInjectable;
-
-  /**
-   * Retrieves the matched transactions of expenses.
-   * @param {number} tenantId
-   * @param {GetMatchedTransactionsFilter} filter
-   * @returns
-   */
-  async getMatchedTransactions(
-    tenantId: number,
-    filter: GetMatchedTransactionsFilter
-  ) {
-    const { Expense } = this.tenancy.models(tenantId);
-
-    const expenses = await Expense.query().onBuild((query) => {
-      query.whereNotExists(Expense.relatedQuery('matchedBankTransaction'));
-      if (filter.fromDate) {
-        query.where('payment_date', '>=', filter.fromDate);
-      }
-      if (filter.toDate) {
-        query.where('payment_date', '<=', filter.toDate);
-      }
-      if (filter.minAmount) {
-        query.where('total_amount', '>=', filter.minAmount);
-      }
-      if (filter.maxAmount) {
-        query.where('total_amount', '<=', filter.maxAmount);
-      }
-    });
-    return this.transformer.transform(
-      tenantId,
-      expenses,
-      new GetMatchedTransactionExpensesTransformer()
-    );
-  }
-
-  /**
-   * Retrieves the given matched expense transaction.
-   * @param {number} tenantId
-   * @param {number} transactionId
-   * @returns {GetMatchedTransactionExpensesTransformer-}
-   */
-  public async getMatchedTransaction(
-    tenantId: number,
-    transactionId: number
-  ): Promise<MatchedTransactionPOJO> {
-    const { Expense } = this.tenancy.models(tenantId);
-
-    const expense = await Expense.query()
-      .findById(transactionId)
-      .throwIfNotFound();
-
-    return this.transformer.transform(
-      tenantId,
-      expense,
-      new GetMatchedTransactionExpensesTransformer()
-    );
-  }
-}

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

@@ -1,63 +0,0 @@
-import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
-import { GetMatchedTransactionInvoicesTransformer } from './GetMatchedTransactionInvoicesTransformer';
-import {
-  GetMatchedTransactionsFilter,
-  MatchedTransactionPOJO,
-  MatchedTransactionsPOJO,
-} from './types';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import { Inject, Service } from 'typedi';
-import { GetMatchedTransactionsByType } from './GetMatchedTransactionsByType';
-
-@Service()
-export class GetMatchedTransactionsByInvoices extends GetMatchedTransactionsByType {
-  @Inject()
-  protected tenancy: HasTenancyService;
-
-  @Inject()
-  protected transformer: TransformerInjectable;
-
-  /**
-   * Retrieves the matched transactions.
-   * @param {number} tenantId -
-   * @param {GetMatchedTransactionsFilter} filter -
-   * @returns {Promise<MatchedTransactionsPOJO>}
-   */
-  public async getMatchedTransactions(
-    tenantId: number,
-    filter: GetMatchedTransactionsFilter
-  ): Promise<MatchedTransactionsPOJO> {
-    const { SaleInvoice } = this.tenancy.models(tenantId);
-
-    const invoices = await SaleInvoice.query().onBuild((q) => {
-      q.whereNotExists(SaleInvoice.relatedQuery('matchedBankTransaction'));
-    });
-
-    return this.transformer.transform(
-      tenantId,
-      invoices,
-      new GetMatchedTransactionInvoicesTransformer()
-    );
-  }
-
-  /**
-   * Retrieves the matched transaction.
-   * @param {number} tenantId
-   * @param {number} transactionId
-   * @returns {Promise<MatchedTransactionPOJO>}
-   */
-  public async getMatchedTransaction(
-    tenantId: number,
-    transactionId: number
-  ): Promise<MatchedTransactionPOJO> {
-    const { SaleInvoice } = this.tenancy.models(tenantId);
-
-    const invoice = await SaleInvoice.query().findById(transactionId);
-
-    return this.transformer.transform(
-      tenantId,
-      invoice,
-      new GetMatchedTransactionInvoicesTransformer()
-    );
-  }
-}

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

@@ -1,68 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
-import { GetMatchedTransactionManualJournalsTransformer } from './GetMatchedTransactionManualJournalsTransformer';
-import { GetMatchedTransactionsByType } from './GetMatchedTransactionsByType';
-import { GetMatchedTransactionsFilter } from './types';
-
-@Service()
-export class GetMatchedTransactionsByManualJournals extends GetMatchedTransactionsByType {
-  @Inject()
-  private transformer: TransformerInjectable;
-
-  /**
-   * Retrieve the matched transactions of manual journals.
-   * @param {number} tenantId
-   * @param {GetMatchedTransactionsFilter} filter
-   * @returns
-   */
-  async getMatchedTransactions(
-    tenantId: number,
-    filter: Omit<GetMatchedTransactionsFilter, 'transactionType'>
-  ) {
-    const { ManualJournal } = this.tenancy.models(tenantId);
-
-    const manualJournals = await ManualJournal.query().onBuild((query) => {
-      query.whereNotExists(
-        ManualJournal.relatedQuery('matchedBankTransaction')
-      );
-      if (filter.fromDate) {
-        query.where('date', '>=', filter.fromDate);
-      }
-      if (filter.toDate) {
-        query.where('date', '<=', filter.toDate);
-      }
-      if (filter.minAmount) {
-        query.where('amount', '>=', filter.minAmount);
-      }
-      if (filter.maxAmount) {
-        query.where('amount', '<=', filter.maxAmount);
-      }
-    });
-    return this.transformer.transform(
-      tenantId,
-      manualJournals,
-      new GetMatchedTransactionManualJournalsTransformer()
-    );
-  }
-
-  /**
-   * Retrieves the matched transaction of manual journals.
-   * @param {number} tenantId
-   * @param {number} transactionId
-   * @returns
-   */
-  async getMatchedTransaction(tenantId: number, transactionId: number) {
-    const { ManualJournal } = this.tenancy.models(tenantId);
-
-    const manualJournal = await ManualJournal.query()
-      .findById(transactionId)
-      .whereNotExists(ManualJournal.relatedQuery('matchedBankTransaction'))
-      .throwIfNotFound();
-
-    return this.transformer.transform(
-      tenantId,
-      manualJournal,
-      new GetMatchedTransactionManualJournalsTransformer()
-    );
-  }
-}

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

@@ -1,66 +0,0 @@
-import { Knex } from 'knex';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import {
-  GetMatchedTransactionsFilter,
-  IMatchTransactionDTO,
-  MatchedTransactionPOJO,
-  MatchedTransactionsPOJO,
-} from './types';
-import { Inject, Service } from 'typedi';
-
-export abstract class GetMatchedTransactionsByType {
-  @Inject()
-  protected tenancy: HasTenancyService;
-
-  /**
-   * Retrieves the matched transactions.
-   * @param {number} tenantId -
-   * @param {GetMatchedTransactionsFilter} filter -
-   * @returns {Promise<MatchedTransactionsPOJO>}
-   */
-  public async getMatchedTransactions(
-    tenantId: number,
-    filter: GetMatchedTransactionsFilter
-  ): Promise<MatchedTransactionsPOJO> {
-    throw new Error(
-      'The `getMatchedTransactions` method is not defined for the transaction type.'
-    );
-  }
-
-  /**
-   * Retrieves the matched transaction details.
-   * @param {number} tenantId -
-   * @param {number} transactionId -
-   * @returns {Promise<MatchedTransactionPOJO>}
-   */
-  public async getMatchedTransaction(
-    tenantId: number,
-    transactionId: number
-  ): Promise<MatchedTransactionPOJO> {
-    throw new Error(
-      'The `getMatchedTransaction` method is not defined for the transaction type.'
-    );
-  }
-
-  /**
-   *
-   * @param {number} tenantId
-   * @param {number} uncategorizedTransactionId
-   * @param {IMatchTransactionDTO} matchTransactionDTO
-   * @param {Knex.Transaction} trx
-   */
-  public async createMatchedTransaction(
-    tenantId: number,
-    uncategorizedTransactionId: number,
-    matchTransactionDTO: IMatchTransactionDTO,
-    trx?: Knex.Transaction
-  ) {
-    const { MatchedBankTransaction } = this.tenancy.models(tenantId);
-
-    await MatchedBankTransaction.query(trx).insert({
-      uncategorizedTransactionId,
-      referenceType: matchTransactionDTO.referenceType,
-      referenceId: matchTransactionDTO.referenceId,
-    });
-  }
-}

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

@@ -1,70 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { GetMatchedTransactions } from './GetMatchedTransactions';
-import { MatchBankTransactions } from './MatchTransactions';
-import { UnmatchMatchedBankTransaction } from './UnmatchMatchedTransaction';
-import { GetMatchedTransactionsFilter, IMatchTransactionsDTO } from './types';
-
-@Service()
-export class MatchBankTransactionsApplication {
-  @Inject()
-  private getMatchedTransactionsService: GetMatchedTransactions;
-
-  @Inject()
-  private matchTransactionService: MatchBankTransactions;
-
-  @Inject()
-  private unmatchMatchedTransactionService: UnmatchMatchedBankTransaction;
-
-  /**
-   * Retrieves the matched transactions.
-   * @param {number} tenantId -
-   * @param {GetMatchedTransactionsFilter} filter -
-   * @returns
-   */
-  public getMatchedTransactions(
-    tenantId: number,
-    uncategorizedTransactionId: number,
-    filter: GetMatchedTransactionsFilter
-  ) {
-    return this.getMatchedTransactionsService.getMatchedTransactions(
-      tenantId,
-      uncategorizedTransactionId,
-      filter
-    );
-  }
-
-  /**
-   * Matches the given uncategorized transaction with the given system transaction.
-   * @param {number} tenantId
-   * @param {number} uncategorizedTransactionId
-   * @param {IMatchTransactionDTO} matchTransactionsDTO
-   * @returns {Promise<void>}
-   */
-  public matchTransaction(
-    tenantId: number,
-    uncategorizedTransactionId: number,
-    matchTransactionsDTO: IMatchTransactionsDTO
-  ): Promise<void> {
-    return this.matchTransactionService.matchTransaction(
-      tenantId,
-      uncategorizedTransactionId,
-      matchTransactionsDTO
-    );
-  }
-
-  /**
-   * Unmatch the given matched transaction.
-   * @param {number} tenantId
-   * @param {number} uncategorizedTransactionId
-   * @returns {Promise<void>}
-   */
-  public unmatchMatchedTransaction(
-    tenantId: number,
-    uncategorizedTransactionId: number
-  ) {
-    return this.unmatchMatchedTransactionService.unmatchMatchedTransaction(
-      tenantId,
-      uncategorizedTransactionId
-    );
-  }
-}

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

@@ -1,157 +0,0 @@
-import { isEmpty, sumBy } from 'lodash';
-import { Knex } from 'knex';
-import { Inject, Service } from 'typedi';
-import { PromisePool } from '@supercharge/promise-pool';
-import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import UnitOfWork from '@/services/UnitOfWork';
-import events from '@/subscribers/events';
-import {
-  ERRORS,
-  IBankTransactionMatchedEventPayload,
-  IBankTransactionMatchingEventPayload,
-  IMatchTransactionsDTO,
-} from './types';
-import { MatchTransactionsTypes } from './MatchTransactionsTypes';
-import { ServiceError } from '@/exceptions';
-
-@Service()
-export class MatchBankTransactions {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  @Inject()
-  private uow: UnitOfWork;
-
-  @Inject()
-  private eventPublisher: EventPublisher;
-
-  @Inject()
-  private matchedBankTransactions: MatchTransactionsTypes;
-
-  /**
-   * Validates the match bank transactions DTO.
-   * @param {number} tenantId
-   * @param {number} uncategorizedTransactionId
-   * @param {IMatchTransactionsDTO} matchTransactionsDTO
-   * @returns {Promise<void>}
-   */
-  async validate(
-    tenantId: number,
-    uncategorizedTransactionId: number,
-    matchTransactionsDTO: IMatchTransactionsDTO
-  ) {
-    const { UncategorizedCashflowTransaction } = this.tenancy.models(tenantId);
-    const { matchedTransactions } = matchTransactionsDTO;
-
-    // Validates the uncategorized transaction existance.
-    const uncategorizedTransaction =
-      await UncategorizedCashflowTransaction.query()
-        .findById(uncategorizedTransactionId)
-        .withGraphFetched('matchedBankTransactions')
-        .throwIfNotFound();
-
-    // Validates the uncategorized transaction is not already matched.
-    if (!isEmpty(uncategorizedTransaction.matchedBankTransactions)) {
-      throw new ServiceError(ERRORS.TRANSACTION_ALREADY_MATCHED);
-    }
-    // Validate the uncategorized transaction is not excluded.
-    if (uncategorizedTransaction.excluded) {
-      throw new ServiceError(ERRORS.CANNOT_MATCH_EXCLUDED_TRANSACTION);
-    }
-    // Validates the given matched transaction.
-    const validateMatchedTransaction = async (matchedTransaction) => {
-      const getMatchedTransactionsService =
-        this.matchedBankTransactions.registry.get(
-          matchedTransaction.referenceType
-        );
-      if (!getMatchedTransactionsService) {
-        throw new ServiceError(
-          ERRORS.RESOURCE_TYPE_MATCHING_TRANSACTION_INVALID
-        );
-      }
-      const foundMatchedTransaction =
-        await getMatchedTransactionsService.getMatchedTransaction(
-          tenantId,
-          matchedTransaction.referenceId
-        );
-      if (!foundMatchedTransaction) {
-        throw new ServiceError(ERRORS.RESOURCE_ID_MATCHING_TRANSACTION_INVALID);
-      }
-      return foundMatchedTransaction;
-    };
-    // Matches the given transactions under promise pool concurrency controlling.
-    const validatationResult = await PromisePool.withConcurrency(10)
-      .for(matchedTransactions)
-      .process(validateMatchedTransaction);
-
-    if (validatationResult.errors?.length > 0) {
-      const error = validatationResult.errors.map((er) => er.raw)[0];
-      throw new ServiceError(error);
-    }
-    // Calculate the total given matching transactions.
-    const totalMatchedTranasctions = sumBy(
-      validatationResult.results,
-      'amount'
-    );
-    // Validates the total given matching transcations whether is not equal
-    // uncategorized transaction amount.
-    if (totalMatchedTranasctions !== uncategorizedTransaction.amount) {
-      throw new ServiceError(ERRORS.TOTAL_MATCHING_TRANSACTIONS_INVALID);
-    }
-  }
-
-  /**
-   * Matches the given uncategorized transaction to the given references.
-   * @param {number} tenantId
-   * @param {number} uncategorizedTransactionId
-   * @returns {Promise<void>}
-   */
-  public async matchTransaction(
-    tenantId: number,
-    uncategorizedTransactionId: number,
-    matchTransactionsDTO: IMatchTransactionsDTO
-  ): Promise<void> {
-    const { matchedTransactions } = matchTransactionsDTO;
-
-    // Validates the given matching transactions DTO.
-    await this.validate(
-      tenantId,
-      uncategorizedTransactionId,
-      matchTransactionsDTO
-    );
-    return this.uow.withTransaction(tenantId, async (trx: Knex.Transaction) => {
-      // Triggers the event `onBankTransactionMatching`.
-      await this.eventPublisher.emitAsync(events.bankMatch.onMatching, {
-        tenantId,
-        uncategorizedTransactionId,
-        matchTransactionsDTO,
-        trx,
-      } as IBankTransactionMatchingEventPayload);
-
-      // Matches the given transactions under promise pool concurrency controlling.
-      await PromisePool.withConcurrency(10)
-        .for(matchedTransactions)
-        .process(async (matchedTransaction) => {
-          const getMatchedTransactionsService =
-            this.matchedBankTransactions.registry.get(
-              matchedTransaction.referenceType
-            );
-          await getMatchedTransactionsService.createMatchedTransaction(
-            tenantId,
-            uncategorizedTransactionId,
-            matchedTransaction,
-            trx
-          );
-        });
-
-      // Triggers the event `onBankTransactionMatched`.
-      await this.eventPublisher.emitAsync(events.bankMatch.onMatched, {
-        tenantId,
-        uncategorizedTransactionId,
-        matchTransactionsDTO,
-        trx,
-      } as IBankTransactionMatchedEventPayload);
-    });
-  }
-}

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

@@ -1,57 +0,0 @@
-import Container, { Service } from 'typedi';
-import { GetMatchedTransactionsByExpenses } from './GetMatchedTransactionsByExpenses';
-import { GetMatchedTransactionsByBills } from './GetMatchedTransactionsByBills';
-import { GetMatchedTransactionsByManualJournals } from './GetMatchedTransactionsByManualJournals';
-import { MatchTransactionsTypesRegistry } from './MatchTransactionsTypesRegistry';
-import { GetMatchedTransactionsByInvoices } from './GetMatchedTransactionsByInvoices';
-
-@Service()
-export class MatchTransactionsTypes {
-  private static registry: MatchTransactionsTypesRegistry;
-
-  /**
-   * Consttuctor method.
-   */
-  constructor() {
-    this.boot();
-  }
-
-  get registered() {
-    return [
-      { type: 'SaleInvoice', service: GetMatchedTransactionsByInvoices },
-      { type: 'Bill', service: GetMatchedTransactionsByBills },
-      { type: 'Expense', service: GetMatchedTransactionsByExpenses },
-      {
-        type: 'ManualJournal',
-        service: GetMatchedTransactionsByManualJournals,
-      },
-    ];
-  }
-
-  /**
-   * Importable instances.
-   */
-  private types = [];
-
-  /**
-   *
-   */
-  public get registry() {
-    return MatchTransactionsTypes.registry;
-  }
-
-  /**
-   * Boots all the registered importables.
-   */
-  public boot() {
-    if (!MatchTransactionsTypes.registry) {
-      const instance = MatchTransactionsTypesRegistry.getInstance();
-
-      this.registered.forEach((registered) => {
-        const serviceInstanace = Container.get(registered.service);
-        instance.register(registered.type, serviceInstanace);
-      });
-      MatchTransactionsTypes.registry = instance;
-    }
-  }
-}

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

@@ -1,50 +0,0 @@
-import { camelCase, upperFirst } from 'lodash';
-import { GetMatchedTransactionsByType } from './GetMatchedTransactionsByType';
-
-export class MatchTransactionsTypesRegistry {
-  private static instance: MatchTransactionsTypesRegistry;
-  private importables: Record<string, GetMatchedTransactionsByType>;
-
-  constructor() {
-    this.importables = {};
-  }
-
-  /**
-   * Gets singleton instance of registry.
-   * @returns {MatchTransactionsTypesRegistry}
-   */
-  public static getInstance(): MatchTransactionsTypesRegistry {
-    if (!MatchTransactionsTypesRegistry.instance) {
-      MatchTransactionsTypesRegistry.instance =
-        new MatchTransactionsTypesRegistry();
-    }
-    return MatchTransactionsTypesRegistry.instance;
-  }
-
-  /**
-   * Registers the given importable service.
-   * @param {string} resource
-   * @param {GetMatchedTransactionsByType} importable
-   */
-  public register(
-    resource: string,
-    importable: GetMatchedTransactionsByType
-  ): void {
-    const _resource = this.sanitizeResourceName(resource);
-    this.importables[_resource] = importable;
-  }
-
-  /**
-   * Retrieves the importable service instance of the given resource name.
-   * @param {string} name
-   * @returns {GetMatchedTransactionsByType}
-   */
-  public get(name: string): GetMatchedTransactionsByType {
-    const _name = this.sanitizeResourceName(name);
-    return this.importables[_name];
-  }
-
-  private sanitizeResourceName(resource: string) {
-    return upperFirst(camelCase(resource));
-  }
-}

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

@@ -1,47 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import UnitOfWork from '@/services/UnitOfWork';
-import events from '@/subscribers/events';
-import { IBankTransactionUnmatchingEventPayload } from './types';
-
-@Service()
-export class UnmatchMatchedBankTransaction {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  @Inject()
-  private uow: UnitOfWork;
-
-  @Inject()
-  private eventPublisher: EventPublisher;
-
-  /**
-   * Unmatch the matched the given uncategorized bank transaction.
-   * @param {number} tenantId
-   * @param {number} uncategorizedTransactionId
-   * @returns {Promise<void>}
-   */
-  public unmatchMatchedTransaction(
-    tenantId: number,
-    uncategorizedTransactionId: number
-  ): Promise<void> {
-    const { MatchedBankTransaction } = this.tenancy.models(tenantId);
-
-    return this.uow.withTransaction(tenantId, async (trx) => {
-      await this.eventPublisher.emitAsync(events.bankMatch.onUnmatching, {
-        tenantId,
-        trx,
-      } as IBankTransactionUnmatchingEventPayload);
-
-      await MatchedBankTransaction.query(trx)
-        .where('uncategorizedTransactionId', uncategorizedTransactionId)
-        .delete();
-
-      await this.eventPublisher.emitAsync(events.bankMatch.onUnmatched, {
-        tenantId,
-        trx,
-      } as IBankTransactionUnmatchingEventPayload);
-    });
-  }
-}

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

@@ -1,34 +0,0 @@
-import { ServiceError } from '@/exceptions';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import { Inject, Service } from 'typedi';
-import { ERRORS } from './types';
-
-@Service()
-export class ValidateTransactionMatched {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  /**
-   * Validate the given transaction whether is matched with bank transactions.
-   * @param {number} tenantId
-   * @param {string} referenceType - Transaction reference type.
-   * @param {number} referenceId - Transaction reference id.
-   * @returns {Promise<void>}
-   */
-  public async validateTransactionNoMatchLinking(
-    tenantId: number,
-    referenceType: string,
-    referenceId: number
-  ) {
-    const { MatchedBankTransaction } = this.tenancy.models(tenantId);
-
-    const foundMatchedTransaction =
-      await MatchedBankTransaction.query().findOne({
-        referenceType,
-        referenceId,
-      });
-    if (foundMatchedTransaction) {
-      throw new ServiceError(ERRORS.CANNOT_DELETE_TRANSACTION_MATCHED);
-    }
-  }
-}

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

@@ -1,22 +0,0 @@
-import moment from 'moment';
-import * as R from 'ramda';
-import UncategorizedCashflowTransaction from '@/models/UncategorizedCashflowTransaction';
-import { MatchedTransactionPOJO } from './types';
-
-export const sortClosestMatchTransactions = (
-  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 - uncategorizedTransaction.amount)
-    ),
-    // Sort by date difference (closest to uncategorized transaction date first)
-    R.ascend((match: MatchedTransactionPOJO) =>
-      Math.abs(
-        moment(match.date).diff(moment(uncategorizedTransaction.date), 'days')
-      )
-    ),
-  ])(matches);
-};

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

@@ -1,36 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { IManualJournalDeletingPayload } from '@/interfaces';
-import events from '@/subscribers/events';
-import { ValidateTransactionMatched } from '../ValidateTransactionsMatched';
-
-@Service()
-export class ValidateMatchingOnCashflowDelete {
-  @Inject()
-  private validateNoMatchingLinkedService: ValidateTransactionMatched;
-
-  /**
-   * Constructor method.
-   */
-  public attach(bus) {
-    bus.subscribe(
-      events.cashflow.onTransactionDeleting,
-      this.validateMatchingOnCashflowDeleting.bind(this)
-    );
-  }
-
-  /**
-   * Validates the cashflow transaction whether matched with bank transaction on deleting.
-   * @param {IManualJournalDeletingPayload}
-   */
-  public async validateMatchingOnCashflowDeleting({
-    tenantId,
-    oldManualJournal,
-    trx,
-  }: IManualJournalDeletingPayload) {
-    await this.validateNoMatchingLinkedService.validateTransactionNoMatchLinking(
-      tenantId,
-      'ManualJournal',
-      oldManualJournal.id
-    );
-  }
-}

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

@@ -1,36 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { IExpenseEventDeletePayload } from '@/interfaces';
-import events from '@/subscribers/events';
-import { ValidateTransactionMatched } from '../ValidateTransactionsMatched';
-
-@Service()
-export class ValidateMatchingOnExpenseDelete {
-  @Inject()
-  private validateNoMatchingLinkedService: ValidateTransactionMatched;
-
-  /**
-   * Constructor method.
-   */
-  public attach(bus) {
-    bus.subscribe(
-      events.expenses.onDeleting,
-      this.validateMatchingOnExpenseDeleting.bind(this)
-    );
-  }
-
-  /**
-   * Validates the expense transaction whether matched with bank transaction on deleting.
-   * @param {IExpenseEventDeletePayload}
-   */
-  public async validateMatchingOnExpenseDeleting({
-    tenantId,
-    oldExpense,
-    trx,
-  }: IExpenseEventDeletePayload) {
-    await this.validateNoMatchingLinkedService.validateTransactionNoMatchLinking(
-      tenantId,
-      'Expense',
-      oldExpense.id
-    );
-  }
-}

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

@@ -1,36 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { IManualJournalDeletingPayload } from '@/interfaces';
-import events from '@/subscribers/events';
-import { ValidateTransactionMatched } from '../ValidateTransactionsMatched';
-
-@Service()
-export class ValidateMatchingOnManualJournalDelete {
-  @Inject()
-  private validateNoMatchingLinkedService: ValidateTransactionMatched;
-
-  /**
-   * Constructor method.
-   */
-  public attach(bus) {
-    bus.subscribe(
-      events.manualJournals.onDeleting,
-      this.validateMatchingOnManualJournalDeleting.bind(this)
-    );
-  }
-
-  /**
-   * Validates the manual journal transaction whether matched with bank transaction on deleting.
-   * @param {IManualJournalDeletingPayload}
-   */
-  public async validateMatchingOnManualJournalDeleting({
-    tenantId,
-    oldManualJournal,
-    trx,
-  }: IManualJournalDeletingPayload) {
-    await this.validateNoMatchingLinkedService.validateTransactionNoMatchLinking(
-      tenantId,
-      'ManualJournal',
-      oldManualJournal.id
-    );
-  }
-}

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

@@ -1,39 +0,0 @@
-import { Inject, Service } from 'typedi';
-import {
-  IBillPaymentEventDeletedPayload,
-  IPaymentReceiveDeletedPayload,
-} from '@/interfaces';
-import { ValidateTransactionMatched } from '../ValidateTransactionsMatched';
-import events from '@/subscribers/events';
-
-@Service()
-export class ValidateMatchingOnPaymentMadeDelete {
-  @Inject()
-  private validateNoMatchingLinkedService: ValidateTransactionMatched;
-
-  /**
-   * Constructor method.
-   */
-  public attach(bus) {
-    bus.subscribe(
-      events.billPayment.onDeleting,
-      this.validateMatchingOnPaymentMadeDeleting.bind(this)
-    );
-  }
-
-  /**
-   * Validates the payment made transaction whether matched with bank transaction on deleting.
-   * @param {IPaymentReceiveDeletedPayload}
-   */
-  public async validateMatchingOnPaymentMadeDeleting({
-    tenantId,
-    oldBillPayment,
-    trx,
-  }: IBillPaymentEventDeletedPayload) {
-    await this.validateNoMatchingLinkedService.validateTransactionNoMatchLinking(
-      tenantId,
-      'PaymentMade',
-      oldBillPayment.id
-    );
-  }
-}

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

@@ -1,36 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { IPaymentReceiveDeletedPayload } from '@/interfaces';
-import { ValidateTransactionMatched } from '../ValidateTransactionsMatched';
-import events from '@/subscribers/events';
-
-@Service()
-export class ValidateMatchingOnPaymentReceivedDelete {
-  @Inject()
-  private validateNoMatchingLinkedService: ValidateTransactionMatched;
-
-  /**
-   * Constructor method.
-   */
-  public attach(bus) {
-    bus.subscribe(
-      events.paymentReceive.onDeleting,
-      this.validateMatchingOnPaymentReceivedDeleting.bind(this)
-    );
-  }
-
-  /**
-   * Validates the payment received transaction whether matched with bank transaction on deleting.
-   * @param {IPaymentReceiveDeletedPayload}
-   */
-  public async validateMatchingOnPaymentReceivedDeleting({
-    tenantId,
-    oldPaymentReceive,
-    trx,
-  }: IPaymentReceiveDeletedPayload) {
-    await this.validateNoMatchingLinkedService.validateTransactionNoMatchLinking(
-      tenantId,
-      'PaymentReceive',
-      oldPaymentReceive.id
-    );
-  }
-}

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

@@ -1,67 +0,0 @@
-import { Knex } from 'knex';
-
-export interface IBankTransactionMatchingEventPayload {
-  tenantId: number;
-  uncategorizedTransactionId: number;
-  matchTransactionsDTO: IMatchTransactionsDTO;
-  trx?: Knex.Transaction;
-}
-
-export interface IBankTransactionMatchedEventPayload {
-  tenantId: number;
-  uncategorizedTransactionId: number;
-  matchTransactionsDTO: IMatchTransactionsDTO;
-  trx?: Knex.Transaction;
-}
-
-export interface IBankTransactionUnmatchingEventPayload {
-  tenantId: number;
-}
-
-export interface IBankTransactionUnmatchedEventPayload {
-  tenantId: number;
-}
-
-export interface IMatchTransactionDTO {
-  referenceType: string;
-  referenceId: number;
-}
-
-export interface IMatchTransactionsDTO {
-  matchedTransactions: Array<IMatchTransactionDTO>;
-}
-
-export interface GetMatchedTransactionsFilter {
-  fromDate: string;
-  toDate: string;
-  minAmount: number;
-  maxAmount: number;
-  transactionType: string;
-}
-
-export interface MatchedTransactionPOJO {
-  amount: number;
-  amountFormatted: string;
-  date: string;
-  dateFormatted: string;
-  referenceNo: string;
-  transactionNo: string;
-  transactionId: number;
-  transactionType: string;
-}
-
-export type MatchedTransactionsPOJO = {
-  perfectMatches: Array<MatchedTransactionPOJO>;
-  possibleMatches: Array<MatchedTransactionPOJO>;
-};
-
-export const ERRORS = {
-  RESOURCE_TYPE_MATCHING_TRANSACTION_INVALID:
-    'RESOURCE_TYPE_MATCHING_TRANSACTION_INVALID',
-  RESOURCE_ID_MATCHING_TRANSACTION_INVALID:
-    'RESOURCE_ID_MATCHING_TRANSACTION_INVALID',
-  TOTAL_MATCHING_TRANSACTIONS_INVALID: 'TOTAL_MATCHING_TRANSACTIONS_INVALID',
-  TRANSACTION_ALREADY_MATCHED: 'TRANSACTION_ALREADY_MATCHED',
-  CANNOT_MATCH_EXCLUDED_TRANSACTION: 'CANNOT_MATCH_EXCLUDED_TRANSACTION',
-  CANNOT_DELETE_TRANSACTION_MATCHED: 'CANNOT_DELETE_TRANSACTION_MATCHED',
-};

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

@@ -3,12 +3,7 @@ import { Inject, Service } from 'typedi';
 import bluebird from 'bluebird';
 import { entries, groupBy } from 'lodash';
 import { CreateAccount } from '@/services/Accounts/CreateAccount';
-import {
+import { PlaidAccount, PlaidTransaction } from '@/interfaces';
-  IAccountCreateDTO,
-  IPlaidTransactionsSyncedEventPayload,
-  PlaidAccount,
-  PlaidTransaction,
-} from '@/interfaces';
 import {
   transformPlaidAccountToCreateAccount,
   transformPlaidTrxsToCashflowCreate,
@@ -16,10 +11,6 @@ import {
 import { DeleteCashflowTransaction } from '@/services/Cashflow/DeleteCashflowTransactionService';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';
-import { Knex } from 'knex';
-import { uniqid } from 'uniqid';
-import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
-import events from '@/subscribers/events';
 
 const CONCURRENCY_ASYNC = 10;
 
@@ -37,38 +28,6 @@ export class PlaidSyncDb {
   @Inject()
   private deleteCashflowTransactionService: DeleteCashflowTransaction;
 
-  @Inject()
-  private eventPublisher: EventPublisher;
-
-  /**
-   * Syncs the Plaid bank account.
-   * @param {number} tenantId
-   * @param {IAccountCreateDTO} createBankAccountDTO
-   * @param {Knex.Transaction} trx
-   * @returns {Promise<void>}
-   */
-  public async syncBankAccount(
-    tenantId: number,
-    createBankAccountDTO: IAccountCreateDTO,
-    trx?: Knex.Transaction
-  ) {
-    const { Account } = this.tenancy.models(tenantId);
-    const plaidAccount = await Account.query().findOne(
-      'plaidAccountId',
-      createBankAccountDTO.plaidAccountId
-    );
-    // Can't continue if the Plaid account is already created.
-    if (plaidAccount) {
-      return;
-    }
-    await this.createAccountService.createAccount(
-      tenantId,
-      createBankAccountDTO,
-      trx,
-      { ignoreUniqueName: true }
-    );
-  }
-
   /**
    * Syncs the plaid accounts to the system accounts.
    * @param {number} tenantId Tenant ID.
@@ -78,8 +37,7 @@ export class PlaidSyncDb {
   public async syncBankAccounts(
     tenantId: number,
     plaidAccounts: PlaidAccount[],
-    institution: any,
+    institution: any
-    trx?: Knex.Transaction
   ): Promise<void> {
     const transformToPlaidAccounts =
       transformPlaidAccountToCreateAccount(institution);
@@ -89,7 +47,7 @@ export class PlaidSyncDb {
     await bluebird.map(
       accountCreateDTOs,
       (createAccountDTO: any) =>
-        this.syncBankAccount(tenantId, createAccountDTO, trx),
+        this.createAccountService.createAccount(tenantId, createAccountDTO),
       { concurrency: CONCURRENCY_ASYNC }
     );
   }
@@ -99,24 +57,26 @@ export class PlaidSyncDb {
    * @param {number} tenantId - Tenant ID.
    * @param {number} plaidAccountId - Plaid account ID.
    * @param {PlaidTransaction[]} plaidTranasctions - Plaid transactions
-   * @return {Promise<void>}
    */
   public async syncAccountTranactions(
     tenantId: number,
     plaidAccountId: number,
-    plaidTranasctions: PlaidTransaction[],
+    plaidTranasctions: PlaidTransaction[]
-    trx?: Knex.Transaction
   ): Promise<void> {
     const { Account } = this.tenancy.models(tenantId);
 
-    const batch = uniqid();
+    const cashflowAccount = await Account.query()
-    const cashflowAccount = await Account.query(trx)
       .findOne({ plaidAccountId })
       .throwIfNotFound();
 
+    const openingEquityBalance = await Account.query().findOne(
+      'slug',
+      'opening-balance-equity'
+    );
     // Transformes the Plaid transactions to cashflow create DTOs.
     const transformTransaction = transformPlaidTrxsToCashflowCreate(
-      cashflowAccount.id
+      cashflowAccount.id,
+      openingEquityBalance.id
     );
     const uncategorizedTransDTOs =
       R.map(transformTransaction)(plaidTranasctions);
@@ -127,30 +87,20 @@ export class PlaidSyncDb {
       (uncategoriedDTO) =>
         this.cashflowApp.createUncategorizedTransaction(
           tenantId,
-          { ...uncategoriedDTO, batch },
+          uncategoriedDTO
-          trx
         ),
       { concurrency: 1 }
     );
-    // Triggers `onPlaidTransactionsSynced` event.
-    await this.eventPublisher.emitAsync(events.plaid.onTransactionsSynced, {
-      tenantId,
-      plaidAccountId,
-      batch,
-    } as IPlaidTransactionsSyncedEventPayload);
   }
 
   /**
    * Syncs the accounts transactions in paraller under controlled concurrency.
    * @param {number} tenantId
    * @param {PlaidTransaction[]} plaidTransactions
-   * @return {Promise<void>}
    */
   public async syncAccountsTransactions(
     tenantId: number,
-    batchNo: string,
+    plaidAccountsTransactions: PlaidTransaction[]
-    plaidAccountsTransactions: PlaidTransaction[],
-    trx?: Knex.Transaction
   ): Promise<void> {
     const groupedTrnsxByAccountId = entries(
       groupBy(plaidAccountsTransactions, 'account_id')
@@ -161,9 +111,7 @@ export class PlaidSyncDb {
         return this.syncAccountTranactions(
           tenantId,
           plaidAccountId,
-          batchNo,
+          plaidTransactions
-          plaidTransactions,
-          trx
         );
       },
       { concurrency: CONCURRENCY_ASYNC }
@@ -176,12 +124,11 @@ export class PlaidSyncDb {
    */
   public async syncRemoveTransactions(
     tenantId: number,
-    plaidTransactionsIds: string[],
+    plaidTransactionsIds: string[]
-    trx?: Knex.Transaction
   ) {
     const { CashflowTransaction } = this.tenancy.models(tenantId);
 
-    const cashflowTransactions = await CashflowTransaction.query(trx).whereIn(
+    const cashflowTransactions = await CashflowTransaction.query().whereIn(
       'plaidTransactionId',
       plaidTransactionsIds
     );
@@ -193,8 +140,7 @@ export class PlaidSyncDb {
       (transactionId: number) =>
         this.deleteCashflowTransactionService.deleteCashflowTransaction(
           tenantId,
-          transactionId,
+          transactionId
-          trx
         ),
       { concurrency: CONCURRENCY_ASYNC }
     );
@@ -205,35 +151,29 @@ export class PlaidSyncDb {
    * @param {number} tenantId - Tenant ID.
    * @param {string} itemId - Plaid item ID.
    * @param {string} lastCursor - Last transaction cursor.
-   * @return {Promise<void>}
    */
   public async syncTransactionsCursor(
     tenantId: number,
     plaidItemId: string,
-    lastCursor: string,
+    lastCursor: string
-    trx?: Knex.Transaction
+  ) {
-  ): Promise<void> {
     const { PlaidItem } = this.tenancy.models(tenantId);
 
-    await PlaidItem.query(trx).findOne({ plaidItemId }).patch({ lastCursor });
+    await PlaidItem.query().findOne({ plaidItemId }).patch({ lastCursor });
   }
 
   /**
    * Updates the last feeds updated at of the given Plaid accounts ids.
    * @param {number} tenantId
    * @param {string[]} plaidAccountIds
-   * @return {Promise<void>}
    */
   public async updateLastFeedsUpdatedAt(
     tenantId: number,
-    plaidAccountIds: string[],
+    plaidAccountIds: string[]
-    trx?: Knex.Transaction
+  ) {
-  ): Promise<void> {
     const { Account } = this.tenancy.models(tenantId);
 
-    await Account.query(trx)
+    await Account.query().whereIn('plaid_account_id', plaidAccountIds).patch({
-      .whereIn('plaid_account_id', plaidAccountIds)
-      .patch({
       lastFeedsUpdatedAt: new Date(),
     });
   }
@@ -243,19 +183,15 @@ export class PlaidSyncDb {
    * @param {number} tenantId
    * @param {number[]} plaidAccountIds
    * @param {boolean} isFeedsActive
-   * @returns {Promise<void>}
    */
   public async updateAccountsFeedsActive(
     tenantId: number,
     plaidAccountIds: string[],
-    isFeedsActive: boolean = true,
+    isFeedsActive: boolean = true
-    trx?: Knex.Transaction
+  ) {
-  ): Promise<void> {
     const { Account } = this.tenancy.models(tenantId);
 
-    await Account.query(trx)
+    await Account.query().whereIn('plaid_account_id', plaidAccountIds).patch({
-      .whereIn('plaid_account_id', plaidAccountIds)
-      .patch({
       isFeedsActive,
     });
   }

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

@@ -3,8 +3,6 @@ import { Inject, Service } from 'typedi';
 import { PlaidClientWrapper } from '@/lib/Plaid/Plaid';
 import { PlaidSyncDb } from './PlaidSyncDB';
 import { PlaidFetchedTransactionsUpdates } from '@/interfaces';
-import UnitOfWork from '@/services/UnitOfWork';
-import { Knex } from 'knex';
 
 @Service()
 export class PlaidUpdateTransactions {
@@ -14,40 +12,12 @@ export class PlaidUpdateTransactions {
   @Inject()
   private plaidSync: PlaidSyncDb;
 
-  @Inject()
-  private uow: UnitOfWork;
-
   /**
-   * Handles sync the Plaid item to Bigcaptial under UOW.
+   * Handles the fetching and storing of new, modified, or removed transactions
-   * @param {number} tenantId
+   * @param {number} tenantId Tenant ID.
-   * @param {number} plaidItemId
+   * @param {string} plaidItemId the Plaid ID for the item.
-   * @returns {Promise<{  addedCount: number; modifiedCount: number; removedCount: number; }>}
    */
   public async updateTransactions(tenantId: number, plaidItemId: string) {
-    return this.uow.withTransaction(tenantId, (trx: Knex.Transaction) => {
-      return this.updateTransactionsWork(tenantId, plaidItemId, trx);
-    });
-  }
-
-  /**
-   * Handles the fetching and storing the following:
-   *  - New, modified, or removed transactions.
-   *  - New bank accounts.
-   *  - Last accounts feeds updated at.
-   *  - Turn on the accounts feed flag.
-   * @param {number} tenantId - Tenant ID.
-   * @param {string} plaidItemId - The Plaid ID for the item.
-   * @returns {Promise<{  addedCount: number; modifiedCount: number; removedCount: number; }>}
-   */
-  public async updateTransactionsWork(
-    tenantId: number,
-    plaidItemId: string,
-    trx?: Knex.Transaction
-  ): Promise<{
-    addedCount: number;
-    modifiedCount: number;
-    removedCount: number;
-  }> {
     // Fetch new transactions from plaid api.
     const { added, modified, removed, cursor, accessToken } =
       await this.fetchTransactionUpdates(tenantId, plaidItemId);
@@ -59,42 +29,28 @@ export class PlaidUpdateTransactions {
     } = await plaidInstance.accountsGet(request);
 
     const plaidAccountsIds = accounts.map((a) => a.account_id);
+
     const {
       data: { institution },
     } = await plaidInstance.institutionsGetById({
       institution_id: item.institution_id,
       country_codes: ['US', 'UK'],
     });
-    // Sync bank accounts.
+    // Update the DB.
-    await this.plaidSync.syncBankAccounts(tenantId, accounts, institution, trx);
+    await this.plaidSync.syncBankAccounts(tenantId, accounts, institution);
-    // Sync bank account transactions.
     await this.plaidSync.syncAccountsTransactions(
       tenantId,
-      added.concat(modified),
+      added.concat(modified)
-      trx
-    );
-    // Sync removed transactions.
-    await this.plaidSync.syncRemoveTransactions(tenantId, removed, trx);
-    // Sync transactions cursor.
-    await this.plaidSync.syncTransactionsCursor(
-      tenantId,
-      plaidItemId,
-      cursor,
-      trx
     );
+    await this.plaidSync.syncRemoveTransactions(tenantId, removed);
+    await this.plaidSync.syncTransactionsCursor(tenantId, plaidItemId, cursor);
+
     // Update the last feeds updated at of the updated accounts.
-    await this.plaidSync.updateLastFeedsUpdatedAt(
+    await this.plaidSync.updateLastFeedsUpdatedAt(tenantId, plaidAccountsIds);
-      tenantId,
+
-      plaidAccountsIds,
-      trx
-    );
     // Turn on the accounts feeds flag.
-    await this.plaidSync.updateAccountsFeedsActive(
+    await this.plaidSync.updateAccountsFeedsActive(tenantId, plaidAccountsIds);
-      tenantId,
+
-      plaidAccountsIds,
-      true,
-      trx
-    );
     return {
       addedCount: added.length,
       modifiedCount: modified.length,

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

@@ -1,42 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { EventSubscriber } from '@/lib/EventPublisher/EventPublisher';
-import {
-  IPlaidItemCreatedEventPayload,
-  IPlaidTransactionsSyncedEventPayload,
-} from '@/interfaces/Plaid';
-import events from '@/subscribers/events';
-import { RecognizeTranasctionsService } from '../../RegonizeTranasctions/RecognizeTranasctionsService';
-import { runAfterTransaction } from '@/services/UnitOfWork/TransactionsHooks';
-
-@Service()
-export class RecognizeSyncedBankTranasctions extends EventSubscriber {
-  @Inject()
-  private recognizeTranasctionsService: RecognizeTranasctionsService;
-
-  /**
-   * Constructor method.
-   */
-  public attach(bus) {
-    bus.subscribe(
-      events.plaid.onTransactionsSynced,
-      this.handleRecognizeSyncedBankTransactions.bind(this)
-    );
-  }
-
-  /**
-   * Updates the Plaid item transactions
-   * @param {IPlaidItemCreatedEventPayload} payload - Event payload.
-   */
-  private handleRecognizeSyncedBankTransactions = async ({
-    tenantId,
-    batch,
-    trx,
-  }: IPlaidTransactionsSyncedEventPayload) => {
-    runAfterTransaction(trx, async () => {
-      await this.recognizeTranasctionsService.recognizeTransactions(
-        tenantId,
-        batch
-      );
-    });
-  };
-}

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

@@ -42,12 +42,7 @@ export const transformPlaidTrxsToCashflowCreate = R.curry(
   ): CreateUncategorizedTransactionDTO => {
     return {
       date: plaidTranasction.date,
-
+      amount: plaidTranasction.amount,
-      // Plaid: Positive values when money moves out of the account; negative values
-      // when money moves in. For example, debit card purchases are positive;
-      // credit card payments, direct deposits, and refunds are negative.
-      amount: -1 * plaidTranasction.amount,
-
       description: plaidTranasction.name,
       payee: plaidTranasction.payment_meta?.payee,
       currencyCode: plaidTranasction.iso_currency_code,

packages/server/src/services/Banking/RegonizeTranasctions/RecognizeTranasctionsService.ts

@@ -1,110 +0,0 @@
-import { Knex } from 'knex';
-import UncategorizedCashflowTransaction from '@/models/UncategorizedCashflowTransaction';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import { transformToMapBy } from '@/utils';
-import { Inject, Service } from 'typedi';
-import { PromisePool } from '@supercharge/promise-pool';
-import { BankRule } from '@/models/BankRule';
-import { bankRulesMatchTransaction } from './_utils';
-
-@Service()
-export class RecognizeTranasctionsService {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  /**
-   * Marks the uncategorized transaction as recognized from the given bank rule.
-   * @param {number} tenantId -
-   * @param {BankRule} bankRule -
-   * @param {UncategorizedCashflowTransaction} transaction -
-   * @param {Knex.Transaction} trx -
-   */
-  private markBankRuleAsRecognized = async (
-    tenantId: number,
-    bankRule: BankRule,
-    transaction: UncategorizedCashflowTransaction,
-    trx?: Knex.Transaction
-  ) => {
-    const { RecognizedBankTransaction, UncategorizedCashflowTransaction } =
-      this.tenancy.models(tenantId);
-
-    const recognizedTransaction = await RecognizedBankTransaction.query(
-      trx
-    ).insert({
-      bankRuleId: bankRule.id,
-      uncategorizedTransactionId: transaction.id,
-      assignedCategory: bankRule.assignCategory,
-      assignedAccountId: bankRule.assignAccountId,
-      assignedPayee: bankRule.assignPayee,
-      assignedMemo: bankRule.assignMemo,
-    });
-    await UncategorizedCashflowTransaction.query(trx)
-      .findById(transaction.id)
-      .patch({
-        recognizedTransactionId: recognizedTransaction.id,
-      });
-  };
-
-  /**
-   * Regonized the uncategorized transactions.
-   * @param {number} tenantId -
-   * @param {Knex.Transaction} trx -
-   */
-  public async recognizeTransactions(
-    tenantId: number,
-    batch: string = '',
-    trx?: Knex.Transaction
-  ) {
-    const { UncategorizedCashflowTransaction, BankRule } =
-      this.tenancy.models(tenantId);
-
-    const uncategorizedTranasctions =
-      await UncategorizedCashflowTransaction.query().onBuild((query) => {
-        query.where('recognized_transaction_id', null);
-        query.where('categorized', false);
-
-        if (batch) query.where('batch', batch);
-      });
-    const bankRules = await BankRule.query().withGraphFetched('conditions');
-    const bankRulesByAccountId = transformToMapBy(
-      bankRules,
-      'applyIfAccountId'
-    );
-    // Try to recognize the transaction.
-    const regonizeTransaction = async (
-      transaction: UncategorizedCashflowTransaction
-    ) => {
-      const allAccountsBankRules = bankRulesByAccountId.get(`null`);
-      const accountBankRules = bankRulesByAccountId.get(
-        `${transaction.accountId}`
-      );
-      const recognizedBankRule = bankRulesMatchTransaction(
-        transaction,
-        accountBankRules
-      );
-      if (recognizedBankRule) {
-        await this.markBankRuleAsRecognized(
-          tenantId,
-          recognizedBankRule,
-          transaction,
-          trx
-        );
-      }
-    };
-    const result = await PromisePool.withConcurrency(MIGRATION_CONCURRENCY)
-      .for(uncategorizedTranasctions)
-      .process((transaction: UncategorizedCashflowTransaction, index, pool) => {
-        return regonizeTransaction(transaction);
-      });
-  }
-
-  /**
-   *
-   * @param {number} uncategorizedTransaction
-   */
-  public async regonizeTransaction(
-    uncategorizedTransaction: UncategorizedCashflowTransaction
-  ) {}
-}
-
-const MIGRATION_CONCURRENCY = 10;

packages/server/src/services/Banking/RegonizeTranasctions/RecognizeTransactionsJob.ts

@@ -1,32 +0,0 @@
-import Container, { Service } from 'typedi';
-import { RecognizeTranasctionsService } from './RecognizeTranasctionsService';
-
-@Service()
-export class RegonizeTransactionsJob {
-  /**
-   * Constructor method.
-   */
-  constructor(agenda) {
-    agenda.define(
-      'recognize-uncategorized-transactions-job',
-      { priority: 'high', concurrency: 2 },
-      this.handler
-    );
-  }
-
-  /**
-   * Triggers sending invoice mail.
-   */
-  private handler = async (job, done: Function) => {
-    const { tenantId } = job.attrs.data;
-    const regonizeTransactions = Container.get(RecognizeTranasctionsService);
-
-    try {
-      await regonizeTransactions.recognizeTransactions(tenantId);
-      done();
-    } catch (error) {
-      console.log(error);
-      done(error);
-    }
-  };
-}

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

@@ -1,104 +0,0 @@
-import UncategorizedCashflowTransaction from '@/models/UncategorizedCashflowTransaction';
-import {
-  BankRuleApplyIfTransactionType,
-  BankRuleConditionComparator,
-  BankRuleConditionType,
-  IBankRule,
-  IBankRuleCondition,
-} from '../Rules/types';
-import { BankRule } from '@/models/BankRule';
-
-const conditionsMatch = (
-  transaction: UncategorizedCashflowTransaction,
-  conditions: IBankRuleCondition[],
-  conditionsType: BankRuleConditionType = BankRuleConditionType.And
-) => {
-  const method =
-    conditionsType === BankRuleConditionType.And ? 'every' : 'some';
-
-  return conditions[method]((condition) => {
-    switch (determineFieldType(condition.field)) {
-      case 'number':
-        return matchNumberCondition(transaction, condition);
-      case 'text':
-        return matchTextCondition(transaction, condition);
-      default:
-        return false;
-    }
-  });
-};
-
-const matchNumberCondition = (
-  transaction: UncategorizedCashflowTransaction,
-  condition: IBankRuleCondition
-) => {
-  switch (condition.comparator) {
-    case BankRuleConditionComparator.Equals:
-      return transaction[condition.field] === condition.value;
-    case BankRuleConditionComparator.Contains:
-      return transaction[condition.field]
-        ?.toString()
-        .includes(condition.value.toString());
-    case BankRuleConditionComparator.NotContain:
-      return !transaction[condition.field]
-        ?.toString()
-        .includes(condition.value.toString());
-    default:
-      return false;
-  }
-};
-
-const matchTextCondition = (
-  transaction: UncategorizedCashflowTransaction,
-  condition: IBankRuleCondition
-) => {
-  switch (condition.comparator) {
-    case BankRuleConditionComparator.Equals:
-      return transaction[condition.field] === condition.value;
-    case BankRuleConditionComparator.Contains:
-      return transaction[condition.field]?.includes(condition.value.toString());
-    case BankRuleConditionComparator.NotContain:
-      return !transaction[condition.field]?.includes(
-        condition.value.toString()
-      );
-    default:
-      return false;
-  }
-};
-
-const matchTransactionType = (
-  bankRule: BankRule,
-  transaction: UncategorizedCashflowTransaction
-): boolean => {
-  return (
-    (transaction.isDepositTransaction &&
-      bankRule.applyIfTransactionType ===
-        BankRuleApplyIfTransactionType.Deposit) ||
-    (transaction.isWithdrawalTransaction &&
-      bankRule.applyIfTransactionType ===
-        BankRuleApplyIfTransactionType.Withdrawal)
-  );
-};
-
-export const bankRulesMatchTransaction = (
-  transaction: UncategorizedCashflowTransaction,
-  bankRules: IBankRule[]
-) => {
-  return bankRules.find((rule) => {
-    return (
-      matchTransactionType(rule, transaction) &&
-      conditionsMatch(transaction, rule.conditions, rule.conditionsType)
-    );
-  });
-};
-
-const determineFieldType = (field: string): string => {
-  switch (field) {
-    case 'amount':
-      return 'number';
-    case 'description':
-      return 'text';
-    default:
-      return 'unknown';
-  }
-};

packages/server/src/services/Banking/RegonizeTranasctions/events/TriggerRecognizedTransactions.ts

@@ -1,76 +0,0 @@
-import { Inject, Service } from 'typedi';
-import events from '@/subscribers/events';
-import {
-  IBankRuleEventCreatedPayload,
-  IBankRuleEventDeletedPayload,
-  IBankRuleEventEditedPayload,
-} from '../../Rules/types';
-
-@Service()
-export class TriggerRecognizedTransactions {
-  @Inject('agenda')
-  private agenda: any;
-
-  /**
-   * Constructor method.
-   */
-  public attach(bus) {
-    bus.subscribe(
-      events.bankRules.onCreated,
-      this.recognizedTransactionsOnRuleCreated.bind(this)
-    );
-    bus.subscribe(
-      events.bankRules.onEdited,
-      this.recognizedTransactionsOnRuleEdited.bind(this)
-    );
-    bus.subscribe(
-      events.bankRules.onDeleted,
-      this.recognizedTransactionsOnRuleDeleted.bind(this)
-    );
-  }
-
-  /**
-   * Triggers the recognize uncategorized transactions job on rule created.
-   * @param {IBankRuleEventCreatedPayload} payload -
-   */
-  private async recognizedTransactionsOnRuleCreated({
-    tenantId,
-    createRuleDTO,
-  }: IBankRuleEventCreatedPayload) {
-    const payload = { tenantId };
-
-    // Cannot run recognition if the option is not enabled.
-    if (createRuleDTO.recognition) {
-      return;
-    }
-    await this.agenda.now('recognize-uncategorized-transactions-job', payload);
-  }
-
-  /**
-   * Triggers the recognize uncategorized transactions job on rule edited.
-   * @param {IBankRuleEventEditedPayload} payload -
-   */
-  private async recognizedTransactionsOnRuleEdited({
-    tenantId,
-    editRuleDTO,
-  }: IBankRuleEventEditedPayload) {
-    const payload = { tenantId };
-
-    // Cannot run recognition if the option is not enabled.
-    if (!editRuleDTO.recognition) {
-      return;
-    }
-    await this.agenda.now('recognize-uncategorized-transactions-job', payload);
-  }
-
-  /**
-   * Triggers the recognize uncategorized transactions job on rule deleted.
-   * @param {IBankRuleEventDeletedPayload} payload -
-   */
-  private async recognizedTransactionsOnRuleDeleted({
-    tenantId,
-  }: IBankRuleEventDeletedPayload) {
-    const payload = { tenantId };
-    await this.agenda.now('recognize-uncategorized-transactions-job', payload);
-  }
-}

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

@@ -1,82 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { CreateBankRuleService } from './CreateBankRule';
-import { DeleteBankRuleSerivce } from './DeleteBankRule';
-import { EditBankRuleService } from './EditBankRule';
-import { GetBankRuleService } from './GetBankRule';
-import { GetBankRulesService } from './GetBankRules';
-import { ICreateBankRuleDTO, IEditBankRuleDTO } from './types';
-
-@Service()
-export class BankRulesApplication {
-  @Inject()
-  private createBankRuleService: CreateBankRuleService;
-
-  @Inject()
-  private editBankRuleService: EditBankRuleService;
-
-  @Inject()
-  private deleteBankRuleService: DeleteBankRuleSerivce;
-
-  @Inject()
-  private getBankRuleService: GetBankRuleService;
-
-  @Inject()
-  private getBankRulesService: GetBankRulesService;
-
-  /**
-   * Creates new bank rule.
-   * @param {number} tenantId
-   * @param {ICreateBankRuleDTO} createRuleDTO
-   * @returns {Promise<void>}
-   */
-  public createBankRule(
-    tenantId: number,
-    createRuleDTO: ICreateBankRuleDTO
-  ): Promise<void> {
-    return this.createBankRuleService.createBankRule(tenantId, createRuleDTO);
-  }
-
-  /**
-   * Edits the given bank rule.
-   * @param {number} tenantId
-   * @param {IEditBankRuleDTO} editRuleDTO
-   * @returns {Promise<void>}
-   */
-  public editBankRule(
-    tenantId: number,
-    ruleId: number,
-    editRuleDTO: IEditBankRuleDTO
-  ): Promise<void> {
-    return this.editBankRuleService.editBankRule(tenantId, ruleId, editRuleDTO);
-  }
-
-  /**
-   * Deletes the given bank rule.
-   * @param {number} tenantId
-   * @param {number} ruleId
-   * @returns {Promise<void>}
-   */
-  public deleteBankRule(tenantId: number, ruleId: number): Promise<void> {
-    return this.deleteBankRuleService.deleteBankRule(tenantId, ruleId);
-  }
-
-  /**
-   * Retrieves the given bank rule.
-   * @param {number} tenantId
-   * @param {number} ruleId
-   * @returns {Promise<any>}
-   */
-  public getBankRule(tenantId: number, ruleId: number): Promise<any> {
-    return this.getBankRuleService.getBankRule(tenantId, ruleId);
-  }
-
-  /**
-   * Retrieves the bank rules of the given account.
-   * @param {number} tenantId
-   * @param {number} accountId
-   * @returns {Promise<any>}
-   */
-  public getBankRules(tenantId: number): Promise<any> {
-    return this.getBankRulesService.getBankRules(tenantId);
-  }
-}

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

@@ -1,71 +0,0 @@
-import { Knex } from 'knex';
-import { Inject, Service } from 'typedi';
-import {
-  IBankRuleEventCreatedPayload,
-  IBankRuleEventCreatingPayload,
-  ICreateBankRuleDTO,
-} from './types';
-import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import UnitOfWork from '@/services/UnitOfWork';
-import events from '@/subscribers/events';
-
-@Service()
-export class CreateBankRuleService {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  @Inject()
-  private uow: UnitOfWork;
-
-  @Inject()
-  private eventPublisher: EventPublisher;
-
-  /**
-   * Transformes the DTO to model.
-   * @param {ICreateBankRuleDTO} createDTO
-   * @returns
-   */
-  private transformDTO(createDTO: ICreateBankRuleDTO) {
-    return {
-      ...createDTO,
-    };
-  }
-
-  /**
-   * Creates a new bank rule.
-   * @param {number} tenantId
-   * @param {ICreateBankRuleDTO} createRuleDTO
-   * @returns {Promise<void>}
-   */
-  public createBankRule(
-    tenantId: number,
-    createRuleDTO: ICreateBankRuleDTO
-  ): Promise<void> {
-    const { BankRule } = this.tenancy.models(tenantId);
-
-    const transformDTO = this.transformDTO(createRuleDTO);
-
-    return this.uow.withTransaction(tenantId, async (trx: Knex.Transaction) => {
-      // Triggers `onBankRuleCreating` event.
-      await this.eventPublisher.emitAsync(events.bankRules.onCreating, {
-        tenantId,
-        createRuleDTO,
-        trx,
-      } as IBankRuleEventCreatingPayload);
-
-      const bankRule = await BankRule.query(trx).upsertGraph({
-        ...transformDTO,
-      });
-
-      // Triggers `onBankRuleCreated` event.
-      await this.eventPublisher.emitAsync(events.bankRules.onCreated, {
-        tenantId,
-        createRuleDTO,
-        trx,
-      } as IBankRuleEventCreatedPayload);
-
-      return bankRule;
-    });
-  }
-}