refactor(nestjs): users module

packages/server/src/common/config/bankfeed.ts

@@ -1,7 +0,0 @@
-import { registerAs } from '@nestjs/config';
-
-export default registerAs('bankfeed', () => ({
-  enabled:
-    process.env.BANK_FEED_ENABLED === 'true' ||
-    process.env.BANK_FEED_ENABLED === 'yes',
-}));

packages/server/src/common/config/index.ts

@@ -13,7 +13,6 @@ import signupRestrictions from './signup-restrictions';
 import jwt from './jwt';
 import mail from './mail';
 import loops from './loops';
-import bankfeed from './bankfeed';
 
 export const config = [
   systemDatabase,
@@ -30,6 +29,5 @@ export const config = [
   signupRestrictions,
   jwt,
   mail,
-  loops,
+  loops
-  bankfeed,
 ];

packages/server/src/common/decorators/LockMutateBaseCurrency.decorator.ts

@@ -1,57 +0,0 @@
-/**
- * Map to store all models that have been marked to prevent base currency mutation.
- * Key is the model name, value is the model class.
- */
-export const preventMutateBaseCurrencyModels = new Map<string, any>();
-
-/**
- * Decorator that marks an ORM model to prevent base currency mutation.
- * When applied to a model class, it adds a static property `preventMutateBaseCurrency` set to true
- * and registers the model in the preventMutateBaseCurrencyModels map.
- *
- * @returns {ClassDecorator} A decorator function that can be applied to a class.
- */
-export function PreventMutateBaseCurrency(): ClassDecorator {
-  return (target: any) => {
-    // Set the static property on the model class
-    target.preventMutateBaseCurrency = true;
-
-    // Register the model in the map
-    const modelName = target.name;
-    preventMutateBaseCurrencyModels.set(modelName, target);
-
-    // Return the modified class
-    return target;
-  };
-}
-
-/**
- * Get all registered models that prevent base currency mutation.
- *
- * @returns {Map<string, any>} Map of model names to model classes
- */
-export function getPreventMutateBaseCurrencyModels(): Map<string, any> {
-  return preventMutateBaseCurrencyModels;
-}
-
-/**
- * Check if a model is registered to prevent base currency mutation.
- *
- * @param {string} modelName - The name of the model to check
- * @returns {boolean} True if the model is registered, false otherwise
- */
-export function isModelPreventMutateBaseCurrency(modelName: string): boolean {
-  return preventMutateBaseCurrencyModels.has(modelName);
-}
-
-/**
- * Get a specific model by name that prevents base currency mutation.
- *
- * @param {string} modelName - The name of the model to retrieve
- * @returns {any | undefined} The model class if found, undefined otherwise
- */
-export function getPreventMutateBaseCurrencyModel(
-  modelName: string,
-): any | undefined {
-  return preventMutateBaseCurrencyModels.get(modelName);
-}

packages/server/src/common/decorators/Validators.ts

@@ -1,32 +0,0 @@
-import { Transform } from 'class-transformer';
-import { ValidateIf, ValidationOptions } from 'class-validator';
-
-/**
- * Decorator that converts the property value to a number.
- * @returns PropertyDecorator
- */
-export function ToNumber() {
-  return Transform(({ value, key }) => {
-    const defaultValue = null;
-
-    if (typeof value === 'number') {
-      return value;
-    }
-    // If value is an empty string or undefined/null, return it as-is (won’t pass validation)
-    if (value === '' || value === null || value === undefined) {
-      return defaultValue;
-    }
-    const parsed = Number(value);
-    return !isNaN(parsed) ? parsed : value;
-  });
-}
-
-/**
- * Validates if the property is not empty.
- * @returns PropertyDecorator
- */
-export function IsOptional(validationOptions?: ValidationOptions) {
-  return ValidateIf((_obj, value) => {
-    return value !== null && value !== undefined && value !== '';
-  }, validationOptions);
-}

packages/server/src/common/interceptors/serialize.interceptor.ts

@@ -70,10 +70,7 @@ export class SerializeInterceptor implements NestInterceptor<any, any> {
     next: CallHandler<any>,
   ): Observable<any> {
     const request = context.switchToHttp().getRequest();
-
-    // Transform both body and query parameters
     request.body = this.strategy.in(request.body);
-    request.query = this.strategy.in(request.query);
 
     // handle returns stream..
     return next.handle().pipe(map(this.strategy.out));

packages/server/src/common/pipes/ClassValidation.pipe.ts

@@ -14,15 +14,12 @@ export class ValidationPipe implements PipeTransform<any> {
       return value;
     }
     const object = plainToInstance(metatype, value);
-    const errors = await validate(object, {
+    const errors = await validate(object);
-      // Strip validated object of any properties that do not have any decorators.
-      whitelist: true,
-    });
 
     if (errors.length > 0) {
       throw new BadRequestException(errors);
     }
-    return object;
+    return value;
   }
 
   private toValidate(metatype: Function): boolean {

packages/server/src/i18n/en/financial_sheet.json

@@ -1,9 +1,9 @@
 {
-  "previoud_period_date": "{date} (PP)",
+  "previoud_period_date": "{{date}} (PP)",
   "fianncial_sheet.previous_period_change": "Change (PP)",
   "previous_period_percentage": "% Change (PP)",
-  "previous_year_date": "{date} (PY)",
+  "previous_year_date": "{{date}} (PY)",
   "previous_year_change": "Change (PY)",
   "previous_year_percentage": "% Change (PY)",
-  "total_row": "Total {value}"
+  "total_row": "Total {{value}}"
 }

packages/server/src/i18n/en/inventory_adjustment.json

@@ -1,4 +0,0 @@
-{
-  "decrement": "Decrement",
-  "increment": "Increment"
-}

packages/server/src/i18n/en/warehouses.json

@@ -1,4 +0,0 @@
-{
-  "primary_warehouse": "Primary Warehouse"
-}
-

packages/server/src/libs/chromiumly/ConvertUtils.ts

@@ -1,4 +1,4 @@
-import * as FormData from 'form-data';
+import FormData from 'form-data';
 import { GotenbergUtils } from './GotenbergUtils';
 import { PageProperties } from './_types';
 

packages/server/src/libs/chromiumly/GotenbergUtils.ts

@@ -1,5 +1,5 @@
-import * as FormData from 'form-data';
+import FormData from 'form-data';
-import { Axios } from 'axios';
+import Axios from 'axios';
 
 export class GotenbergUtils {
   public static assert(condition: boolean, message: string): asserts condition {
@@ -10,12 +10,12 @@ export class GotenbergUtils {
 
   public static async fetch(endpoint: string, data: FormData): Promise<Buffer> {
     try {
-      const response = await new Axios({
+      const response = await Axios.post(endpoint, data, {
         headers: {
           ...data.getHeaders(),
         },
         responseType: 'arraybuffer', // This ensures you get a Buffer bac
-      }).post(endpoint, data);
+      });
       return response.data;
     } catch (error) {
       console.error(error);

packages/server/src/libs/chromiumly/HTMLConvert.ts

@@ -1,5 +1,5 @@
 import { constants, createReadStream, PathLike, promises } from 'fs';
-import * as FormData from 'form-data';
+import FormData from 'form-data';
 import { GotenbergUtils } from './GotenbergUtils';
 import { IConverter, PageProperties } from './_types';
 import { PdfFormat, ChromiumRoute } from './_types';

packages/server/src/libs/chromiumly/UrlConvert.ts

@@ -1,4 +1,4 @@
-import * as  FormData from 'form-data';
+import FormData from 'form-data';
 import { IConverter, PageProperties, PdfFormat, ChromiumRoute } from './_types';
 import { ConverterUtils } from './ConvertUtils';
 import { Converter } from './Converter';

packages/server/src/modules/Accounts/MutateBaseCurrencyAccounts.ts

@@ -13,7 +13,9 @@ export class MutateBaseCurrencyAccounts {
    * Mutates the all accounts or the organziation.
    * @param {string} currencyCode
    */
-  async mutateAllAccountsCurrency(currencyCode: string) {
+  mutateAllAccountsCurrency = async (
-    await this.accountModel().query().update({ currencyCode });
+    currencyCode: string,
-  }
+  ) => {
+    await Account.query().update({ currencyCode });
+  };
 }

packages/server/src/modules/App/App.module.ts

@@ -88,10 +88,6 @@ import { ViewsModule } from '../Views/Views.module';
 import { CurrenciesModule } from '../Currencies/Currencies.module';
 import { MiscellaneousModule } from '../Miscellaneous/Miscellaneous.module';
 import { UsersModule } from '../UsersModule/Users.module';
-import { ContactsModule } from '../Contacts/Contacts.module';
-import { BankingPlaidModule } from '../BankingPlaid/BankingPlaid.module';
-import { BankingCategorizeModule } from '../BankingCategorize/BankingCategorize.module';
-import { TenantModelsInitializeModule } from '../Tenancy/TenantModelsInitialize.module';
 
 @Module({
   imports: [
@@ -153,7 +149,6 @@ import { TenantModelsInitializeModule } from '../Tenancy/TenantModelsInitialize.
     ScheduleModule.forRoot(),
     TenancyDatabaseModule,
     TenancyModelsModule,
-    TenantModelsInitializeModule,
     AuthModule,
     TenancyModule,
     ChromiumlyTenancyModule,
@@ -186,12 +181,10 @@ import { TenantModelsInitializeModule } from '../Tenancy/TenantModelsInitialize.
     LedgerModule,
     BankAccountsModule,
     BankRulesModule,
+    BankingTransactionsModule,
     BankingTransactionsExcludeModule,
     BankingTransactionsRegonizeModule,
-    BankingTransactionsModule,
     BankingMatchingModule,
-    BankingPlaidModule,
-    BankingCategorizeModule,
     TransactionsLockingModule,
     SettingsModule,
     FeaturesModule,
@@ -217,8 +210,7 @@ import { TenantModelsInitializeModule } from '../Tenancy/TenantModelsInitialize.
     ViewsModule,
     CurrenciesModule,
     MiscellaneousModule,
-    UsersModule,
+    UsersModule
-    ContactsModule
   ],
   controllers: [AppController],
   providers: [

packages/server/src/modules/Attachments/Attachment.module.ts

@@ -33,7 +33,6 @@ const models = [
 
 @Module({
   imports: [S3Module, ...models],
-  exports: [...models],
   controllers: [AttachmentsController],
   providers: [
     DeleteAttachment,

packages/server/src/modules/Attachments/utils.ts

@@ -1,4 +1,4 @@
-import * as path from 'path';
+import path from 'path';
 // import config from '@/config';
 
 export const getUploadedObjectUri = (objectKey: string) => {

packages/server/src/modules/BankRules/commands/EditBankRule.service.ts

@@ -23,13 +23,13 @@ export class EditBankRuleService {
   ) {}
 
   /**
-   * Transforms the given edit bank rule dto to model object.
+   *
-   * @param editDTO
+   * @param createDTO
    * @returns
    */
-  private transformDTO(editDTO: EditBankRuleDto): ModelObject<BankRule> {
+  private transformDTO(createDTO: EditBankRuleDto): ModelObject<BankRule> {
     return {
-      ...editDTO,
+      ...createDTO,
     } as ModelObject<BankRule>;
   }
 

packages/server/src/modules/BankRules/dtos/BankRule.dto.ts

@@ -12,7 +12,6 @@ import {
 } from 'class-validator';
 import { BankRuleComparator } from '../types';
 import { ApiProperty } from '@nestjs/swagger';
-import { ToNumber } from '@/common/decorators/Validators';
 
 class BankRuleConditionDto {
   @IsNotEmpty()
@@ -45,8 +44,6 @@ export class CommandBankRuleDto {
   })
   name: string;
 
-  @IsNotEmpty()
-  @ToNumber()
   @IsInt()
   @Min(0)
   @ApiProperty({
@@ -56,7 +53,6 @@ export class CommandBankRuleDto {
   order: number;
 
   @IsOptional()
-  @ToNumber()
   @IsInt()
   @Min(0)
   @ApiProperty({
@@ -65,7 +61,6 @@ export class CommandBankRuleDto {
   })
   applyIfAccountId?: number;
 
-  @IsNotEmpty()
   @IsIn(['deposit', 'withdrawal'])
   @ApiProperty({
     description: 'The transaction type to apply the rule if',
@@ -87,14 +82,11 @@ export class CommandBankRuleDto {
   @Type(() => BankRuleConditionDto)
   @ApiProperty({
     description: 'The conditions to apply the rule if',
-    example: [
+    example: [{ field: 'description', comparator: 'contains', value: 'Salary' }],
-      { field: 'description', comparator: 'contains', value: 'Salary' },
-    ],
   })
   conditions: BankRuleConditionDto[];
 
   @IsString()
-  @IsNotEmpty()
   @ApiProperty({
     description: 'The category to assign the rule if',
     example: 'Income:Salary',
@@ -103,8 +95,6 @@ export class CommandBankRuleDto {
 
   @IsInt()
   @Min(0)
-  @ToNumber()
-  @IsNotEmpty()
   @ApiProperty({
     description: 'The account ID to assign the rule if',
     example: 1,

packages/server/src/modules/BankingAccounts/queries/GetBankAccountSummary.ts

@@ -1,13 +1,8 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { Account } from '@/modules/Accounts/models/Account.model';
 import { UncategorizedBankTransaction } from '@/modules/BankingTransactions/models/UncategorizedBankTransaction';
+import { BaseModel } from '@/models/Model';
 import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
-import { Knex } from 'knex';
-import { TENANCY_DB_CONNECTION } from '@/modules/Tenancy/TenancyDB/TenancyDB.constants';
-import { initialize } from 'objection';
-import { MatchedBankTransaction } from '@/modules/BankingMatching/models/MatchedBankTransaction';
-import { TenantModel } from '@/modules/System/models/TenantModel';
-import { RecognizedBankTransaction } from '@/modules/BankingTranasctionsRegonize/models/RecognizedBankTransaction';
 
 @Injectable()
 export class GetBankAccountSummary {
@@ -19,19 +14,6 @@ export class GetBankAccountSummary {
     private readonly uncategorizedBankTransactionModel: TenantModelProxy<
       typeof UncategorizedBankTransaction
     >,
-
-    @Inject(MatchedBankTransaction.name)
-    private readonly matchedBankTransactionModel: TenantModelProxy<
-      typeof MatchedBankTransaction
-    >,
-
-    @Inject(RecognizedBankTransaction.name)
-    private readonly recognizedBankTransaction: TenantModelProxy<
-      typeof RecognizedBankTransaction
-    >,
-
-    @Inject(TENANCY_DB_CONNECTION)
-    private readonly tenantDb: () => Knex,
   ) {}
 
   /**
@@ -45,11 +27,6 @@ export class GetBankAccountSummary {
       .findById(bankAccountId)
       .throwIfNotFound();
 
-    await initialize(this.tenantDb(), [
-      this.uncategorizedBankTransactionModel(),
-      this.matchedBankTransactionModel(),
-      this.recognizedBankTransaction(),
-    ]);
     const commonQuery = (q) => {
       // Include just the given account.
       q.where('accountId', bankAccountId);
@@ -60,6 +37,11 @@ export class GetBankAccountSummary {
       // Only the not categorized.
       q.modify('notCategorized');
     };
+
+    interface UncategorizedTransactionsCount {
+      total: number;
+    }
+
     // Retrieves the uncategorized transactions count of the given bank account.
     const uncategorizedTranasctionsCount =
       await this.uncategorizedBankTransactionModel()

packages/server/src/modules/BankingCategorize/BankingCategorize.application.ts

@@ -1,92 +0,0 @@
-import { Knex } from 'knex';
-import { CategorizeBankTransaction } from './commands/CategorizeBankTransaction';
-import { UncategorizeBankTransactionService } from './commands/UncategorizeBankTransaction.service';
-import { UncategorizeBankTransactionsBulk } from './commands/UncategorizeBankTransactionsBulk.service';
-import { UncategorizedBankTransactionDto } from './dtos/CreateUncategorizedBankTransaction.dto';
-import { CategorizeBankTransactionDto } from './dtos/CategorizeBankTransaction.dto';
-import { CategorizeTransactionAsExpense } from './commands/CategorizeTransactionAsExpense';
-import { CreateUncategorizedTransactionService } from './commands/CreateUncategorizedTransaction.service';
-import { ICategorizeCashflowTransactioDTO } from './types/BankingCategorize.types';
-import { Injectable } from '@nestjs/common';
-
-@Injectable()
-export class BankingCategorizeApplication {
-  constructor(
-    private readonly categorizeBankTransaction: CategorizeBankTransaction,
-    private readonly uncategorizeBankTransaction: UncategorizeBankTransactionService,
-    private readonly uncategorizeBankTransactionsBulk: UncategorizeBankTransactionsBulk,
-    private readonly categorizeTransactionAsExpense: CategorizeTransactionAsExpense,
-    private readonly createUncategorizedTransaction: CreateUncategorizedTransactionService,
-  ) {}
-
-  /**
-   * Categorize a bank transaction with the given ID and categorization data.
-   * @param {number | Array<number>} uncategorizedTransactionId - The ID(s) of the uncategorized transaction(s) to categorize.
-   * @param {CategorizeBankTransactionDto} categorizeDTO - Data for categorization.
-   * @returns {Promise<any>} The result of the categorization operation.
-   */
-  public categorizeTransaction(
-    uncategorizedTransactionId: number | Array<number>,
-    categorizeDTO: CategorizeBankTransactionDto,
-  ) {
-    return this.categorizeBankTransaction.categorize(
-      uncategorizedTransactionId,
-      categorizeDTO,
-    );
-  }
-
-  /**
-   * Uncategorize a bank transaction with the given ID.
-   * @param {number} uncategorizedTransactionId - The ID of the transaction to uncategorize.
-   * @returns {Promise<Array<number>>} Array of affected transaction IDs.
-   */
-  public uncategorizeTransaction(
-    uncategorizedTransactionId: number,
-  ): Promise<Array<number>> {
-    return this.uncategorizeBankTransaction.uncategorize(
-      uncategorizedTransactionId,
-    );
-  }
-
-  /**
-   * Uncategorize multiple bank transactions in bulk.
-   * @param {number | Array<number>} uncategorizedTransactionIds - The ID(s) of the transaction(s) to uncategorize.
-   * @returns {Promise<void>}
-   */
-  public uncategorizeTransactionsBulk(
-    uncategorizedTransactionIds: number | Array<number>,
-  ) {
-    return this.uncategorizeBankTransactionsBulk.uncategorizeBulk(
-      uncategorizedTransactionIds,
-    );
-  }
-
-  /**
-   * Categorize a transaction as an expense.
-   * @param {number} cashflowTransactionId - The ID of the cashflow transaction to categorize.
-   * @param {ICategorizeCashflowTransactioDTO} transactionDTO - Data for categorization.
-   * @returns {Promise<any>} The result of the categorization operation.
-   */
-  public categorizeTransactionAsExpenseType(
-    cashflowTransactionId: number,
-    transactionDTO: ICategorizeCashflowTransactioDTO,
-  ) {
-    return this.categorizeTransactionAsExpense.categorize(
-      cashflowTransactionId,
-      transactionDTO,
-    );
-  }
-
-  /**
-   * Create a new uncategorized bank transaction.
-   * @param {UncategorizedBankTransactionDto} createDTO - Data for creating the uncategorized transaction.
-   * @param {Knex.Transaction} [trx] - Optional Knex transaction.
-   * @returns {Promise<any>} The created uncategorized transaction.
-   */
-  public createUncategorizedBankTransaction(
-    createDTO: UncategorizedBankTransactionDto,
-    trx?: Knex.Transaction,
-  ) {
-    return this.createUncategorizedTransaction.create(createDTO, trx);
-  }
-}

packages/server/src/modules/BankingCategorize/BankingCategorize.controller.ts

@@ -1,56 +0,0 @@
-import { Body, Controller, Delete, Param, Post, Query } from '@nestjs/common';
-import { castArray, omit } from 'lodash';
-import { BankingCategorizeApplication } from './BankingCategorize.application';
-import { CategorizeBankTransactionRouteDto } from './dtos/CategorizeBankTransaction.dto';
-import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
-
-@Controller('banking/categorize')
-@ApiTags('banking-categorization')
-export class BankingCategorizeController {
-  constructor(
-    private readonly bankingCategorizeApplication: BankingCategorizeApplication,
-  ) {}
-
-  @Post()
-  @ApiOperation({ summary: 'Categorize bank transactions.' })
-  @ApiResponse({
-    status: 200,
-    description: 'The bank transactions have been categorized successfully.',
-  })
-  public categorizeTransaction(
-    @Body() body: CategorizeBankTransactionRouteDto,
-  ) {
-    return this.bankingCategorizeApplication.categorizeTransaction(
-      castArray(body.uncategorizedTransactionIds),
-      omit(body, 'uncategorizedTransactionIds'),
-    );
-  }
-
-  @Delete('/bulk')
-  @ApiOperation({ summary: 'Uncategorize bank transactions.' })
-  @ApiResponse({
-    status: 200,
-    description: 'The bank transactions have been uncategorized successfully.',
-  })
-  public uncategorizeTransactionsBulk(
-    @Query() uncategorizedTransactionIds: number[] | number,
-  ) {
-    return this.bankingCategorizeApplication.uncategorizeTransactionsBulk(
-      castArray(uncategorizedTransactionIds),
-    );
-  }
-
-  @Delete('/:id')
-  @ApiOperation({ summary: 'Uncategorize a bank transaction.' })
-  @ApiResponse({
-    status: 200,
-    description: 'The bank transaction has been uncategorized successfully.',
-  })
-  public uncategorizeTransaction(
-    @Param('id') uncategorizedTransactionId: number,
-  ) {
-    return this.bankingCategorizeApplication.uncategorizeTransaction(
-      Number(uncategorizedTransactionId),
-    );
-  }
-}

packages/server/src/modules/BankingCategorize/BankingCategorize.module.ts

@@ -1,38 +1,20 @@
-import { forwardRef, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { CreateUncategorizedTransactionService } from './commands/CreateUncategorizedTransaction.service';
 import { CategorizeTransactionAsExpense } from './commands/CategorizeTransactionAsExpense';
 import { BankingTransactionsModule } from '../BankingTransactions/BankingTransactions.module';
 import { ExpensesModule } from '../Expenses/Expenses.module';
 import { UncategorizedTransactionsImportable } from './commands/UncategorizedTransactionsImportable';
-import { BankingCategorizeController } from './BankingCategorize.controller';
-import { BankingCategorizeApplication } from './BankingCategorize.application';
-import { CategorizeBankTransaction } from './commands/CategorizeBankTransaction';
-import { UncategorizeBankTransactionService } from './commands/UncategorizeBankTransaction.service';
-import { UncategorizeBankTransactionsBulk } from './commands/UncategorizeBankTransactionsBulk.service';
 
 @Module({
-  imports: [
+  imports: [BankingTransactionsModule, ExpensesModule],
-    BankingTransactionsModule,
-    ExpensesModule,
-    forwardRef(() => BankingTransactionsModule),
-  ],
   providers: [
     CreateUncategorizedTransactionService,
     CategorizeTransactionAsExpense,
-    UncategorizedTransactionsImportable,
+    UncategorizedTransactionsImportable
-    BankingCategorizeApplication,
-    CategorizeBankTransaction,
-    UncategorizeBankTransactionService,
-    UncategorizeBankTransactionsBulk,
   ],
   exports: [
     CreateUncategorizedTransactionService,
     CategorizeTransactionAsExpense,
-    BankingCategorizeApplication,
-    CategorizeBankTransaction,
-    UncategorizeBankTransactionService,
-    UncategorizeBankTransactionsBulk,
   ],
-  controllers: [BankingCategorizeController],
 })
 export class BankingCategorizeModule {}

packages/server/src/modules/BankingCategorize/commands/CategorizeCashflowTransaction.ts

@@ -5,6 +5,7 @@ import { Knex } from 'knex';
 import {
   ICashflowTransactionCategorizedPayload,
   ICashflowTransactionUncategorizingPayload,
+  ICategorizeCashflowTransactioDTO,
 } from '../types/BankingCategorize.types';
 import {
   transformCategorizeTransToCashflow,
@@ -16,10 +17,9 @@ import { UnitOfWork } from '@/modules/Tenancy/TenancyDB/UnitOfWork.service';
 import { UncategorizedBankTransaction } from '@/modules/BankingTransactions/models/UncategorizedBankTransaction';
 import { events } from '@/common/events/events';
 import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
-import { CategorizeBankTransactionDto } from '../dtos/CategorizeBankTransaction.dto';
 
 @Injectable()
-export class CategorizeBankTransaction {
+export class CategorizeCashflowTransaction {
   constructor(
     private readonly eventPublisher: EventEmitter2,
     private readonly uow: UnitOfWork,
@@ -38,7 +38,7 @@ export class CategorizeBankTransaction {
    */
   public async categorize(
     uncategorizedTransactionId: number | Array<number>,
-    categorizeDTO: CategorizeBankTransactionDto,
+    categorizeDTO: ICategorizeCashflowTransactioDTO,
   ) {
     const uncategorizedTransactionIds = castArray(uncategorizedTransactionId);
 
@@ -68,6 +68,7 @@ export class CategorizeBankTransaction {
       await this.eventPublisher.emitAsync(
         events.cashflow.onTransactionCategorizing,
         {
+          // tenantId,
           oldUncategorizedTransactions,
           trx,
         } as ICashflowTransactionUncategorizingPayload,

packages/server/src/modules/BankingCategorize/commands/CreateUncategorizedTransaction.service.ts

@@ -1,5 +1,6 @@
 import { Knex } from 'knex';
 import {
+  CreateUncategorizedTransactionDTO,
   IUncategorizedTransactionCreatedEventPayload,
   IUncategorizedTransactionCreatingEventPayload,
 } from '../types/BankingCategorize.types';
@@ -9,7 +10,6 @@ import { UncategorizedBankTransaction } from '../../BankingTransactions/models/U
 import { UnitOfWork } from '@/modules/Tenancy/TenancyDB/UnitOfWork.service';
 import { events } from '@/common/events/events';
 import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
-import { UncategorizedBankTransactionDto } from '../dtos/CreateUncategorizedBankTransaction.dto';
 
 @Injectable()
 export class CreateUncategorizedTransactionService {
@@ -30,7 +30,7 @@ export class CreateUncategorizedTransactionService {
    * @returns {Promise<UncategorizedBankTransaction>}
    */
   public create(
-    createUncategorizedTransactionDTO: UncategorizedBankTransactionDto,
+    createUncategorizedTransactionDTO: CreateUncategorizedTransactionDTO,
     trx?: Knex.Transaction,
   ) {
     return this.uow.withTransaction(async (trx: Knex.Transaction) => {

packages/server/src/modules/BankingCategorize/commands/UncategorizeCashflowTransaction.service.ts

@@ -12,7 +12,7 @@ import { UncategorizedBankTransaction } from '../../BankingTransactions/models/U
 import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 
 @Injectable()
-export class UncategorizeBankTransactionService {
+export class UncategorizeCashflowTransactionService {
   constructor(
     private readonly eventPublisher: EventEmitter2,
     private readonly uow: UnitOfWork,

packages/server/src/modules/BankingCategorize/commands/UncategorizeCashflowTransactionsBulk.service.ts

@@ -1,17 +1,18 @@
 import { castArray } from 'lodash';
 import { PromisePool } from '@supercharge/promise-pool';
 import { Injectable } from '@nestjs/common';
-import { UncategorizeBankTransactionService } from './UncategorizeBankTransaction.service';
+import { UncategorizeCashflowTransactionService } from './UncategorizeCashflowTransaction.service';
 
 @Injectable()
-export class UncategorizeBankTransactionsBulk {
+export class UncategorizeCashflowTransactionsBulk {
   constructor(
-    private readonly uncategorizeTransactionService: UncategorizeBankTransactionService
+    private readonly uncategorizeTransactionService: UncategorizeCashflowTransactionService
   ) {}
 
   /**
    * Uncategorize the given bank transactions in bulk.
-   * @param {number | Array<number>} uncategorizedTransactionId
+   * @param {number} tenantId
+   * @param {number} uncategorizedTransactionId
    */
   public async uncategorizeBulk(
     uncategorizedTransactionId: number | Array<number>

packages/server/src/modules/BankingCategorize/dtos/CategorizeBankTransaction.dto.ts

@@ -1,113 +0,0 @@
-import { ToNumber } from '@/common/decorators/Validators';
-import {
-  IsArray,
-  IsDateString,
-  IsInt,
-  IsNotEmpty,
-  IsNumber,
-  IsOptional,
-  IsString,
-} from 'class-validator';
-import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
-
-/**
- * DTO for categorizing bank transactions
- */
-export class CategorizeBankTransactionDto {
-  @ApiProperty({
-    description: 'The date of the bank transaction',
-    type: Date,
-    example: '2023-01-01T00:00:00.000Z',
-  })
-  @IsDateString()
-  @IsNotEmpty()
-  date: Date;
-
-  @ApiProperty({
-    description: 'ID of the credit account associated with this transaction',
-    type: Number,
-    example: 1001,
-  })
-  @IsInt()
-  @ToNumber()
-  @IsNotEmpty()
-  creditAccountId: number;
-
-  @ApiPropertyOptional({
-    description: 'Optional external reference number',
-    type: String,
-    example: 'REF-001',
-  })
-  @IsString()
-  @IsOptional()
-  referenceNo: string;
-
-  @ApiPropertyOptional({
-    description: 'Optional transaction number or reference',
-    type: String,
-    example: 'TRX-001',
-  })
-  @IsString()
-  @IsOptional()
-  transactionNumber: string;
-
-  @ApiProperty({
-    description: 'Type of bank transaction (e.g., deposit, withdrawal)',
-    type: String,
-    example: 'deposit',
-  })
-  @IsString()
-  @IsNotEmpty()
-  transactionType: string;
-
-  @ApiPropertyOptional({
-    description: 'Exchange rate for currency conversion',
-    type: Number,
-    default: 1,
-    example: 1.15,
-  })
-  @IsNumber()
-  @ToNumber()
-  @IsOptional()
-  exchangeRate: number = 1;
-
-  @ApiPropertyOptional({
-    description: 'Currency code for the transaction',
-    type: String,
-    example: 'USD',
-  })
-  @IsString()
-  @IsOptional()
-  currencyCode: string;
-
-  @ApiPropertyOptional({
-    description: 'Description of the bank transaction',
-    type: String,
-    example: 'Monthly rent payment',
-  })
-  @IsString()
-  @IsOptional()
-  description: string;
-
-  @ApiPropertyOptional({
-    description: 'ID of the branch where the transaction occurred',
-    type: Number,
-    example: 101,
-  })
-  @IsNumber()
-  @IsOptional()
-  branchId: number;
-}
-
-/**
- * Extended DTO for categorizing bank transactions with IDs of uncategorized transactions
- */
-export class CategorizeBankTransactionRouteDto extends CategorizeBankTransactionDto {
-  @ApiProperty({
-    description: 'Array of uncategorized transaction IDs to be categorized',
-    type: [Number],
-    example: [1001, 1002, 1003],
-  })
-  @IsArray()
-  uncategorizedTransactionIds: Array<number>;
-}

packages/server/src/modules/BankingCategorize/dtos/CreateUncategorizedBankTransaction.dto.ts

@@ -1,36 +0,0 @@
-import { IsBoolean, IsDateString, IsNumber, IsString } from 'class-validator';
-
-export class UncategorizedBankTransactionDto {
-  @IsDateString()
-  date: Date | string;
-
-  @IsNumber()
-  accountId: number;
-
-  @IsNumber()
-  amount: number;
-
-  @IsString()
-  currencyCode: string;
-
-  @IsString()
-  payee?: string;
-
-  @IsString()
-  description?: string;
-
-  @IsString()
-  referenceNo?: string | null;
-
-  @IsString()
-  plaidTransactionId?: string | null;
-
-  @IsBoolean()
-  pending?: boolean;
-
-  @IsString()
-  pendingPlaidTransactionId?: string | null;
-
-  @IsString()
-  batch?: string;
-}

packages/server/src/modules/BankingMatching/BankingMatching.controller.ts

@@ -1,44 +1,47 @@
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { Body, Controller, Get, Param, Post, Query } from '@nestjs/common';
 import { BankingMatchingApplication } from './BankingMatchingApplication';
-import { GetMatchedTransactionsFilter } from './types';
+import { GetMatchedTransactionsFilter, IMatchTransactionDTO } from './types';
 import { MatchBankTransactionDto } from './dtos/MatchBankTransaction.dto';
 
 @Controller('banking/matching')
 @ApiTags('banking-transactions-matching')
 export class BankingMatchingController {
   constructor(
-    private readonly bankingMatchingApplication: BankingMatchingApplication,
+    private readonly bankingMatchingApplication: BankingMatchingApplication
   ) {}
 
-  @Get('matched')
+  @Get('matched/transactions')
   @ApiOperation({ summary: 'Retrieves the matched transactions.' })
   async getMatchedTransactions(
     @Query('uncategorizedTransactionIds') uncategorizedTransactionIds: number[],
-    @Query() filter: GetMatchedTransactionsFilter,
+    @Query() filter: GetMatchedTransactionsFilter
   ) {
     return this.bankingMatchingApplication.getMatchedTransactions(
       uncategorizedTransactionIds,
-      filter,
+      filter
     );
   }
 
-  @Post('/match')
+  @Post('/match/:uncategorizedTransactionId')
   @ApiOperation({ summary: 'Match the given uncategorized transaction.' })
-  async matchTransaction(@Body() matchedTransactions: MatchBankTransactionDto) {
+  async matchTransaction(
+    @Param('uncategorizedTransactionId') uncategorizedTransactionId: number | number[],
+    @Body() matchedTransactions: MatchBankTransactionDto
+  ) {
     return this.bankingMatchingApplication.matchTransaction(
-      matchedTransactions.uncategorizedTransactions,
+      uncategorizedTransactionId,
-      matchedTransactions.matchedTransactions,
+      matchedTransactions
     );
   }
 
   @Post('/unmatch/:uncategorizedTransactionId')
   @ApiOperation({ summary: 'Unmatch the given uncategorized transaction.' })
   async unmatchMatchedTransaction(
-    @Param('uncategorizedTransactionId') uncategorizedTransactionId: number,
+    @Param('uncategorizedTransactionId') uncategorizedTransactionId: number
   ) {
     return this.bankingMatchingApplication.unmatchMatchedTransaction(
-      uncategorizedTransactionId,
+      uncategorizedTransactionId
     );
   }
 }

packages/server/src/modules/BankingMatching/BankingMatchingApplication.ts

@@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common';
 import { GetMatchedTransactions } from './queries/GetMatchedTransactions.service';
 import { MatchBankTransactions } from './commands/MatchTransactions';
 import { UnmatchMatchedBankTransaction } from './commands/UnmatchMatchedTransaction.service';
-import { GetMatchedTransactionsFilter } from './types';
+import { GetMatchedTransactionsFilter, IMatchTransactionDTO } from './types';
-import { MatchTransactionEntryDto } from './dtos/MatchBankTransaction.dto';
+import { MatchBankTransactionDto } from './dtos/MatchBankTransaction.dto';
 
 @Injectable()
 export class BankingMatchingApplication {
@@ -31,18 +31,17 @@ export class BankingMatchingApplication {
 
   /**
    * Matches the given uncategorized transaction with the given system transaction.
-   * @param {IMatchBankTransactionDto} matchedTransactionsDTO
+   * @param {number} uncategorizedTransactionId
+   * @param {IMatchTransactionDTO} matchTransactionsDTO
    * @returns {Promise<void>}
    */
   public matchTransaction(
     uncategorizedTransactionId: number | Array<number>,
-    matchedTransactionsDto:
+    matchedTransactions: MatchBankTransactionDto,
-      | MatchTransactionEntryDto
-      | Array<MatchTransactionEntryDto>,
   ): Promise<void> {
     return this.matchTransactionService.matchTransaction(
       uncategorizedTransactionId,
-      matchedTransactionsDto,
+      matchedTransactions,
     );
   }
 

packages/server/src/modules/BankingMatching/commands/MatchTransactions.ts

@@ -21,7 +21,7 @@ import { ServiceError } from '@/modules/Items/ServiceError';
 import { UncategorizedBankTransaction } from '@/modules/BankingTransactions/models/UncategorizedBankTransaction';
 import { events } from '@/common/events/events';
 import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
-import { MatchTransactionEntryDto } from '../dtos/MatchBankTransaction.dto';
+import { MatchBankTransactionDto } from '../dtos/MatchBankTransaction.dto';
 
 @Injectable()
 export class MatchBankTransactions {
@@ -107,15 +107,16 @@ export class MatchBankTransactions {
 
   /**
    * Matches the given uncategorized transaction to the given references.
+   * @param {number} tenantId
    * @param {number} uncategorizedTransactionId
    * @returns {Promise<void>}
    */
   public async matchTransaction(
     uncategorizedTransactionId: number | Array<number>,
-    matchedTransactionsDto: MatchTransactionEntryDto | Array<MatchTransactionEntryDto>,
+    matchedTransactionsDto: MatchBankTransactionDto,
   ): Promise<void> {
     const uncategorizedTransactionIds = castArray(uncategorizedTransactionId);
-    const matchedTransactions = castArray(matchedTransactionsDto);
+    const matchedTransactions = matchedTransactionsDto.entries;
 
     // Validates the given matching transactions DTO.
     await this.validate(uncategorizedTransactionIds, matchedTransactions);
@@ -130,7 +131,7 @@ export class MatchBankTransactions {
       // Matches the given transactions under promise pool concurrency controlling.
       await PromisePool.withConcurrency(10)
         .for(matchedTransactions)
-        .process(async (matchedTransaction: MatchTransactionEntryDto) => {
+        .process(async (matchedTransaction) => {
           const getMatchedTransactionsService =
             this.matchedBankTransactions.registry.get(
               matchedTransaction.referenceType,

packages/server/src/modules/BankingMatching/dtos/MatchBankTransaction.dto.ts

@@ -1,5 +1,4 @@
 import {
-  ArrayMinSize,
   IsArray,
   IsNotEmpty,
   IsNumber,
@@ -28,10 +27,6 @@ export class MatchTransactionEntryDto {
 }
 
 export class MatchBankTransactionDto {
-  @IsArray()
-  @ArrayMinSize(1)
-  uncategorizedTransactions: Array<number>
-
   @IsArray()
   @ValidateNested({ each: true })
   @Type(() => MatchTransactionEntryDto)
@@ -42,5 +37,5 @@ export class MatchBankTransactionDto {
       { referenceType: 'SaleInvoice', referenceId: 2 },
     ],
   })
-  matchedTransactions: MatchTransactionEntryDto[];
+  entries: MatchTransactionEntryDto[];
 }

packages/server/src/modules/BankingMatching/events/DecrementUncategorizedTransactionsOnMatch.ts

@@ -1,14 +1,14 @@
-import PromisePool from '@supercharge/promise-pool';
-import { OnEvent } from '@nestjs/event-emitter';
-import { Inject, Injectable } from '@nestjs/common';
 import {
   IBankTransactionMatchedEventPayload,
   IBankTransactionUnmatchedEventPayload,
 } from '../types';
+import PromisePool from '@supercharge/promise-pool';
+import { OnEvent } from '@nestjs/event-emitter';
 import { Account } from '@/modules/Accounts/models/Account.model';
-import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
+import { Inject, Injectable } from '@nestjs/common';
 import { UncategorizedBankTransaction } from '@/modules/BankingTransactions/models/UncategorizedBankTransaction';
 import { events } from '@/common/events/events';
+import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 
 @Injectable()
 export class DecrementUncategorizedTransactionOnMatchingSubscriber {

packages/server/src/modules/BankingMatching/queries/GetMatchedTransactionsByCashflow.ts

@@ -1,4 +1,3 @@
-import { Knex } from 'knex';
 import { GetMatchedTransactionsByType } from './GetMatchedTransactionsByType';
 import { GetMatchedTransactionCashflowTransformer } from './GetMatchedTransactionCashflowTransformer';
 import { GetMatchedTransactionsFilter } from '../types';

packages/server/src/modules/BankingMatching/queries/GetMatchedTransactionsByExpenses.ts

@@ -1,13 +1,10 @@
 import { Inject, Injectable } from '@nestjs/common';
-import { GetMatchedTransactionsFilter, MatchedTransactionPOJO, MatchedTransactionsPOJO } from '../types';
+import { GetMatchedTransactionsFilter, MatchedTransactionPOJO } from '../types';
 import { GetMatchedTransactionsByType } from './GetMatchedTransactionsByType';
 import { GetMatchedTransactionExpensesTransformer } from './GetMatchedTransactionExpensesTransformer';
 import { TransformerInjectable } from '@/modules/Transformer/TransformerInjectable.service';
 import { Expense } from '@/modules/Expenses/models/Expense.model';
 import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
-import { Knex } from 'knex';
-import { TENANCY_DB_CONNECTION } from '@/modules/Tenancy/TenancyDB/TenancyDB.constants';
-import { initialize } from 'objection';
 
 @Injectable()
 export class GetMatchedTransactionsByExpenses extends GetMatchedTransactionsByType {
@@ -16,26 +13,17 @@ export class GetMatchedTransactionsByExpenses extends GetMatchedTransactionsByTy
 
     @Inject(Expense.name)
     protected readonly expenseModel: TenantModelProxy<typeof Expense>,
-
-    @Inject(TENANCY_DB_CONNECTION)
-    private readonly tenantDb: () => Knex,
-
-    @Inject('TENANT_MODELS_INIT')
-    private readonly tenantModelsInit: () => Promise<boolean>,
-    
   ) {
     super();
   }
 
   /**
    * Retrieves the matched transactions of expenses.
+   * @param {number} tenantId
    * @param {GetMatchedTransactionsFilter} filter
    * @returns
    */
-  async getMatchedTransactions(
+  async getMatchedTransactions(filter: GetMatchedTransactionsFilter) {
-    filter: GetMatchedTransactionsFilter,
-  ): Promise<MatchedTransactionsPOJO> {
-    // await this.tenantModelsInit();
     // Retrieve the expense matches.
     const expenses = await this.expenseModel()
       .query()
@@ -61,7 +49,6 @@ export class GetMatchedTransactionsByExpenses extends GetMatchedTransactionsByTy
         }
         query.orderBy('paymentDate', 'DESC');
       });
-
     return this.transformer.transform(
       expenses,
       new GetMatchedTransactionExpensesTransformer(),

packages/server/src/modules/BankingMatching/queries/GetMatchedTransactionsByInvoices.service.ts

@@ -1,4 +1,3 @@
-import { Inject, Injectable } from '@nestjs/common';
 import { Knex } from 'knex';
 import { first } from 'lodash';
 import { GetMatchedTransactionInvoicesTransformer } from './GetMatchedTransactionInvoicesTransformer';
@@ -10,6 +9,7 @@ import {
 } from '../types';
 import { GetMatchedTransactionsByType } from './GetMatchedTransactionsByType';
 import { CreatePaymentReceivedService } from '@/modules/PaymentReceived/commands/CreatePaymentReceived.serivce';
+import { Inject, Injectable } from '@nestjs/common';
 import { SaleInvoice } from '@/modules/SaleInvoices/models/SaleInvoice';
 import { TransformerInjectable } from '@/modules/Transformer/TransformerInjectable.service';
 import { UncategorizedBankTransaction } from '@/modules/BankingTransactions/models/UncategorizedBankTransaction';
@@ -86,6 +86,7 @@ export class GetMatchedTransactionsByInvoices extends GetMatchedTransactionsByTy
 
   /**
    * Creates the common matched transaction.
+   * @param {number} tenantId
    * @param {Array<number>} uncategorizedTransactionIds
    * @param {IMatchTransactionDTO} matchTransactionDTO
    * @param {Knex.Transaction} trx

packages/server/src/modules/BankingMatching/queries/GetMatchedTransactionsByManualJournals.service.ts

@@ -1,13 +1,10 @@
-import { Knex } from 'knex';
 import { Inject, Injectable } from '@nestjs/common';
-import { initialize } from 'objection';
 import { GetMatchedTransactionManualJournalsTransformer } from './GetMatchedTransactionManualJournalsTransformer';
 import { GetMatchedTransactionsByType } from './GetMatchedTransactionsByType';
 import { GetMatchedTransactionsFilter } from '../types';
 import { ManualJournal } from '@/modules/ManualJournals/models/ManualJournal';
 import { TransformerInjectable } from '@/modules/Transformer/TransformerInjectable.service';
 import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
-import { TENANCY_DB_CONNECTION } from '@/modules/Tenancy/TenancyDB/TenancyDB.constants';
 
 @Injectable()
 export class GetMatchedTransactionsByManualJournals extends GetMatchedTransactionsByType {

packages/server/src/modules/BankingMatching/queries/GetMatchedTransactionsByType.ts

@@ -12,7 +12,7 @@ import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 
 export abstract class GetMatchedTransactionsByType {
   @Inject(MatchedBankTransaction.name)
-  matchedBankTransactionModel: TenantModelProxy<
+  private readonly matchedBankTransactionModel: TenantModelProxy<
     typeof MatchedBankTransaction
   >;
 

packages/server/src/modules/BankingPlaid/BankingPlaid.controller.ts

@@ -1,22 +0,0 @@
-import { Body, Controller, Post } from '@nestjs/common';
-import { PlaidApplication } from './PlaidApplication';
-import { PlaidItemDto } from './dtos/PlaidItem.dto';
-import { ApiOperation, ApiTags } from '@nestjs/swagger';
-
-@Controller('banking/plaid')
-@ApiTags('banking-plaid')
-export class BankingPlaidController {
-  constructor(private readonly plaidApplication: PlaidApplication) {}
-
-  @Post('link-token')
-  @ApiOperation({ summary: 'Get Plaid link token' })
-  getLinkToken() {
-    return this.plaidApplication.getLinkToken();
-  }
-
-  @Post('exchange-token')
-  @ApiOperation({ summary: 'Exchange Plaid access token' })
-  exchangeToken(@Body() itemDTO: PlaidItemDto) {
-    return this.plaidApplication.exchangeToken(itemDTO);
-  }
-}

packages/server/src/modules/BankingPlaid/BankingPlaid.module.ts

@@ -1,4 +1,3 @@
-import { BullModule } from '@nestjs/bullmq';
 import { Module } from '@nestjs/common';
 import { PlaidUpdateTransactionsOnItemCreatedSubscriber } from './subscribers/PlaidUpdateTransactionsOnItemCreatedSubscriber';
 import { PlaidUpdateTransactions } from './command/PlaidUpdateTransactions';
@@ -16,11 +15,6 @@ import { PlaidItemService } from './command/PlaidItem';
 import { TenancyContext } from '../Tenancy/TenancyContext.service';
 import { InjectSystemModel } from '../System/SystemModels/SystemModels.module';
 import { SystemPlaidItem } from './models/SystemPlaidItem';
-import { BankingPlaidController } from './BankingPlaid.controller';
-import { BankingPlaidWebhooksController } from './BankingPlaidWebhooks.controller';
-import { SetupPlaidItemTenantService } from './command/SetupPlaidItemTenant.service';
-import { UpdateBankingPlaidTransitionsQueueJob } from './types/BankingPlaid.types';
-import { PlaidFetchTransactionsProcessor } from './jobs/PlaidFetchTransactionsJob';
 
 const models = [RegisterTenancyModel(PlaidItem)];
 
@@ -30,7 +24,6 @@ const models = [RegisterTenancyModel(PlaidItem)];
     AccountsModule,
     BankingCategorizeModule,
     BankingTransactionsModule,
-    BullModule.registerQueue({ name: UpdateBankingPlaidTransitionsQueueJob }),
     ...models,
   ],
   providers: [
@@ -41,12 +34,9 @@ const models = [RegisterTenancyModel(PlaidItem)];
     PlaidWebooks,
     PlaidLinkTokenService,
     PlaidApplication,
-    SetupPlaidItemTenantService,
-    TenancyContext,
-    PlaidFetchTransactionsProcessor,
     PlaidUpdateTransactionsOnItemCreatedSubscriber,
+    TenancyContext,
   ],
   exports: [...models],
-  controllers: [BankingPlaidController, BankingPlaidWebhooksController],
 })
 export class BankingPlaidModule {}

packages/server/src/modules/BankingPlaid/BankingPlaidWebhooks.controller.ts

@@ -1,31 +0,0 @@
-import { Body, Controller, Post } from '@nestjs/common';
-import { PlaidWebhookDto } from './dtos/PlaidItem.dto';
-import { ApiOperation, ApiTags } from '@nestjs/swagger';
-import { PlaidApplication } from './PlaidApplication';
-import { PublicRoute } from '../Auth/guards/jwt.guard';
-import { SetupPlaidItemTenantService } from './command/SetupPlaidItemTenant.service';
-
-@Controller('banking/plaid')
-@ApiTags('banking-plaid')
-@PublicRoute()
-export class BankingPlaidWebhooksController {
-  constructor(
-    private readonly plaidApplication: PlaidApplication,
-    private readonly setupPlaidItemTenantService: SetupPlaidItemTenantService,
-  ) {}
-
-  @Post('webhooks')
-  @ApiOperation({ summary: 'Listen to Plaid webhooks' })
-  webhooks(@Body() { itemId, webhookType, webhookCode }: PlaidWebhookDto) {
-    return this.setupPlaidItemTenantService.setupPlaidTenant(
-      itemId,
-      () => {
-        return this.plaidApplication.webhooks(
-          itemId,
-          webhookType,
-          webhookCode,
-        );
-      },
-    );
-  }
-}

packages/server/src/modules/BankingPlaid/PlaidApplication.ts

@@ -1,12 +1,8 @@
-import { ClsService } from 'nestjs-cls';
-import { Inject, Injectable } from '@nestjs/common';
 import { PlaidLinkTokenService } from './queries/GetPlaidLinkToken.service';
 import { PlaidItemService } from './command/PlaidItem';
 import { PlaidWebooks } from './command/PlaidWebhooks';
-import { PlaidItemDto } from './dtos/PlaidItem.dto';
+import { Injectable } from '@nestjs/common';
-import { SystemPlaidItem } from './models/SystemPlaidItem';
+import { PlaidItemDTO } from './types/BankingPlaid.types';
-import { TenantModel } from '../System/models/TenantModel';
-import { SystemUser } from '../System/models/SystemUser';
 
 @Injectable()
 export class PlaidApplication {
@@ -14,16 +10,6 @@ export class PlaidApplication {
     private readonly getLinkTokenService: PlaidLinkTokenService,
     private readonly plaidItemService: PlaidItemService,
     private readonly plaidWebhooks: PlaidWebooks,
-    private readonly clsService: ClsService,
-
-    @Inject(SystemPlaidItem.name)
-    private readonly systemPlaidItemModel: typeof SystemPlaidItem,
-
-    @Inject(TenantModel.name)
-    private readonly tenantModel: typeof TenantModel,
-
-    @Inject(SystemUser.name)
-    private readonly systemUserModel: typeof SystemUser,
   ) {}
 
   /**
@@ -39,7 +25,7 @@ export class PlaidApplication {
    * @param {PlaidItemDTO} itemDTO
    * @returns
    */
-  public exchangeToken(itemDTO: PlaidItemDto): Promise<void> {
+  public exchangeToken(itemDTO: PlaidItemDTO): Promise<void> {
     return this.plaidItemService.item(itemDTO);
   }
 
@@ -55,33 +41,10 @@ export class PlaidApplication {
     webhookType: string,
     webhookCode: string,
   ): Promise<void> {
-    return this.plaidWebhooks.webhooks(plaidItemId, webhookType, webhookCode);
+    return this.plaidWebhooks.webhooks(
-  }
+      plaidItemId,
-
+      webhookType,
-  public async setupPlaidTenant(plaidItemId: string, callback: () => void) {
+      webhookCode,
-    const plaidItem = await this.systemPlaidItemModel
+    );
-      .query()
-      .findOne({ plaidItemId });
-
-    if (!plaidItem) {
-      throw new Error('Plaid item not found');
-    }
-    const tenant = await this.tenantModel
-      .query()
-      .findOne({ id: plaidItem.tenantId })
-      .throwIfNotFound();
-
-    const user = await this.systemUserModel
-      .query()
-      .findOne({
-        tenantId: tenant.id,
-      })
-      .modify('active')
-      .throwIfNotFound();
-
-    this.clsService.set('organizationId', tenant.organizationId);
-    this.clsService.set('userId', user.id);
-
-    return callback();
   }
 }

packages/server/src/modules/BankingPlaid/PlaidWebhookTenantBootMiddleware.ts

@@ -0,0 +1,32 @@
+// import { Request, Response, NextFunction } from 'express';
+// import { SystemPlaidItem, Tenant } from '@/system/models';
+// import tenantDependencyInjection from '@/api/middleware/TenantDependencyInjection';
+
+// export const PlaidWebhookTenantBootMiddleware = async (
+//   req: Request,
+//   res: Response,
+//   next: NextFunction
+// ) => {
+//   const { item_id: plaidItemId } = req.body;
+//   const plaidItem = await SystemPlaidItem.query().findOne({ plaidItemId });
+
+//   const notFoundOrganization = () => {
+//     return res.boom.unauthorized('Organization identication not found.', {
+//       errors: [{ type: 'ORGANIZATION.ID.NOT.FOUND', code: 100 }],
+//     });
+//   };
+//   // In case the given organization not found.
+//   if (!plaidItem) {
+//     return notFoundOrganization();
+//   }
+//   const tenant = await Tenant.query()
+//     .findById(plaidItem.tenantId)
+//     .withGraphFetched('metadata');
+
+//   // When the given organization id not found on the system storage.
+//   if (!tenant) {
+//     return notFoundOrganization();
+//   }
+//   tenantDependencyInjection(req, tenant);
+//   next();
+// };

packages/server/src/modules/BankingPlaid/command/PlaidItem.ts

@@ -6,9 +6,11 @@ import { EventEmitter2 } from '@nestjs/event-emitter';
 import { events } from '@/common/events/events';
 import { SystemPlaidItem } from '../models/SystemPlaidItem';
 import { TenancyContext } from '@/modules/Tenancy/TenancyContext.service';
-import { IPlaidItemCreatedEventPayload } from '../types/BankingPlaid.types';
+import {
+  IPlaidItemCreatedEventPayload,
+  PlaidItemDTO,
+} from '../types/BankingPlaid.types';
 import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
-import { PlaidItemDto } from '../dtos/PlaidItem.dto';
 
 @Injectable()
 export class PlaidItemService {
@@ -17,7 +19,9 @@ export class PlaidItemService {
     private readonly tenancyContext: TenancyContext,
 
     @Inject(SystemPlaidItem.name)
-    private readonly systemPlaidItemModel: typeof SystemPlaidItem,
+    private readonly systemPlaidItemModel: TenantModelProxy<
+      typeof SystemPlaidItem
+    >,
 
     @Inject(PlaidItem.name)
     private readonly plaidItemModel: TenantModelProxy<typeof PlaidItem>,
@@ -29,10 +33,10 @@ export class PlaidItemService {
   /**
    * Exchanges the public token to get access token and item id and then creates
    * a new Plaid item.
-   * @param {PlaidItemDto} itemDTO - Plaid item data transfer object.
+   * @param {PlaidItemDTO} itemDTO - Plaid item data transfer object.
    * @returns {Promise<void>}
    */
-  public async item(itemDTO: PlaidItemDto): Promise<void> {
+  public async item(itemDTO: PlaidItemDTO): Promise<void> {
     const { publicToken, institutionId } = itemDTO;
 
     const tenant = await this.tenancyContext.getTenant();
@@ -53,7 +57,7 @@ export class PlaidItemService {
       plaidInstitutionId: institutionId,
     });
     // Stores the Plaid item id on system scope.
-    await this.systemPlaidItemModel.query().insert({ tenantId, plaidItemId });
+    await this.systemPlaidItemModel().query().insert({ tenantId, plaidItemId });
 
     // Triggers `onPlaidItemCreated` event.
     await this.eventEmitter.emitAsync(events.plaid.onItemCreated, {

packages/server/src/modules/BankingPlaid/command/PlaidSyncDB.ts

@@ -1,6 +1,5 @@
 import * as R from 'ramda';
-import * as bluebird from 'bluebird';
+import bluebird from 'bluebird';
-import * as uniqid from 'uniqid';
 import { entries, groupBy } from 'lodash';
 import {
   AccountBase as PlaidAccountBase,
@@ -13,6 +12,7 @@ import {
   transformPlaidTrxsToCashflowCreate,
 } from '../utils';
 import { Knex } from 'knex';
+import uniqid from 'uniqid';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { RemovePendingUncategorizedTransaction } from '../../BankingTransactions/commands/RemovePendingUncategorizedTransaction.service';
 import { CreateAccountService } from '../../Accounts/CreateAccount.service';

packages/server/src/modules/BankingPlaid/command/PlaidUpdateTransactions.ts

@@ -15,13 +15,6 @@ import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 
 @Injectable()
 export class PlaidUpdateTransactions {
-  /**
-   * Constructor method.
-   * @param {PlaidSyncDb} plaidSync - Plaid sync service.
-   * @param {UnitOfWork} uow - Unit of work.
-   * @param {TenantModelProxy<typeof PlaidItem>} plaidItemModel - Plaid item model.
-   * @param {PlaidApi} plaidClient - Plaid client.
-   */
   constructor(
     private readonly plaidSync: PlaidSyncDb,
     private readonly uow: UnitOfWork,
@@ -35,7 +28,8 @@ export class PlaidUpdateTransactions {
 
   /**
    * Handles sync the Plaid item to Bigcaptial under UOW.
-   * @param {string} plaidItemId - Plaid item id.
+   * @param {number} tenantId - Tenant id.
+   * @param {number} plaidItemId - Plaid item id.
    * @returns {Promise<{ addedCount: number; modifiedCount: number; removedCount: number; }>}
    */
   public async updateTransactions(plaidItemId: string) {
@@ -50,8 +44,8 @@ export class PlaidUpdateTransactions {
    *  - 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.
-   * @param {Knex.Transaction} trx - Knex transaction.
    * @returns {Promise<{  addedCount: number; modifiedCount: number; removedCount: number; }>}
    */
   public async updateTransactionsWork(
@@ -103,6 +97,7 @@ export class PlaidUpdateTransactions {
 
   /**
    * Fetches transactions from the `Plaid API` for a given item.
+   * @param {number} tenantId - Tenant ID.
    * @param {string} plaidItemId - The Plaid ID for the item.
    * @returns {Promise<PlaidFetchedTransactionsUpdates>}
    */

packages/server/src/modules/BankingPlaid/command/PlaidWebhooks.ts

@@ -1,4 +1,3 @@
-import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 import { PlaidItem } from '../models/PlaidItem';
 import { PlaidUpdateTransactions } from './PlaidUpdateTransactions';
 import { Inject, Injectable } from '@nestjs/common';
@@ -9,7 +8,7 @@ export class PlaidWebooks {
     private readonly updateTransactionsService: PlaidUpdateTransactions,
 
     @Inject(PlaidItem.name)
-    private readonly plaidItemModel: TenantModelProxy<typeof PlaidItem>,
+    private readonly plaidItemModel: typeof PlaidItem,
   ) {}
 
   /**
@@ -77,10 +76,11 @@ export class PlaidWebooks {
    * @returns {Promise<void>}
    */
   public async handleTransactionsWebooks(
+    tenantId: number,
     plaidItemId: string,
     webhookCode: string,
   ): Promise<void> {
-    const plaidItem = await this.plaidItemModel()
+    const plaidItem = await this.plaidItemModel
       .query()
       .findOne({ plaidItemId })
       .throwIfNotFound();
@@ -122,8 +122,9 @@ export class PlaidWebooks {
 
   /**
    * Handles all Item webhook events.
-   * @param {string} plaidItemId - The Plaid ID for the item
+   * @param {number} tenantId - Tenant ID
    * @param {string} webhookCode - The webhook code
+   * @param {string} plaidItemId - The Plaid ID for the item
    * @returns {Promise<void>}
    */
   public async itemsHandler(

packages/server/src/modules/BankingPlaid/command/SetupPlaidItemTenant.service.ts

@@ -1,54 +0,0 @@
-import { ClsService } from 'nestjs-cls';
-import { Inject, Injectable } from '@nestjs/common';
-import { SystemPlaidItem } from '../models/SystemPlaidItem';
-import { TenantModel } from '@/modules/System/models/TenantModel';
-import { SystemUser } from '@/modules/System/models/SystemUser';
-
-@Injectable()
-export class SetupPlaidItemTenantService {
-  constructor(
-    private readonly clsService: ClsService,
-
-    @Inject(SystemPlaidItem.name)
-    private readonly systemPlaidItemModel: typeof SystemPlaidItem,
-
-    @Inject(TenantModel.name)
-    private readonly tenantModel: typeof TenantModel,
-
-    @Inject(SystemUser.name)
-    private readonly systemUserModel: typeof SystemUser,
-  ) {}
-
-  /**
-   * Sets up the Plaid tenant.
-   * @param {string} plaidItemId - The Plaid item id.
-   * @param {() => void} callback - The callback function to execute after setting up the Plaid tenant.
-   * @returns {Promise<void>}
-   */
-  public async setupPlaidTenant(plaidItemId: string, callback: () => void) {
-    const plaidItem = await this.systemPlaidItemModel
-      .query()
-      .findOne({ plaidItemId });
-
-    if (!plaidItem) {
-      throw new Error('Plaid item not found');
-    }
-    const tenant = await this.tenantModel
-      .query()
-      .findOne({ id: plaidItem.tenantId })
-      .throwIfNotFound();
-
-    const user = await this.systemUserModel
-      .query()
-      .findOne({
-        tenantId: tenant.id,
-      })
-      .modify('active')
-      .throwIfNotFound();
-
-    this.clsService.set('organizationId', tenant.organizationId);
-    this.clsService.set('userId', user.id);
-
-    return callback();
-  }
-}

packages/server/src/modules/BankingPlaid/dtos/PlaidItem.dto.ts

@@ -1,26 +0,0 @@
-import { IsNotEmpty, IsString } from 'class-validator';
-
-export class PlaidItemDto {
-  @IsString()
-  @IsNotEmpty()
-  publicToken: string;
-
-  @IsString()
-  @IsNotEmpty()
-  institutionId: string;
-}
-
-export class PlaidWebhookDto {
-  @IsString()
-  @IsNotEmpty()
-  itemId: string;
-
-  @IsString()
-  @IsNotEmpty()
-  webhookType: string;
-
-  @IsString()
-  @IsNotEmpty()
-  webhookCode: string;
-}
-  

packages/server/src/modules/BankingPlaid/jobs/PlaidFetchTransactionsJob.ts

@@ -1,46 +1,43 @@
-import { Process } from '@nestjs/bull';
+// import Container, { Service } from 'typedi';
-import { UseCls } from 'nestjs-cls';
+// import { PlaidUpdateTransactions } from './PlaidUpdateTransactions';
-import { Processor, WorkerHost } from '@nestjs/bullmq';
+// import { IPlaidItemCreatedEventPayload } from '@/interfaces';
-import { Scope } from '@nestjs/common';
-import { Job } from 'bullmq';
-import {
-  PlaidFetchTransitonsEventPayload,
-  UpdateBankingPlaidTransitionsJob,
-  UpdateBankingPlaidTransitionsQueueJob,
-} from '../types/BankingPlaid.types';
-import { PlaidUpdateTransactions } from '../command/PlaidUpdateTransactions';
-import { SetupPlaidItemTenantService } from '../command/SetupPlaidItemTenant.service';
 
-@Processor({
+// @Service()
-  name: UpdateBankingPlaidTransitionsQueueJob,
+// export class PlaidFetchTransactionsJob {
-  scope: Scope.REQUEST,
+//   /**
-})
+//    * Constructor method.
-export class PlaidFetchTransactionsProcessor extends WorkerHost {
+//    */
-  constructor(
+//   constructor(agenda) {
-    private readonly plaidFetchTransactionsService: PlaidUpdateTransactions,
+//     agenda.define(
-    private readonly setupPlaidItemService: SetupPlaidItemTenantService,
+//       'plaid-update-account-transactions',
-  ) {
+//       { priority: 'high', concurrency: 2 },
-    super();
+//       this.handler
-  }
+//     );
+//   }
 
-  /**
+//   /**
-   * Triggers the function.
+//    * Triggers the function.
-   */
+//    */
-  @Process(UpdateBankingPlaidTransitionsJob)
+//   private handler = async (job, done: Function) => {
-  @UseCls()
+//     const { tenantId, plaidItemId } = job.attrs
-  async process(job: Job<PlaidFetchTransitonsEventPayload>) {
+//       .data as IPlaidItemCreatedEventPayload;
-    const { plaidItemId } = job.data;
 
-    try {
+//     const plaidFetchTransactionsService = Container.get(
-      await this.setupPlaidItemService.setupPlaidTenant(plaidItemId, () => {
+//       PlaidUpdateTransactions
-        return this.plaidFetchTransactionsService.updateTransactions(
+//     );
-          plaidItemId,
+//     const io = Container.get('socket');
-        );
+
-      });
+//     try {
-      // Notify the frontend to reflect the new transactions changes.
+//       await plaidFetchTransactionsService.updateTransactions(
-      // io.emit('NEW_TRANSACTIONS_DATA', { plaidItemId });
+//         tenantId,
-    } catch (error) {
+//         plaidItemId
-      console.log(error);
+//       );
-    }
+//       // Notify the frontend to reflect the new transactions changes.
-  }
+//       io.emit('NEW_TRANSACTIONS_DATA', { plaidItemId });
-}
+//       done();
+//     } catch (error) {
+//       console.log(error);
+//       done(error);
+//     }
+//   };
+// }

packages/server/src/modules/BankingPlaid/models/SystemPlaidItem.ts

@@ -30,7 +30,7 @@ export class SystemPlaidItem extends BaseModel {
    * Relationship mapping.
    */
   static get relationMappings() {
-    const { TenantModel } = require('../../System/models/TenantModel');
+    const Tenant = require('system/models/Tenant');
 
     return {
       /**
@@ -38,7 +38,7 @@ export class SystemPlaidItem extends BaseModel {
        */
       tenant: {
         relation: Model.BelongsToOneRelation,
-        modelClass: TenantModel,
+        modelClass: Tenant.default,
         join: {
           from: 'users.tenantId',
           to: 'tenants.id',

packages/server/src/modules/BankingPlaid/subscribers/PlaidUpdateTransactionsOnItemCreatedSubscriber.ts

@@ -1,34 +1,22 @@
 import { events } from '@/common/events/events';
 import { Injectable } from '@nestjs/common';
 import { OnEvent } from '@nestjs/event-emitter';
-import { Queue } from 'bullmq';
+import { IPlaidItemCreatedEventPayload } from '../types/BankingPlaid.types';
-import { InjectQueue } from '@nestjs/bullmq';
-import {
-  IPlaidItemCreatedEventPayload,
-  UpdateBankingPlaidTransitionsJob,
-  UpdateBankingPlaidTransitionsQueueJob,
-} from '../types/BankingPlaid.types';
 
 @Injectable()
 export class PlaidUpdateTransactionsOnItemCreatedSubscriber {
-  constructor(
-    @InjectQueue(UpdateBankingPlaidTransitionsQueueJob)
-    private readonly updateTransitionsQueue: Queue,
-  ) {}
-
   /**
    * Updates the Plaid item transactions
    * @param {IPlaidItemCreatedEventPayload} payload - Event payload.
    */
   @OnEvent(events.plaid.onItemCreated)
   public async handleUpdateTransactionsOnItemCreated({
+    tenantId,
     plaidItemId,
+    plaidAccessToken,
+    plaidInstitutionId,
   }: IPlaidItemCreatedEventPayload) {
-    const payload = { plaidItemId };
+    const payload = { tenantId, plaidItemId };
-
+    // await this.agenda.now('plaid-update-account-transactions', payload);
-    await this.updateTransitionsQueue.add(
+  };
-      UpdateBankingPlaidTransitionsJob,
-      payload,
-    );
-  }
 }

packages/server/src/modules/BankingPlaid/types/BankingPlaid.types.ts

@@ -1,11 +1,11 @@
-import { Knex } from 'knex';
+import { Knex } from "knex";
-import { RemovedTransaction, Transaction } from 'plaid';
+import { RemovedTransaction, Transaction } from "plaid";
 
 export interface IPlaidTransactionsSyncedEventPayload {
   // tenantId: number;
   plaidAccountId: number;
   batch: string;
-  trx?: Knex.Transaction;
+  trx?: Knex.Transaction
 }
 
 export interface PlaidItemDTO {
@@ -13,6 +13,7 @@ export interface PlaidItemDTO {
   institutionId: string;
 }
 
+
 export interface PlaidFetchedTransactionsUpdates {
   added: Transaction[];
   modified: Transaction[];
@@ -21,20 +22,11 @@ export interface PlaidFetchedTransactionsUpdates {
   cursor: string;
 }
 
+
+
 export interface IPlaidItemCreatedEventPayload {
   tenantId: number;
   plaidAccessToken: string;
   plaidItemId: string;
   plaidInstitutionId: string;
 }
-
-export const UpdateBankingPlaidTransitionsJob =
-  'update-banking-plaid-transitions-job';
-
-  export const UpdateBankingPlaidTransitionsQueueJob =
-  'update-banking-plaid-transitions-query';
-
-
-export interface PlaidFetchTransitonsEventPayload {
-  plaidItemId: string;
-}

packages/server/src/modules/BankingTranasctionsRegonize/BankingRecognizedTransactions.controller.ts

@@ -1,25 +0,0 @@
-import { Controller, Get, Param, Query } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
-import { RecognizedTransactionsApplication } from './RecognizedTransactions.application';
-
-@Controller('banking/recognized')
-@ApiTags('banking-recognized')
-export class BankingRecognizedTransactionsController {
-  constructor(
-    private readonly recognizedTransactionsApplication: RecognizedTransactionsApplication,
-  ) {}
-
-  @Get(':recognizedTransactionId')
-  async getRecognizedTransaction(
-    @Param('recognizedTransactionId') recognizedTransactionId: number,
-  ) {
-    return this.recognizedTransactionsApplication.getRecognizedTransaction(
-      Number(recognizedTransactionId),
-    );
-  }
-
-  @Get()
-  async getRecognizedTransactions(@Query() query: any) {
-    return this.recognizedTransactionsApplication.getRecognizedTransactions(query);
-  }
-}

packages/server/src/modules/BankingTranasctionsRegonize/BankingTransactionsRegonize.module.ts

@@ -1,46 +1,32 @@
 import { forwardRef, Module } from '@nestjs/common';
 import { RegisterTenancyModel } from '../Tenancy/TenancyModels/Tenancy.module';
 import { RecognizedBankTransaction } from './models/RecognizedBankTransaction';
+import { GetAutofillCategorizeTransactionService } from './queries/GetAutofillCategorizeTransaction.service';
 import { RevertRecognizedTransactionsService } from './commands/RevertRecognizedTransactions.service';
 import { RecognizeTranasctionsService } from './commands/RecognizeTranasctions.service';
 import { TriggerRecognizedTransactionsSubscriber } from './events/TriggerRecognizedTransactions';
 import { BankingTransactionsModule } from '../BankingTransactions/BankingTransactions.module';
 import { BankRulesModule } from '../BankRules/BankRules.module';
-import { BankingRecognizedTransactionsController } from './BankingRecognizedTransactions.controller';
-import { RecognizedTransactionsApplication } from './RecognizedTransactions.application';
-import { GetRecognizedTransactionsService } from './GetRecongizedTransactions';
-import { GetRecognizedTransactionService } from './queries/GetRecognizedTransaction.service';
-import { BullModule } from '@nestjs/bullmq';
-import { RecognizeUncategorizedTransactionsQueue } from './_types';
-import { RegonizeTransactionsPrcessor } from './jobs/RecognizeTransactionsJob';
-import { TenancyModule } from '../Tenancy/Tenancy.module';
 
 const models = [RegisterTenancyModel(RecognizedBankTransaction)];
 
 @Module({
   imports: [
     BankingTransactionsModule,
-    TenancyModule,
     forwardRef(() => BankRulesModule),
-    BullModule.registerQueue({
-      name: RecognizeUncategorizedTransactionsQueue,
-    }),
     ...models,
   ],
   providers: [
-    RecognizedTransactionsApplication,
+    GetAutofillCategorizeTransactionService,
-    GetRecognizedTransactionsService,
     RevertRecognizedTransactionsService,
     RecognizeTranasctionsService,
     TriggerRecognizedTransactionsSubscriber,
-    GetRecognizedTransactionService,
-    RegonizeTransactionsPrcessor,
   ],
   exports: [
     ...models,
+    GetAutofillCategorizeTransactionService,
     RevertRecognizedTransactionsService,
     RecognizeTranasctionsService,
   ],
-  controllers: [BankingRecognizedTransactionsController],
 })
 export class BankingTransactionsRegonizeModule {}

packages/server/src/modules/BankingTranasctionsRegonize/RecognizedTransactions.application.ts

@@ -1,57 +0,0 @@
-import { Knex } from 'knex';
-import { Injectable } from '@nestjs/common';
-import { GetRecognizedTransactionsService } from './GetRecongizedTransactions';
-import { GetRecognizedTransactionService } from './queries/GetRecognizedTransaction.service';
-import { RevertRecognizedTransactionsService } from './commands/RevertRecognizedTransactions.service';
-import { IGetRecognizedTransactionsQuery } from '../BankingTransactions/types/BankingTransactions.types';
-import { RevertRecognizedTransactionsCriteria } from './_types';
-
-@Injectable()
-export class RecognizedTransactionsApplication {
-  constructor(
-    private readonly getRecognizedTransactionsService: GetRecognizedTransactionsService,
-    private readonly getRecognizedTransactionService: GetRecognizedTransactionService,
-    private readonly revertRecognizedTransactionsService: RevertRecognizedTransactionsService,
-  ) {}
-
-  /**
-   * Retrieves the recognized transactions based on the provided filter.
-   * @param {IGetRecognizedTransactionsQuery} filter - Filter criteria.
-   * @returns {Promise<{ data: any[], pagination: any }>}
-   */
-  public getRecognizedTransactions(filter: IGetRecognizedTransactionsQuery) {
-    return this.getRecognizedTransactionsService.getRecognizedTranactions(
-      filter,
-    );
-  }
-
-  /**
-   * Retrieves a specific recognized transaction by ID.
-   * @param {number} recognizedTransactionId - The ID of the recognized transaction.
-   * @returns {Promise<any>}
-   */
-  public getRecognizedTransaction(recognizedTransactionId: number) {
-    return this.getRecognizedTransactionService.getRecognizedTransaction(
-      recognizedTransactionId,
-    );
-  }
-
-  /**
-   * Reverts a recognized transaction.
-   * @param {number} ruleId - The ID of the recognized transaction to revert.
-   * @param {RevertRecognizedTransactionsCriteria} transactionsCriteria - The criteria for the recognized transaction to revert.
-   * @param {Knex.Transaction} trx - The transaction to use for the revert operation.
-   * @returns {Promise<any>}
-   */
-  public revertRecognizedTransactions(
-    ruleId?: number | Array<number>,
-    transactionsCriteria?: RevertRecognizedTransactionsCriteria,
-    trx?: Knex.Transaction,
-  ) {
-    return this.revertRecognizedTransactionsService.revertRecognizedTransactions(
-      ruleId,
-      transactionsCriteria,
-      trx,
-    );
-  }
-}

packages/server/src/modules/BankingTranasctionsRegonize/_types.ts

@@ -1,5 +1,3 @@
-import { TenantJobPayload } from "@/interfaces/Tenant";
-
 export interface RevertRecognizedTransactionsCriteria {
   batch?: string;
   accountId?: number;
@@ -9,14 +7,3 @@ export interface RecognizeTransactionsCriteria {
   batch?: string;
   accountId?: number;
 }
-
-export const RecognizeUncategorizedTransactionsJob =
-  'recognize-uncategorized-transactions-job';
-export const RecognizeUncategorizedTransactionsQueue =
-  'recognize-uncategorized-transactions-queue';
-
-
-export interface RecognizeUncategorizedTransactionsJobPayload extends TenantJobPayload {
-  ruleId: number,
-  transactionsCriteria: any;
-}

packages/server/src/modules/BankingTranasctionsRegonize/events/TriggerRecognizedTransactions.ts

@@ -2,47 +2,21 @@ import { isEqual, omit } from 'lodash';
 import { Injectable } from '@nestjs/common';
 import { OnEvent } from '@nestjs/event-emitter';
 import { events } from '@/common/events/events';
-import {
+import { IBankRuleEventCreatedPayload, IBankRuleEventDeletedPayload, IBankRuleEventEditedPayload } from '@/modules/BankRules/types';
-  IBankRuleEventCreatedPayload,
-  IBankRuleEventDeletedPayload,
-  IBankRuleEventEditedPayload,
-} from '@/modules/BankRules/types';
-import { Queue } from 'bullmq';
-import { InjectQueue } from '@nestjs/bullmq';
-import {
-  RecognizeUncategorizedTransactionsJob,
-  RecognizeUncategorizedTransactionsJobPayload,
-  RecognizeUncategorizedTransactionsQueue,
-} from '../_types';
-import { TenancyContext } from '@/modules/Tenancy/TenancyContext.service';
 
 @Injectable()
 export class TriggerRecognizedTransactionsSubscriber {
-  constructor(
-    private readonly tenancyContect: TenancyContext,
-
-    @InjectQueue(RecognizeUncategorizedTransactionsQueue)
-    private readonly recognizeTransactionsQueue: Queue,
-  ) {}
-
   /**
    * Triggers the recognize uncategorized transactions job on rule created.
    * @param {IBankRuleEventCreatedPayload} payload -
    */
   @OnEvent(events.bankRules.onCreated)
-  async recognizedTransactionsOnRuleCreated({
+  private async recognizedTransactionsOnRuleCreated({
     bankRule,
   }: IBankRuleEventCreatedPayload) {
-    const tenantPayload = await this.tenancyContect.getTenantJobPayload();
+    const payload = { ruleId: bankRule.id };
-    const payload = {
-      ruleId: bankRule.id,
-      ...tenantPayload,
-    } as RecognizeUncategorizedTransactionsJobPayload;
 
-    await this.recognizeTransactionsQueue.add(
+    // await this.agenda.now('recognize-uncategorized-transactions-job', payload);
-      RecognizeUncategorizedTransactionsJob,
-      payload,
-    );
   }
 
   /**
@@ -50,33 +24,27 @@ export class TriggerRecognizedTransactionsSubscriber {
    * @param {IBankRuleEventEditedPayload} payload -
    */
   @OnEvent(events.bankRules.onEdited)
-  async recognizedTransactionsOnRuleEdited({
+  private async recognizedTransactionsOnRuleEdited({
     editRuleDTO,
     oldBankRule,
     bankRule,
   }: IBankRuleEventEditedPayload) {
+    const payload = { ruleId: bankRule.id };
 
     // Cannot continue if the new and old bank rule values are the same,
     // after excluding `createdAt` and `updatedAt` dates.
     if (
       isEqual(
         omit(bankRule, ['createdAt', 'updatedAt']),
-        omit(oldBankRule, ['createdAt', 'updatedAt']),
+        omit(oldBankRule, ['createdAt', 'updatedAt'])
       )
     ) {
       return;
     }
-    const tenantPayload = await this.tenancyContect.getTenantJobPayload();
+    // await this.agenda.now(
-    const payload = {
+    //   'rerecognize-uncategorized-transactions-job',
-      ruleId: bankRule.id,
+    //   payload
-      ...tenantPayload,
+    // );
-    } as RecognizeUncategorizedTransactionsJobPayload;
-
-    // Re-recognize the transactions based on the new rules.
-    await this.recognizeTransactionsQueue.add(
-      RecognizeUncategorizedTransactionsJob,
-      payload,
-    );
   }
 
   /**
@@ -84,20 +52,15 @@ export class TriggerRecognizedTransactionsSubscriber {
    * @param {IBankRuleEventDeletedPayload} payload -
    */
   @OnEvent(events.bankRules.onDeleted)
-  async recognizedTransactionsOnRuleDeleted({
+  private async recognizedTransactionsOnRuleDeleted({
     ruleId,
   }: IBankRuleEventDeletedPayload) {
-    const tenantPayload = await this.tenancyContect.getTenantJobPayload();
+    const payload = { ruleId };
-    const payload = {
-      ruleId,
-      ...tenantPayload,
-    } as RecognizeUncategorizedTransactionsJobPayload;
 
-    // Re-recognize the transactions based on the new rules.
+    // await this.agenda.now(
-    await this.recognizeTransactionsQueue.add(
+    //   'revert-recognized-uncategorized-transactions-job',
-      RecognizeUncategorizedTransactionsJob,
+    //   payload
-      payload,
+    // );
-    );
   }
 
   /**
@@ -105,7 +68,7 @@ export class TriggerRecognizedTransactionsSubscriber {
    * @param {IImportFileCommitedEventPayload} payload -
    */
   @OnEvent(events.import.onImportCommitted)
-  async triggerRecognizeTransactionsOnImportCommitted({
+  private async triggerRecognizeTransactionsOnImportCommitted({
     importId,
 
     // @ts-ignore
@@ -113,8 +76,10 @@ export class TriggerRecognizedTransactionsSubscriber {
     // const importFile = await Import.query().findOne({ importId });
     // const batch = importFile.paramsParsed.batch;
     // const payload = { transactionsCriteria: { batch } };
+
     // // Cannot continue if the imported resource is not bank account transactions.
     // if (importFile.resource !== 'UncategorizedCashflowTransaction') return;
+
     // await this.agenda.now('recognize-uncategorized-transactions-job', payload);
   }
 }

packages/server/src/modules/BankingTranasctionsRegonize/jobs/RecognizeTransactionsJob.ts

@@ -1,48 +1,36 @@
-import { Job } from 'bullmq';
+// import Container, { Service } from 'typedi';
-import { Processor, WorkerHost } from '@nestjs/bullmq';
+// import { RecognizeTranasctionsService } from '../commands/RecognizeTranasctions.service';
-import { Scope } from '@nestjs/common';
-import { ClsService, UseCls } from 'nestjs-cls';
-import { RecognizeTranasctionsService } from '../commands/RecognizeTranasctions.service';
-import {
-  RecognizeUncategorizedTransactionsJobPayload,
-  RecognizeUncategorizedTransactionsQueue,
-} from '../_types';
-import { Process } from '@nestjs/bull';
 
-@Processor({
+// @Service()
-  name: RecognizeUncategorizedTransactionsQueue,
+// export class RegonizeTransactionsJob {
-  scope: Scope.REQUEST,
+//   /**
-})
+//    * Constructor method.
-export class RegonizeTransactionsPrcessor extends WorkerHost {
+//    */
-  /**
+//   constructor(agenda) {
-   * @param {RecognizeTranasctionsService} recognizeTranasctionsService -
+//     agenda.define(
-   * @param {ClsService} clsService -
+//       'recognize-uncategorized-transactions-job',
-   */
+//       { priority: 'high', concurrency: 2 },
-  constructor(
+//       this.handler
-    private readonly recognizeTranasctionsService: RecognizeTranasctionsService,
+//     );
-    private readonly clsService: ClsService,
+//   }
-  ) {
-    super();
-  }
 
-  /**
+//   /**
-   * Triggers sending invoice mail.
+//    * Triggers sending invoice mail.
-   */
+//    */
-  @Process(RecognizeUncategorizedTransactionsQueue)
+//   private handler = async (job, done: Function) => {
-  @UseCls()
+//     const { tenantId, ruleId, transactionsCriteria } = job.attrs.data;
-  async process(job: Job<RecognizeUncategorizedTransactionsJobPayload>) {
+//     const regonizeTransactions = Container.get(RecognizeTranasctionsService);
-    const { ruleId, transactionsCriteria } = job.data;
 
-    this.clsService.set('organizationId', job.data.organizationId);
+//     try {
-    this.clsService.set('userId', job.data.userId);
+//       await regonizeTransactions.recognizeTransactions(
-
+//         tenantId,
-    try {
+//         ruleId,
-      await this.recognizeTranasctionsService.recognizeTransactions(
+//         transactionsCriteria
-        ruleId,
+//       );
-        transactionsCriteria,
+//       done();
-      );
+//     } catch (error) {
-    } catch (error) {
+//       console.log(error);
-      console.log(error);
+//       done(error);
-    }
+//     }
-  }
+//   };
-}
+// }

packages/server/src/modules/BankingTransactions/BankingTransactions.controller.ts

@@ -0,0 +1,54 @@
+import {
+  Body,
+  Controller,
+  Delete,
+  Get,
+  Param,
+  Post,
+  Query,
+} from '@nestjs/common';
+import { ApiTags } from '@nestjs/swagger';
+import { BankingTransactionsApplication } from './BankingTransactionsApplication.service';
+import {
+  IBankAccountsFilter,
+  ICashflowAccountTransactionsQuery,
+} from './types/BankingTransactions.types';
+import { CreateBankTransactionDto } from './dtos/CreateBankTransaction.dto';
+
+@Controller('banking/transactions')
+@ApiTags('banking-transactions')
+export class BankingTransactionsController {
+  constructor(
+    private readonly bankingTransactionsApplication: BankingTransactionsApplication,
+  ) {}
+
+  @Get()
+  async getBankAccountTransactions(
+    @Query() query: ICashflowAccountTransactionsQuery,
+  ) {
+    return this.bankingTransactionsApplication.getBankAccountTransactions(
+      query,
+    );
+  }
+
+  @Post()
+  async createTransaction(@Body() transactionDTO: CreateBankTransactionDto) {
+    return this.bankingTransactionsApplication.createTransaction(
+      transactionDTO,
+    );
+  }
+
+  @Delete(':id')
+  async deleteTransaction(@Param('id') transactionId: string) {
+    return this.bankingTransactionsApplication.deleteTransaction(
+      Number(transactionId),
+    );
+  }
+
+  @Get(':id')
+  async getTransaction(@Param('id') transactionId: string) {
+    return this.bankingTransactionsApplication.getTransaction(
+      Number(transactionId),
+    );
+  }
+}

packages/server/src/modules/BankingTransactions/BankingTransactions.module.ts

@@ -19,19 +19,13 @@ import { CommandBankTransactionValidator } from './commands/CommandCasflowValida
 import { BranchTransactionDTOTransformer } from '../Branches/integrations/BranchTransactionDTOTransform';
 import { BranchesModule } from '../Branches/Branches.module';
 import { RemovePendingUncategorizedTransaction } from './commands/RemovePendingUncategorizedTransaction.service';
-import { BankingTransactionsController } from './controllers/BankingTransactions.controller';
+import { BankingTransactionsController } from './BankingTransactions.controller';
 import { GetBankAccountsService } from './queries/GetBankAccounts.service';
 import { DynamicListModule } from '../DynamicListing/DynamicList.module';
 import { BankAccount } from './models/BankAccount';
 import { LedgerModule } from '../Ledger/Ledger.module';
 import { GetBankAccountTransactionsService } from './queries/GetBankAccountTransactions/GetBankAccountTransactions.service';
 import { GetBankAccountTransactionsRepository } from './queries/GetBankAccountTransactions/GetBankAccountTransactionsRepo.service';
-import { GetUncategorizedTransactions } from './queries/GetUncategorizedTransactions';
-import { GetUncategorizedBankTransactionService } from './queries/GetUncategorizedBankTransaction.service';
-import { BankingUncategorizedTransactionsController } from './controllers/BankingUncategorizedTransactions.controller';
-import { BankingPendingTransactionsController } from './controllers/BankingPendingTransactions.controller';
-import { GetPendingBankAccountTransactions } from './queries/GetPendingBankAccountTransaction.service';
-import { GetAutofillCategorizeTransactionService } from './queries/GetAutofillCategorizeTransaction/GetAutofillCategorizeTransaction.service';
 
 const models = [
   RegisterTenancyModel(UncategorizedBankTransaction),
@@ -48,11 +42,7 @@ const models = [
     DynamicListModule,
     ...models,
   ],
-  controllers: [
+  controllers: [BankingTransactionsController],
-    BankingTransactionsController,
-    BankingUncategorizedTransactionsController,
-    BankingPendingTransactionsController,
-  ],
   providers: [
     BankTransactionAutoIncrement,
     BankTransactionGLEntriesService,
@@ -71,16 +61,7 @@ const models = [
     RemovePendingUncategorizedTransaction,
     GetBankAccountTransactionsRepository,
     GetBankAccountTransactionsService,
-    GetUncategorizedTransactions,
-    GetUncategorizedBankTransactionService,
-    GetPendingBankAccountTransactions,
-    GetAutofillCategorizeTransactionService,
-  ],
-  exports: [
-    ...models,
-    RemovePendingUncategorizedTransaction,
-    CommandBankTransactionValidator,
-    CreateBankTransactionService
   ],
+  exports: [...models, RemovePendingUncategorizedTransaction],
 })
 export class BankingTransactionsModule {}

packages/server/src/modules/BankingTransactions/BankingTransactionsApplication.service.ts

@@ -9,13 +9,6 @@ import {
 import { GetBankAccountsService } from './queries/GetBankAccounts.service';
 import { CreateBankTransactionDto } from './dtos/CreateBankTransaction.dto';
 import { GetBankAccountTransactionsService } from './queries/GetBankAccountTransactions/GetBankAccountTransactions.service';
-import { GetUncategorizedTransactions } from './queries/GetUncategorizedTransactions';
-import { GetUncategorizedBankTransactionService } from './queries/GetUncategorizedBankTransaction.service';
-import { GetUncategorizedTransactionsQueryDto } from './dtos/GetUncategorizedTransactionsQuery.dto';
-import { GetPendingBankAccountTransactions } from './queries/GetPendingBankAccountTransaction.service';
-import { GetPendingTransactionsQueryDto } from './dtos/GetPendingTransactionsQuery.dto';
-import { GetAutofillCategorizeTransactionService } from './queries/GetAutofillCategorizeTransaction/GetAutofillCategorizeTransaction.service';
-import { GetBankTransactionsQueryDto } from './dtos/GetBankTranasctionsQuery.dto';
 
 @Injectable()
 export class BankingTransactionsApplication {
@@ -25,10 +18,6 @@ export class BankingTransactionsApplication {
     private readonly getCashflowTransactionService: GetBankTransactionService,
     private readonly getBankAccountsService: GetBankAccountsService,
     private readonly getBankAccountTransactionsService: GetBankAccountTransactionsService,
-    private readonly getBankAccountUncategorizedTransitionsService: GetUncategorizedTransactions,
-    private readonly getBankAccountUncategorizedTransactionService: GetUncategorizedBankTransactionService,
-    private readonly getPendingBankAccountTransactionsService: GetPendingBankAccountTransactions,
-    private readonly getAutofillCategorizeTransactionService: GetAutofillCategorizeTransactionService,
   ) {}
 
   /**
@@ -55,7 +44,7 @@ export class BankingTransactionsApplication {
    * Retrieves the bank transactions of the given bank id.
    * @param {ICashflowAccountTransactionsQuery} query
    */
-  public getBankAccountTransactions(query: GetBankTransactionsQueryDto) {
+  public getBankAccountTransactions(query: ICashflowAccountTransactionsQuery) {
     return this.getBankAccountTransactionsService.bankAccountTransactions(
       query,
     );
@@ -79,53 +68,4 @@ export class BankingTransactionsApplication {
   public getBankAccounts(filterDTO: IBankAccountsFilter) {
     return this.getBankAccountsService.getBankAccounts(filterDTO);
   }
-
-  /**
-   * Retrieves the uncategorized cashflow transactions.
-   * @param {number} accountId - Account id.
-   * @param {IGetUncategorizedTransactionsQuery} query - Query.
-   */
-  public getBankAccountUncategorizedTransactions(
-    accountId: number,
-    query: GetUncategorizedTransactionsQueryDto,
-  ) {
-    return this.getBankAccountUncategorizedTransitionsService.getTransactions(
-      accountId,
-      query,
-    );
-  }
-
-  /**
-   * Retrieves specific uncategorized cashflow transaction.
-   * @param {number} uncategorizedTransactionId - Uncategorized transaction id.
-   */
-  public getUncategorizedTransaction(uncategorizedTransactionId: number) {
-    return this.getBankAccountUncategorizedTransactionService.getTransaction(
-      uncategorizedTransactionId,
-    );
-  }
-
-  /**
-   * Retrieves the pending bank account transactions.
-   * @param {GetPendingTransactionsQueryDto} filter - Pending transactions query.
-   */
-  public getPendingBankAccountTransactions(
-    filter?: GetPendingTransactionsQueryDto,
-  ) {
-    return this.getPendingBankAccountTransactionsService.getPendingTransactions(
-      filter,
-    );
-  }
-
-  /**
-   * Retrieves the autofill values of categorize transactions form.
-   * @param {Array<number> | number} uncategorizeTransactionsId - Uncategorized transactions ids.
-   */
-  public getAutofillCategorizeTransaction(
-    uncategorizeTransactionsId: Array<number> | number,
-  ) {
-    return this.getAutofillCategorizeTransactionService.getAutofillCategorizeTransaction(
-      uncategorizeTransactionsId,
-    );
-  }
 }

packages/server/src/modules/BankingTransactions/commands/CommandCasflowValidator.service.ts

@@ -1,4 +1,3 @@
-import { Injectable } from '@nestjs/common';
 import { includes, camelCase, upperFirst, sumBy } from 'lodash';
 import { getCashflowTransactionType } from '../utils';
 import {
@@ -7,6 +6,7 @@ import {
   ERRORS,
 } from '../constants';
 import { Account } from '@/modules/Accounts/models/Account.model';
+import { Injectable } from '@nestjs/common';
 import { ServiceError } from '@/modules/Items/ServiceError';
 import { BankTransaction } from '../models/BankTransaction';
 import { UncategorizedBankTransaction } from '../models/UncategorizedBankTransaction';

packages/server/src/modules/BankingTransactions/commands/CreateBankTransaction.service.ts

@@ -1,6 +1,7 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { pick } from 'lodash';
 import { Knex } from 'knex';
+import * as R from 'ramda';
 import * as composeAsync from 'async/compose';
 import { CASHFLOW_TRANSACTION_TYPE } from '../constants';
 import { transformCashflowTransactionType } from '../utils';
@@ -13,12 +14,12 @@ import { events } from '@/common/events/events';
 import { Account } from '@/modules/Accounts/models/Account.model';
 import { BankTransaction } from '../models/BankTransaction';
 import {
+  ICashflowNewCommandDTO,
   ICommandCashflowCreatedPayload,
   ICommandCashflowCreatingPayload,
 } from '../types/BankingTransactions.types';
 import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 import { CreateBankTransactionDto } from '../dtos/CreateBankTransaction.dto';
-import { formatDateFields } from '@/utils/format-date-fields';
 
 @Injectable()
 export class CreateBankTransactionService {
@@ -41,7 +42,7 @@ export class CreateBankTransactionService {
    * @param {ICashflowNewCommandDTO} newCashflowTransactionDTO
    */
   public authorize = async (
-    newCashflowTransactionDTO: CreateBankTransactionDto,
+    newCashflowTransactionDTO: ICashflowNewCommandDTO,
     creditAccount: Account,
   ) => {
     const transactionType = transformCashflowTransactionType(
@@ -59,7 +60,7 @@ export class CreateBankTransactionService {
 
   /**
    * Transformes owner contribution DTO to cashflow transaction.
-   * @param {CreateBankTransactionDto} newCashflowTransactionDTO - New transaction DTO.
+   * @param {ICashflowNewCommandDTO} newCashflowTransactionDTO - New transaction DTO.
    * @returns {ICashflowTransactionInput} - Cashflow transaction object.
    */
   private transformCashflowTransactionDTO = async (
@@ -90,7 +91,7 @@ export class CreateBankTransactionService {
 
     const initialDTO = {
       amount,
-      ...formatDateFields(fromDTO, ['date']),
+      ...fromDTO,
       transactionNumber,
       currencyCode: cashflowAccount.currencyCode,
       exchangeRate: fromDTO?.exchangeRate || 1,
@@ -116,7 +117,7 @@ export class CreateBankTransactionService {
    * @returns {Promise<ICashflowTransaction>}
    */
   public newCashflowTransaction = async (
-    newTransactionDTO: CreateBankTransactionDto,
+    newTransactionDTO: ICashflowNewCommandDTO,
     userId?: number,
   ): Promise<BankTransaction> => {
     // Retrieves the cashflow account or throw not found error.

packages/server/src/modules/BankingTransactions/controllers/BankingPendingTransactions.controller.ts

@@ -1,42 +0,0 @@
-import { Controller, Get, Query } from '@nestjs/common';
-import { ApiTags, ApiOperation, ApiResponse, ApiQuery } from '@nestjs/swagger';
-import { BankingTransactionsApplication } from '../BankingTransactionsApplication.service';
-import { GetPendingTransactionsQueryDto } from '../dtos/GetPendingTransactionsQuery.dto';
-
-@Controller('banking/pending')
-@ApiTags('banking-pending')
-export class BankingPendingTransactionsController {
-  constructor(
-    private readonly bankingTransactionsApplication: BankingTransactionsApplication,
-  ) {}
-
-  @Get()
-  @ApiOperation({ summary: 'Get pending bank account transactions' })
-  @ApiResponse({
-    status: 200,
-    description: 'Returns a list of pending bank account transactions',
-  })
-  @ApiQuery({
-    name: 'page',
-    required: false,
-    type: Number,
-    description: 'Page number for pagination',
-  })
-  @ApiQuery({
-    name: 'pageSize',
-    required: false,
-    type: Number,
-    description: 'Number of items per page',
-  })
-  @ApiQuery({
-    name: 'accountId',
-    required: false,
-    type: Number,
-    description: 'Filter by bank account ID',
-  })
-  async getPendingTransactions(@Query() query: GetPendingTransactionsQueryDto) {
-    return this.bankingTransactionsApplication.getPendingBankAccountTransactions(
-      query,
-    );
-  }
-}

packages/server/src/modules/BankingTransactions/controllers/BankingTransactions.controller.ts

@@ -1,108 +0,0 @@
-import {
-  Body,
-  Controller,
-  Delete,
-  Get,
-  Param,
-  Post,
-  Query,
-} from '@nestjs/common';
-import { ApiTags, ApiOperation, ApiResponse, ApiParam, ApiQuery, ApiBody } from '@nestjs/swagger';
-import { BankingTransactionsApplication } from '../BankingTransactionsApplication.service';
-import { CreateBankTransactionDto } from '../dtos/CreateBankTransaction.dto';
-import { GetBankTransactionsQueryDto } from '../dtos/GetBankTranasctionsQuery.dto';
-
-@Controller('banking/transactions')
-@ApiTags('banking-transactions')
-export class BankingTransactionsController {
-  constructor(
-    private readonly bankingTransactionsApplication: BankingTransactionsApplication,
-  ) {}
-
-  @Get()
-  @ApiOperation({ summary: 'Get bank account transactions' })
-  @ApiResponse({
-    status: 200,
-    description: 'Returns a list of bank account transactions',
-  })
-  @ApiQuery({
-    name: 'page',
-    required: false,
-    type: Number,
-    description: 'Page number for pagination',
-  })
-  @ApiQuery({
-    name: 'pageSize',
-    required: false,
-    type: Number,
-    description: 'Number of items per page',
-  })
-  async getBankAccountTransactions(
-    @Query() query: GetBankTransactionsQueryDto,
-  ) {
-    return this.bankingTransactionsApplication.getBankAccountTransactions(
-      query,
-    );
-  }
-
-  @Post()
-  @ApiOperation({ summary: 'Create a new bank transaction' })
-  @ApiResponse({
-    status: 201,
-    description: 'The bank transaction has been successfully created',
-  })
-  @ApiResponse({
-    status: 400,
-    description: 'Invalid input data',
-  })
-  @ApiBody({ type: CreateBankTransactionDto })
-  async createTransaction(@Body() transactionDTO: CreateBankTransactionDto) {
-    return this.bankingTransactionsApplication.createTransaction(
-      transactionDTO,
-    );
-  }
-
-  @Delete(':id')
-  @ApiOperation({ summary: 'Delete a bank transaction' })
-  @ApiResponse({
-    status: 200,
-    description: 'The bank transaction has been successfully deleted',
-  })
-  @ApiResponse({
-    status: 404,
-    description: 'Bank transaction not found',
-  })
-  @ApiParam({
-    name: 'id',
-    required: true,
-    type: String,
-    description: 'Bank transaction ID',
-  })
-  async deleteTransaction(@Param('id') transactionId: string) {
-    return this.bankingTransactionsApplication.deleteTransaction(
-      Number(transactionId),
-    );
-  }
-
-  @Get(':id')
-  @ApiOperation({ summary: 'Get a specific bank transaction by ID' })
-  @ApiResponse({
-    status: 200,
-    description: 'Returns the bank transaction details',
-  })
-  @ApiResponse({
-    status: 404,
-    description: 'Bank transaction not found',
-  })
-  @ApiParam({
-    name: 'id',
-    required: true,
-    type: String,
-    description: 'Bank transaction ID',
-  })
-  async getTransaction(@Param('id') transactionId: string) {
-    return this.bankingTransactionsApplication.getTransaction(
-      Number(transactionId),
-    );
-  }
-}

packages/server/src/modules/BankingTransactions/controllers/BankingUncategorizedTransactions.controller.ts

@@ -1,106 +0,0 @@
-import { Controller, Get, Param, Query } from '@nestjs/common';
-import {
-  ApiTags,
-  ApiOperation,
-  ApiResponse,
-  ApiParam,
-  ApiQuery,
-} from '@nestjs/swagger';
-import { GetUncategorizedTransactionsQueryDto } from '../dtos/GetUncategorizedTransactionsQuery.dto';
-import { BankingTransactionsApplication } from '../BankingTransactionsApplication.service';
-
-@Controller('banking/uncategorized')
-@ApiTags('banking-uncategorized')
-export class BankingUncategorizedTransactionsController {
-  constructor(
-    private readonly bankingTransactionsApplication: BankingTransactionsApplication,
-  ) {}
-
-  @Get('autofill')
-  @ApiOperation({ summary: 'Get autofill values for categorize transactions' })
-  @ApiResponse({
-    status: 200,
-    description: 'Returns autofill values for categorize transactions',
-  })
-  @ApiParam({
-    name: 'accountId',
-    required: true,
-    type: Number,
-    description: 'Bank account ID',
-  })
-  @ApiQuery({
-    name: 'uncategorizeTransactionsId',
-    required: true,
-    type: Number,
-    description: 'Uncategorize transactions ID',
-  })
-  async getAutofillCategorizeTransaction(
-    @Query('uncategorizedTransactionIds') uncategorizedTransactionIds: Array<number> | number,
-  ) {
-    console.log(uncategorizedTransactionIds)
-    return this.bankingTransactionsApplication.getAutofillCategorizeTransaction(
-      uncategorizedTransactionIds,
-    );
-  }
-
-  @Get('accounts/:accountId')
-  @ApiOperation({
-    summary: 'Get uncategorized transactions for a specific bank account',
-  })
-  @ApiResponse({
-    status: 200,
-    description:
-      'Returns a list of uncategorized transactions for the specified bank account',
-  })
-  @ApiParam({
-    name: 'accountId',
-    required: true,
-    type: Number,
-    description: 'Bank account ID',
-  })
-  @ApiQuery({
-    name: 'page',
-    required: false,
-    type: Number,
-    description: 'Page number for pagination',
-  })
-  @ApiQuery({
-    name: 'pageSize',
-    required: false,
-    type: Number,
-    description: 'Number of items per page',
-  })
-  async getBankAccountUncategorizedTransactions(
-    @Param('accountId') accountId: number,
-    @Query() query: GetUncategorizedTransactionsQueryDto,
-  ) {
-    return this.bankingTransactionsApplication.getBankAccountUncategorizedTransactions(
-      accountId,
-      query,
-    );
-  }
-
-  @Get(':uncategorizedTransactionId')
-  @ApiOperation({ summary: 'Get a specific uncategorized transaction by ID' })
-  @ApiResponse({
-    status: 200,
-    description: 'Returns the uncategorized transaction details',
-  })
-  @ApiResponse({
-    status: 404,
-    description: 'Uncategorized transaction not found',
-  })
-  @ApiParam({
-    name: 'uncategorizedTransactionId',
-    required: true,
-    type: Number,
-    description: 'Uncategorized transaction ID',
-  })
-  async getUncategorizedTransaction(
-    @Param('uncategorizedTransactionId') uncategorizedTransactionId: number,
-  ) {
-    return this.bankingTransactionsApplication.getUncategorizedTransaction(
-      Number(uncategorizedTransactionId),
-    );
-  }
-}

packages/server/src/modules/BankingTransactions/dtos/CreateBankTransaction.dto.ts

@@ -1,153 +1,58 @@
-import { ToNumber } from '@/common/decorators/Validators';
 import {
   IsBoolean,
-  IsDateString,
+  IsDate,
-  IsInt,
-  IsNotEmpty,
   IsNumber,
   IsOptional,
   IsString,
 } from 'class-validator';
-import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 
 export class CreateBankTransactionDto {
-  @ApiProperty({
+  @IsDate()
-    description: 'The date of the bank transaction',
-    type: Date,
-    example: '2023-01-01T00:00:00.000Z',
-  })
-  @IsDateString()
-  @IsNotEmpty()
   date: Date;
 
-  @ApiPropertyOptional({
-    description: 'Optional transaction number or reference',
-    type: String,
-    example: 'TRX-001',
-  })
   @IsString()
-  @IsOptional()
+  transactionNumber: string;
-  transactionNumber?: string;
 
-  @ApiPropertyOptional({
-    description: 'Optional external reference number',
-    type: String,
-    example: 'REF-001',
-  })
   @IsString()
-  @IsOptional()
+  referenceNo: string;
-  referenceNo?: string;
 
-  @ApiProperty({
-    description: 'Type of bank transaction (e.g., deposit, withdrawal)',
-    type: String,
-    example: 'deposit',
-  })
-  @IsNotEmpty()
   @IsString()
   transactionType: string;
 
-  @ApiProperty({
-    description: 'Description of the bank transaction',
-    type: String,
-    example: 'Monthly rent payment',
-  })
   @IsString()
   description: string;
 
-  @ApiProperty({
-    description: 'Transaction amount',
-    type: Number,
-    example: 1000.5,
-  })
-  @IsNotEmpty()
-  @ToNumber()
   @IsNumber()
   amount: number;
 
-  @ApiProperty({
-    description: 'Exchange rate for currency conversion',
-    type: Number,
-    default: 1,
-    example: 1.15,
-  })
-  @ToNumber()
   @IsNumber()
-  exchangeRate: number = 1;
+  exchangeRate: number;
 
-  @ApiPropertyOptional({
-    description: 'Currency code for the transaction',
-    type: String,
-    example: 'USD',
-  })
   @IsString()
-  @IsOptional()
   currencyCode: string;
 
-  @ApiProperty({
+  @IsNumber()
-    description: 'ID of the credit account associated with this transaction',
-    type: Number,
-    example: 1001,
-  })
-  @IsNotEmpty()
-  @ToNumber()
-  @IsInt()
   creditAccountId: number;
 
-  @ApiProperty({
+  @IsNumber()
-    description: 'ID of the cashflow account associated with this transaction',
-    type: Number,
-    example: 2001,
-  })
-  @IsNotEmpty()
-  @ToNumber()
-  @IsInt()
   cashflowAccountId: number;
 
-  @ApiProperty({
-    description: 'Whether the transaction should be published',
-    type: Boolean,
-    default: true,
-  })
   @IsBoolean()
-  @IsOptional()
+  publish: boolean;
-  publish: boolean = true;
 
-  @ApiPropertyOptional({
-    description: 'ID of the branch where the transaction occurred',
-    type: Number,
-    example: 101,
-  })
   @IsOptional()
-  @ToNumber()
+  @IsNumber()
-  @IsInt()
   branchId?: number;
 
-  @ApiPropertyOptional({
-    description: 'Plaid transaction ID if imported from Plaid',
-    type: String,
-    example: 'plaid_trx_12345',
-  })
   @IsOptional()
   @IsString()
   plaidTransactionId?: string;
 
-  @ApiPropertyOptional({
-    description: 'Plaid account ID if imported from Plaid',
-    type: String,
-    example: 'plaid_acc_67890',
-  })
   @IsOptional()
   @IsString()
   plaidAccountId?: string;
 
-  @ApiPropertyOptional({
-    description:
-      'ID of the uncategorized transaction if this is categorizing an existing transaction',
-    type: Number,
-    example: 5001,
-  })
   @IsOptional()
-  @IsInt()
+  @IsNumber()
   uncategorizedTransactionId?: number;
 }

packages/server/src/modules/BankingTransactions/dtos/GetBankTranasctionsQuery.dto.ts

@@ -1,52 +0,0 @@
-import {
-  IsNotEmpty,
-  IsNumber,
-  IsNumberString,
-  IsOptional,
-} from 'class-validator';
-import { NumberFormatQueryDto } from './NumberFormatQuery.dto';
-import { Type } from 'class-transformer';
-import { ApiProperty } from '@nestjs/swagger';
-
-export class GetBankTransactionsQueryDto {
-  @IsOptional()
-  @Type(() => Number)
-  @IsNumber()
-  @ApiProperty({
-    description: 'Page number for pagination',
-    required: false,
-    type: Number,
-    example: 1
-  })
-  page: number;
-
-  @IsOptional()
-  @Type(() => Number)
-  @IsNumber()
-  @ApiProperty({
-    description: 'Number of items per page',
-    required: false,
-    type: Number,
-    example: 10
-  })
-  pageSize: number;
-
-  @IsNotEmpty()
-  @Type(() => Number)
-  @IsNumber()
-  @ApiProperty({
-    description: 'Bank account ID',
-    required: true,
-    type: Number,
-    example: 1
-  })
-  accountId: number;
-
-  @IsOptional()
-  @ApiProperty({
-    description: 'Number format options',
-    required: false,
-    type: NumberFormatQueryDto
-  })
-  numberFormat: NumberFormatQueryDto;
-}

packages/server/src/modules/BankingTransactions/dtos/GetPendingTransactionsQuery.dto.ts

@@ -1,31 +0,0 @@
-import { IsOptional } from "class-validator";
-import { ApiProperty } from "@nestjs/swagger";
-
-export class GetPendingTransactionsQueryDto {
-  @IsOptional()
-  @ApiProperty({
-    description: 'Page number for pagination',
-    required: false,
-    type: Number,
-    example: 1
-  })
-  page?: number;
-
-  @IsOptional()
-  @ApiProperty({
-    description: 'Number of items per page',
-    required: false,
-    type: Number,
-    example: 10
-  })
-  pageSize?: number;
-
-  @IsOptional()
-  @ApiProperty({
-    description: 'Filter by bank account ID',
-    required: false,
-    type: Number,
-    example: 1
-  })
-  accountId?: number;
-}

packages/server/src/modules/BankingTransactions/dtos/GetUncategorizedTransactionsQuery.dto.ts

@@ -1,58 +0,0 @@
-import { IsOptional } from 'class-validator';
-import { ApiProperty } from '@nestjs/swagger';
-
-export class GetUncategorizedTransactionsQueryDto {
-  @IsOptional()
-  @ApiProperty({
-    description: 'Page number for pagination',
-    required: false,
-    type: Number,
-    example: 1
-  })
-  page?: number;
-
-  @IsOptional()
-  @ApiProperty({
-    description: 'Number of items per page',
-    required: false,
-    type: Number,
-    example: 10
-  })
-  pageSize?: number;
-
-  @IsOptional()
-  @ApiProperty({
-    description: 'Minimum date for filtering transactions',
-    required: false,
-    type: Date,
-    example: '2023-01-01'
-  })
-  minDate?: Date;
-
-  @IsOptional()
-  @ApiProperty({
-    description: 'Maximum date for filtering transactions',
-    required: false,
-    type: Date,
-    example: '2023-12-31'
-  })
-  maxDate?: Date;
-
-  @IsOptional()
-  @ApiProperty({
-    description: 'Minimum amount for filtering transactions',
-    required: false,
-    type: Number,
-    example: 100
-  })
-  minAmount?: number;
-
-  @IsOptional()
-  @ApiProperty({
-    description: 'Maximum amount for filtering transactions',
-    required: false,
-    type: Number,
-    example: 1000
-  })
-  maxAmount?: number;
-}

packages/server/src/modules/BankingTransactions/dtos/NumberFormatQuery.dto.ts

@@ -1,26 +0,0 @@
-import { Type } from "class-transformer";
-import { IsBoolean, IsEnum, IsNumber, IsOptional, IsPositive } from "class-validator";
-
-export class NumberFormatQueryDto {
-  @Type(() => Number)
-  @IsNumber()
-  @IsPositive()
-  @IsOptional()
-  readonly precision: number;
-
-  @IsBoolean()
-  @IsOptional()
-  readonly divideOn1000: boolean;
-
-  @IsBoolean()
-  @IsOptional()
-  readonly showZero: boolean;
-
-  @IsEnum(['total', 'always', 'none'])
-  @IsOptional()
-  readonly formatMoney: 'total' | 'always' | 'none';
-
-  @IsEnum(['parentheses', 'mines'])
-  @IsOptional()
-  readonly negativeFormat: 'parentheses' | 'mines';
-}

packages/server/src/modules/BankingTransactions/models/UncategorizedBankTransaction.ts

@@ -1,9 +1,9 @@
 /* eslint-disable global-require */
 import * as moment from 'moment';
 import { Model } from 'objection';
-import { TenantBaseModel } from '@/modules/System/models/TenantBaseModel';
+import { BaseModel } from '@/models/Model';
 
-export class UncategorizedBankTransaction extends TenantBaseModel {
+export class UncategorizedBankTransaction extends BaseModel {
   readonly amount!: number;
   readonly date!: Date | string;
   readonly categorized!: boolean;

packages/server/src/modules/BankingTransactions/queries/GetBankAccountTransactions/GetBankAccountTransactions.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { getBankAccountTransactionsDefaultQuery } from './_utils';
 import { GetBankAccountTransactionsRepository } from './GetBankAccountTransactionsRepo.service';
 import { GetBankAccountTransactions } from './GetBankAccountTransactions';
-import { GetBankTransactionsQueryDto } from '../../dtos/GetBankTranasctionsQuery.dto';
+import { ICashflowAccountTransactionsQuery } from '../../types/BankingTransactions.types';
 
 @Injectable()
 export class GetBankAccountTransactionsService {
@@ -16,7 +16,7 @@ export class GetBankAccountTransactionsService {
    * @return {Promise<IInvetoryItemDetailDOO>}
    */
   public async bankAccountTransactions(
-    query: GetBankTransactionsQueryDto,
+    query: ICashflowAccountTransactionsQuery,
   ) {
     const parsedQuery = {
       ...getBankAccountTransactionsDefaultQuery(),

packages/server/src/modules/BankingTransactions/queries/GetBankAccountTransactions/GetBankAccountTransactions.ts

@@ -1,6 +1,6 @@
 // @ts-nocheck
-import * as R from 'ramda';
+import R from 'ramda';
-import * as moment from 'moment';
+import moment from 'moment';
 import { first, isEmpty } from 'lodash';
 import {
   ICashflowAccountTransaction,

packages/server/src/modules/BankingTransactions/queries/GetBankAccountTransactions/GetBankAccountTransactionsRepo.service.ts

@@ -1,16 +1,13 @@
-import { Inject, Injectable, Scope } from '@nestjs/common';
+import { Injectable, Scope } from '@nestjs/common';
 import { ICashflowAccountTransactionsQuery } from '../../types/BankingTransactions.types';
 import {
   groupMatchedBankTransactions,
   groupUncategorizedTransactions,
 } from './_utils';
-import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
-import { AccountTransaction } from '@/modules/Accounts/models/AccountTransaction.model';
-import { UncategorizedBankTransaction } from '../../models/UncategorizedBankTransaction';
-import { MatchedBankTransaction } from '@/modules/BankingMatching/models/MatchedBankTransaction';
 
 @Injectable({ scope: Scope.REQUEST })
 export class GetBankAccountTransactionsRepository {
+  private models: any;
   public query: ICashflowAccountTransactionsQuery;
   public transactions: any;
   public uncategorizedTransactions: any;
@@ -20,28 +17,6 @@ export class GetBankAccountTransactionsRepository {
   public pagination: any;
   public openingBalance: any;
 
-  /**
-   * @param {TenantModelProxy<typeof AccountTransaction>} accountTransactionModel - Account transaction model.
-   * @param {TenantModelProxy<typeof UncategorizedBankTransaction>} uncategorizedBankTransactionModel - Uncategorized transaction model
-   * @param {TenantModelProxy<typeof MatchedBankTransaction>} matchedBankTransactionModel - Matched bank transaction model.
-   */
-  constructor(
-    @Inject(AccountTransaction.name)
-    private readonly accountTransactionModel: TenantModelProxy<
-      typeof AccountTransaction
-    >,
-
-    @Inject(UncategorizedBankTransaction.name)
-    private readonly uncategorizedBankTransactionModel: TenantModelProxy<
-      typeof UncategorizedBankTransaction
-    >,
-
-    @Inject(MatchedBankTransaction.name)
-    private readonly matchedBankTransactionModel: TenantModelProxy<
-      typeof MatchedBankTransaction
-    >,
-  ) {}
-
   setQuery(query: ICashflowAccountTransactionsQuery) {
     this.query = query;
   }
@@ -62,8 +37,9 @@ export class GetBankAccountTransactionsRepository {
    * @param {ICashflowAccountTransactionsQuery} query -
    */
   async initCashflowAccountTransactions() {
-    const { results, pagination } = await this.accountTransactionModel()
+    const { AccountTransaction } = this.models;
-      .query()
+
+    const { results, pagination } = await AccountTransaction.query()
       .where('account_id', this.query.accountId)
       .orderBy([
         { column: 'date', order: 'desc' },
@@ -83,9 +59,10 @@ export class GetBankAccountTransactionsRepository {
    * @return {Promise<number>}
    */
   async initCashflowAccountOpeningBalance(): Promise<void> {
+    const { AccountTransaction } = this.models;
+
     // Retrieve the opening balance of credit and debit balances.
-    const openingBalancesSubquery = this.accountTransactionModel()
+    const openingBalancesSubquery = AccountTransaction.query()
-      .query()
       .where('account_id', this.query.accountId)
       .orderBy([
         { column: 'date', order: 'desc' },
@@ -95,8 +72,7 @@ export class GetBankAccountTransactionsRepository {
       .offset(this.pagination.pageSize * (this.pagination.page - 1));
 
     // Sumation of credit and debit balance.
-    const openingBalances = await this.accountTransactionModel()
+    const openingBalances = await AccountTransaction.query()
-      .query()
       .sum('credit as credit')
       .sum('debit as debit')
       .from(openingBalancesSubquery.as('T'))
@@ -111,11 +87,14 @@ export class GetBankAccountTransactionsRepository {
    * Initialize the uncategorized transactions of the bank account.
    */
   async initCategorizedTransactions() {
+    const { UncategorizedCashflowTransaction } = this.models;
     const refs = this.transactions.map((t) => [t.referenceType, t.referenceId]);
+
     const uncategorizedTransactions =
-      await this.uncategorizedBankTransactionModel()
+      await UncategorizedCashflowTransaction.query().whereIn(
-        .query()
+        ['categorizeRefType', 'categorizeRefId'],
-        .whereIn(['categorizeRefType', 'categorizeRefId'], refs);
+        refs,
+      );
 
     this.uncategorizedTransactions = uncategorizedTransactions;
     this.uncategorizedTransactionsMapByRef = groupUncategorizedTransactions(
@@ -127,11 +106,14 @@ export class GetBankAccountTransactionsRepository {
    * Initialize the matched bank transactions of the bank account.
    */
   async initMatchedTransactions(): Promise<void> {
+    const { MatchedBankTransaction } = this.models;
     const refs = this.transactions.map((t) => [t.referenceType, t.referenceId]);
 
-    const matchedBankTransactions = await this.matchedBankTransactionModel()
+    const matchedBankTransactions =
-      .query()
+      await MatchedBankTransaction.query().whereIn(
-      .whereIn(['referenceType', 'referenceId'], refs);
+        ['referenceType', 'referenceId'],
+        refs,
+      );
     this.matchedBankTransactions = matchedBankTransactions;
     this.matchedBankTransactionsMapByRef = groupMatchedBankTransactions(
       matchedBankTransactions,

packages/server/src/modules/BankingTransactions/queries/GetPendingBankAccountTransaction.service.ts

@@ -2,8 +2,6 @@ import { Inject, Injectable } from '@nestjs/common';
 import { GetPendingBankAccountTransactionTransformer } from './GetPendingBankAccountTransactionTransformer';
 import { UncategorizedBankTransaction } from '../models/UncategorizedBankTransaction';
 import { TransformerInjectable } from '@/modules/Transformer/TransformerInjectable.service';
-import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
-import { GetPendingTransactionsQueryDto } from '../dtos/GetPendingTransactionsQuery.dto';
 
 @Injectable()
 export class GetPendingBankAccountTransactions {
@@ -11,24 +9,21 @@ export class GetPendingBankAccountTransactions {
     private readonly transformerService: TransformerInjectable,
 
     @Inject(UncategorizedBankTransaction.name)
-    private readonly uncategorizedBankTransactionModel: TenantModelProxy<
+    private readonly uncategorizedBankTransactionModel: typeof UncategorizedBankTransaction
-      typeof UncategorizedBankTransaction
-    >,
   ) {}
 
   /**
    * Retrieves the given bank accounts pending transaction.
-   * @param {GetPendingTransactionsQueryDto} filter - Pending transactions query.
+   * @param {GetPendingTransactionsQuery} filter - Pending transactions query.
    */
-  async getPendingTransactions(filter?: GetPendingTransactionsQueryDto) {
+  async getPendingTransactions(filter?: GetPendingTransactionsQuery) {
     const _filter = {
       page: 1, 
       pageSize: 20,
       ...filter,
     };
     const { results, pagination } =
-      await this.uncategorizedBankTransactionModel()
+      await this.uncategorizedBankTransactionModel.query()
-        .query()
         .onBuild((q) => {
           q.modify('pending');
 
@@ -40,8 +35,14 @@ export class GetPendingBankAccountTransactions {
 
     const data = await this.transformerService.transform(
       results,
-      new GetPendingBankAccountTransactionTransformer(),
+      new GetPendingBankAccountTransactionTransformer()
     );
     return { data, pagination };
   }
 }
+
+interface GetPendingTransactionsQuery {
+  page?: number;
+  pageSize?: number;
+  accountId?: number;
+}

packages/server/src/modules/BankingTransactions/queries/GetRecognizedTransaction.service.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { GetRecognizedTransactionTransformer } from './GetRecognizedTransactionTransformer';
 import { TransformerInjectable } from '@/modules/Transformer/TransformerInjectable.service';
-import { UncategorizedBankTransaction } from '../../BankingTransactions/models/UncategorizedBankTransaction';
+import { UncategorizedBankTransaction } from '../models/UncategorizedBankTransaction';
 import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 
 @Injectable()

packages/server/src/modules/BankingTransactions/queries/GetRecongizedTransactions.ts

@@ -1,9 +1,8 @@
 import { Inject, Injectable } from '@nestjs/common';
-import { GetRecognizedTransactionTransformer } from './queries/GetRecognizedTransactionTransformer';
+import { GetRecognizedTransactionTransformer } from './GetRecognizedTransactionTransformer';
-import { UncategorizedBankTransaction } from '../BankingTransactions/models/UncategorizedBankTransaction';
+import { UncategorizedBankTransaction } from '../models/UncategorizedBankTransaction';
 import { TransformerInjectable } from '@/modules/Transformer/TransformerInjectable.service';
-import { IGetRecognizedTransactionsQuery } from '../BankingTransactions/types/BankingTransactions.types';
+import { IGetRecognizedTransactionsQuery } from '../types/BankingTransactions.types';
-import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 
 @Injectable()
 export class GetRecognizedTransactionsService {
@@ -11,7 +10,7 @@ export class GetRecognizedTransactionsService {
     private readonly transformer: TransformerInjectable,
 
     @Inject(UncategorizedBankTransaction.name)
-    private readonly uncategorizedBankTransactionModel: TenantModelProxy<typeof UncategorizedBankTransaction>,
+    private readonly uncategorizedBankTransactionModel: typeof UncategorizedBankTransaction,
   ) {}
 
   /**
@@ -26,7 +25,7 @@ export class GetRecognizedTransactionsService {
       ...filter,
     };
     const { results, pagination } =
-      await this.uncategorizedBankTransactionModel().query()
+      await this.uncategorizedBankTransactionModel.query()
         .onBuild((q) => {
           q.withGraphFetched('recognizedTransaction.assignAccount');
           q.withGraphFetched('recognizedTransaction.bankRule');

packages/server/src/modules/BankingTransactions/queries/GetUncategorizedTransactions.ts

@@ -1,33 +1,26 @@
-import { Inject, Injectable } from '@nestjs/common';
 import { TransformerInjectable } from '@/modules/Transformer/TransformerInjectable.service';
 import { UncategorizedBankTransaction } from '../models/UncategorizedBankTransaction';
+import { Inject, Injectable } from '@nestjs/common';
 import { UncategorizedTransactionTransformer } from '../../BankingCategorize/commands/UncategorizedTransaction.transformer';
-import { GetUncategorizedTransactionsQueryDto } from '../dtos/GetUncategorizedTransactionsQuery.dto';
+import { IGetUncategorizedTransactionsQuery } from '../types/BankingTransactions.types';
-import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 
 @Injectable()
 export class GetUncategorizedTransactions {
-  /**
-   * @param {TransformerInjectable} transformer 
-   * @param {UncategorizedBankTransaction.name} uncategorizedBankTransactionModel 
-   */
   constructor(
     private readonly transformer: TransformerInjectable,
 
     @Inject(UncategorizedBankTransaction.name)
-    private readonly uncategorizedBankTransactionModel: TenantModelProxy<
+    private readonly uncategorizedBankTransactionModel: typeof UncategorizedBankTransaction,
-      typeof UncategorizedBankTransaction
-    >,
   ) {}
 
   /**
    * Retrieves the uncategorized cashflow transactions.
+   * @param {number} tenantId - Tenant id.
    * @param {number} accountId - Account Id.
-   * @param {IGetUncategorizedTransactionsQuery} query - Query.
    */
   public async getTransactions(
     accountId: number,
-    query: GetUncategorizedTransactionsQueryDto,
+    query: IGetUncategorizedTransactionsQuery
   ) {
     // Parsed query with default values.
     const _query = {
@@ -35,9 +28,9 @@ export class GetUncategorizedTransactions {
       pageSize: 20,
       ...query,
     };
+
     const { results, pagination } =
-      await this.uncategorizedBankTransactionModel()
+      await this.uncategorizedBankTransactionModel.query()
-        .query()
         .onBuild((q) => {
           q.where('accountId', accountId);
           q.where('categorized', false);
@@ -70,7 +63,7 @@ export class GetUncategorizedTransactions {
 
     const data = await this.transformer.transform(
       results,
-      new UncategorizedTransactionTransformer(),
+      new UncategorizedTransactionTransformer()
     );
     return {
       data,

packages/server/src/modules/BankingTransactions/subscribers/CashflowTransactionSubscriber.ts

@@ -3,10 +3,7 @@ import { OnEvent } from '@nestjs/event-emitter';
 import { BankTransactionAutoIncrement } from '../commands/BankTransactionAutoIncrement.service';
 import { BankTransactionGLEntriesService } from '../commands/BankTransactionGLEntries';
 import { events } from '@/common/events/events';
-import {
+import { ICommandCashflowCreatedPayload, ICommandCashflowDeletedPayload } from '../types/BankingTransactions.types';
-  ICommandCashflowCreatedPayload,
-  ICommandCashflowDeletedPayload,
-} from '../types/BankingTransactions.types';
 
 @Injectable()
 export class BankingTransactionGLEntriesSubscriber {
@@ -59,5 +56,5 @@ export class BankingTransactionGLEntriesSubscriber {
       cashflowTransactionId,
       trx,
     );
-  }
+  };
 }

packages/server/src/modules/BankingTransactions/subscribers/DecrementUncategorizedTransactionOnCategorize.ts

@@ -8,13 +8,12 @@ import { Inject, Injectable } from '@nestjs/common';
 import { events } from '@/common/events/events';
 import { Account } from '@/modules/Accounts/models/Account.model';
 import { UncategorizedBankTransaction } from '../models/UncategorizedBankTransaction';
-import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 
 @Injectable()
 export class DecrementUncategorizedTransactionOnCategorizeSubscriber {
   constructor(
     @Inject(Account.name)
-    private readonly accountModel: TenantModelProxy<typeof Account>,
+    private readonly accountModel: typeof Account,
   ) {}
 
   /**
@@ -34,7 +33,7 @@ export class DecrementUncategorizedTransactionOnCategorizeSubscriber {
           if (uncategorizedTransaction.isPending) {
             return;
           }
-          await this.accountModel()
+          await this.accountModel
             .query(trx)
             .findById(uncategorizedTransaction.accountId)
             .decrement('uncategorizedTransactions', 1);
@@ -59,7 +58,7 @@ export class DecrementUncategorizedTransactionOnCategorizeSubscriber {
           if (uncategorizedTransaction.isPending) {
             return;
           }
-          await this.accountModel()
+          await this.accountModel
             .query(trx)
             .findById(uncategorizedTransaction.accountId)
             .increment('uncategorizedTransactions', 1);
@@ -81,7 +80,7 @@ export class DecrementUncategorizedTransactionOnCategorizeSubscriber {
     // Cannot continue if the transaction is still pending.
     if (uncategorizedTransaction.isPending) return;
 
-    await this.accountModel()
+    await this.accountModel
       .query(trx)
       .findById(uncategorizedTransaction.accountId)
       .increment('uncategorizedTransactions', 1);

packages/server/src/modules/BankingTransactionsExclude/BankingTransactionsExclude.controller.ts

@@ -5,34 +5,19 @@ import {
   Get,
   Param,
   Post,
-  Put,
   Query,
 } from '@nestjs/common';
 import { ExcludeBankTransactionsApplication } from './ExcludeBankTransactionsApplication';
 import { ExcludedBankTransactionsQuery } from './types/BankTransactionsExclude.types';
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
 
-@Controller('banking/exclude')
+@Controller('banking/transactions')
 @ApiTags('banking-transactions')
 export class BankingTransactionsExcludeController {
   constructor(
     private readonly excludeBankTransactionsApplication: ExcludeBankTransactionsApplication,
   ) {}
 
-  @Put('bulk')
-  @ApiOperation({ summary: 'Exclude the given bank transactions.' })
-  public excludeBankTransactions(@Body('ids') ids: number[]) {
-    return this.excludeBankTransactionsApplication.excludeBankTransactions(ids);
-  }
-
-  @Delete('bulk')
-  @ApiOperation({ summary: 'Unexclude the given bank transactions.' })
-  public unexcludeBankTransactions(@Body('ids') ids: number[]) {
-    return this.excludeBankTransactionsApplication.unexcludeBankTransactions(
-      ids,
-    );
-  }
-
   @Get()
   @ApiOperation({ summary: 'Retrieves the excluded bank transactions.' })
   public getExcludedBankTransactions(
@@ -43,7 +28,7 @@ export class BankingTransactionsExcludeController {
     );
   }
 
-  @Put(':id')
+  @Post(':id/exclude')
   @ApiOperation({ summary: 'Exclude the given bank transaction.' })
   public excludeBankTransaction(@Param('id') id: string) {
     return this.excludeBankTransactionsApplication.excludeBankTransaction(
@@ -51,11 +36,25 @@ export class BankingTransactionsExcludeController {
     );
   }
 
-  @Delete(':id')
+  @Delete(':id/exclude')
   @ApiOperation({ summary: 'Unexclude the given bank transaction.' })
   public unexcludeBankTransaction(@Param('id') id: string) {
     return this.excludeBankTransactionsApplication.unexcludeBankTransaction(
       Number(id),
     );
   }
+
+  @Post('bulk/exclude')
+  @ApiOperation({ summary: 'Exclude the given bank transactions.' })
+  public excludeBankTransactions(@Body('ids') ids: number[]) {
+    return this.excludeBankTransactionsApplication.excludeBankTransactions(ids);
+  }
+
+  @Delete('bulk/exclude')
+  @ApiOperation({ summary: 'Unexclude the given bank transactions.' })
+  public unexcludeBankTransactions(@Body('ids') ids: number[]) {
+    return this.excludeBankTransactionsApplication.unexcludeBankTransactions(
+      ids,
+    );
+  }
 }

packages/server/src/modules/BankingTransactionsExclude/BankingTransactionsExclude.module.ts

@@ -1,4 +1,4 @@
-import { forwardRef, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { ExcludeBankTransactionsApplication } from './ExcludeBankTransactionsApplication';
 import { ExcludeBankTransactionService } from './commands/ExcludeBankTransaction.service';
 import { UnexcludeBankTransactionService } from './commands/UnexcludeBankTransaction.service';
@@ -10,9 +10,7 @@ import { BankingTransactionsExcludeController } from './BankingTransactionsExclu
 import { BankingTransactionsModule } from '../BankingTransactions/BankingTransactions.module';
 
 @Module({
-  imports: [
+  imports: [BankingTransactionsModule],
-    forwardRef(() => BankingTransactionsModule),
-  ],
   providers: [
     ExcludeBankTransactionsApplication,
     ExcludeBankTransactionService,

packages/server/src/modules/BillLandedCosts/BaseLandedCost.service.ts

@@ -1,191 +0,0 @@
-import { Inject } from '@nestjs/common';
-import { difference, sumBy } from 'lodash';
-import {
-  ILandedCostItemDTO,
-  ILandedCostDTO,
-  IBillLandedCostTransaction,
-  ILandedCostTransaction,
-  ILandedCostTransactionEntry,
-} from './types/BillLandedCosts.types';
-import { TenantModelProxy } from '../System/models/TenantBaseModel';
-import { BillLandedCost } from './models/BillLandedCost';
-import { ServiceError } from '../Items/ServiceError';
-import { CONFIG, ERRORS } from './utils';
-import { ItemEntry } from '../TransactionItemEntry/models/ItemEntry';
-import { Bill } from '../Bills/models/Bill';
-import { TransactionLandedCost } from './commands/TransctionLandedCost.service';
-
-export class BaseLandedCostService {
-  @Inject()
-  public readonly transactionLandedCost: TransactionLandedCost;
-
-  @Inject(BillLandedCost.name)
-  private readonly billLandedCostModel: TenantModelProxy<typeof BillLandedCost>;
-
-  /**
-   * Validates allocate cost items association with the purchase invoice entries.
-   * @param {IItemEntry[]} purchaseInvoiceEntries
-   * @param {ILandedCostItemDTO[]} landedCostItems
-   */
-  protected validateAllocateCostItems = (
-    purchaseInvoiceEntries: ItemEntry[],
-    landedCostItems: ILandedCostItemDTO[],
-  ): void => {
-    // Purchase invoice entries items ids.
-    const purchaseInvoiceItems = purchaseInvoiceEntries.map((e) => e.id);
-    const landedCostItemsIds = landedCostItems.map((item) => item.entryId);
-
-    // Not found items ids.
-    const notFoundItemsIds = difference(
-      purchaseInvoiceItems,
-      landedCostItemsIds,
-    );
-    // Throw items ids not found service error.
-    if (notFoundItemsIds.length > 0) {
-      throw new ServiceError(ERRORS.LANDED_COST_ITEMS_IDS_NOT_FOUND);
-    }
-  };
-
-  /**
-   * Transformes DTO to bill landed cost model object.
-   * @param {ILandedCostDTO} landedCostDTO
-   * @param {IBill} bill
-   * @param {ILandedCostTransaction} costTransaction
-   * @param {ILandedCostTransactionEntry} costTransactionEntry
-   * @returns
-   */
-  protected transformToBillLandedCost(
-    landedCostDTO: ILandedCostDTO,
-    bill: Bill,
-    costTransaction: ILandedCostTransaction,
-    costTransactionEntry: ILandedCostTransactionEntry,
-  ) {
-    const amount = sumBy(landedCostDTO.items, 'cost');
-
-    return {
-      billId: bill.id,
-
-      fromTransactionType: landedCostDTO.transactionType,
-      fromTransactionId: landedCostDTO.transactionId,
-      fromTransactionEntryId: landedCostDTO.transactionEntryId,
-
-      amount,
-      currencyCode: costTransaction.currencyCode,
-      exchangeRate: costTransaction.exchangeRate || 1,
-
-      allocationMethod: landedCostDTO.allocationMethod,
-      allocateEntries: landedCostDTO.items,
-
-      description: landedCostDTO.description,
-      costAccountId: costTransactionEntry.costAccountId,
-    };
-  }
-
-  /**
-   * Retrieve the cost transaction or throw not found error.
-   * @param {number} tenantId
-   * @param {transactionType} transactionType -
-   * @param {transactionId} transactionId -
-   */
-  public getLandedCostOrThrowError = async (
-    transactionType: string,
-    transactionId: number,
-  ) => {
-    const Model = this.transactionLandedCost.getModel(
-      transactionType,
-    );
-    const model = await Model.query().findById(transactionId);
-
-    if (!model) {
-      throw new ServiceError(ERRORS.LANDED_COST_TRANSACTION_NOT_FOUND);
-    }
-    return this.transactionLandedCost.transformToLandedCost(
-      transactionType,
-      model,
-    );
-  };
-
-  /**
-   * Retrieve the landed cost entries.
-   * @param {number} tenantId
-   * @param {string} transactionType
-   * @param {number} transactionId
-   * @returns
-   */
-  public getLandedCostEntry = async (
-    transactionType: string,
-    transactionId: number,
-    transactionEntryId: number,
-  ): Promise<any> => {
-    const Model = this.transactionLandedCost.getModel(
-      tenantId,
-      transactionType,
-    );
-    const relation = CONFIG.COST_TYPES[transactionType].entries;
-
-    const entry = await Model.relatedQuery(relation)
-      .for(transactionId)
-      .findOne('id', transactionEntryId)
-      .where('landedCost', true)
-      .onBuild((q) => {
-        if (transactionType === 'Bill') {
-          q.withGraphFetched('item');
-        } else if (transactionType === 'Expense') {
-          q.withGraphFetched('expenseAccount');
-        }
-      });
-
-    if (!entry) {
-      throw new ServiceError(ERRORS.LANDED_COST_ENTRY_NOT_FOUND);
-    }
-    return this.transactionLandedCost.transformToLandedCostEntry(
-      transactionType,
-      entry,
-    );
-  };
-
-  /**
-   * Retrieve allocate items cost total.
-   * @param {ILandedCostDTO} landedCostDTO
-   * @returns {number}
-   */
-  protected getAllocateItemsCostTotal = (
-    landedCostDTO: ILandedCostDTO,
-  ): number => {
-    return sumBy(landedCostDTO.items, 'cost');
-  };
-
-  /**
-   * Validates the landed cost entry amount.
-   * @param {number} unallocatedCost -
-   * @param {number} amount -
-   */
-  protected validateLandedCostEntryAmount = (
-    unallocatedCost: number,
-    amount: number,
-  ): void => {
-    if (unallocatedCost < amount) {
-      throw new ServiceError(ERRORS.COST_AMOUNT_BIGGER_THAN_UNALLOCATED_AMOUNT);
-    }
-  };
-
-  /**
-   * Retrieve the give bill landed cost or throw not found service error.
-   * @param {number} tenantId - Tenant id.
-   * @param {number} landedCostId - Landed cost id.
-   * @returns {Promise<IBillLandedCost>}
-   */
-  public getBillLandedCostOrThrowError = async (
-    landedCostId: number,
-  ): Promise<BillLandedCost> => {
-    // Retrieve the bill landed cost model.
-    const billLandedCost = await this.billLandedCostModel()
-      .query()
-      .findById(landedCostId);
-
-    if (!billLandedCost) {
-      throw new ServiceError(ERRORS.BILL_LANDED_COST_NOT_FOUND);
-    }
-    return billLandedCost;
-  };
-}

packages/server/src/modules/BillLandedCosts/BillLandedCosts.module.ts

@@ -1,32 +1,8 @@
 import { Module } from '@nestjs/common';
 import { TransactionLandedCostEntriesService } from './TransactionLandedCostEntries.service';
-import { AllocateLandedCostService } from './commands/AllocateLandedCost.service';
-import { LandedCostGLEntriesSubscriber } from './commands/LandedCostGLEntries.subscriber';
-import { LandedCostGLEntries } from './commands/LandedCostGLEntries.service';
-import { LandedCostSyncCostTransactions } from './commands/LandedCostSyncCostTransactions.service';
-import { LandedCostSyncCostTransactionsSubscriber } from './commands/LandedCostSyncCostTransactions.subscriber';
-import { BillAllocatedLandedCostTransactions } from './commands/BillAllocatedLandedCostTransactions.service';
-import { BillAllocateLandedCostController } from './LandedCost.controller';
-import { RevertAllocatedLandedCost } from './commands/RevertAllocatedLandedCost.service';
-import LandedCostTranasctions from './commands/LandedCostTransactions.service';
-import { LandedCostInventoryTransactions } from './commands/LandedCostInventoryTransactions.service';
-import { InventoryCostModule } from '../InventoryCost/InventoryCost.module';
 
 @Module({
-  imports: [InventoryCostModule],
+  providers: [TransactionLandedCostEntriesService],
-  providers: [
-    AllocateLandedCostService,
-    TransactionLandedCostEntriesService,
-    BillAllocatedLandedCostTransactions,
-    LandedCostGLEntriesSubscriber,
-    LandedCostGLEntries,
-    LandedCostSyncCostTransactions,
-    RevertAllocatedLandedCost,
-    LandedCostInventoryTransactions,
-    LandedCostTranasctions,
-    LandedCostSyncCostTransactionsSubscriber,
-  ],
   exports: [TransactionLandedCostEntriesService],
-  controllers: [BillAllocateLandedCostController],
 })
 export class BillLandedCostsModule {}

packages/server/src/modules/BillLandedCosts/LandedCost.controller.ts

@@ -1,84 +0,0 @@
-import {
-  Body,
-  Controller,
-  Delete,
-  Get,
-  Param,
-  Post,
-  Query,
-} from '@nestjs/common';
-import { AllocateBillLandedCostDto } from './dtos/AllocateBillLandedCost.dto';
-import { AllocateLandedCostService } from './commands/AllocateLandedCost.service';
-import { BillAllocatedLandedCostTransactions } from './commands/BillAllocatedLandedCostTransactions.service';
-import { RevertAllocatedLandedCost } from './commands/RevertAllocatedLandedCost.service';
-import { LandedCostTranasctions } from './commands/LandedCostTransactions.service';
-
-@Controller('landed-cost')
-export class BillAllocateLandedCostController {
-  constructor(
-    private allocateLandedCost: AllocateLandedCostService,
-    private billAllocatedCostTransactions: BillAllocatedLandedCostTransactions,
-    private revertAllocatedLandedCost: RevertAllocatedLandedCost,
-    private landedCostTranasctions: LandedCostTranasctions,
-  ) {}
-
-  @Get('/transactions')
-  async getLandedCostTransactions(
-    @Query('transaction_type') transactionType: string,
-  ) {
-    const transactions =
-      await this.landedCostTranasctions.getLandedCostTransactions(transactionType);
-
-    return transactions;
-  }
-
-  @Post('/bills/:billId/allocate')
-  public async calculateLandedCost(
-    @Param('billId') billId: number,
-    @Body() landedCostDTO: AllocateBillLandedCostDto,
-  ) {
-    const billLandedCost = await this.allocateLandedCost.allocateLandedCost(
-      landedCostDTO,
-      billId,
-    );
-    return {
-      id: billLandedCost.id,
-      message: 'The items cost are located successfully.',
-    };
-  }
-
-  @Delete('/:allocatedLandedCostId')
-  public async deleteAllocatedLandedCost(
-    @Param('allocatedLandedCostId') allocatedLandedCostId: number,
-  ) {
-    await this.revertAllocatedLandedCost.deleteAllocatedLandedCost(
-      allocatedLandedCostId,
-    );
-
-    return {
-      id: allocatedLandedCostId,
-      message: 'The allocated landed cost are delete successfully.',
-    };
-  }
-
-  public async  listLandedCosts(
-  ) {
-    const transactions =
-      await this.landedCostTranasctions.getLandedCostTransactions(query);
-
-    return transactions;
-  };
-
-  @Get('/bills/:billId/transactions')
-  async getBillLandedCostTransactions(@Param('billId') billId: number) {
-    const transactions =
-      await this.billAllocatedCostTransactions.getBillLandedCostTransactions(
-        billId,
-      );
-
-    return {
-      billId,
-      transactions,
-    };
-  }
-}

packages/server/src/modules/BillLandedCosts/TransactionLandedCostEntries.service.ts

@@ -1,10 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { ServiceError } from '../Items/ServiceError';
 import { transformToMap } from '@/utils/transform-to-key';
-import {
+import { ICommonLandedCostEntry, ICommonLandedCostEntryDTO } from './types/BillLandedCosts.types';
-  ICommonLandedCostEntry,
-  ICommonLandedCostEntryDTO,
-} from './types/BillLandedCosts.types';
 
 const ERRORS = {
   ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED:
@@ -22,7 +19,7 @@ export class TransactionLandedCostEntriesService {
    */
   public getLandedCostEntriesDeleted(
     oldCommonEntries: ICommonLandedCostEntry[],
-    newCommonEntriesDTO: ICommonLandedCostEntryDTO[],
+    newCommonEntriesDTO: ICommonLandedCostEntryDTO[]
   ): ICommonLandedCostEntry[] {
     const newBillEntriesById = transformToMap(newCommonEntriesDTO, 'id');
 
@@ -43,11 +40,11 @@ export class TransactionLandedCostEntriesService {
    */
   public validateLandedCostEntriesNotDeleted(
     oldCommonEntries: ICommonLandedCostEntry[],
-    newCommonEntriesDTO: ICommonLandedCostEntryDTO[],
+    newCommonEntriesDTO: ICommonLandedCostEntryDTO[]
   ): void {
     const entriesDeleted = this.getLandedCostEntriesDeleted(
       oldCommonEntries,
-      newCommonEntriesDTO,
+      newCommonEntriesDTO
     );
     if (entriesDeleted.length > 0) {
       throw new ServiceError(ERRORS.ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED);
@@ -61,7 +58,7 @@ export class TransactionLandedCostEntriesService {
    */
   public validateLocatedCostEntriesSmallerThanNewEntries(
     oldCommonEntries: ICommonLandedCostEntry[],
-    newCommonEntriesDTO: ICommonLandedCostEntryDTO[],
+    newCommonEntriesDTO: ICommonLandedCostEntryDTO[]
   ): void {
     const oldBillEntriesById = transformToMap(oldCommonEntries, 'id');
 
@@ -70,7 +67,7 @@ export class TransactionLandedCostEntriesService {
 
       if (oldEntry && oldEntry.allocatedCostAmount > entry.amount) {
         throw new ServiceError(
-          ERRORS.LOCATED_COST_ENTRIES_SHOULD_BIGGE_THAN_NEW_ENTRIES,
+          ERRORS.LOCATED_COST_ENTRIES_SHOULD_BIGGE_THAN_NEW_ENTRIES
         );
       }
     });

packages/server/src/modules/BillLandedCosts/commands/AllocateLandedCost.service.ts

@@ -1,107 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-import { Knex } from 'knex';
-import {
-  IAllocatedLandedCostCreatedPayload,
-  ILandedCostDTO,
-} from '../types/BillLandedCosts.types';
-import { EventEmitter2 } from '@nestjs/event-emitter';
-import { UnitOfWork } from '@/modules/Tenancy/TenancyDB/UnitOfWork.service';
-import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
-import { Bill } from '@/modules/Bills/models/Bill';
-import { BillLandedCost } from '../models/BillLandedCost';
-import { BaseLandedCostService } from '../BaseLandedCost.service';
-import { events } from '@/common/events/events';
-import { AllocateBillLandedCostDto } from '../dtos/AllocateBillLandedCost.dto';
-
-@Injectable()
-export class AllocateLandedCostService extends BaseLandedCostService {
-  constructor(
-    private readonly uow: UnitOfWork,
-    private readonly eventPublisher: EventEmitter2,
-
-    @Inject(Bill.name)
-    private readonly billModel: TenantModelProxy<typeof Bill>,
-
-    @Inject(BillLandedCost.name)
-    private readonly billLandedCostModel: TenantModelProxy<typeof BillLandedCost>
-  ) {
-    super();
-  }
-
-  /**
-   * =================================
-   * - Allocate landed cost.
-   * =================================
-   * - Validates the allocate cost not the same purchase invoice id.
-   * - Get the given bill (purchase invoice) or throw not found error.
-   * - Get the given landed cost transaction or throw not found error.
-   * - Validate landed cost transaction has enough unallocated cost amount.
-   * - Validate landed cost transaction entry has enough unallocated cost amount.
-   * - Validate allocate entries existance and associated with cost bill transaction.
-   * - Writes inventory landed cost transaction.
-   * - Increment the allocated landed cost transaction.
-   * - Increment the allocated landed cost transaction entry.
-   * --------------------------------
-   * @param {ILandedCostDTO} landedCostDTO - Landed cost DTO.
-   * @param {number} tenantId - Tenant id.
-   * @param {number} billId - Purchase invoice id.
-   */
-  public async allocateLandedCost(
-    allocateCostDTO: AllocateBillLandedCostDto,
-    billId: number,
-  ): Promise<BillLandedCost> {
-    // Retrieve total cost of allocated items.
-    const amount = this.getAllocateItemsCostTotal(allocateCostDTO);
-
-    // Retrieve the purchase invoice or throw not found error.
-    const bill = await Bill.query()
-      .findById(billId)
-      .withGraphFetched('entries')
-      .throwIfNotFound();
-
-    // Retrieve landed cost transaction or throw not found service error.
-    const costTransaction = await this.getLandedCostOrThrowError(
-      allocateCostDTO.transactionType,
-      allocateCostDTO.transactionId,
-    );
-    // Retrieve landed cost transaction entries.
-    const costTransactionEntry = await this.getLandedCostEntry(
-      allocateCostDTO.transactionType,
-      allocateCostDTO.transactionId,
-      allocateCostDTO.transactionEntryId,
-    );
-    // Validates allocate cost items association with the purchase invoice entries.
-    this.validateAllocateCostItems(bill.entries, allocateCostDTO.items);
-
-    // Validate the amount of cost with unallocated landed cost.
-    this.validateLandedCostEntryAmount(
-      costTransactionEntry.unallocatedCostAmount,
-      amount,
-    );
-    // Transformes DTO to bill landed cost model object.
-    const billLandedCostObj = this.transformToBillLandedCost(
-      allocateCostDTO,
-      bill,
-      costTransaction,
-      costTransactionEntry,
-    );
-    // Saves landed cost transactions with associated tranasctions under
-    // unit-of-work eniverment.
-    return this.uow.withTransaction(async (trx: Knex.Transaction) => {
-      // Save the bill landed cost model.
-      const billLandedCost =
-        await BillLandedCost.query(trx).insertGraph(billLandedCostObj);
-      // Triggers `onBillLandedCostCreated` event.
-      await this.eventPublisher.emitAsync(events.billLandedCost.onCreated, {
-        bill,
-        billLandedCostId: billLandedCost.id,
-        billLandedCost,
-        costTransaction,
-        costTransactionEntry,
-        trx,
-      } as IAllocatedLandedCostCreatedPayload);
-
-      return billLandedCost;
-    });
-  };
-}

packages/server/src/modules/BillLandedCosts/commands/BillAllocatedLandedCostTransactions.service.ts

@@ -1,177 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-import { I18nService } from 'nestjs-i18n';
-import { omit } from 'lodash';
-import * as R from 'ramda';
-import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
-import { Bill } from '@/modules/Bills/models/Bill';
-import { BillLandedCost } from '../models/BillLandedCost';
-import { IBillLandedCostTransaction } from '../types/BillLandedCosts.types';
-
-@Injectable()
-export class BillAllocatedLandedCostTransactions {
-  constructor(
-    private readonly i18nService: I18nService,
-
-    @Inject(Bill.name)
-    private readonly billModel: TenantModelProxy<typeof Bill>,
-
-    @Inject(BillLandedCost.name)
-    private readonly billLandedCostModel: TenantModelProxy<
-      typeof BillLandedCost
-    >,
-  ) {}
-
-  /**
-   * Retrieve the bill associated landed cost transactions.
-   * @param  {number} tenantId - Tenant id.
-   * @param  {number} billId - Bill id.
-   * @return {Promise<IBillLandedCostTransaction>}
-   */
-  public getBillLandedCostTransactions = async (
-    billId: number,
-  ): Promise<IBillLandedCostTransaction> => {
-    // Retrieve the given bill id or throw not found service error.
-    const bill = await this.billModel()
-      .query()
-      .findById(billId)
-      .throwIfNotFound();
-
-    // Retrieve the bill associated allocated landed cost with bill and expense entry.
-    const landedCostTransactions = await this.billLandedCostModel()
-      .query()
-      .where('bill_id', billId)
-      .withGraphFetched('allocateEntries')
-      .withGraphFetched('allocatedFromBillEntry.item')
-      .withGraphFetched('allocatedFromExpenseEntry.expenseAccount')
-      .withGraphFetched('bill');
-
-    const transactionsJson = this.i18nService.i18nApply(
-      [[qim.$each, 'allocationMethodFormatted']],
-      landedCostTransactions.map((a) => a.toJSON()),
-      tenantId,
-    );
-    return this.transformBillLandedCostTransactions(transactionsJson);
-  };
-
-  /**
-   *
-   * @param {IBillLandedCostTransaction[]} landedCostTransactions
-   * @returns
-   */
-  private transformBillLandedCostTransactions = (
-    landedCostTransactions: IBillLandedCostTransaction[],
-  ) => {
-    return landedCostTransactions.map(this.transformBillLandedCostTransaction);
-  };
-
-  /**
-   *
-   * @param {IBillLandedCostTransaction} transaction
-   * @returns
-   */
-  private transformBillLandedCostTransaction = (
-    transaction: IBillLandedCostTransaction,
-  ) => {
-    const getTransactionName = R.curry(this.condBillLandedTransactionName)(
-      transaction.fromTransactionType,
-    );
-    const getTransactionDesc = R.curry(
-      this.condBillLandedTransactionDescription,
-    )(transaction.fromTransactionType);
-
-    return {
-      formattedAmount: formatNumber(transaction.amount, {
-        currencyCode: transaction.currencyCode,
-      }),
-      ...omit(transaction, [
-        'allocatedFromBillEntry',
-        'allocatedFromExpenseEntry',
-      ]),
-      name: getTransactionName(transaction),
-      description: getTransactionDesc(transaction),
-      formattedLocalAmount: formatNumber(transaction.localAmount, {
-        currencyCode: 'USD',
-      }),
-    };
-  };
-
-  /**
-   * Retrieve bill landed cost tranaction name based on the given transaction type.
-   * @param transactionType
-   * @param transaction
-   * @returns
-   */
-  private condBillLandedTransactionName = (
-    transactionType: string,
-    transaction,
-  ) => {
-    return R.cond([
-      [
-        R.always(R.equals(transactionType, 'Bill')),
-        this.getLandedBillTransactionName,
-      ],
-      [
-        R.always(R.equals(transactionType, 'Expense')),
-        this.getLandedExpenseTransactionName,
-      ],
-    ])(transaction);
-  };
-
-  /**
-   *
-   * @param transaction
-   * @returns
-   */
-  private getLandedBillTransactionName = (transaction): string => {
-    return transaction.allocatedFromBillEntry.item.name;
-  };
-
-  /**
-   *
-   * @param transaction
-   * @returns
-   */
-  private getLandedExpenseTransactionName = (transaction): string => {
-    return transaction.allocatedFromExpenseEntry.expenseAccount.name;
-  };
-
-  /**
-   * Retrieve landed cost.
-   * @param transaction
-   * @returns
-   */
-  private getLandedBillTransactionDescription = (transaction): string => {
-    return transaction.allocatedFromBillEntry.description;
-  };
-
-  /**
-   *
-   * @param transaction
-   * @returns
-   */
-  private getLandedExpenseTransactionDescription = (transaction): string => {
-    return transaction.allocatedFromExpenseEntry.description;
-  };
-
-  /**
-   * Retrieve the bill landed cost transaction description based on transaction type.
-   * @param {string} tranasctionType
-   * @param transaction
-   * @returns
-   */
-  private condBillLandedTransactionDescription = (
-    tranasctionType: string,
-    transaction,
-  ) => {
-    return R.cond([
-      [
-        R.always(R.equals(tranasctionType, 'Bill')),
-        this.getLandedBillTransactionDescription,
-      ],
-      [
-        R.always(R.equals(tranasctionType, 'Expense')),
-        this.getLandedExpenseTransactionDescription,
-      ],
-    ])(transaction);
-  };
-}

packages/server/src/modules/BillLandedCosts/commands/LandedCostGLEntries.service.ts

@@ -1,234 +0,0 @@
-import * as R from 'ramda';
-import { Knex } from 'knex';
-import { Inject, Injectable } from '@nestjs/common';
-import { BaseLandedCostService } from '../BaseLandedCost.service';
-import { BillLandedCost } from '../models/BillLandedCost';
-import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
-import { Bill } from '@/modules/Bills/models/Bill';
-import { BillLandedCostEntry } from '../models/BillLandedCostEntry';
-import { ILedger, ILedgerEntry } from '@/modules/Ledger/types/Ledger.types';
-import { Ledger } from '@/modules/Ledger/Ledger';
-
-@Injectable()
-export class LandedCostGLEntries extends BaseLandedCostService {
-  constructor(
-    private readonly journalService: JournalPosterService,
-    private readonly ledgerRepository: LedgerRepository,
-
-    @Inject(BillLandedCost.name)
-    private readonly billLandedCostModel: TenantModelProxy<typeof BillLandedCost>,
-  ) {
-    super();
-  }
-
-  /**
-   * Retrieves the landed cost GL common entry.
-   * @param {IBill} bill
-   * @param {IBillLandedCost} allocatedLandedCost
-   * @returns
-   */
-  private getLandedCostGLCommonEntry = (
-    bill: Bill,
-    allocatedLandedCost: BillLandedCost
-  ) => {
-    return {
-      date: bill.billDate,
-      currencyCode: allocatedLandedCost.currencyCode,
-      exchangeRate: allocatedLandedCost.exchangeRate,
-
-      transactionType: 'LandedCost',
-      transactionId: allocatedLandedCost.id,
-      transactionNumber: bill.billNumber,
-
-      referenceNumber: bill.referenceNo,
-
-      credit: 0,
-      debit: 0,
-    };
-  };
-
-  /**
-   * Retrieves the landed cost GL inventory entry.
-   * @param {IBill} bill
-   * @param {IBillLandedCost} allocatedLandedCost
-   * @param {IBillLandedCostEntry} allocatedEntry
-   * @returns {ILedgerEntry}
-   */
-  private getLandedCostGLInventoryEntry = (
-    bill: Bill,
-    allocatedLandedCost: BillLandedCost,
-    allocatedEntry: BillLandedCostEntry
-  ): ILedgerEntry => {
-    const commonEntry = this.getLandedCostGLCommonEntry(
-      bill,
-      allocatedLandedCost
-    );
-    return {
-      ...commonEntry,
-      debit: allocatedLandedCost.localAmount,
-      accountId: allocatedEntry.itemEntry.item.inventoryAccountId,
-      index: 1,
-      accountNormal: AccountNormal.DEBIT,
-    };
-  };
-
-  /**
-   * Retrieves the landed cost GL cost entry.
-   * @param {IBill} bill
-   * @param {IBillLandedCost} allocatedLandedCost
-   * @param {ILandedCostTransactionEntry} fromTransactionEntry
-   * @returns {ILedgerEntry}
-   */
-  private getLandedCostGLCostEntry = (
-    bill: Bill,
-    allocatedLandedCost: BillLandedCost,
-    fromTransactionEntry: ILandedCostTransactionEntry
-  ): ILedgerEntry => {
-    const commonEntry = this.getLandedCostGLCommonEntry(
-      bill,
-      allocatedLandedCost
-    );
-    return {
-      ...commonEntry,
-      credit: allocatedLandedCost.localAmount,
-      accountId: fromTransactionEntry.costAccountId,
-      index: 2,
-      accountNormal: AccountNormal.CREDIT,
-    };
-  };
-
-  /**
-   * Retrieve allocated landed cost entry GL entries.
-   * @param {IBill} bill
-   * @param {IBillLandedCost} allocatedLandedCost
-   * @param {ILandedCostTransactionEntry} fromTransactionEntry
-   * @param {IBillLandedCostEntry} allocatedEntry
-   * @returns {ILedgerEntry}
-   */
-  private getLandedCostGLAllocateEntry = R.curry(
-    (
-      bill: Bill,
-      allocatedLandedCost: BillLandedCost,
-      fromTransactionEntry: LandedCostTransactionEntry,
-      allocatedEntry: BillLandedCostEntry
-    ): ILedgerEntry[] => {
-      const inventoryEntry = this.getLandedCostGLInventoryEntry(
-        bill,
-        allocatedLandedCost,
-        allocatedEntry
-      );
-      const costEntry = this.getLandedCostGLCostEntry(
-        bill,
-        allocatedLandedCost,
-        fromTransactionEntry
-      );
-      return [inventoryEntry, costEntry];
-    }
-  );
-
-  /**
-   * Compose the landed cost GL entries.
-   * @param {BillLandedCost} allocatedLandedCost
-   * @param {Bill} bill
-   * @param {ILandedCostTransactionEntry} fromTransactionEntry
-   * @returns {ILedgerEntry[]}
-   */
-  public getLandedCostGLEntries = (
-    allocatedLandedCost: BillLandedCost,
-    bill: Bill,
-    fromTransactionEntry: LandedCostTransactionEntry
-  ): ILedgerEntry[] => {
-    const getEntry = this.getLandedCostGLAllocateEntry(
-      bill,
-      allocatedLandedCost,
-      fromTransactionEntry
-    );
-    return allocatedLandedCost.allocateEntries.map(getEntry).flat();
-  };
-
-  /**
-   * Retrieves the landed cost GL ledger.
-   * @param   {IBillLandedCost} allocatedLandedCost
-   * @param   {Bill} bill
-   * @param   {ILandedCostTransactionEntry} fromTransactionEntry
-   * @returns {ILedger}
-   */
-  public getLandedCostLedger = (
-    allocatedLandedCost: BillLandedCost,
-    bill: Bill,
-    fromTransactionEntry: LandedCostTransactionEntry
-  ): ILedger => {
-    const entries = this.getLandedCostGLEntries(
-      allocatedLandedCost,
-      bill,
-      fromTransactionEntry
-    );
-    return new Ledger(entries);
-  };
-
-  /**
-   * Writes landed cost GL entries to the storage layer.
-   * @param {number} tenantId -
-   */
-  public writeLandedCostGLEntries = async (
-    allocatedLandedCost: BillLandedCost,
-    bill: Bill,
-    fromTransactionEntry: ILandedCostTransactionEntry,
-    trx?: Knex.Transaction
-  ) => {
-    const ledgerEntries = this.getLandedCostGLEntries(
-      allocatedLandedCost,
-      bill,
-      fromTransactionEntry
-    );
-    await this.ledgerRepository.saveLedgerEntries(ledgerEntries, trx);
-  };
-
-  /**
-   * Generates and writes GL entries of the given landed cost.
-   * @param {number} billLandedCostId
-   * @param {Knex.Transaction} trx
-   */
-  public createLandedCostGLEntries = async (
-    billLandedCostId: number,
-    trx?: Knex.Transaction
-  ) => {
-    // Retrieve the bill landed cost transacion with associated
-    // allocated entries and items.
-    const allocatedLandedCost = await this.billLandedCostModel().query(trx)
-      .findById(billLandedCostId)
-      .withGraphFetched('bill')
-      .withGraphFetched('allocateEntries.itemEntry.item');
-
-    // Retrieve the allocated from transactione entry.
-    const transactionEntry = await this.getLandedCostEntry(
-      allocatedLandedCost.fromTransactionType,
-      allocatedLandedCost.fromTransactionId,
-      allocatedLandedCost.fromTransactionEntryId
-    );
-    // Writes the given landed cost GL entries to the storage layer.
-    await this.writeLandedCostGLEntries(
-      allocatedLandedCost,
-      allocatedLandedCost.bill,
-      transactionEntry,
-      trx
-    );
-  };
-
-  /**
-   * Reverts GL entries of the given allocated landed cost transaction.
-   * @param {number} tenantId
-   * @param {number} landedCostId
-   * @param {Knex.Transaction} trx
-   */
-  public revertLandedCostGLEntries = async (
-    landedCostId: number,
-    trx: Knex.Transaction
-  ) => {
-    await this.journalService.revertJournalTransactions(
-      landedCostId,
-      'LandedCost',
-      trx
-    );
-  };
-}

packages/server/src/modules/BillLandedCosts/commands/LandedCostGLEntries.subscriber.ts

@@ -1,45 +0,0 @@
-import {
-  IAllocatedLandedCostCreatedPayload,
-  IAllocatedLandedCostDeletedPayload,
-} from '../types/BillLandedCosts.types';
-import { OnEvent } from '@nestjs/event-emitter';
-import { LandedCostGLEntries } from './LandedCostGLEntries.service';
-import { Injectable } from '@nestjs/common';
-import { events } from '@/common/events/events';
-
-@Injectable()
-export class LandedCostGLEntriesSubscriber {
-  constructor(
-    private readonly billLandedCostGLEntries: LandedCostGLEntries,
-  ) {}
-
-  /**
-   * Writes GL entries once landed cost transaction created.
-   * @param {IAllocatedLandedCostCreatedPayload} payload -
-   */
-  @OnEvent(events.billLandedCost.onCreated)
-  async writeGLEntriesOnceLandedCostCreated({
-    billLandedCost,
-    trx,
-  }: IAllocatedLandedCostCreatedPayload) {
-    await this.billLandedCostGLEntries.createLandedCostGLEntries(
-      billLandedCost.id,
-      trx
-    );
-  };
-
-  /**
-   * Reverts GL entries associated to landed cost transaction once deleted.
-   * @param {IAllocatedLandedCostDeletedPayload} payload -
-   */
-  @OnEvent(events.billLandedCost.onDeleted)
-  async revertGLEnteriesOnceLandedCostDeleted({
-    oldBillLandedCost,
-    trx,
-  }: IAllocatedLandedCostDeletedPayload) {
-    await this.billLandedCostGLEntries.revertLandedCostGLEntries(
-      oldBillLandedCost.id,
-      trx
-    );
-  };
-}

packages/server/src/modules/BillLandedCosts/commands/LandedCostInventoryTransactions.service.ts

@@ -1,66 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { Knex } from 'knex';
-import { IBillLandedCostTransaction } from '../types/BillLandedCosts.types';
-import { Bill } from '@/modules/Bills/models/Bill';
-import { mergeLocatedWithBillEntries } from '../utils';
-import { InventoryTransactionsService } from '@/modules/InventoryCost/commands/InventoryTransactions.service';
-
-@Injectable()
-export class LandedCostInventoryTransactions {
-  constructor(
-    private readonly inventoryTransactionsService: InventoryTransactionsService,
-  ) {}
-
-  /**
-   * Records inventory transactions.
-   * @param {number} tenantId
-   * @param {IBillLandedCostTransaction} billLandedCost
-   * @param {IBill} bill -
-   */
-  public recordInventoryTransactions = async (
-    billLandedCost: IBillLandedCostTransaction,
-    bill: Bill,
-    trx?: Knex.Transaction,
-  ) => {
-    // Retrieve the merged allocated entries with bill entries.
-    const allocateEntries = mergeLocatedWithBillEntries(
-      billLandedCost.allocateEntries,
-      bill.entries,
-    );
-    // Mappes the allocate cost entries to inventory transactions.
-    const inventoryTransactions = allocateEntries.map((allocateEntry) => ({
-      date: bill.billDate,
-      itemId: allocateEntry.entry.itemId,
-      direction: 'IN',
-      quantity: null,
-      rate: allocateEntry.cost,
-      transactionType: 'LandedCost',
-      transactionId: billLandedCost.id,
-      entryId: allocateEntry.entryId,
-    }));
-    // Writes inventory transactions.
-    return this.inventoryTransactionsService.recordInventoryTransactions(
-      inventoryTransactions,
-      false,
-      trx,
-    );
-  };
-
-  /**
-   * Deletes the inventory transaction.
-   * @param {number} tenantId - Tenant id.
-   * @param {number} landedCostId - Landed cost id.
-   * @param {Knex.Transaction} trx - Knex transactions.
-   * @returns
-   */
-  public removeInventoryTransactions = (
-    landedCostId: number,
-    trx?: Knex.Transaction,
-  ) => {
-    return this.inventoryTransactionsService.deleteInventoryTransactions(
-      landedCostId,
-      'LandedCost',
-      trx,
-    );
-  };
-}

packages/server/src/modules/BillLandedCosts/commands/LandedCostInventoryTransactions.subscriber.ts

@@ -1,49 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { OnEvent } from '@nestjs/event-emitter';
-import {
-  IAllocatedLandedCostCreatedPayload,
-  IAllocatedLandedCostDeletedPayload,
-} from '../types/BillLandedCosts.types';
-import { events } from '@/common/events/events';
-import { LandedCostInventoryTransactions } from './LandedCostInventoryTransactions.service';
-
-@Injectable()
-export class LandedCostInventoryTransactionsSubscriber {
-  constructor(
-    private readonly landedCostInventory: LandedCostInventoryTransactions,
-  ) {}
-
-  /**
-   * Writes inventory transactions of the landed cost transaction once created.
-   * @param {IAllocatedLandedCostCreatedPayload} payload -
-   */
-  @OnEvent(events.billLandedCost.onCreated)
-  async writeInventoryTransactionsOnceCreated({
-    billLandedCost,
-    trx,
-    bill,
-  }: IAllocatedLandedCostCreatedPayload) {
-    // Records the inventory transactions.
-    await this.landedCostInventory.recordInventoryTransactions(
-      billLandedCost,
-      bill,
-      trx,
-    );
-  }
-
-  /**
-   * Reverts inventory transactions of the landed cost transaction once deleted.
-   * @param {IAllocatedLandedCostDeletedPayload} payload -
-   */
-  @OnEvent(events.billLandedCost.onDeleted)
-  async revertInventoryTransactionsOnceDeleted({
-    oldBillLandedCost,
-    trx,
-  }: IAllocatedLandedCostDeletedPayload) {
-    // Removes the inventory transactions.
-    await this.landedCostInventory.removeInventoryTransactions(
-      oldBillLandedCost.id,
-      trx,
-    );
-  }
-}

packages/server/src/modules/BillLandedCosts/commands/LandedCostSyncCostTransactions.service.ts

@@ -1,73 +0,0 @@
-import { Knex } from 'knex';
-import { CONFIG } from '../utils';
-import { Injectable } from '@nestjs/common';
-import { TransactionLandedCost } from './TransctionLandedCost.service';
-
-@Injectable()
-export class LandedCostSyncCostTransactions {
-  constructor(
-    private readonly transactionLandedCost: TransactionLandedCost,
-  ) {}
-
-  /**
-   * Allocate the landed cost amount to cost transactions.
-   * @param {number} tenantId -
-   * @param {string} transactionType
-   * @param {number} transactionId
-   */
-  public incrementLandedCostAmount = async (
-    transactionType: string,
-    transactionId: number,
-    transactionEntryId: number,
-    amount: number,
-    trx?: Knex.Transaction
-  ): Promise<void> => {
-    const Model = this.transactionLandedCost.getModel(
-      transactionType
-    );
-    const relation = CONFIG.COST_TYPES[transactionType].entries;
-
-    // Increment the landed cost transaction amount.
-    await Model.query(trx)
-      .where('id', transactionId)
-      .increment('allocatedCostAmount', amount);
-
-    // Increment the landed cost entry.
-    await Model.relatedQuery(relation, trx)
-      .for(transactionId)
-      .where('id', transactionEntryId)
-      .increment('allocatedCostAmount', amount);
-  };
-
-  /**
-   * Reverts the landed cost amount to cost transaction.
-   * @param {number} tenantId - Tenant id.
-   * @param {string} transactionType - Transaction type.
-   * @param {number} transactionId - Transaction id.
-   * @param {number} transactionEntryId - Transaction entry id.
-   * @param {number} amount - Amount
-   */
-  public revertLandedCostAmount = async (
-    transactionType: string,
-    transactionId: number,
-    transactionEntryId: number,
-    amount: number,
-    trx?: Knex.Transaction
-  ) => {
-    const Model = this.transactionLandedCost.getModel(
-      transactionType
-    );
-    const relation = CONFIG.COST_TYPES[transactionType].entries;
-
-    // Decrement the allocate cost amount of cost transaction.
-    await Model.query(trx)
-      .where('id', transactionId)
-      .decrement('allocatedCostAmount', amount);
-
-    // Decrement the allocated cost amount cost transaction entry.
-    await Model.relatedQuery(relation, trx)
-      .for(transactionId)
-      .where('id', transactionEntryId)
-      .decrement('allocatedCostAmount', amount);
-  };
-}

packages/server/src/modules/BillLandedCosts/commands/LandedCostSyncCostTransactions.subscriber.ts

@@ -1,53 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import {
-  IAllocatedLandedCostCreatedPayload,
-  IAllocatedLandedCostDeletedPayload,
-} from '../types/BillLandedCosts.types';
-import { events } from '@/common/events/events';
-import { LandedCostSyncCostTransactions } from './LandedCostSyncCostTransactions.service';
-import { OnEvent } from '@nestjs/event-emitter';
-
-@Injectable()
-export class LandedCostSyncCostTransactionsSubscriber {
-  constructor(
-    private landedCostSyncCostTransaction: LandedCostSyncCostTransactions,
-  ) {}
-
-  /**
-   * Increment cost transactions once the landed cost allocated.
-   * @param {IAllocatedLandedCostCreatedPayload} payload -
-   */
-  @OnEvent(events.billLandedCost.onCreated)
-  async incrementCostTransactionsOnceCreated({
-    billLandedCost,
-    trx,
-  }: IAllocatedLandedCostCreatedPayload) {
-    // Increment landed cost amount on transaction and entry.
-    await this.landedCostSyncCostTransaction.incrementLandedCostAmount(
-      billLandedCost.fromTransactionType,
-      billLandedCost.fromTransactionId,
-      billLandedCost.fromTransactionEntryId,
-      billLandedCost.amount,
-      trx,
-    );
-  }
-
-  /**
-   * Decrement cost transactions once the allocated landed cost reverted.
-   * @param {IAllocatedLandedCostDeletedPayload} payload -
-   */
-  @OnEvent(events.billLandedCost.onDeleted)
-  async decrementCostTransactionsOnceDeleted({
-    oldBillLandedCost,
-    trx,
-  }: IAllocatedLandedCostDeletedPayload) {
-    // Reverts the landed cost amount to the cost transaction.
-    await this.landedCostSyncCostTransaction.revertLandedCostAmount(
-      oldBillLandedCost.fromTransactionType,
-      oldBillLandedCost.fromTransactionId,
-      oldBillLandedCost.fromTransactionEntryId,
-      oldBillLandedCost.amount,
-      trx,
-    );
-  }
-}