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

add
fix: Lemon Squeezy redirect to base url
2026-02-17 13:20:31 +00:00 · 2024-06-03 20:46:53 +02:00 · 2024-06-03 19:52:43 +02:00 · 2024-06-03 19:49:58 +02:00
49 changed files with 379 additions and 1057 deletions
--- a/.env.example
+++ b/.env.example
@@ -75,9 +75,30 @@ 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=
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,41 +2,6 @@

 All notable changes to Bigcapital server-side will be in this file.

-## [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
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -22,15 +22,11 @@ services:
      - 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
@@ -93,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
@@ -127,8 +120,6 @@ services:
      - S3_SECRET_ACCESS_KEY=${S3_SECRET_ACCESS_KEY}
      - S3_ENDPOINT=${S3_ENDPOINT}
      - S3_BUCKET=${S3_BUCKET}
-    networks:
-      - bigcapital_network

  database_migration:
    container_name: bigcapital-database-migration
@@ -146,8 +137,6 @@ services:
      - TENANT_DB_NAME_PERFIX=${TENANT_DB_NAME_PERFIX}
    depends_on:
      - mysql
-    networks:
-      - bigcapital_network

  mysql:
    container_name: bigcapital-mysql
@@ -163,8 +152,6 @@ services:
      - mysql:/var/lib/mysql
    expose:
      - '3306'
-    networks:
-      - bigcapital_network

  mongo:
    container_name: bigcapital-mongo
@@ -174,8 +161,6 @@ services:
      - '27017'
    volumes:
      - mongo:/var/lib/mongodb
-    networks:
-      - bigcapital_network

  redis:
    container_name: bigcapital-redis
@@ -186,15 +171,11 @@ services:
      - '6379'
    volumes:
      - redis:/data
-    networks:
-      - bigcapital_network

  gotenberg:
    image: gotenberg/gotenberg:7
    expose:
      - '9000'
-    networks:
-      - bigcapital_network

 # Volumes
 volumes:
@@ -209,8 +190,3 @@ volumes:
  redis:
    name: bigcapital_prod_redis
    driver: local
-
-# Networks
-networks:
-  bigcapital_network:
-    driver: bridge
--- a/packages/server/package.json
+++ b/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",
--- a/packages/server/src/api/controllers/Attachments/AttachmentsController.ts
+++ b/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.uploadPipelineService.uploadPipeline().single('file'),
+      this.attachmentsApplication.uploadPipeline.single('file'),
      this.validateUploadedFileExistance,
      this.uploadAttachment.bind(this)
    );
--- a/packages/server/src/api/controllers/Webhooks/Webhooks.ts
+++ b/packages/server/src/api/controllers/Webhooks/Webhooks.ts
@@ -1,6 +1,7 @@
-import { NextFunction, Router, Request, Response } from 'express';
-import { Inject, Service } from 'typedi';
+import { Router } from 'express';
 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,25 +57,20 @@ 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;
+    const {
+      webhook_type: webhookType,
+      webhook_code: webhookCode,
+      item_id: plaidItemId,
+    } = req.body;

-    try {
-      const {
-        webhook_type: webhookType,
-        webhook_code: webhookCode,
-        item_id: plaidItemId,
-      } = req.body;
-
-      await this.plaidApp.webhooks(
-        tenantId,
-        plaidItemId,
-        webhookType,
-        webhookCode
-      );
-      return res.status(200).send({ code: 200, message: 'ok' });
-    } catch (error) {
-      next(error);
-    }
+    await this.plaidApp.webhooks(
+      tenantId,
+      plaidItemId,
+      webhookType,
+      webhookCode
+    );
+    return res.status(200).send({ code: 200, message: 'ok' });
  }
 }
--- a/packages/server/src/commands/bigcapital.ts
+++ b/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
-        ? await getAllSystemTenants(sysKnex)
-        : await getAllInitializedTenants(sysKnex);
+      const tenants = await getAllSystemTenants(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(
-    '-t, --tenant_id [tenant_id]',
-    'Which organization id do you migrate.'
-  )
+  .option('-t, --tenant_id [tenant_id]', 'Which tenant 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)
-          .for(tenants)
-          .process((tenant, index, pool) => {
-            return migrateTenant(tenant.organizationId);
-          })
-          .then(() => {
-            success('All tenants are migrated.');
-          });
+        tenants.forEach((tenant) => {
+          const oper = migrateTenant(tenant.organizationId);
+          migrateOpers.push(oper);
+        });
      } 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(
-    '-t, --tenant_id [tenant_id]',
-    'Which organization id do you migrate.'
-  )
+  .option('-t, --tenant_id [tenant_id]', 'Which tenant 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)
-          .for(tenants)
-          .process((tenant, index, pool) => {
-            return migrateTenant(tenant.organizationId);
-          })
-          .then(() => {
-            success('All tenants are rollbacked.');
-          });
+        tenants.forEach((tenant) => {
+          const oper = migrateTenant(tenant.organizationId);
+          migrateOpers.push(oper);
+        });
      } 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);
    }
  });
+
--- a/packages/server/src/config/index.ts
+++ b/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,
  },
 };
--- a/packages/server/src/database/migrations/20240604154005_create_documents_links_table.js
+++ b/packages/server/src/database/migrations/20240604154005_create_documents_links_table.js
--- a/packages/server/src/database/migrations/20231108170207_create_documents_table.js
+++ b/packages/server/src/database/migrations/20231108170207_create_documents_table.js
--- a/packages/server/src/database/migrations/20231108170207_create_storage_table.js
+++ b/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');
-};
--- a/packages/server/src/database/migrations/20240604153938_drop_storage_table.js
+++ b/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) {};
--- a/packages/server/src/interfaces/Account.ts
+++ b/packages/server/src/interfaces/Account.ts
@@ -164,7 +164,3 @@ export enum TaxRateAction {
  DELETE = 'Delete',
  VIEW = 'View',
 }
-
-export interface CreateAccountParams {
-  ignoreUniqueName: boolean;
-}
--- a/packages/server/src/interfaces/GeneralLedgerSheet.ts
+++ b/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[];
--- a/packages/server/src/models/UncategorizedCashflowTransaction.ts
+++ b/packages/server/src/models/UncategorizedCashflowTransaction.ts
@@ -104,10 +104,10 @@ export default class UncategorizedCashflowTransaction extends mixin(
   */
  private async updateUncategorizedTransactionCount(
    queryContext: QueryContext,
-    increment: boolean,
-    amount: number = 1
+    increment: boolean
  ) {
    const operation = increment ? 'increment' : 'decrement';
+    const amount = increment ? 1 : -1;

    await Account.query(queryContext.transaction)
      .findById(this.accountId)
--- a/packages/server/src/services/Accounting/Ledger.ts
+++ b/packages/server/src/services/Accounting/Ledger.ts
@@ -51,7 +51,7 @@ export default class Ledger implements ILedger {

  /**
   * Filters entries by the given accounts ids then returns a new ledger.
-   * @param {number[]} accountIds
+   * @param {number[]} accountIds 
   * @returns {ILedger}
   */
  public whereAccountsIds(accountIds: number[]): ILedger {
@@ -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;
-  }
 }
--- a/packages/server/src/services/Accounts/CreateAccount.ts
+++ b/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';
@@ -31,22 +30,19 @@ export class CreateAccount {

  /**
   * Authorize the account creation.
-   * @param {number} tenantId
-   * @param {IAccountCreateDTO} accountDTO
+   * @param  {number} tenantId
+   * @param  {IAccountCreateDTO} accountDTO
   */
  private authorize = async (
    tenantId: number,
    accountDTO: IAccountCreateDTO,
-    baseCurrency: string,
-    params?: CreateAccountParams
+    baseCurrency: string
  ) => {
    // Validate account name uniquiness.
-    if (!params.ignoreUniqueName) {
-      await this.validator.validateAccountNameUniquiness(
-        tenantId,
-        accountDTO.name
-      );
-    }
+    await this.validator.validateAccountNameUniquiness(
+      tenantId,
+      accountDTO.name
+    );
    // Validate the account code uniquiness.
    if (accountDTO.code) {
      await this.validator.isAccountCodeUniqueOrThrowError(
@@ -86,7 +82,7 @@ export class CreateAccount {

  /**
   * Transformes the create account DTO to input model.
-   * @param {IAccountCreateDTO} createAccountDTO
+   * @param   {IAccountCreateDTO} createAccountDTO
   */
  private transformDTOToModel = (
    createAccountDTO: IAccountCreateDTO,
@@ -108,8 +104,7 @@ export class CreateAccount {
  public createAccount = async (
    tenantId: number,
    accountDTO: IAccountCreateDTO,
-    trx?: Knex.Transaction,
-    params: CreateAccountParams = { ignoreUniqueName: false }
+    trx?: Knex.Transaction
  ): 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(
-      tenantId,
-      accountDTO,
-      tenantMeta.baseCurrency,
-      params
-    );
+    await this.authorize(tenantId, accountDTO, tenantMeta.baseCurrency);
+
    // Transformes the DTO to model.
    const accountInputModel = this.transformDTOToModel(
      accountDTO,
@@ -157,4 +148,3 @@ export class CreateAccount {
    );
  };
 }
-
--- a/packages/server/src/services/Attachments/AttachmentsApplication.ts
+++ b/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
--- a/packages/server/src/services/Attachments/S3UploadPipeline.ts
+++ b/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.
--- a/packages/server/src/services/Banking/Plaid/PlaidSyncDB.ts
+++ b/packages/server/src/services/Banking/Plaid/PlaidSyncDB.ts
@@ -3,11 +3,7 @@ import { Inject, Service } from 'typedi';
 import bluebird from 'bluebird';
 import { entries, groupBy } from 'lodash';
 import { CreateAccount } from '@/services/Accounts/CreateAccount';
-import {
-  IAccountCreateDTO,
-  PlaidAccount,
-  PlaidTransaction,
-} from '@/interfaces';
+import { PlaidAccount, PlaidTransaction } from '@/interfaces';
 import {
  transformPlaidAccountToCreateAccount,
  transformPlaidTrxsToCashflowCreate,
@@ -15,7 +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';

 const CONCURRENCY_ASYNC = 10;

@@ -33,35 +28,6 @@ export class PlaidSyncDb {
  @Inject()
  private deleteCashflowTransactionService: DeleteCashflowTransaction;

-  /**
-   * 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.
@@ -71,8 +37,7 @@ export class PlaidSyncDb {
  public async syncBankAccounts(
    tenantId: number,
    plaidAccounts: PlaidAccount[],
-    institution: any,
-    trx?: Knex.Transaction
+    institution: any
  ): Promise<void> {
    const transformToPlaidAccounts =
      transformPlaidAccountToCreateAccount(institution);
@@ -82,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 }
    );
  }
@@ -96,16 +61,15 @@ export class PlaidSyncDb {
  public async syncAccountTranactions(
    tenantId: number,
    plaidAccountId: number,
-    plaidTranasctions: PlaidTransaction[],
-    trx?: Knex.Transaction
+    plaidTranasctions: PlaidTransaction[]
  ): Promise<void> {
    const { Account } = this.tenancy.models(tenantId);

-    const cashflowAccount = await Account.query(trx)
+    const cashflowAccount = await Account.query()
      .findOne({ plaidAccountId })
      .throwIfNotFound();

-    const openingEquityBalance = await Account.query(trx).findOne(
+    const openingEquityBalance = await Account.query().findOne(
      'slug',
      'opening-balance-equity'
    );
@@ -123,8 +87,7 @@ export class PlaidSyncDb {
      (uncategoriedDTO) =>
        this.cashflowApp.createUncategorizedTransaction(
          tenantId,
-          uncategoriedDTO,
-          trx
+          uncategoriedDTO
        ),
      { concurrency: 1 }
    );
@@ -137,8 +100,7 @@ export class PlaidSyncDb {
   */
  public async syncAccountsTransactions(
    tenantId: number,
-    plaidAccountsTransactions: PlaidTransaction[],
-    trx?: Knex.Transaction
+    plaidAccountsTransactions: PlaidTransaction[]
  ): Promise<void> {
    const groupedTrnsxByAccountId = entries(
      groupBy(plaidAccountsTransactions, 'account_id')
@@ -149,8 +111,7 @@ export class PlaidSyncDb {
        return this.syncAccountTranactions(
          tenantId,
          plaidAccountId,
-          plaidTransactions,
-          trx
+          plaidTransactions
        );
      },
      { concurrency: CONCURRENCY_ASYNC }
@@ -163,12 +124,11 @@ export class PlaidSyncDb {
   */
  public async syncRemoveTransactions(
    tenantId: number,
-    plaidTransactionsIds: string[],
-    trx?: Knex.Transaction
+    plaidTransactionsIds: string[]
  ) {
    const { CashflowTransaction } = this.tenancy.models(tenantId);

-    const cashflowTransactions = await CashflowTransaction.query(trx).whereIn(
+    const cashflowTransactions = await CashflowTransaction.query().whereIn(
      'plaidTransactionId',
      plaidTransactionsIds
    );
@@ -180,8 +140,7 @@ export class PlaidSyncDb {
      (transactionId: number) =>
        this.deleteCashflowTransactionService.deleteCashflowTransaction(
          tenantId,
-          transactionId,
-          trx
+          transactionId
        ),
      { concurrency: CONCURRENCY_ASYNC }
    );
@@ -196,12 +155,11 @@ export class PlaidSyncDb {
  public async syncTransactionsCursor(
    tenantId: number,
    plaidItemId: string,
-    lastCursor: string,
-    trx?: Knex.Transaction
+    lastCursor: string
  ) {
    const { PlaidItem } = this.tenancy.models(tenantId);

-    await PlaidItem.query(trx).findOne({ plaidItemId }).patch({ lastCursor });
+    await PlaidItem.query().findOne({ plaidItemId }).patch({ lastCursor });
  }

  /**
@@ -211,16 +169,13 @@ export class PlaidSyncDb {
   */
  public async updateLastFeedsUpdatedAt(
    tenantId: number,
-    plaidAccountIds: string[],
-    trx?: Knex.Transaction
+    plaidAccountIds: string[]
  ) {
    const { Account } = this.tenancy.models(tenantId);

-    await Account.query(trx)
-      .whereIn('plaid_account_id', plaidAccountIds)
-      .patch({
-        lastFeedsUpdatedAt: new Date(),
-      });
+    await Account.query().whereIn('plaid_account_id', plaidAccountIds).patch({
+      lastFeedsUpdatedAt: new Date(),
+    });
  }

  /**
@@ -232,15 +187,12 @@ export class PlaidSyncDb {
  public async updateAccountsFeedsActive(
    tenantId: number,
    plaidAccountIds: string[],
-    isFeedsActive: boolean = true,
-    trx?: Knex.Transaction
+    isFeedsActive: boolean = true
  ) {
    const { Account } = this.tenancy.models(tenantId);

-    await Account.query(trx)
-      .whereIn('plaid_account_id', plaidAccountIds)
-      .patch({
-        isFeedsActive,
-      });
+    await Account.query().whereIn('plaid_account_id', plaidAccountIds).patch({
+      isFeedsActive,
+    });
  }
 }
--- a/packages/server/src/services/Banking/Plaid/PlaidUpdateTransactions.ts
+++ b/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.
-   * @param {number} tenantId
-   * @param {number} plaidItemId
-   * @returns {Promise<{  addedCount: number; modifiedCount: number; removedCount: number; }>}
+   * Handles the fetching and storing of new, modified, or removed transactions
+   * @param {number} tenantId Tenant ID.
+   * @param {string} plaidItemId the Plaid ID for the item.
   */
  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.
-    await this.plaidSync.syncBankAccounts(tenantId, accounts, institution, trx);
-    // Sync bank account transactions.
+    // Update the DB.
+    await this.plaidSync.syncBankAccounts(tenantId, accounts, institution);
    await this.plaidSync.syncAccountsTransactions(
      tenantId,
-      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
+      added.concat(modified)
    );
+    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(
-      tenantId,
-      plaidAccountsIds,
-      trx
-    );
+    await this.plaidSync.updateLastFeedsUpdatedAt(tenantId, plaidAccountsIds);
+
    // Turn on the accounts feeds flag.
-    await this.plaidSync.updateAccountsFeedsActive(
-      tenantId,
-      plaidAccountsIds,
-      true,
-      trx
-    );
+    await this.plaidSync.updateAccountsFeedsActive(tenantId, plaidAccountsIds);
+
    return {
      addedCount: added.length,
      modifiedCount: modified.length,
--- a/packages/server/src/services/Banking/Plaid/utils.ts
+++ b/packages/server/src/services/Banking/Plaid/utils.ts
@@ -42,12 +42,7 @@ export const transformPlaidTrxsToCashflowCreate = R.curry(
  ): CreateUncategorizedTransactionDTO => {
    return {
      date: plaidTranasction.date,
-
-      // 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,
-
+      amount: plaidTranasction.amount,
      description: plaidTranasction.name,
      payee: plaidTranasction.payment_meta?.payee,
      currencyCode: plaidTranasction.iso_currency_code,
--- a/packages/server/src/services/Cashflow/CashflowApplication.ts
+++ b/packages/server/src/services/Cashflow/CashflowApplication.ts
@@ -1,4 +1,3 @@
-import { Knex } from 'knex';
 import { Inject, Service } from 'typedi';
 import { DeleteCashflowTransaction } from './DeleteCashflowTransactionService';
 import { UncategorizeCashflowTransaction } from './UncategorizeCashflowTransaction';
@@ -120,13 +119,11 @@ export class CashflowApplication {
   */
  public createUncategorizedTransaction(
    tenantId: number,
-    createUncategorizedTransactionDTO: CreateUncategorizedTransactionDTO,
-    trx?: Knex.Transaction
+    createUncategorizedTransactionDTO: CreateUncategorizedTransactionDTO
  ) {
    return this.createUncategorizedTransactionService.create(
      tenantId,
-      createUncategorizedTransactionDTO,
-      trx
+      createUncategorizedTransactionDTO
    );
  }

--- a/packages/server/src/services/Cashflow/CategorizeCashflowTransaction.ts
+++ b/packages/server/src/services/Cashflow/CategorizeCashflowTransaction.ts
@@ -12,6 +12,7 @@ import { Knex } from 'knex';
 import { transformCategorizeTransToCashflow } from './utils';
 import { CommandCashflowValidator } from './CommandCasflowValidator';
 import NewCashflowTransactionService from './NewCashflowTransactionService';
+import { TransferAuthorizationGuaranteeDecision } from 'plaid';

@Service()
 export class CategorizeCashflowTransaction {
--- a/packages/server/src/services/Cashflow/DeleteCashflowTransactionService.ts
+++ b/packages/server/src/services/Cashflow/DeleteCashflowTransactionService.ts
@@ -30,8 +30,7 @@ export class DeleteCashflowTransaction {
   */
  public deleteCashflowTransaction = async (
    tenantId: number,
-    cashflowTransactionId: number,
-    trx?: Knex.Transaction
+    cashflowTransactionId: number
  ): Promise<{ oldCashflowTransaction: ICashflowTransaction }> => {
    const { CashflowTransaction, CashflowTransactionLine } =
      this.tenancy.models(tenantId);
@@ -44,44 +43,34 @@ export class DeleteCashflowTransaction {
    this.throwErrorIfTransactionNotFound(oldCashflowTransaction);

    // Starting database transaction.
-    return this.uow.withTransaction(
-      tenantId,
-      async (trx: Knex.Transaction) => {
-        // Triggers `onCashflowTransactionDelete` event.
-        await this.eventPublisher.emitAsync(
-          events.cashflow.onTransactionDeleting,
-          {
-            trx,
-            tenantId,
-            oldCashflowTransaction,
-          } as ICommandCashflowDeletingPayload
-        );
+    return this.uow.withTransaction(tenantId, async (trx: Knex.Transaction) => {
+      // Triggers `onCashflowTransactionDelete` event.
+      await this.eventPublisher.emitAsync(events.cashflow.onTransactionDeleting, {
+        trx,
+        tenantId,
+        oldCashflowTransaction,
+      } as ICommandCashflowDeletingPayload);

-        // Delete cashflow transaction associated lines first.
-        await CashflowTransactionLine.query(trx)
-          .where('cashflow_transaction_id', cashflowTransactionId)
-          .delete();
+      // Delete cashflow transaction associated lines first.
+      await CashflowTransactionLine.query(trx)
+        .where('cashflow_transaction_id', cashflowTransactionId)
+        .delete();

-        // Delete cashflow transaction.
-        await CashflowTransaction.query(trx)
-          .findById(cashflowTransactionId)
-          .delete();
+      // Delete cashflow transaction.
+      await CashflowTransaction.query(trx)
+        .findById(cashflowTransactionId)
+        .delete();

-        // Triggers `onCashflowTransactionDeleted` event.
-        await this.eventPublisher.emitAsync(
-          events.cashflow.onTransactionDeleted,
-          {
-            trx,
-            tenantId,
-            cashflowTransactionId,
-            oldCashflowTransaction,
-          } as ICommandCashflowDeletedPayload
-        );
+      // Triggers `onCashflowTransactionDeleted` event.
+      await this.eventPublisher.emitAsync(events.cashflow.onTransactionDeleted, {
+        trx,
+        tenantId,
+        cashflowTransactionId,
+        oldCashflowTransaction,
+      } as ICommandCashflowDeletedPayload);

-        return { oldCashflowTransaction };
-      },
-      trx
-    );
+      return { oldCashflowTransaction };
+    });
  };

  /**
--- a/packages/server/src/services/Cashflow/constants.ts
+++ b/packages/server/src/services/Cashflow/constants.ts
@@ -68,11 +68,7 @@ export const CASHFLOW_TRANSACTION_TYPE_META = {
  [`${CASHFLOW_TRANSACTION_TYPE.OTHER_EXPENSE}`]: {
    type: 'OtherExpense',
    direction: CASHFLOW_DIRECTION.OUT,
-    creditType: [
-      ACCOUNT_TYPE.EXPENSE,
-      ACCOUNT_TYPE.OTHER_EXPENSE,
-      ACCOUNT_TYPE.COST_OF_GOODS_SOLD,
-    ],
+    creditType: [ACCOUNT_TYPE.EXPENSE, ACCOUNT_TYPE.OTHER_EXPENSE],
  },
 };

--- a/packages/server/src/services/Cashflow/utils.ts
+++ b/packages/server/src/services/Cashflow/utils.ts
@@ -1,4 +1,4 @@
-import { upperFirst, camelCase } from 'lodash';
+import { upperFirst, camelCase, omit } from 'lodash';
 import {
  CASHFLOW_TRANSACTION_TYPE,
  CASHFLOW_TRANSACTION_TYPE_META,
@@ -6,6 +6,7 @@ import {
 } from './constants';
 import {
  ICashflowNewCommandDTO,
+  ICashflowTransaction,
  ICategorizeCashflowTransactioDTO,
  IUncategorizedCashflowTransaction,
 } from '@/interfaces';
@@ -41,8 +42,8 @@ export const getCashflowAccountTransactionsTypes = () => {
 /**
 * Tranasformes the given uncategorized transaction and categorized DTO
 * to cashflow create DTO.
- * @param {IUncategorizedCashflowTransaction} uncategorizeModel
- * @param {ICategorizeCashflowTransactioDTO} categorizeDTO
+ * @param {IUncategorizedCashflowTransaction} uncategorizeModel 
+ * @param {ICategorizeCashflowTransactioDTO} categorizeDTO 
 * @returns {ICashflowNewCommandDTO}
 */
 export const transformCategorizeTransToCashflow = (
@@ -61,7 +62,6 @@ export const transformCategorizeTransToCashflow = (
    transactionNumber: categorizeDTO.transactionNumber,
    transactionType: categorizeDTO.transactionType,
    uncategorizedTransactionId: uncategorizeModel.id,
-    branchId: categorizeDTO?.branchId,
    publish: true,
  };
 };
--- a/packages/server/src/services/FinancialStatements/BalanceSheet/BalanceSheetAggregators.ts
+++ b/packages/server/src/services/FinancialStatements/BalanceSheet/BalanceSheetAggregators.ts
@@ -1,4 +1,6 @@
 import * as R from 'ramda';
+import { FinancialPreviousPeriod } from '../FinancialPreviousPeriod';
+import { FinancialHorizTotals } from '../FinancialHorizTotals';
 import { FinancialSheetStructure } from '../FinancialSheetStructure';
 import {
  BALANCE_SHEET_SCHEMA_NODE_TYPE,
--- a/packages/server/src/services/FinancialStatements/BalanceSheet/BalanceSheetRepository.ts
+++ b/packages/server/src/services/FinancialStatements/BalanceSheet/BalanceSheetRepository.ts
@@ -3,6 +3,7 @@ import * as R from 'ramda';
 import { Knex } from 'knex';
 import { isEmpty } from 'lodash';
 import {
+  IAccount,
  IAccountTransactionsGroupBy,
  IBalanceSheetQuery,
  ILedger,
@@ -11,6 +12,7 @@ import { transformToMapBy } from 'utils';
 import Ledger from '@/services/Accounting/Ledger';
 import { BalanceSheetQuery } from './BalanceSheetQuery';
 import { FinancialDatePeriods } from '../FinancialDatePeriods';
+import { ACCOUNT_PARENT_TYPE, ACCOUNT_TYPE } from '@/data/AccountTypes';
 import { BalanceSheetRepositoryNetIncome } from './BalanceSheetRepositoryNetIncome';

@Service()
--- a/packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedger.ts
+++ b/packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedger.ts
@@ -1,31 +1,29 @@
-import { isEmpty, get, last, sumBy, first, head } from 'lodash';
-import moment from 'moment';
-import * as R from 'ramda';
+import { isEmpty, get, last, sumBy } from 'lodash';
 import {
  IGeneralLedgerSheetQuery,
  IGeneralLedgerSheetAccount,
  IGeneralLedgerSheetAccountBalance,
  IGeneralLedgerSheetAccountTransaction,
  IAccount,
-  ILedgerEntry,
+  IJournalPoster,
+  IJournalEntry,
+  IContact,
 } from '@/interfaces';
 import FinancialSheet from '../FinancialSheet';
-import { GeneralLedgerRepository } from './GeneralLedgerRepository';
-import { FinancialSheetStructure } from '../FinancialSheetStructure';
-import { flatToNestedArray } from '@/utils';
-import Ledger from '@/services/Accounting/Ledger';
-import { calculateRunningBalance } from './_utils';
+import moment from 'moment';

 /**
 * General ledger sheet.
 */
-export default class GeneralLedgerSheet extends R.compose(
-  FinancialSheetStructure
-)(FinancialSheet) {
-  private query: IGeneralLedgerSheetQuery;
-  private baseCurrency: string;
-  private i18n: any;
-  private repository: GeneralLedgerRepository;
+export default class GeneralLedgerSheet extends FinancialSheet {
+  tenantId: number;
+  accounts: IAccount[];
+  query: IGeneralLedgerSheetQuery;
+  openingBalancesJournal: IJournalPoster;
+  transactions: IJournalPoster;
+  contactsMap: Map<number, IContact>;
+  baseCurrency: string;
+  i18n: any;

  /**
   * Constructor method.
@@ -36,59 +34,63 @@ export default class GeneralLedgerSheet extends R.compose(
   * @param {IJournalPoster} closingBalancesJournal -
   */
  constructor(
+    tenantId: number,
    query: IGeneralLedgerSheetQuery,
-    repository: GeneralLedgerRepository,
+    accounts: IAccount[],
+    contactsByIdMap: Map<number, IContact>,
+    transactions: IJournalPoster,
+    openingBalancesJournal: IJournalPoster,
+    baseCurrency: string,
    i18n
  ) {
    super();

+    this.tenantId = tenantId;
    this.query = query;
    this.numberFormat = this.query.numberFormat;
-    this.repository = repository;
-    this.baseCurrency = this.repository.tenant.metadata.currencyCode;
+    this.accounts = accounts;
+    this.contactsMap = contactsByIdMap;
+    this.transactions = transactions;
+    this.openingBalancesJournal = openingBalancesJournal;
+    this.baseCurrency = baseCurrency;
    this.i18n = i18n;
  }

  /**
-   * Entry mapper.
-   * @param {ILedgerEntry} entry -
-   * @return {IGeneralLedgerSheetAccountTransaction}
+   * Retrieve the transaction amount.
+   * @param {number} credit - Credit amount.
+   * @param {number} debit - Debit amount.
+   * @param {string} normal - Credit or debit.
   */
-  private getEntryRunningBalance(
-    entry: ILedgerEntry,
-    openingBalance: number,
-    runningBalance?: number
-  ): number {
-    const lastRunningBalance = runningBalance || openingBalance;
-
-    const amount = Ledger.getAmount(
-      entry.credit,
-      entry.debit,
-      entry.accountNormal
-    );
-    return calculateRunningBalance(amount, lastRunningBalance);
+  getAmount(credit: number, debit: number, normal: string) {
+    return normal === 'credit' ? credit - debit : debit - credit;
  }

  /**
-   * Maps the given ledger entry to G/L transaction.
-   * @param {ILedgerEntry} entry
-   * @param {number} runningBalance
-   * @returns {IGeneralLedgerSheetAccountTransaction}
+   * Entry mapper.
+   * @param {IJournalEntry} entry -
+   * @return {IGeneralLedgerSheetAccountTransaction}
   */
-  private transactionMapper(
-    entry: ILedgerEntry,
-    runningBalance: number
-  ): IGeneralLedgerSheetAccountTransaction {
-    const contact = this.repository.contactsById.get(entry.contactId);
-    const amount = Ledger.getAmount(
+  entryReducer(
+    entries: IGeneralLedgerSheetAccountTransaction[],
+    entry: IJournalEntry,
+    openingBalance: number
+  ): IGeneralLedgerSheetAccountTransaction[] {
+    const lastEntry = last(entries);
+
+    const contact = this.contactsMap.get(entry.contactId);
+    const amount = this.getAmount(
      entry.credit,
      entry.debit,
      entry.accountNormal
    );
-    return {
-      id: entry.id,
+    const runningBalance =
+      amount + (!isEmpty(entries) ? lastEntry.runningBalance : openingBalance);
+
+    const newEntry = {
      date: entry.date,
      dateFormatted: moment(entry.date).format('YYYY MMM DD'),
+      entryId: entry.id,

      transactionNumber: entry.transactionNumber,
      referenceType: entry.referenceType,
@@ -107,15 +109,16 @@ export default class GeneralLedgerSheet extends R.compose(
      amount,
      runningBalance,

-      formattedAmount: this.formatNumber(amount, { excerptZero: false }),
-      formattedCredit: this.formatNumber(entry.credit, { excerptZero: false }),
-      formattedDebit: this.formatNumber(entry.debit, { excerptZero: false }),
-      formattedRunningBalance: this.formatNumber(runningBalance, {
-        excerptZero: false,
-      }),
+      formattedAmount: this.formatNumber(amount),
+      formattedCredit: this.formatNumber(entry.credit),
+      formattedDebit: this.formatNumber(entry.debit),
+      formattedRunningBalance: this.formatNumber(runningBalance),

      currencyCode: this.baseCurrency,
-    } as IGeneralLedgerSheetAccountTransaction;
+    };
+    entries.push(newEntry);
+
+    return entries;
  }

  /**
@@ -127,48 +130,28 @@ export default class GeneralLedgerSheet extends R.compose(
    account: IAccount,
    openingBalance: number
  ): IGeneralLedgerSheetAccountTransaction[] {
-    const entries = this.repository.transactionsLedger
-      .whereAccountId(account.id)
-      .getEntries();
+    const entries = this.transactions.getAccountEntries(account.id);

-    return entries
-      .reduce((prev: Array<[number, ILedgerEntry]>, current: ILedgerEntry) => {
-        const prevEntry = last(prev);
-        const prevRunningBalance = head(prevEntry) as number;
-        const amount = this.getEntryRunningBalance(
-          current,
-          openingBalance,
-          prevRunningBalance
-        );
-        return [...prev, [amount, current]];
-      }, [])
-      .map((entryPair: [number, ILedgerEntry]) => {
-        const [runningBalance, entry] = entryPair;
-
-        return this.transactionMapper(entry, runningBalance);
-      });
+    return entries.reduce(
+      (
+        entries: IGeneralLedgerSheetAccountTransaction[],
+        entry: IJournalEntry
+      ) => {
+        return this.entryReducer(entries, entry, openingBalance);
+      },
+      []
+    );
  }

  /**
-   * Retrieves the given account opening balance.
-   * @param {number} accountId
-   * @returns {number}
-   */
-  private accountOpeningBalance(accountId: number): number {
-    return this.repository.openingBalanceTransactionsLedger
-      .whereAccountId(accountId)
-      .getClosingBalance();
-  }
-
-  /**
-   * Retrieve the given account opening balance.
+   * Retrieve account opening balance.
   * @param {IAccount} account
   * @return {IGeneralLedgerSheetAccountBalance}
   */
-  private accountOpeningBalanceTotal(
-    accountId: number
+  private accountOpeningBalance(
+    account: IAccount
  ): IGeneralLedgerSheetAccountBalance {
-    const amount = this.accountOpeningBalance(accountId);
+    const amount = this.openingBalancesJournal.getAccountBalance(account.id);
    const formattedAmount = this.formatTotalNumber(amount);
    const currencyCode = this.baseCurrency;
    const date = this.query.fromDate;
@@ -177,31 +160,15 @@ export default class GeneralLedgerSheet extends R.compose(
  }

  /**
-   * Retrieves the given account closing balance.
-   * @param {number} accountId
-   * @returns {number}
-   */
-  private accountClosingBalance(accountId: number): number {
-    const openingBalance = this.repository.openingBalanceTransactionsLedger
-      .whereAccountId(accountId)
-      .getClosingBalance();
-
-    const transactionsBalance = this.repository.transactionsLedger
-      .whereAccountId(accountId)
-      .getClosingBalance();
-
-    return openingBalance + transactionsBalance;
-  }
-
-  /**
-   * Retrieves the given account closing balance.
+   * Retrieve account closing balance.
   * @param {IAccount} account
   * @return {IGeneralLedgerSheetAccountBalance}
   */
-  private accountClosingBalanceTotal(
-    accountId: number
+  private accountClosingBalance(
+    openingBalance: number,
+    transactions: IGeneralLedgerSheetAccountTransaction[]
  ): IGeneralLedgerSheetAccountBalance {
-    const amount = this.accountClosingBalance(accountId);
+    const amount = this.calcClosingBalance(openingBalance, transactions);
    const formattedAmount = this.formatTotalNumber(amount);
    const currencyCode = this.baseCurrency;
    const date = this.query.toDate;
@@ -209,78 +176,31 @@ export default class GeneralLedgerSheet extends R.compose(
    return { amount, formattedAmount, currencyCode, date };
  }

-  /**
-   * Retrieves the given account closing balance with subaccounts.
-   * @param {number} accountId
-   * @returns {number}
-   */
-  private accountClosingBalanceWithSubaccounts = (
-    accountId: number
-  ): number => {
-    const depsAccountsIds =
-      this.repository.accountsGraph.dependenciesOf(accountId);
-
-    const openingBalance = this.repository.openingBalanceTransactionsLedger
-      .whereAccountsIds([...depsAccountsIds, accountId])
-      .getClosingBalance();
-
-    const transactionsBalanceWithSubAccounts =
-      this.repository.transactionsLedger
-        .whereAccountsIds([...depsAccountsIds, accountId])
-        .getClosingBalance();
-
-    const closingBalance = openingBalance + transactionsBalanceWithSubAccounts;
-
-    return closingBalance;
-  };
-
-  /**
-   * Retrieves the closing balance with subaccounts total node.
-   * @param {number} accountId
-   * @returns {IGeneralLedgerSheetAccountBalance}
-   */
-  private accountClosingBalanceWithSubaccountsTotal = (
-    accountId: number
-  ): IGeneralLedgerSheetAccountBalance => {
-    const amount = this.accountClosingBalanceWithSubaccounts(accountId);
-    const formattedAmount = this.formatTotalNumber(amount);
-    const currencyCode = this.baseCurrency;
-    const date = this.query.toDate;
-
-    return { amount, formattedAmount, currencyCode, date };
-  };
-
-  /**
-   * Detarmines whether the closing balance subaccounts node should be exist.
-   * @param {number} accountId
-   * @returns {boolean}
-   */
-  private isAccountNodeIncludesClosingSubaccounts = (accountId: number) => {
-    // Retrun early if there is no accounts in the filter so
-    // return closing subaccounts in all cases.
-    if (isEmpty(this.query.accountsIds)) {
-      return true;
-    }
-    // Returns true if the given account id includes transactions.
-    return this.repository.accountNodesIncludeTransactions.includes(accountId);
-  };
+  private calcClosingBalance(
+    openingBalance: number,
+    transactions: IGeneralLedgerSheetAccountTransaction[]
+  ) {
+    return openingBalance + sumBy(transactions, (trans) => trans.amount);
+  }

  /**
   * Retreive general ledger accounts sections.
   * @param {IAccount} account
   * @return {IGeneralLedgerSheetAccount}
   */
-  private accountMapper = (account: IAccount): IGeneralLedgerSheetAccount => {
-    const openingBalance = this.accountOpeningBalanceTotal(account.id);
+  private accountMapper(account: IAccount): IGeneralLedgerSheetAccount {
+    const openingBalance = this.accountOpeningBalance(account);
+
    const transactions = this.accountTransactionsMapper(
      account,
      openingBalance.amount
    );
-    const closingBalance = this.accountClosingBalanceTotal(account.id);
-    const closingBalanceSubaccounts =
-      this.accountClosingBalanceWithSubaccountsTotal(account.id);
+    const closingBalance = this.accountClosingBalance(
+      openingBalance.amount,
+      transactions
+    );

-    const initialNode = {
+    return {
      id: account.id,
      name: account.name,
      code: account.code,
@@ -290,90 +210,34 @@ export default class GeneralLedgerSheet extends R.compose(
      transactions,
      closingBalance,
    };
-
-    return R.compose(
-      R.when(
-        () => this.isAccountNodeIncludesClosingSubaccounts(account.id),
-        R.assoc('closingBalanceSubaccounts', closingBalanceSubaccounts)
-      )
-    )(initialNode);
-  };
+  }

  /**
-   * Maps over deep nodes to retrieve the G/L account node.
-   * @param {IAccount[]} accounts
-   * @returns {IGeneralLedgerSheetAccount[]}
-   */
-  private accountNodesDeepMap = (
-    accounts: IAccount[]
-  ): IGeneralLedgerSheetAccount[] => {
-    return this.mapNodesDeep(accounts, this.accountMapper);
-  };
-
-  /**
-   * Transformes the flatten nodes to nested nodes.
-   */
-  private nestedAccountsNode = (flattenAccounts: IAccount[]): IAccount[] => {
-    return flatToNestedArray(flattenAccounts, {
-      id: 'id',
-      parentId: 'parentAccountId',
-    });
-  };
-
-  /**
-   * Filters account nodes.
-   * @param {IGeneralLedgerSheetAccount[]} nodes
-   * @returns  {IGeneralLedgerSheetAccount[]}
-   */
-  private filterAccountNodesByTransactionsFilter = (
-    nodes: IGeneralLedgerSheetAccount[]
-  ): IGeneralLedgerSheetAccount[] => {
-    return this.filterNodesDeep(
-      nodes,
-      (account: IGeneralLedgerSheetAccount) =>
-        !(account.transactions.length === 0 && this.query.noneTransactions)
-    );
-  };
-
-  /**
-   * Filters account nodes by the acounts filter.
-   * @param {IAccount[]} nodes
-   * @returns {IAccount[]}
-   */
-  private filterAccountNodesByAccountsFilter = (
-    nodes: IAccount[]
-  ): IAccount[] => {
-    return this.filterNodesDeep(nodes, (node: IGeneralLedgerSheetAccount) => {
-      if (R.isEmpty(this.query.accountsIds)) {
-        return true;
-      }
-      // Returns true if the given account id exists in the filter.
-      return this.repository.accountNodeInclude?.includes(node.id);
-    });
-  };
-
-  /**
-   * Retrieves mapped accounts with general ledger transactions and
-   * opeing/closing balance.
+   * Retrieve mapped accounts with general ledger transactions and opeing/closing balance.
   * @param {IAccount[]} accounts -
   * @return {IGeneralLedgerSheetAccount[]}
   */
  private accountsWalker(accounts: IAccount[]): IGeneralLedgerSheetAccount[] {
-    return R.compose(
-      R.defaultTo([]),
-      this.filterAccountNodesByTransactionsFilter,
-      this.accountNodesDeepMap,
-      R.defaultTo([]),
-      this.filterAccountNodesByAccountsFilter,
-      this.nestedAccountsNode
-    )(accounts);
+    return (
+      accounts
+        .map((account: IAccount) => this.accountMapper(account))
+        // Filter general ledger accounts that have no transactions
+        // when`noneTransactions` is on.
+        .filter(
+          (generalLedgerAccount: IGeneralLedgerSheetAccount) =>
+            !(
+              generalLedgerAccount.transactions.length === 0 &&
+              this.query.noneTransactions
+            )
+        )
+    );
  }

  /**
-   * Retrieves general ledger report data.
+   * Retrieve general ledger report data.
   * @return {IGeneralLedgerSheetAccount[]}
   */
  public reportData(): IGeneralLedgerSheetAccount[] {
-    return this.accountsWalker(this.repository.accounts);
+    return this.accountsWalker(this.accounts);
  }
 }
--- a/packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedgerRepository.ts
+++ b/packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedgerRepository.ts
@@ -1,180 +0,0 @@
-import moment from 'moment';
-import * as R from 'ramda';
-import {
-  IAccount,
-  IAccountTransaction,
-  IContact,
-  IGeneralLedgerSheetQuery,
-  ITenant,
-} from '@/interfaces';
-import Ledger from '@/services/Accounting/Ledger';
-import { transformToMap } from '@/utils';
-import { Tenant } from '@/system/models';
-import { flatten, isEmpty, uniq } from 'lodash';
-
-export class GeneralLedgerRepository {
-  public filter: IGeneralLedgerSheetQuery;
-  public accounts: IAccount[];
-
-  public transactions: IAccountTransaction[];
-  public openingBalanceTransactions: IAccountTransaction[];
-
-  public transactionsLedger: Ledger;
-  public openingBalanceTransactionsLedger: Ledger;
-
-  public repositories: any;
-  public models: any;
-  public accountsGraph: any;
-
-  public contacts: IContact;
-  public contactsById: Map<number, IContact>;
-
-  public tenantId: number;
-  public tenant: ITenant;
-
-  public accountNodesIncludeTransactions: Array<number> = [];
-  public accountNodeInclude: Array<number> = [];
-
-  /**
-   * Constructor method.
-   * @param models
-   * @param repositories
-   * @param filter
-   */
-  constructor(
-    repositories: any,
-    filter: IGeneralLedgerSheetQuery,
-    tenantId: number
-  ) {
-    this.filter = filter;
-    this.repositories = repositories;
-    this.tenantId = tenantId;
-  }
-
-  /**
-   * Initialize the G/L report.
-   */
-  public async asyncInitialize() {
-    await this.initTenant();
-    await this.initAccounts();
-    await this.initAccountsGraph();
-    await this.initContacts();
-    await this.initAccountsOpeningBalance();
-    this.initAccountNodesIncludeTransactions();
-    await this.initTransactions();
-    this.initAccountNodesIncluded();
-  }
-
-  /**
-   * Initialize the tenant.
-   */
-  public async initTenant() {
-    this.tenant = await Tenant.query()
-      .findById(this.tenantId)
-      .withGraphFetched('metadata');
-  }
-
-  /**
-   * Initialize the accounts.
-   */
-  public async initAccounts() {
-    this.accounts = await this.repositories.accountRepository
-      .all()
-      .orderBy('name', 'ASC');
-  }
-
-  /**
-   * Initialize the accounts graph.
-   */
-  public async initAccountsGraph() {
-    this.accountsGraph =
-      await this.repositories.accountRepository.getDependencyGraph();
-  }
-
-  /**
-   * Initialize the contacts.
-   */
-  public async initContacts() {
-    this.contacts = await this.repositories.contactRepository.all();
-    this.contactsById = transformToMap(this.contacts, 'id');
-  }
-
-  /**
-   * Initialize the G/L transactions from/to the given date.
-   */
-  public async initTransactions() {
-    this.transactions = await this.repositories.transactionsRepository
-      .journal({
-        fromDate: this.filter.fromDate,
-        toDate: this.filter.toDate,
-        branchesIds: this.filter.branchesIds,
-      })
-      .orderBy('date', 'ASC')
-      .onBuild((query) => {
-        if (this.filter.accountsIds?.length > 0) {
-          query.whereIn('accountId', this.accountNodesIncludeTransactions);
-        }
-      });
-    // Transform array transactions to journal collection.
-    this.transactionsLedger = Ledger.fromTransactions(this.transactions);
-  }
-
-  /**
-   * Initialize the G/L accounts opening balance.
-   */
-  public async initAccountsOpeningBalance() {
-    // Retreive opening balance credit/debit sumation.
-    this.openingBalanceTransactions =
-      await this.repositories.transactionsRepository.journal({
-        toDate: moment(this.filter.fromDate).subtract(1, 'day'),
-        sumationCreditDebit: true,
-        branchesIds: this.filter.branchesIds,
-      });
-
-    // Accounts opening transactions.
-    this.openingBalanceTransactionsLedger = Ledger.fromTransactions(
-      this.openingBalanceTransactions
-    );
-  }
-
-  /**
-   * Initialize the account nodes that should include transactions.
-   * @returns {void}
-   */
-  public initAccountNodesIncludeTransactions() {
-    if (isEmpty(this.filter.accountsIds)) {
-      return;
-    }
-    const childrenNodeIds = this.filter.accountsIds?.map(
-      (accountId: number) => {
-        return this.accountsGraph.dependenciesOf(accountId);
-      }
-    );
-    const nodeIds = R.concat(this.filter.accountsIds, childrenNodeIds);
-
-    this.accountNodesIncludeTransactions = uniq(flatten(nodeIds));
-  }
-
-  /**
-   * Initialize the account node ids should be included,
-   * if the filter by acounts is presented.
-   * @returns {void}
-   */
-  public initAccountNodesIncluded() {
-    if (isEmpty(this.filter.accountsIds)) {
-      return;
-    }
-    const nodeIds = this.filter.accountsIds.map((accountId) => {
-      const childrenIds = this.accountsGraph.dependenciesOf(accountId);
-      const parentIds = this.accountsGraph.dependantsOf(accountId);
-
-      return R.concat(childrenIds, parentIds);
-    });
-
-    this.accountNodeInclude = R.compose(
-      R.uniq,
-      R.flatten,
-      R.concat(this.filter.accountsIds)
-    )(nodeIds);
-  }
-}
--- a/packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedgerService.ts
+++ b/packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedgerService.ts
@@ -1,10 +1,18 @@
 import { Service, Inject } from 'typedi';
 import moment from 'moment';
+import { ServiceError } from '@/exceptions';
+import { difference } from 'lodash';
 import { IGeneralLedgerSheetQuery, IGeneralLedgerMeta } from '@/interfaces';
 import TenancyService from '@/services/Tenancy/TenancyService';
+import Journal from '@/services/Accounting/JournalPoster';
 import GeneralLedgerSheet from '@/services/FinancialStatements/GeneralLedger/GeneralLedger';
+import { transformToMap } from 'utils';
+import { Tenant } from '@/system/models';
 import { GeneralLedgerMeta } from './GeneralLedgerMeta';
-import { GeneralLedgerRepository } from './GeneralLedgerRepository';
+
+const ERRORS = {
+  ACCOUNTS_NOT_FOUND: 'ACCOUNTS_NOT_FOUND',
+};

@Service()
 export class GeneralLedgerService {
@@ -32,13 +40,29 @@ export class GeneralLedgerService {
    };
  }

+  /**
+   * Validates accounts existance on the storage.
+   * @param {number} tenantId
+   * @param {number[]} accountsIds
+   */
+  async validateAccountsExistance(tenantId: number, accountsIds: number[]) {
+    const { Account } = this.tenancy.models(tenantId);
+
+    const storedAccounts = await Account.query().whereIn('id', accountsIds);
+    const storedAccountsIds = storedAccounts.map((a) => a.id);
+
+    if (difference(accountsIds, storedAccountsIds).length > 0) {
+      throw new ServiceError(ERRORS.ACCOUNTS_NOT_FOUND);
+    }
+  }
+
  /**
   * Retrieve general ledger report statement.
   * @param {number} tenantId
   * @param {IGeneralLedgerSheetQuery} query
-   * @return {Promise<IGeneralLedgerStatement>}
+   * @return {IGeneralLedgerStatement}
   */
-  public async generalLedger(
+  async generalLedger(
    tenantId: number,
    query: IGeneralLedgerSheetQuery
  ): Promise<{
@@ -46,24 +70,60 @@ export class GeneralLedgerService {
    query: IGeneralLedgerSheetQuery;
    meta: IGeneralLedgerMeta;
  }> {
-    const repositories = this.tenancy.repositories(tenantId);
+    const { accountRepository, transactionsRepository, contactRepository } =
+      this.tenancy.repositories(tenantId);
+
    const i18n = this.tenancy.i18n(tenantId);

+    const tenant = await Tenant.query()
+      .findById(tenantId)
+      .withGraphFetched('metadata');
+
    const filter = {
      ...this.defaultQuery,
      ...query,
    };
-    const genealLedgerRepository = new GeneralLedgerRepository(
-      repositories,
-      query,
-      tenantId
-    );
-    await genealLedgerRepository.asyncInitialize();
+    // Retrieve all accounts with associated type from the storage.
+    const accounts = await accountRepository.all();
+    const accountsGraph = await accountRepository.getDependencyGraph();

+    // Retrieve all contacts on the storage.
+    const contacts = await contactRepository.all();
+    const contactsByIdMap = transformToMap(contacts, 'id');
+
+    // Retreive journal transactions from/to the given date.
+    const transactions = await transactionsRepository.journal({
+      fromDate: filter.fromDate,
+      toDate: filter.toDate,
+      branchesIds: filter.branchesIds,
+    });
+    // Retreive opening balance credit/debit sumation.
+    const openingBalanceTrans = await transactionsRepository.journal({
+      toDate: moment(filter.fromDate).subtract(1, 'day'),
+      sumationCreditDebit: true,
+      branchesIds: filter.branchesIds,
+    });
+    // Transform array transactions to journal collection.
+    const transactionsJournal = Journal.fromTransactions(
+      transactions,
+      tenantId,
+      accountsGraph
+    );
+    // Accounts opening transactions.
+    const openingTransJournal = Journal.fromTransactions(
+      openingBalanceTrans,
+      tenantId,
+      accountsGraph
+    );
    // General ledger report instance.
    const generalLedgerInstance = new GeneralLedgerSheet(
+      tenantId,
      filter,
-      genealLedgerRepository,
+      accounts,
+      contactsByIdMap,
+      transactionsJournal,
+      openingTransJournal,
+      tenant.metadata.baseCurrency,
      i18n
    );
    // Retrieve general ledger report data.
--- a/packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedgerTable.ts
+++ b/packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedgerTable.ts
@@ -83,8 +83,8 @@ export class GeneralLedgerTable extends R.compose(
   */
  private openingBalanceColumnsAccessors(): IColumnMapperMeta[] {
    return [
-      { key: 'date', value: 'Opening Balance' },
-      { key: 'account_name', value: '' },
+      { key: 'date', value: this.meta.fromDate },
+      { key: 'account_name', value: 'Opening Balance' },
      { key: 'reference_type', accessor: '_empty_' },
      { key: 'reference_number', accessor: '_empty_' },
      { key: 'description', accessor: 'description' },
@@ -97,15 +97,12 @@ export class GeneralLedgerTable extends R.compose(

  /**
   * Closing balance row column accessors.
-   * @param {IGeneralLedgerSheetAccount} account -
   * @returns {ITableColumnAccessor[]}
   */
-  private closingBalanceColumnAccessors(
-    account: IGeneralLedgerSheetAccount
-  ): IColumnMapperMeta[] {
+  private closingBalanceColumnAccessors(): IColumnMapperMeta[] {
    return [
-      { key: 'date', value: `Closing balance for ${account.name}` },
-      { key: 'account_name', value: `` },
+      { key: 'date', value: this.meta.toDate },
+      { key: 'account_name', value: 'Closing Balance' },
      { key: 'reference_type', accessor: '_empty_' },
      { key: 'reference_number', accessor: '_empty_' },
      { key: 'description', accessor: '_empty_' },
@@ -116,36 +113,6 @@ export class GeneralLedgerTable extends R.compose(
    ];
  }

-  /**
-   * Closing balance row column accessors.
-   * @param {IGeneralLedgerSheetAccount} account -
-   * @returns {ITableColumnAccessor[]}
-   */
-  private closingBalanceWithSubaccountsColumnAccessors(
-    account: IGeneralLedgerSheetAccount
-  ): IColumnMapperMeta[] {
-    return [
-      {
-        key: 'date',
-        value: `Closing Balance for ${account.name} with sub-accounts`,
-      },
-      {
-        key: 'account_name',
-        value: ``,
-      },
-      { key: 'reference_type', accessor: '_empty_' },
-      { key: 'reference_number', accessor: '_empty_' },
-      { key: 'description', accessor: '_empty_' },
-      { key: 'credit', accessor: '_empty_' },
-      { key: 'debit', accessor: '_empty_' },
-      { key: 'amount', accessor: 'closingBalanceSubaccounts.formattedAmount' },
-      {
-        key: 'running_balance',
-        accessor: 'closingBalanceSubaccounts.formattedAmount',
-      },
-    ];
-  }
-
  /**
   * Retrieves the common table columns.
   * @returns {ITableColumn[]}
@@ -217,22 +184,7 @@ export class GeneralLedgerTable extends R.compose(
   * @returns {ITableRow}
   */
  private closingBalanceMapper = (account: IGeneralLedgerSheetAccount) => {
-    const columns = this.closingBalanceColumnAccessors(account);
-    const meta = {
-      rowTypes: [ROW_TYPE.CLOSING_BALANCE],
-    };
-    return tableRowMapper(account, columns, meta);
-  };
-
-  /**
-   * Maps the given account node to opening balance table row.
-   * @param {IGeneralLedgerSheetAccount} account
-   * @returns {ITableRow}
-   */
-  private closingBalanceWithSubaccountsMapper = (
-    account: IGeneralLedgerSheetAccount
-  ): ITableRow => {
-    const columns = this.closingBalanceWithSubaccountsColumnAccessors(account);
+    const columns = this.closingBalanceColumnAccessors();
    const meta = {
      rowTypes: [ROW_TYPE.CLOSING_BALANCE],
    };
@@ -269,27 +221,8 @@ export class GeneralLedgerTable extends R.compose(
      rowTypes: [ROW_TYPE.ACCOUNT],
    };
    const row = tableRowMapper(account, columns, meta);
-    const closingBalanceWithSubaccounts =
-      this.closingBalanceWithSubaccountsMapper(account);

-    // Appends the closing balance with sub-accounts row if the account
-    // has children accounts and the node is define.
-    const isAppendClosingSubaccounts = () =>
-      account.children?.length > 0 && !!account.closingBalanceSubaccounts;
-
-    const children = R.compose(
-      R.when(
-        isAppendClosingSubaccounts,
-        R.append(closingBalanceWithSubaccounts)
-      ),
-      R.concat(R.defaultTo([], transactions)),
-      R.when(
-        () => account?.children?.length > 0,
-        R.concat(R.defaultTo([], account.children))
-      )
-    )([]);
-
-    return R.assoc('children', children)(row);
+    return R.assoc('children', transactions)(row);
  };

  /**
@@ -300,7 +233,7 @@ export class GeneralLedgerTable extends R.compose(
  private accountsMapper = (
    accounts: IGeneralLedgerSheetAccount[]
  ): ITableRow[] => {
-    return this.mapNodesDeepReverse(accounts, this.accountMapper);
+    return this.mapNodesDeep(accounts, this.accountMapper);
  };

  /**
@@ -317,6 +250,7 @@ export class GeneralLedgerTable extends R.compose(
   */
  public tableColumns(): ITableColumn[] {
    const columns = this.commonColumns();
+
    return R.compose(this.tableColumnsCellIndexing)(columns);
  }
 }
--- a/packages/server/src/services/FinancialStatements/GeneralLedger/_utils.ts
+++ b/packages/server/src/services/FinancialStatements/GeneralLedger/_utils.ts
@@ -1,13 +0,0 @@
-/**
- * Calculate the running balance.
- * @param {number} amount - Transaction amount.
- * @param {number} lastRunningBalance - Last running balance.
- * @param {number} openingBalance - Opening balance.
- * @return {number} Running balance.
- */
-export function calculateRunningBalance(
-  amount: number,
-  lastRunningBalance: number
-): number {
-  return amount + lastRunningBalance;
-}
--- a/packages/server/src/services/Resource/ResourceService.ts
+++ b/packages/server/src/services/Resource/ResourceService.ts
@@ -108,28 +108,17 @@ export default class ResourceService {
    const $hasFields = (field) =>
      'undefined' !== typeof field.fields ? field : undefined;

-    const $ColumnHasColumns = (column) =>
+    const $hasColumns = (column) =>
      'undefined' !== typeof column.columns ? column : undefined;

-    const $hasColumns = (columns) =>
-      'undefined' !== typeof columns ? columns : undefined;
-
    const naviagations = [
      ['fields', qim.$each, 'name'],
      ['fields', qim.$each, $enumerationType, 'options', qim.$each, 'label'],
      ['fields2', qim.$each, 'name'],
      ['fields2', qim.$each, $enumerationType, 'options', qim.$each, 'label'],
      ['fields2', qim.$each, $hasFields, 'fields', qim.$each, 'name'],
-      ['columns', $hasColumns, qim.$each, 'name'],
-      [
-        'columns',
-        $hasColumns,
-        qim.$each,
-        $ColumnHasColumns,
-        'columns',
-        qim.$each,
-        'name',
-      ],
+      ['columns', qim.$each, 'name'],
+      ['columns', qim.$each, $hasColumns, 'columns', qim.$each, 'name'],
    ];
    return this.i18nService.i18nApply(naviagations, meta, tenantId);
  }
--- a/packages/webapp/src/components/Branches/BranchSuggestField_.tsx
+++ b/packages/webapp/src/components/Branches/BranchSuggestField_.tsx
@@ -1,18 +0,0 @@
-// @ts-nocheck
-import { FSuggest } from '../Forms';
-
-interface BranchSuggestFieldProps {
-  items: any[];
-}
-
-export function BranchSuggestField({ ...props }: BranchSuggestFieldProps) {
-  return (
-    <FSuggest
-      valueAccessor={'id'}
-      labelAccessor={'code'}
-      textAccessor={'name'}
-      inputProps={{ placeholder: 'Select a branch' }}
-      {...props}
-    />
-  );
-}
--- a/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionBoot.tsx
+++ b/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionBoot.tsx
@@ -1,6 +1,5 @@
 // @ts-nocheck
-import React, { useMemo } from 'react';
-import { first } from 'lodash';
+import React from 'react';
 import { DrawerHeaderContent, DrawerLoading } from '@/components';
 import { DRAWERS } from '@/constants/drawers';
 import {
@@ -35,12 +34,6 @@ function CategorizeTransactionBoot({ uncategorizedTransactionId, ...props }) {
    isLoading: isUncategorizedTransactionLoading,
  } = useUncategorizedTransaction(uncategorizedTransactionId);

-  // Retrieves the primary branch.
-  const primaryBranch = useMemo(
-    () => branches?.find((b) => b.primary) || first(branches),
-    [branches],
-  );
-
  const provider = {
    uncategorizedTransactionId,
    uncategorizedTransaction,
@@ -49,7 +42,6 @@ function CategorizeTransactionBoot({ uncategorizedTransactionId, ...props }) {
    accounts,
    isBranchesLoading,
    isAccountsLoading,
-    primaryBranch,
  };
  const isLoading =
    isBranchesLoading || isUncategorizedTransactionLoading || isAccountsLoading;
--- a/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionBranchField.tsx
+++ b/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionBranchField.tsx
@@ -1,22 +0,0 @@
-// @ts-nocheck
-import { FFormGroup, FeatureCan } from '@/components';
-import { useCategorizeTransactionBoot } from './CategorizeTransactionBoot';
-import { Features } from '@/constants';
-import { BranchSuggestField } from '@/components/Branches/BranchSuggestField_';
-
-export function CategorizeTransactionBranchField() {
-  const { branches } = useCategorizeTransactionBoot();
-
-  return (
-    <FFormGroup name={'branchId'} label={'Branch'} fastField inline>
-      <FeatureCan feature={Features.Branches}>
-        <BranchSuggestField
-          name={'branchId'}
-          items={branches}
-          popoverProps={{ minimal: true }}
-          fill
-        />
-      </FeatureCan>
-    </FFormGroup>
-  );
-}
--- a/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionForm.tsx
+++ b/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionForm.tsx
@@ -24,11 +24,8 @@ function CategorizeTransactionFormRoot({
  // #withDrawerActions
  closeDrawer,
 }) {
-  const {
-    uncategorizedTransactionId,
-    uncategorizedTransaction,
-    primaryBranch,
-  } = useCategorizeTransactionBoot();
+  const { uncategorizedTransactionId, uncategorizedTransaction } =
+    useCategorizeTransactionBoot();
  const { mutateAsync: categorizeTransaction } = useCategorizeTransaction();

  // Callbacks handles form submit.
@@ -40,28 +37,18 @@ function CategorizeTransactionFormRoot({
      .then(() => {
        setSubmitting(false);
        closeDrawer(DRAWERS.CATEGORIZE_TRANSACTION);
-
+        
        AppToaster.show({
          message: 'The uncategorized transaction has been categorized.',
          intent: Intent.SUCCESS,
        });
      })
-      .catch((err) => {
+      .catch(() => {
        setSubmitting(false);
-        if (
-          err.response.data?.errors?.some(
-            (e) => e.type === 'BRANCH_ID_REQUIRED',
-          )
-        ) {
-          setErrors({
-            branchId: 'The branch is required.',
-          });
-        } else {
-          AppToaster.show({
-            message: 'Something went wrong!',
-            intent: Intent.DANGER,
-          });
-        }
+        AppToaster.show({
+          message: 'Something went wrong!',
+          intent: Intent.DANGER,
+        });
      });
  };
  // Form initial values in create and edit mode.
@@ -73,9 +60,6 @@ function CategorizeTransactionFormRoot({
     * as well.
     */
    ...transformToCategorizeForm(uncategorizedTransaction),
-
-    /** Assign the primary branch id as default value. */
-    branchId: primaryBranch?.id || null,
  };

  return (
--- a/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/MoneyIn/CategorizeTransactionOtherIncome.tsx
+++ b/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/MoneyIn/CategorizeTransactionOtherIncome.tsx
@@ -8,7 +8,6 @@ import {
  FTextArea,
 } from '@/components';
 import { useCategorizeTransactionBoot } from '../CategorizeTransactionBoot';
-import { CategorizeTransactionBranchField } from '../CategorizeTransactionBranchField';

 export default function CategorizeTransactionOtherIncome() {
  const { accounts } = useCategorizeTransactionBoot();
@@ -69,8 +68,6 @@ export default function CategorizeTransactionOtherIncome() {
          fill={true}
        />
      </FFormGroup>
-
-      <CategorizeTransactionBranchField />
    </>
  );
 }
--- a/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/MoneyIn/CategorizeTransactionOwnerContribution.tsx
+++ b/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/MoneyIn/CategorizeTransactionOwnerContribution.tsx
@@ -8,7 +8,6 @@ import {
  FTextArea,
 } from '@/components';
 import { useCategorizeTransactionBoot } from '../CategorizeTransactionBoot';
-import { CategorizeTransactionBranchField } from '../CategorizeTransactionBranchField';

 export default function CategorizeTransactionOwnerContribution() {
  const { accounts } = useCategorizeTransactionBoot();
@@ -64,8 +63,6 @@ export default function CategorizeTransactionOwnerContribution() {
      <FFormGroup name={'description'} label={'Description'} fastField inline>
        <FTextArea name={'description'} growVertically large fill />
      </FFormGroup>
-
-      <CategorizeTransactionBranchField />
    </>
  );
 }
--- a/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/MoneyIn/CategorizeTransactionTransferFrom.tsx
+++ b/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/MoneyIn/CategorizeTransactionTransferFrom.tsx
@@ -8,7 +8,6 @@ import {
  FTextArea,
 } from '@/components';
 import { useCategorizeTransactionBoot } from '../CategorizeTransactionBoot';
-import { CategorizeTransactionBranchField } from '../CategorizeTransactionBranchField';

 export default function CategorizeTransactionTransferFrom() {
  const { accounts } = useCategorizeTransactionBoot();
@@ -48,7 +47,7 @@ export default function CategorizeTransactionTransferFrom() {
        inline
      >
        <AccountsSelect
-          name={'creditAccountId'}
+          name={'to_account_id'}
          items={accounts}
          filterByRootTypes={['asset']}
          fastField
@@ -69,8 +68,6 @@ export default function CategorizeTransactionTransferFrom() {
          fill={true}
        />
      </FFormGroup>
-
-      <CategorizeTransactionBranchField />
    </>
  );
 }
--- a/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/MoneyOut/CategorizeTransactionOtherExpense.tsx
+++ b/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/MoneyOut/CategorizeTransactionOtherExpense.tsx
@@ -8,7 +8,6 @@ import {
  FTextArea,
 } from '@/components';
 import { useCategorizeTransactionBoot } from '../CategorizeTransactionBoot';
-import { CategorizeTransactionBranchField } from '../CategorizeTransactionBranchField';

 export default function CategorizeTransactionOtherExpense() {
  const { accounts } = useCategorizeTransactionBoot();
@@ -69,8 +68,6 @@ export default function CategorizeTransactionOtherExpense() {
          fill={true}
        />
      </FFormGroup>
-
-      <CategorizeTransactionBranchField />
    </>
  );
 }
--- a/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/MoneyOut/CategorizeTransactionOwnerDrawings.tsx
+++ b/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/MoneyOut/CategorizeTransactionOwnerDrawings.tsx
@@ -8,7 +8,6 @@ import {
  FTextArea,
 } from '@/components';
 import { useCategorizeTransactionBoot } from '../CategorizeTransactionBoot';
-import { CategorizeTransactionBranchField } from '../CategorizeTransactionBranchField';

 export default function CategorizeTransactionOwnerDrawings() {
  const { accounts } = useCategorizeTransactionBoot();
@@ -69,8 +68,6 @@ export default function CategorizeTransactionOwnerDrawings() {
          fill={true}
        />
      </FFormGroup>
-
-      <CategorizeTransactionBranchField />
    </>
  );
 }
--- a/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/MoneyOut/CategorizeTransactionToAccount.tsx
+++ b/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/MoneyOut/CategorizeTransactionToAccount.tsx
@@ -8,7 +8,6 @@ import {
  FTextArea,
 } from '@/components';
 import { useCategorizeTransactionBoot } from '../CategorizeTransactionBoot';
-import { CategorizeTransactionBranchField } from '../CategorizeTransactionBranchField';

 export default function CategorizeTransactionToAccount() {
  const { accounts } = useCategorizeTransactionBoot();
@@ -50,7 +49,7 @@ export default function CategorizeTransactionToAccount() {
        <AccountsSelect
          name={'creditAccountId'}
          items={accounts}
-          filterByRootTypes={['asset']}
+          filterByRootTypes={['assset']}
          fastField
          fill
          allowCreate
@@ -69,8 +68,6 @@ export default function CategorizeTransactionToAccount() {
          fill={true}
        />
      </FFormGroup>
-
-      <CategorizeTransactionBranchField />
    </>
  );
 }
--- a/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/_utils.ts
+++ b/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/_utils.ts
@@ -11,7 +11,6 @@ export const defaultInitialValues = {
  transactionType: '',
  referenceNo: '',
  description: '',
-  branchId: '',
 };

 export const transformToCategorizeForm = (uncategorizedTransaction) => {
--- a/packages/webapp/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerTable.tsx
+++ b/packages/webapp/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerTable.tsx
@@ -96,19 +96,12 @@ const GeneralLedgerDataTable = styled(ReportDataTable)`
            }
          }
        }
+        &:not(:first-child).is-expanded .td {
+          border-top: 1px solid #ddd;
+        }
      }
      &--OPENING_BALANCE,
      &--CLOSING_BALANCE {
-        .td {
-          color: #000;
-        }
-        .date {
-          font-weight: 500;
-
-          .cell-inner {
-            position: absolute;
-          }
-        }
        .amount {
          font-weight: 500;
        }
@@ -117,9 +110,6 @@ const GeneralLedgerDataTable = styled(ReportDataTable)`
        .name {
          font-weight: 500;
        }
-        .td {
-          border-top: 1px solid #ddd;
-        }
      }
    }
  }
--- a/packages/webapp/src/containers/Setup/SetupSubscription/SubscriptionPlan.tsx
+++ b/packages/webapp/src/containers/Setup/SetupSubscription/SubscriptionPlan.tsx
@@ -26,7 +26,7 @@ function SubscriptionPricing({
    useGetLemonSqueezyCheckout();

  const handleClick = () => {
-    getLemonCheckout({ variantId: '338516' })
+    getLemonCheckout({ variantId: '337977' })
      .then((res) => {
        const checkoutUrl = res.data.data.attributes.url;
        window.LemonSqueezy.Url.Open(checkoutUrl);
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,9 +50,6 @@ importers:
      '@lemonsqueezy/lemonsqueezy.js':
        specifier: ^2.2.0
        version: 2.2.0
-      '@supercharge/promise-pool':
-        specifier: ^3.2.0
-        version: 3.2.0
      '@types/express':
        specifier: ^4.17.21
        version: 4.17.21
@@ -5754,11 +5751,6 @@ packages:
    resolution: {integrity: sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==}
    dev: false

-  /@supercharge/promise-pool@3.2.0:
-    resolution: {integrity: sha512-pj0cAALblTZBPtMltWOlZTQSLT07jIaFNeM8TWoJD1cQMgDB9mcMlVMoetiB35OzNJpqQ2b+QEtwiR9f20mADg==}
-    engines: {node: '>=8'}
-    dev: false
-
  /@surma/rollup-plugin-off-main-thread@2.2.3:
    resolution: {integrity: sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==}
    dependencies:
@@ -17390,7 +17382,6 @@ packages:

  /memory-pager@1.5.0:
    resolution: {integrity: sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==}
-    requiresBuild: true
    dev: false

  /memorystream@0.3.1:
@@ -23481,7 +23472,6 @@ packages:

  /sparse-bitfield@3.0.3:
    resolution: {integrity: sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==}
-    requiresBuild: true
    dependencies:
      memory-pager: 1.5.0
    dev: false
Author	SHA1	Message	Date
Ahmed Bouhuolia	9174203320	feat: organize Plaid env variables for sandbox and development envs.	2024-06-03 20:46:53 +02:00
Ahmed Bouhuolia	11cc4ffb0a	add	2024-06-03 19:52:43 +02:00
Ahmed Bouhuolia	c279b982e6	fix: Lemon Squeezy redirect to base url	2024-06-03 19:49:58 +02:00