Fix throttle TTL to use milliseconds per NestJS v6 docs

Co-authored-by: abouolia <2197422+abouolia@users.noreply.github.com>

.all-contributorsrc

@@ -168,16 +168,6 @@
       "contributions": [
         "bug"
       ]
-    },
-    {
-      "login": "Daniel15",
-      "name": "Daniel Lo Nigro",
-      "avatar_url": "https://avatars.githubusercontent.com/u/91933?v=4",
-      "profile": "https://d.sb/",
-      "contributions": [
-        "bug",
-        "code"
-      ]
     }
   ],
   "contributorsPerLine": 7,

.env.example

@@ -35,10 +35,17 @@ TENANT_DB_NAME_PERFIX=bigcapital_tenant_
 BASE_URL=http://example.com
 JWT_SECRET=b0JDZW56RnV6aEthb0RGPXVEcUI
 
+# Jobs MongoDB
+MONGODB_DATABASE_URL=mongodb://localhost/bigcapital
+
 # App proxy
 PUBLIC_PROXY_PORT=80
 PUBLIC_PROXY_SSL_PORT=443
 
+# Agendash
+AGENDASH_AUTH_USER=agendash
+AGENDASH_AUTH_PASSWORD=123123
+
 # Sign-up restrictions
 SIGNUP_DISABLED=false
 SIGNUP_ALLOWED_DOMAINS=
@@ -91,18 +98,8 @@ POSTHOG_API_KEY=
 POSTHOG_HOST=
 
 # Stripe Payment
-# Get the keys from the Stripe dashboard
-# Starts with "sk_"
 STRIPE_PAYMENT_SECRET_KEY=
-# Starts with "pk_"
 STRIPE_PAYMENT_PUBLISHABLE_KEY=
-# Get the client ID from https://dashboard.stripe.com/settings/connect/onboarding-options/oauth
-# Starts with "ca_"
 STRIPE_PAYMENT_CLIENT_ID=
-# Configure the webhook here: https://dashboard.stripe.com/workbench/webhooks/
-# Endpoint URL is https://example.com/api/webhooks/stripe (replace "example.com" with the correct domain)
-# Select the "checkout.session.completed" and "account.updated" events
-# Starts with "whsec_"
 STRIPE_PAYMENT_WEBHOOKS_SECRET=
-# Replace example.com with the correct domain
-STRIPE_PAYMENT_REDIRECT_URL=https://example.com/preferences/payment-methods/stripe/callback
+STRIPE_PAYMENT_REDIRECT_URL=

CONTRIBUTING.md

@@ -54,7 +54,7 @@ pnpm install
 - Run all required docker containers in the development, we already configured all containers under `docker-compose.yml`.
 
 ```
-docker compose up -d
+docker-compose up -d
 ```
 
 Wait some seconds, and hit `docker-compose ps` and you should see the same result below.
@@ -75,7 +75,7 @@ pnpm run build:server
 - Run the database migration for system database.
 
 ```
-pnpm run system:migrate:latest
+node packages/server/build/commands.js system:migrate:latest
 ```
 
 And you should get something like that.
@@ -84,10 +84,10 @@ And you should get something like that.
 Batch 1 run: 6 migrations
 ```
 
-- Next, start the server.
+- Next, start the webapp application.
 
 ```
-pnpm run server:start
+pnpm run dev:server
 ```
 
 **[`^top^`](#)**
@@ -96,6 +96,12 @@ pnpm run server:start
 
 ## Contribute to Frontend
 
+- Clone the `bigcapital` repository and cd into `bigcapital` directory.
+
+```
+git clone https://github.com/bigcapital/bigcapital.git && cd bigcaptial
+```
+
 - Install all npm dependencies of the monorepo, you don't have to change directory to the `frontend` package. just hit that command and will install all packages across all application.
 
 ```
@@ -132,4 +138,4 @@ There are many other ways to get involved with the community and to participate
 
 Again, Feel free to ping us on [`#contributing`](https://discord.com/invite/c8nPBJafeb) on our Discord community if you need any help on this :)
 
-Thank You!
+Thank You!

README.md

@@ -135,7 +135,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://myself.vercel.app/"><img src="https://avatars.githubusercontent.com/u/42431274?v=4?s=100" width="100px;" alt="Sachin Mittal"/><br /><sub><b>Sachin Mittal</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Amittalsam98" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.camilooviedo.com/"><img src="https://avatars.githubusercontent.com/u/64604272?v=4?s=100" width="100px;" alt="Camilo Oviedo"/><br /><sub><b>Camilo Oviedo</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=Champetaman" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://nklmantey.com/"><img src="https://avatars.githubusercontent.com/u/90279429?v=4?s=100" width="100px;" alt="Mantey"/><br /><sub><b>Mantey</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Anklmantey" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://d.sb/"><img src="https://avatars.githubusercontent.com/u/91933?v=4?s=100" width="100px;" alt="Daniel Lo Nigro"/><br /><sub><b>Daniel Lo Nigro</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3ADaniel15" title="Bug reports">🐛</a> <a href="https://github.com/bigcapitalhq/bigcapital/commits?author=Daniel15" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

docker-compose.prod.yml

@@ -32,9 +32,11 @@ services:
       - '3000'
     links:
       - mysql
+      - mongo
       - redis
     depends_on:
       - mysql
+      - mongo
       - redis
     restart: on-failure
     networks:
@@ -64,9 +66,16 @@ services:
       # Authentication
       - JWT_SECRET=${JWT_SECRET}
 
+      # MongoDB
+      - MONGODB_DATABASE_URL=mongodb://mongo/bigcapital
+
       # Application
       - BASE_URL=${BASE_URL}
 
+      # Agendash
+      - AGENDASH_AUTH_USER=${AGENDASH_AUTH_USER}
+      - AGENDASH_AUTH_PASSWORD=${AGENDASH_AUTH_PASSWORD}
+
       # Sign-up restrictions
       - SIGNUP_DISABLED=${SIGNUP_DISABLED}
       - SIGNUP_ALLOWED_DOMAINS=${SIGNUP_ALLOWED_DOMAINS}
@@ -84,7 +93,7 @@ services:
       - OPEN_EXCHANGE_RATE_APP_ID-${OPEN_EXCHANGE_RATE_APP_ID}
 
       # Bank Sync
-      - BANK_FEED_ENABLED=${BANK_FEED_ENABLED}
+      - BANKING_CONNECT=${BANKING_CONNECT}
 
       # Plaid
       - PLAID_ENV=${PLAID_ENV}
@@ -114,13 +123,6 @@ services:
       - S3_ENDPOINT=${S3_ENDPOINT}
       - S3_BUCKET=${S3_BUCKET}
 
-      # Stripe
-      - STRIPE_PAYMENT_SECRET_KEY=${STRIPE_PAYMENT_SECRET_KEY}
-      - STRIPE_PAYMENT_PUBLISHABLE_KEY=${STRIPE_PAYMENT_PUBLISHABLE_KEY}
-      - STRIPE_PAYMENT_CLIENT_ID=${STRIPE_PAYMENT_CLIENT_ID}
-      - STRIPE_PAYMENT_WEBHOOKS_SECRET=${STRIPE_PAYMENT_WEBHOOKS_SECRET}
-      - STRIPE_PAYMENT_REDIRECT_URL=${STRIPE_PAYMENT_REDIRECT_URL}
-
   database_migration:
     container_name: bigcapital-database-migration
     build:
@@ -157,6 +159,17 @@ services:
     networks:
       - bigcapital_network
 
+  mongo:
+    container_name: bigcapital-mongo
+    restart: on-failure
+    build: ./docker/mongo
+    expose:
+      - '27017'
+    volumes:
+      - mongo:/var/lib/mongodb
+    networks:
+      - bigcapital_network
+
   redis:
     container_name: bigcapital-redis
     restart: on-failure
@@ -182,6 +195,10 @@ volumes:
     name: bigcapital_prod_mysql
     driver: local
 
+  mongo:
+    name: bigcapital_prod_mongo
+    driver: local
+
   redis:
     name: bigcapital_prod_redis
     driver: local

docker-compose.yml

@@ -24,13 +24,25 @@ services:
       restart_policy:
         condition: unless-stopped
 
+  mongo:
+    build: ./docker/mongo
+    expose:
+      - '27017'
+    volumes:
+      - mongo:/var/lib/mongodb
+    ports:
+      - '27017:27017'
+    deploy:
+      restart_policy:
+        condition: unless-stopped
+
   redis:
     build:
       context: ./docker/redis
     expose:
-      - '6379'
+      - "6379"
     ports:
-      - '6379:6379'
+      - "6379:6379"
     volumes:
       - redis:/data
     deploy:
@@ -40,7 +52,7 @@ services:
   gotenberg:
     image: gotenberg/gotenberg:7
     ports:
-      - '9000:3000'
+      - "9000:3000"
 
 # Volumes
 volumes:
@@ -48,6 +60,10 @@ volumes:
     name: bigcapital_dev_mysql
     driver: local
 
+  mongo:
+    name: bigcapital_dev_mongo
+    driver: local
+
   redis:
     name: bigcapital_dev_redis
-    driver: local
+    driver: local

docker/mongo/Dockerfile

@@ -0,0 +1 @@
+FROM mongo:5.0

docker/redis/Dockerfile

@@ -1,4 +1,4 @@
-FROM redis:6.2.21
+FROM redis:6.2.0
 
 COPY redis.conf /usr/local/etc/redis/redis.conf
 

packages/server/.env.example

@@ -35,10 +35,17 @@ TENANT_DB_NAME_PERFIX=bigcapital_tenant_
 BASE_URL=http://example.com
 JWT_SECRET=b0JDZW56RnV6aEthb0RGPXVEcUI
 
+# Jobs MongoDB
+MONGODB_DATABASE_URL=mongodb://localhost/bigcapital
+
 # App proxy
 PUBLIC_PROXY_PORT=80
 PUBLIC_PROXY_SSL_PORT=443
 
+# Agendash
+AGENDASH_AUTH_USER=agendash
+AGENDASH_AUTH_PASSWORD=123123
+
 # Sign-up restrictions
 SIGNUP_DISABLED=false
 SIGNUP_ALLOWED_DOMAINS=

packages/server/Dockerfile

@@ -1,100 +0,0 @@
-FROM node:18.16.0-alpine as build
-
-USER root
-
-ARG MAIL_HOST= \
-  MAIL_USERNAME= \
-  MAIL_PASSWORD= \
-  MAIL_PORT= \
-  MAIL_SECURE= \
-  MAIL_FROM_NAME= \
-  MAIL_FROM_ADDRESS= \
-  # Database
-  DB_HOST= \
-  DB_USER= \
-  DB_PASSWORD= \
-  DB_CHARSET= \
-  # System database.
-  SYSTEM_DB_NAME= \
-  SYSTEM_DB_PASSWORD= \
-  SYSTEM_DB_USER= \
-  SYSTEM_DB_HOST= \
-  SYSTEM_DB_CHARSET= \
-  # Tenant databases.
-  TENANT_DB_USER= \
-  TENANT_DB_PASSWORD= \
-  TENANT_DB_HOST= \
-  TENANT_DB_NAME_PERFIX= \
-  TENANT_DB_CHARSET= \
-  # Authentication
-  JWT_SECRET= \
-  # Application
-  BASE_URL= \
-  # Sign-up restriction
-  SIGNUP_DISABLED= \
-  SIGNUP_ALLOWED_DOMAINS= \
-  SIGNUP_ALLOWED_EMAILS=
-
-ENV MAIL_HOST=$MAIL_HOST \
-  MAIL_USERNAME=$MAIL_USERNAME \
-  MAIL_PASSWORD=$MAIL_PASSWORD \
-  MAIL_PORT=$MAIL_PORT \
-  MAIL_SECURE=$MAIL_SECURE \
-  MAIL_FROM_NAME=$MAIL_FROM_NAME \
-  MAIL_FROM_ADDRESS=$MAIL_FROM_ADDRESS \
-  # Database
-  DB_HOST=$DB_HOST \
-  DB_USER=$DB_USER \
-  DB_PASSWORD=$DB_PASSWORD \
-  DB_CHARSET=$DB_CHARSET \
-  # System database.
-  SYSTEM_DB_HOST=$SYSTEM_DB_HOST \
-  SYSTEM_DB_USER=$SYSTEM_DB_USER \
-  SYSTEM_DB_PASSWORD=$SYSTEM_DB_PASSWORD \
-  SYSTEM_DB_NAME=$SYSTEM_DB_NAME \
-  SYSTEM_DB_CHARSET=$SYSTEM_DB_CHARSET \
-  # Tenant databases.
-  TENANT_DB_NAME_PERFIX=$TENANT_DB_NAME_PERFIX \
-  TENANT_DB_HOST=$TENANT_DB_HOST \
-  TENANT_DB_PASSWORD=$TENANT_DB_PASSWORD \
-  TENANT_DB_USER=$TENANT_DB_USER \
-  TENANT_DB_CHARSET=$TENANT_DB_CHARSET \
-  # Authentication
-  JWT_SECRET=$JWT_SECRET \
-  # Application
-  BASE_URL=$BASE_URL \
-  # Sign-up restriction
-  SIGNUP_DISABLED=$SIGNUP_DISABLED \
-  SIGNUP_ALLOWED_DOMAINS=$SIGNUP_ALLOWED_DOMAINS \
-  SIGNUP_ALLOWED_EMAILS=$SIGNUP_ALLOWED_EMAILS
-
-# New Relic config file.
-ENV NEW_RELIC_NO_CONFIG_FILE=true
-
-# Create app directory.
-WORKDIR /app
-
-RUN chown node:node /
-
-# Install pnpm 
-RUN npm install -g pnpm
-
-# Copy application dependency manifests to the container image.
-COPY --chown=node:node ./ ./
-
-# Install application dependencies
-RUN apk update
-RUN apk add python3 build-base chromium
-
-# Set PYHTON env
-ENV PYTHON=/usr/bin/python3
-
-# Install packages dependencies for production.
-RUN pnpm install
-
-COPY --chown=node:node ./packages/server ./packages/server
-
-# # Creates a "dist" folder with the production build
-RUN pnpm run build:server --skip-nx-cache
-
-CMD [ "node", "./packages/server/build/index.js" ]

packages/server/package.json

@@ -167,9 +167,6 @@
       "**/*.(t|j)s"
     ],
     "coverageDirectory": "../coverage",
-    "testEnvironment": "node",
-    "moduleNameMapper": {
-      "^@/(.*)$": "<rootDir>/$1"
-    }
+    "testEnvironment": "node"
   }
 }

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

@@ -1,5 +0,0 @@
-import { registerAs } from '@nestjs/config';
-
-export default registerAs('app', () => ({
-  baseUrl: process.env.BASE_URL,
-}));

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

@@ -1,5 +0,0 @@
-import { registerAs } from '@nestjs/config';
-
-export default registerAs('cloud', () => ({
-  hostedOnCloud: process.env.HOSTED_ON_BIGCAPITAL_CLOUD === 'true',
-}));

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

@@ -1,4 +1,3 @@
-import app from './app';
 import systemDatabase from './system-database';
 import tenantDatabase from './tenant-database';
 import signup from './signup';
@@ -16,12 +15,9 @@ import mail from './mail';
 import loops from './loops';
 import bankfeed from './bankfeed';
 import throttle from './throttle';
-import cloud from './cloud';
 
 export const config = [
-  app,
   systemDatabase,
-  cloud,
   tenantDatabase,
   signup,
   gotenberg,

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

@@ -2,10 +2,12 @@ import { registerAs } from '@nestjs/config';
 
 export default registerAs('throttle', () => ({
   global: {
+    // TTL in milliseconds (NestJS throttler v6+)
     ttl: parseInt(process.env.THROTTLE_GLOBAL_TTL ?? '60000', 10),
     limit: parseInt(process.env.THROTTLE_GLOBAL_LIMIT ?? '100', 10),
   },
   auth: {
+    // TTL in milliseconds (NestJS throttler v6+)
     ttl: parseInt(process.env.THROTTLE_AUTH_TTL ?? '60000', 10),
     limit: parseInt(process.env.THROTTLE_AUTH_LIMIT ?? '10', 10),
   },

packages/server/src/common/dtos/BulkDelete.dto.ts

@@ -1,55 +0,0 @@
-import { IsArray, IsInt, ArrayNotEmpty, IsBoolean, IsOptional } from 'class-validator';
-import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
-import { Transform } from 'class-transformer';
-import { parseBoolean } from '@/utils/parse-boolean';
-
-export class BulkDeleteDto {
-  @IsArray()
-  @ArrayNotEmpty()
-  @IsInt({ each: true })
-  @ApiProperty({
-    description: 'Array of IDs to delete',
-    type: [Number],
-    example: [1, 2, 3],
-  })
-  ids: number[];
-
-  @IsOptional()
-  @IsBoolean()
-  @Transform(({ value, obj }) => parseBoolean(value ?? obj?.skip_undeletable, false))
-  @ApiPropertyOptional({
-    description: 'When true, undeletable items will be skipped and only deletable ones will be removed.',
-    type: Boolean,
-    default: false,
-  })
-  skipUndeletable?: boolean;
-}
-
-export class ValidateBulkDeleteResponseDto {
-  @ApiProperty({
-    description: 'Number of items that can be deleted',
-    example: 2,
-  })
-  deletableCount: number;
-
-  @ApiProperty({
-    description: 'Number of items that cannot be deleted',
-    example: 1,
-  })
-  nonDeletableCount: number;
-
-  @ApiProperty({
-    description: 'IDs of items that can be deleted',
-    type: [Number],
-    example: [1, 2],
-  })
-  deletableIds: number[];
-
-  @ApiProperty({
-    description: 'IDs of items that cannot be deleted',
-    type: [Number],
-    example: [3],
-  })
-  nonDeletableIds: number[];
-}
-

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

@@ -7,46 +7,53 @@ import {
 } from '@nestjs/common';
 import { type Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { mapKeysDeep } from '@/utils/deepdash';
 
-export function camelToSnake<T = any>(value: T): T {
+export function camelToSnake<T = any>(value: T) {
   if (value === null || value === undefined) {
     return value;
   }
-  return mapKeysDeep(
-    value,
-    (_value: string, key: any, parent: any, context: any) => {
-      if (Array.isArray(parent)) {
-        // tell mapKeysDeep to skip mapping inside this branch
-        context.skipChildren = true;
-        return key;
-      }
-      return key
-        .split(/(?=[A-Z])/)
-        .join('_')
-        .toLowerCase();
-    },
-  ) as T;
+  if (Array.isArray(value)) {
+    return value.map(camelToSnake);
+  }
+  if (typeof value === 'object' && !(value instanceof Date)) {
+    return Object.fromEntries(
+      Object.entries(value).map(([key, value]) => [
+        key
+          .split(/(?=[A-Z])/)
+          .join('_')
+          .toLowerCase(),
+        camelToSnake(value),
+      ]),
+    );
+  }
+  return value;
 }
 
-export function snakeToCamel<T = any>(value: T): T {
+export function snakeToCamel<T = any>(value: T) {
   if (value === null || value === undefined) {
     return value;
   }
-  return mapKeysDeep(
-    value,
-    (_value: string, key: any, parent: any, context: any) => {
-      if (Array.isArray(parent)) {
-        // tell mapKeysDeep to skip mapping inside this branch
-        context.skipChildren = true;
-        return key;
-      }
-      const converted = key.replace(/([-_]\w)/g, (group) =>
-        group[1].toUpperCase(),
-      );
-      return converted[0].toLowerCase() + converted.slice(1);
-    },
-  ) as T;
+
+  if (Array.isArray(value)) {
+    return value.map(snakeToCamel);
+  }
+
+  const impl = (str: string) => {
+    const converted = str.replace(/([-_]\w)/g, (group) =>
+      group[1].toUpperCase(),
+    );
+    return converted[0].toLowerCase() + converted.slice(1);
+  };
+
+  if (typeof value === 'object' && !(value instanceof Date)) {
+    return Object.fromEntries(
+      Object.entries(value).map(([key, value]) => [
+        impl(key),
+        snakeToCamel(value),
+      ]),
+    );
+  }
+  return value;
 }
 
 export const DEFAULT_STRATEGY = {
@@ -56,7 +63,7 @@ export const DEFAULT_STRATEGY = {
 
 @Injectable()
 export class SerializeInterceptor implements NestInterceptor<any, any> {
-  constructor(@Optional() readonly strategy = DEFAULT_STRATEGY) { }
+  constructor(@Optional() readonly strategy = DEFAULT_STRATEGY) {}
 
   intercept(
     context: ExecutionContext,

packages/server/src/common/interceptors/to-json.interceptor.ts

@@ -5,18 +5,15 @@ import {
   NestInterceptor,
 } from '@nestjs/common';
 import { Observable, map } from 'rxjs';
-import { mapValuesDeep } from '@/utils/deepdash';
+import { mapValues, mapValuesDeep } from '@/utils/deepdash';
 
 @Injectable()
 export class ToJsonInterceptor implements NestInterceptor {
   intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
     return next.handle().pipe(
       map((data) => {
-        if (data === null || data === undefined) {
-          return data;
-        }
         return mapValuesDeep(data, (value) => {
-          if (value !== null && value !== undefined && typeof value.toJSON === 'function') {
+          if (value && typeof value.toJSON === 'function') {
             return value.toJSON();
           }
           return value;

packages/server/src/constants/metable-options.ts

@@ -1,27 +1,4 @@
-import { chain, mapKeys } from 'lodash';
-
-const getTransactionsLockingSettingsSchema = (modules: string[]) => {
-  const moduleSchema = {
-    active: { type: 'boolean' },
-    lock_to_date: { type: 'date' },
-    unlock_from_date: { type: 'date' },
-    unlock_to_date: { type: 'date' },
-    lock_reason: { type: 'string' },
-    unlock_reason: { type: 'string' },
-  };
-  return chain(modules)
-    .map((module: string) => {
-      return mapKeys(moduleSchema, (value, key: string) => `${module}.${key}`);
-    })
-    .flattenDeep()
-    .reduce((result, value) => {
-      return {
-        ...result,
-        ...value,
-      };
-    }, {})
-    .value();
-};
+// import { getTransactionsLockingSettingsSchema } from '@/api/controllers/TransactionsLocking/utils';
 
 export const SettingsOptions = {
   organization: {
@@ -246,12 +223,12 @@ export const SettingsOptions = {
     'locking-type': {
       type: 'string',
     },
-    ...getTransactionsLockingSettingsSchema([
-      'all',
-      'sales',
-      'purchases',
-      'financial',
-    ]),
+    // ...getTransactionsLockingSettingsSchema([
+    //   'all',
+    //   'sales',
+    //   'purchases',
+    //   'financial',
+    // ]),
   },
   features: {
     'multi-warehouses': {

packages/server/src/database/system/migrations/20251102082642_create_api_keys_table.js

@@ -1,36 +0,0 @@
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-exports.up = function (knex) {
-  return knex.schema.createTable('api_keys', (table) => {
-    table.increments();
-    table.string('key').notNullable().unique().index();
-    table.string('name');
-    table
-      .integer('user_id')
-      .unsigned()
-      .notNullable()
-      .index()
-      .references('id')
-      .inTable('users');
-    table
-      .bigInteger('tenant_id')
-      .unsigned()
-      .notNullable()
-      .index()
-      .references('id')
-      .inTable('tenants');
-    table.dateTime('expires_at').nullable().index();
-    table.dateTime('revoked_at').nullable().index();
-    table.timestamps();
-  });
-};
-
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-exports.down = function (knex) {
-  return knex.schema.dropTableIfExists('api_keys');
-};

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

@@ -3,7 +3,6 @@
   "field.description": "Description",
   "field.slug": "Account slug",
   "field.code": "Account code",
-  "field.code_hint": "Unique number to identify the account.",
   "field.root_type": "Root type",
   "field.normal": "Account normal",
   "field.normal.credit": "Credit",
@@ -14,6 +13,5 @@
   "field.balance": "Balance",
   "field.bank_balance": "Bank Balance",
   "field.parent_account": "Parent Account",
-  "field.created_at": "Created at",
-  "field.account_hint": "Matches the account name or code."
+  "field.created_at": "Created at"
 }

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

@@ -1,30 +0,0 @@
-{
-  "field.vendor": "Vendor",
-  "field.bill_number": "Bill No.",
-  "field.bill_date": "Date",
-  "field.due_date": "Due Date",
-  "field.reference_no": "Reference No.",
-  "field.exchange_rate": "Exchange Rate",
-  "field.note": "Note",
-  "field.open": "Open",
-  "field.entries": "Entries",
-  "field.item": "Item",
-  "field.item_hint": "Matches the item name or code.",
-  "field.rate": "Rate",
-  "field.quantity": "Quantity",
-  "field.description": "Line Description",
-  "field.amount": "Amount",
-  "field.payment_amount": "Payment Amount",
-  "field.status": "Status",
-  "field.status.paid": "Paid",
-  "field.status.partially-paid": "Partially Paid",
-  "field.status.overdue": "Overdue",
-  "field.status.unpaid": "Unpaid",
-  "field.status.opened": "Opened",
-  "field.status.draft": "Draft",
-  "field.created_at": "Created At",
-  "allocation_method": "Allocation Method",
-  "allocation_method.quantity": "Quantity",
-  "allocation_method.value": "Valuation"
-}
-

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

@@ -1,15 +0,0 @@
-{
-  "field.vendor": "Vendor",
-  "field.payment_date": "Payment Date",
-  "field.payment_number": "Payment No.",
-  "field.payment_account": "Payment Account",
-  "field.exchange_rate": "Exchange Rate",
-  "field.note": "Note",
-  "field.reference": "Reference",
-  "field.entries": "Entries",
-  "field.entries.bill": "Bill",
-  "field.entries.payment_amount": "Payment Amount",
-  "field.payment_number_hint": "The payment number should be unique.",
-  "field.bill_hint": "Matches the bill number."
-}
-

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

@@ -1,16 +0,0 @@
-{
-  "field.customer": "Customer",
-  "field.exchange_rate": "Exchange Rate",
-  "field.credit_note_date": "Credit Note Date",
-  "field.reference_no": "Reference No.",
-  "field.note": "Note",
-  "field.terms_conditions": "Terms & Conditions",
-  "field.credit_note_number": "Credit Note Number",
-  "field.open": "Open",
-  "field.entries": "Entries",
-  "field.item": "Item",
-  "field.rate": "Rate",
-  "field.quantity": "Quantity",
-  "field.description": "Description"
-}
-

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

@@ -1,5 +0,0 @@
-{
-  "type.business": "Business",
-  "type.individual": "Individual"
-}
-

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

@@ -1,21 +0,0 @@
-{
-  "field.customer": "Customer",
-  "field.estimate_date": "Estimate Date",
-  "field.expiration_date": "Expiration Date",
-  "field.estimate_number": "Estimate No.",
-  "field.reference_no": "Reference No.",
-  "field.exchange_rate": "Exchange Rate",
-  "field.currency": "Currency",
-  "field.note": "Note",
-  "field.terms_conditions": "Terms & Conditions",
-  "field.delivered": "Delivered",
-  "field.entries": "Entries",
-  "field.amount": "Amount",
-  "field.status": "Status",
-  "field.status.draft": "Draft",
-  "field.status.delivered": "Delivered",
-  "field.status.rejected": "Rejected",
-  "field.status.approved": "Approved",
-  "field.created_at": "Created At"
-}
-

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

@@ -26,7 +26,6 @@
   "field.due_amount": "Due amount",
   "field.delivered": "Delivered",
   "field.item_name": "Item Name",
-  "field.item_hint": "Matches the item name or code.",
   "field.rate": "Rate",
   "field.quantity": "Quantity",
   "field.description": "Description",
@@ -39,7 +38,5 @@
   "field.status.draft": "Draft",
   "field.created_at": "Created at",
   "field.currency": "Currency",
-  "field.entries": "Entries",
-  "field.branch": "Branch",
-  "field.warehouse": "Warehouse"
+  "field.entries": "Entries"
 }

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

@@ -17,7 +17,6 @@
   "field.quantity_on_hand": "Quantity on Hand",
   "field.note": "Note",
   "field.category": "Category",
-  "field.category_hint": "Matches the category name.",
   "field.active": "Active",
   "field.created_at": "Created At"
 }

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

@@ -1,17 +0,0 @@
-{
-  "field.customer": "Customer",
-  "field.payment_date": "Payment Date",
-  "field.amount": "Amount",
-  "field.reference_no": "Reference No.",
-  "field.deposit_account": "Deposit Account",
-  "field.payment_receive_no": "Payment No.",
-  "field.statement": "Statement",
-  "field.entries": "Entries",
-  "field.exchange_rate": "Exchange Rate",
-  "field.invoice": "Invoice",
-  "field.entries.payment_amount": "Payment Amount",
-  "field.created_at": "Created At",
-  "field.payment_no_hint": "The payment number should be unique.",
-  "field.invoice_hint": "Matches the invoice number."
-}
-

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

@@ -10,21 +10,5 @@
   "paper.receipt_amount": "Receipt amount",
   "paper.total": "Total",
   "paper.balance_due": "Balance Due",
-  "paper.payment_amount": "Payment Amount",
-
-  "field.receipt_date": "Receipt Date",
-  "field.customer": "Customer",
-  "field.deposit_account": "Deposit Account",
-  "field.exchange_rate": "Exchange Rate",
-  "field.receipt_number": "Receipt Number",
-  "field.reference_no": "Reference No.",
-  "field.closed": "Closed",
-  "field.entries": "Entries",
-  "field.statement": "Statement",
-  "field.receipt_message": "Receipt Message",
-  "field.amount": "Amount",
-  "field.status": "Status",
-  "field.status.draft": "Draft",
-  "field.status.closed": "Closed",
-  "field.created_at": "Created At"
+  "paper.payment_amount": "Payment Amount"
 }

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

@@ -2,18 +2,5 @@
   "view.draft": "Draft",
   "view.published": "Published",
   "view.open": "Open",
-  "view.closed": "Closed",
-
-  "field.vendor": "Vendor",
-  "field.vendor_credit_number": "Vendor Credit No.",
-  "field.vendor_credit_date": "Vendor Credit Date",
-  "field.reference_no": "Reference No.",
-  "field.exchange_rate": "Exchange Rate",
-  "field.note": "Note",
-  "field.open": "Open",
-  "field.entries": "Entries",
-  "field.item": "Item",
-  "field.rate": "Rate",
-  "field.quantity": "Quantity",
-  "field.description": "Description"
+  "view.closed": "Closed"
 }

packages/server/src/libs/migration-seed/FsMigrations.ts

@@ -11,7 +11,6 @@ class FsMigrations {
   private sortDirsSeparately: boolean;
   private migrationsPaths: string[];
   private loadExtensions: string[];
-  private seedsDirectory: string;
 
   /**
    * Constructor method.
@@ -31,8 +30,6 @@ class FsMigrations {
     }
     this.migrationsPaths = migrationDirectories;
     this.loadExtensions = loadExtensions || DEFAULT_LOAD_EXTENSIONS;
-    // Store the seeds directory (first path is the seeds directory)
-    this.seedsDirectory = migrationDirectories[0] || '';
   }
 
   /**
@@ -96,10 +93,7 @@ class FsMigrations {
    * @returns {string}
    */
   public getMigration(migration: MigrateItem): string {
-    return importWebpackSeedModule(
-      migration.file.replace('.ts', ''),
-      this.seedsDirectory,
-    );
+    return importWebpackSeedModule(migration.file.replace('.ts', ''));
   }
 }
 

packages/server/src/libs/migration-seed/Utils.ts

@@ -1,6 +1,5 @@
 // @ts-nocheck
 import * as fs from 'fs';
-import * as path from 'path';
 
 /**
  * Detarmines the module type of the given file path.
@@ -36,32 +35,8 @@ export async function importFile(filepath: string): any {
 /**
  *
  * @param {string} moduleName
- * @param {string} seedsDirectory - The seeds directory path from config
  * @returns
  */
-export async function importWebpackSeedModule(
-  moduleName: string,
-  seedsDirectory: string,
-): any {
-  // Convert the seeds directory to a relative path from this file's location
-  const utilsDir = __dirname;
-  const seedsDirAbsolute = path.isAbsolute(seedsDirectory)
-    ? seedsDirectory
-    : path.resolve(process.cwd(), seedsDirectory);
-
-  // Get relative path from Utils.js location to seeds directory
-  const relativePath = path.relative(utilsDir, seedsDirAbsolute);
-
-  // Convert to forward slashes for import (works on all platforms)
-  const importPath = relativePath.split(path.sep).join('/');
-
-  // Construct the import path (add ./ prefix if not already present, or handle empty/current dir)
-  let finalPath = importPath;
-  if (!finalPath || finalPath === '.') {
-    finalPath = './';
-  } else if (!finalPath.startsWith('.')) {
-    finalPath = `./${finalPath}`;
-  }
-
-  return import(`${finalPath}/${moduleName}`);
+export async function importWebpackSeedModule(moduleName: string): any {
+  return import(`../../database/seeds/core/${moduleName}`);
 }

packages/server/src/main.ts

@@ -4,7 +4,10 @@ import { ClsMiddleware } from 'nestjs-cls';
 import * as path from 'path';
 import './utils/moment-mysql';
 import { AppModule } from './modules/App/App.module';
-import { NestExpressApplication } from '@nestjs/platform-express';
+import { ServiceErrorFilter } from './common/filters/service-error.filter';
+import { ModelHasRelationsFilter } from './common/filters/model-has-relations.filter';
+import { ValidationPipe } from './common/pipes/ClassValidation.pipe';
+import { ToJsonInterceptor } from './common/interceptors/to-json.interceptor';
 
 global.__public_dirname = path.join(__dirname, '..', 'public');
 global.__static_dirname = path.join(__dirname, '../static');
@@ -12,15 +15,17 @@ global.__views_dirname = path.join(global.__static_dirname, '/views');
 global.__images_dirname = path.join(global.__static_dirname, '/images');
 
 async function bootstrap() {
-  const app = await NestFactory.create<NestExpressApplication>(AppModule, {
-    rawBody: true,
-  });
-  app.set('query parser', 'extended');
+  const app = await NestFactory.create(AppModule);
   app.setGlobalPrefix('/api');
 
   // create and mount the middleware manually here
   app.use(new ClsMiddleware({}).use);
 
+  app.useGlobalInterceptors(new ToJsonInterceptor());
+
+  // use the validation pipe globally
+  app.useGlobalPipes(new ValidationPipe());
+
   const config = new DocumentBuilder()
     .setTitle('Bigcapital')
     .setDescription('Financial accounting software')
@@ -30,6 +35,9 @@ async function bootstrap() {
   const documentFactory = () => SwaggerModule.createDocument(app, config);
   SwaggerModule.setup('swagger', app, documentFactory);
 
+  app.useGlobalFilters(new ServiceErrorFilter());
+  app.useGlobalFilters(new ModelHasRelationsFilter());
+
   await app.listen(process.env.PORT ?? 3000);
 }
 bootstrap();

packages/server/src/models/Model.ts

@@ -48,30 +48,14 @@ export class PaginationQueryBuilder<
       // No relations defined
       return this.delete();
     }
-
-    // Only check HasManyRelation and ManyToManyRelation relations, as BelongsToOneRelation are just 
-    // foreign key references and shouldn't prevent deletion. Only dependent records should block deletion.
-    const dependentRelationNames = relationNames.filter((name) => {
-      const relation = relationMappings[name];
-      return relation && (
-        relation.relation === Model.HasManyRelation ||
-        relation.relation === Model.ManyToManyRelation
-      );
-    });
-
-    if (dependentRelationNames.length === 0) {
-      // No dependent relations defined, safe to delete
-      return this.delete();
-    }
-
     const recordQuery = this.clone();
 
-    dependentRelationNames.forEach((relationName: string) => {
+    relationNames.forEach((relationName: string) => {
       recordQuery.withGraphFetched(relationName);
     });
     const record = await recordQuery;
 
-    const hasRelations = dependentRelationNames.some((name) => {
+    const hasRelations = relationNames.some((name) => {
       const val = record[name];
       return Array.isArray(val) ? val.length > 0 : val != null;
     });

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

@@ -7,17 +7,15 @@ import {
   Get,
   Query,
   ParseIntPipe,
-  Put,
-  HttpCode,
 } from '@nestjs/common';
 import { AccountsApplication } from './AccountsApplication.service';
 import { CreateAccountDTO } from './CreateAccount.dto';
 import { EditAccountDTO } from './EditAccount.dto';
+import { IAccountsFilter } from './Accounts.types';
 import {
   ApiExtraModels,
   ApiOperation,
   ApiParam,
-  ApiQuery,
   ApiResponse,
   ApiTags,
   getSchemaPath,
@@ -26,59 +24,16 @@ import { AccountResponseDto } from './dtos/AccountResponse.dto';
 import { AccountTypeResponseDto } from './dtos/AccountTypeResponse.dto';
 import { GetAccountTransactionResponseDto } from './dtos/GetAccountTransactionResponse.dto';
 import { GetAccountTransactionsQueryDto } from './dtos/GetAccountTransactionsQuery.dto';
-import { GetAccountsQueryDto } from './dtos/GetAccountsQuery.dto';
 import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
-import {
-  BulkDeleteDto,
-  ValidateBulkDeleteResponseDto,
-} from '@/common/dtos/BulkDelete.dto';
 
 @Controller('accounts')
 @ApiTags('Accounts')
 @ApiExtraModels(AccountResponseDto)
 @ApiExtraModels(AccountTypeResponseDto)
 @ApiExtraModels(GetAccountTransactionResponseDto)
-@ApiExtraModels(ValidateBulkDeleteResponseDto)
 @ApiCommonHeaders()
 export class AccountsController {
-  constructor(private readonly accountsApplication: AccountsApplication) { }
-
-  @Post('validate-bulk-delete')
-  @HttpCode(200)
-  @ApiOperation({
-    summary:
-      'Validates which accounts can be deleted and returns counts of deletable and non-deletable accounts.',
-  })
-  @ApiResponse({
-    status: 200,
-    description:
-      'Validation completed. Returns counts and IDs of deletable and non-deletable accounts.',
-    schema: {
-      $ref: getSchemaPath(ValidateBulkDeleteResponseDto),
-    },
-  })
-  async validateBulkDeleteAccounts(
-    @Body() bulkDeleteDto: BulkDeleteDto,
-  ): Promise<ValidateBulkDeleteResponseDto> {
-    return this.accountsApplication.validateBulkDeleteAccounts(
-      bulkDeleteDto.ids,
-    );
-  }
-
-  @Post('bulk-delete')
-  @HttpCode(200)
-  @ApiOperation({ summary: 'Deletes multiple accounts in bulk.' })
-  @ApiResponse({
-    status: 200,
-    description: 'The accounts have been successfully deleted.',
-  })
-  async bulkDeleteAccounts(
-    @Body() bulkDeleteDto: BulkDeleteDto,
-  ): Promise<void> {
-    return this.accountsApplication.bulkDeleteAccounts(bulkDeleteDto.ids, {
-      skipUndeletable: bulkDeleteDto.skipUndeletable ?? false,
-    });
-  }
+  constructor(private readonly accountsApplication: AccountsApplication) {}
 
   @Post()
   @ApiOperation({ summary: 'Create an account' })
@@ -90,7 +45,7 @@ export class AccountsController {
     return this.accountsApplication.createAccount(accountDTO);
   }
 
-  @Put(':id')
+  @Post(':id')
   @ApiOperation({ summary: 'Edit the given account.' })
   @ApiResponse({
     status: 200,
@@ -128,7 +83,6 @@ export class AccountsController {
   }
 
   @Post(':id/activate')
-  @HttpCode(200)
   @ApiOperation({ summary: 'Activate the given account.' })
   @ApiResponse({
     status: 200,
@@ -146,7 +100,6 @@ export class AccountsController {
   }
 
   @Post(':id/inactivate')
-  @HttpCode(200)
   @ApiOperation({ summary: 'Inactivate the given account.' })
   @ApiResponse({
     status: 200,
@@ -225,19 +178,7 @@ export class AccountsController {
       items: { $ref: getSchemaPath(AccountResponseDto) },
     },
   })
-  @ApiQuery({
-    name: 'onlyInactive',
-    required: false,
-    type: Boolean,
-    description: 'Filter to show only inactive accounts',
-  })
-  @ApiQuery({
-    name: 'structure',
-    required: false,
-    type: String,
-    description: 'Structure type for the accounts list',
-  })
-  async getAccounts(@Query() filter: GetAccountsQueryDto) {
+  async getAccounts(@Query() filter: Partial<IAccountsFilter>) {
     return this.accountsApplication.getAccounts(filter);
   }
 }

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

@@ -19,8 +19,6 @@ import { GetAccountsService } from './GetAccounts.service';
 import { DynamicListModule } from '../DynamicListing/DynamicList.module';
 import { AccountsExportable } from './AccountsExportable.service';
 import { AccountsImportable } from './AccountsImportable.service';
-import { BulkDeleteAccountsService } from './BulkDeleteAccounts.service';
-import { ValidateBulkDeleteAccountsService } from './ValidateBulkDeleteAccounts.service';
 
 const models = [RegisterTenancyModel(BankAccount)];
 
@@ -42,9 +40,7 @@ const models = [RegisterTenancyModel(BankAccount)];
     GetAccountTransactionsService,
     GetAccountsService,
     AccountsExportable,
-    AccountsImportable,
-    BulkDeleteAccountsService,
-    ValidateBulkDeleteAccountsService,
+    AccountsImportable
   ],
   exports: [
     AccountRepository,

packages/server/src/modules/Accounts/AccountsApplication.service.ts

@@ -10,14 +10,10 @@ import { GetAccount } from './GetAccount.service';
 import { ActivateAccount } from './ActivateAccount.service';
 import { GetAccountTypesService } from './GetAccountTypes.service';
 import { GetAccountTransactionsService } from './GetAccountTransactions.service';
-import { IAccountsTransactionsFilter } from './Accounts.types';
+import { IAccountsFilter, IAccountsTransactionsFilter } from './Accounts.types';
 import { GetAccountsService } from './GetAccounts.service';
 import { IFilterMeta } from '@/interfaces/Model';
 import { GetAccountTransactionResponseDto } from './dtos/GetAccountTransactionResponse.dto';
-import { GetAccountsQueryDto } from './dtos/GetAccountsQuery.dto';
-import { BulkDeleteAccountsService } from './BulkDeleteAccounts.service';
-import { ValidateBulkDeleteAccountsService } from './ValidateBulkDeleteAccounts.service';
-import { ValidateBulkDeleteResponseDto } from '@/common/dtos/BulkDelete.dto';
 
 @Injectable()
 export class AccountsApplication {
@@ -40,9 +36,7 @@ export class AccountsApplication {
     private readonly getAccountService: GetAccount,
     private readonly getAccountTransactionsService: GetAccountTransactionsService,
     private readonly getAccountsService: GetAccountsService,
-    private readonly bulkDeleteAccountsService: BulkDeleteAccountsService,
-    private readonly validateBulkDeleteAccountsService: ValidateBulkDeleteAccountsService,
-  ) { }
+  ) {}
 
   /**
    * Creates a new account.
@@ -114,11 +108,11 @@ export class AccountsApplication {
 
   /**
    * Retrieves the accounts list.
-   * @param {GetAccountsQueryDto} filterDTO - Filter DTO.
+   * @param {IAccountsFilter} filterDTO - Filter DTO.
    * @returns {Promise<{ accounts: IAccountResponse[]; filterMeta: IFilterMeta }>}
    */
   public getAccounts = (
-    filterDTO: GetAccountsQueryDto,
+    filterDTO: Partial<IAccountsFilter>,
   ): Promise<{ accounts: Account[]; filterMeta: IFilterMeta }> => {
     return this.getAccountsService.getAccountsList(filterDTO);
   };
@@ -133,28 +127,4 @@ export class AccountsApplication {
   ): Promise<Array<GetAccountTransactionResponseDto>> => {
     return this.getAccountTransactionsService.getAccountsTransactions(filter);
   };
-
-  /**
-   * Validates which accounts can be deleted in bulk.
-   */
-  public validateBulkDeleteAccounts = (
-    accountIds: number[],
-  ): Promise<ValidateBulkDeleteResponseDto> => {
-    return this.validateBulkDeleteAccountsService.validateBulkDeleteAccounts(
-      accountIds,
-    );
-  };
-
-  /**
-   * Deletes multiple accounts in bulk.
-   */
-  public bulkDeleteAccounts = (
-    accountIds: number[],
-    options?: { skipUndeletable?: boolean },
-  ): Promise<void> => {
-    return this.bulkDeleteAccountsService.bulkDeleteAccounts(
-      accountIds,
-      options,
-    );
-  };
 }

packages/server/src/modules/Accounts/BulkDeleteAccounts.service.ts

@@ -1,41 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { Knex } from 'knex';
-import { PromisePool } from '@supercharge/promise-pool';
-import { castArray, uniq } from 'lodash';
-import { DeleteAccount } from './DeleteAccount.service';
-
-@Injectable()
-export class BulkDeleteAccountsService {
-  constructor(private readonly deleteAccountService: DeleteAccount) { }
-
-  /**
-   * Deletes multiple accounts.
-   * @param {number | Array<number>} accountIds - The account id or ids.
-   * @param {Knex.Transaction} trx - The transaction.
-   */
-  async bulkDeleteAccounts(
-    accountIds: number | Array<number>,
-    options?: { skipUndeletable?: boolean },
-    trx?: Knex.Transaction,
-  ): Promise<void> {
-    const { skipUndeletable = false } = options ?? {};
-    const accountsIds = uniq(castArray(accountIds));
-
-    const results = await PromisePool.withConcurrency(1)
-      .for(accountsIds)
-      .process(async (accountId: number) => {
-        try {
-          await this.deleteAccountService.deleteAccount(accountId);
-        } catch (error) {
-          if (!skipUndeletable) {
-            throw error;
-          }
-        }
-      });
-
-    if (!skipUndeletable && results.errors && results.errors.length > 0) {
-      throw results.errors[0].raw;
-    }
-  }
-}
-

packages/server/src/modules/Accounts/CommandAccountValidators.service.ts

@@ -17,7 +17,7 @@ export class CommandAccountValidators {
     @Inject(Account.name)
     private readonly accountModel: TenantModelProxy<typeof Account>,
     private readonly accountRepository: AccountRepository,
-  ) { }
+  ) {}
 
   /**
    * Throws error if the account was prefined.
@@ -115,7 +115,7 @@ export class CommandAccountValidators {
     accountName: string,
     notAccountId?: number,
   ) {
-    const foundAccount = await this.accountModel()
+    const foundAccount = await this.accountModel
       .query()
       .findOne('name', accountName)
       .onBuild((query) => {

packages/server/src/modules/Accounts/CreateAccount.dto.ts

@@ -1,7 +1,7 @@
-import { IsOptional, ToNumber } from '@/common/decorators/Validators';
 import { ApiProperty } from '@nestjs/swagger';
 import {
   IsString,
+  IsOptional,
   IsInt,
   MinLength,
   MaxLength,
@@ -65,7 +65,7 @@ export class CreateAccountDTO {
   description?: string;
 
   @IsOptional()
-  @ToNumber()
+  @IsInt()
   @ApiProperty({
     description: 'ID of the parent account',
     example: 1,

packages/server/src/modules/Accounts/DeleteAccount.service.ts

@@ -18,7 +18,7 @@ export class DeleteAccount {
     private eventEmitter: EventEmitter2,
     private uow: UnitOfWork,
     private validator: CommandAccountValidators,
-  ) { }
+  ) {}
 
   /**
    * Authorize account delete.
@@ -50,17 +50,10 @@ export class DeleteAccount {
   /**
    * Deletes the account from the storage.
    * @param {number} accountId
-   * @param {Knex.Transaction} trx - Database transaction instance.
    */
-  public deleteAccount = async (
-    accountId: number,
-    trx?: Knex.Transaction,
-  ): Promise<void> => {
+  public deleteAccount = async (accountId: number): Promise<void> => {
     // Retrieve account or not found service error.
-    const oldAccount = await this.accountModel()
-      .query()
-      .findById(accountId)
-      .throwIfNotFound();
+    const oldAccount = await this.accountModel().query().findById(accountId);
 
     // Authorize before delete account.
     await this.authorize(accountId, oldAccount);
@@ -89,6 +82,6 @@ export class DeleteAccount {
         oldAccount,
         trx,
       } as IAccountEventDeletedPayload);
-    }, trx);
+    });
   };
 }

packages/server/src/modules/Accounts/EditAccount.dto.ts

@@ -1,6 +1,11 @@
-import { IsString, MinLength, MaxLength } from 'class-validator';
 import { ApiProperty } from '@nestjs/swagger';
-import { IsOptional, ToNumber } from '@/common/decorators/Validators';
+import {
+  IsString,
+  IsOptional,
+  IsInt,
+  MinLength,
+  MaxLength,
+} from 'class-validator';
 
 export class EditAccountDTO {
   @IsString()
@@ -40,7 +45,7 @@ export class EditAccountDTO {
   description?: string;
 
   @IsOptional()
-  @ToNumber()
+  @IsInt()
   @ApiProperty({
     description: 'The parent account ID of the account',
     example: 1,

packages/server/src/modules/Accounts/EditAccount.service.ts

@@ -17,7 +17,7 @@ export class EditAccount {
 
     @Inject(Account.name)
     private readonly accountModel: TenantModelProxy<typeof Account>,
-  ) { }
+  ) {}
 
   /**
    * Authorize the account editing.
@@ -85,7 +85,8 @@ export class EditAccount {
       // Update the account on the storage.
       const account = await this.accountModel()
         .query(trx)
-        .updateAndFetchById(accountId, { ...accountDTO });
+        .findById(accountId)
+        .updateAndFetch({ ...accountDTO });
 
       // Triggers `onAccountEdited` event.
       // await this.eventEmitter.emitAsync(events.accounts.onEdited, {

packages/server/src/modules/Accounts/GetAccounts.service.ts

@@ -8,7 +8,6 @@ import { Account } from './models/Account.model';
 import { AccountRepository } from './repositories/Account.repository';
 import { IFilterMeta } from '@/interfaces/Model';
 import { TenantModelProxy } from '../System/models/TenantBaseModel';
-import { GetAccountsQueryDto } from './dtos/GetAccountsQuery.dto';
 
 @Injectable()
 export class GetAccountsService {
@@ -19,7 +18,7 @@ export class GetAccountsService {
 
     @Inject(Account.name)
     private readonly accountModel: TenantModelProxy<typeof Account>,
-  ) { }
+  ) {}
 
   /**
    * Retrieve accounts datatable list.
@@ -27,12 +26,12 @@ export class GetAccountsService {
    * @returns {Promise<{ accounts: IAccountResponse[]; filterMeta: IFilterMeta }>}
    */
   public async getAccountsList(
-    filterDto: Partial<GetAccountsQueryDto>,
+    filterDto: Partial<IAccountsFilter>,
   ): Promise<{ accounts: Account[]; filterMeta: IFilterMeta }> {
     const parsedFilterDto = {
       sortOrder: 'desc',
       columnSortBy: 'created_at',
-      onlyInactive: false,
+      inactiveMode: false,
       structure: IAccountsStructureType.Tree,
       ...filterDto,
     };
@@ -49,7 +48,7 @@ export class GetAccountsService {
       .query()
       .onBuild((builder) => {
         dynamicList.buildQuery()(builder);
-        builder.modify('inactiveMode', filterDto.onlyInactive);
+        builder.modify('inactiveMode', filter.inactiveMode);
       });
     const accountsGraph = await this.accountRepository.getDependencyGraph();
 
@@ -59,6 +58,7 @@ export class GetAccountsService {
       new AccountTransformer(),
       { accountsGraph, structure: parsedFilterDto.structure },
     );
+
     return {
       accounts: transformedAccounts,
       filterMeta: dynamicList.getResponseMeta(),

packages/server/src/modules/Accounts/ValidateBulkDeleteAccounts.service.ts

@@ -1,63 +0,0 @@
-import { Injectable, Inject } from '@nestjs/common';
-import { Knex } from 'knex';
-import { TENANCY_DB_CONNECTION } from '../Tenancy/TenancyDB/TenancyDB.constants';
-import { DeleteAccount } from './DeleteAccount.service';
-import { ModelHasRelationsError } from '@/common/exceptions/ModelHasRelations.exception';
-
-@Injectable()
-export class ValidateBulkDeleteAccountsService {
-  constructor(
-    private readonly deleteAccountService: DeleteAccount,
-    @Inject(TENANCY_DB_CONNECTION)
-    private readonly tenantKnex: () => Knex,
-  ) {}
-
-  /**
-   * Validates which accounts from the provided IDs can be deleted.
-   * Uses the actual deleteAccount service to validate, ensuring the same validation logic.
-   * Uses a transaction that is always rolled back to ensure no database changes.
-   * @param {number[]} accountIds - Array of account IDs to validate
-   * @returns {Promise<{deletableCount: number, nonDeletableCount: number, deletableIds: number[], nonDeletableIds: number[]}>}
-   */
-  public async validateBulkDeleteAccounts(accountIds: number[]): Promise<{
-    deletableCount: number;
-    nonDeletableCount: number;
-    deletableIds: number[];
-    nonDeletableIds: number[];
-  }> {
-    const trx = await this.tenantKnex().transaction({
-      isolationLevel: 'read uncommitted',
-    });
-
-    try {
-      const deletableIds: number[] = [];
-      const nonDeletableIds: number[] = [];
-
-      for (const accountId of accountIds) {
-        try {
-          await this.deleteAccountService.deleteAccount(accountId, trx);
-          deletableIds.push(accountId);
-        } catch (error) {
-          if (error instanceof ModelHasRelationsError) {
-            nonDeletableIds.push(accountId);
-          } else {
-            nonDeletableIds.push(accountId);
-          }
-        }
-      }
-
-      await trx.rollback();
-
-      return {
-        deletableCount: deletableIds.length,
-        nonDeletableCount: nonDeletableIds.length,
-        deletableIds,
-        nonDeletableIds,
-      };
-    } catch (error) {
-      await trx.rollback();
-      throw error;
-    }
-  }
-}
-

packages/server/src/modules/Accounts/dtos/GetAccountsQuery.dto.ts

@@ -1,27 +0,0 @@
-import { IsBoolean, IsEnum, IsOptional } from 'class-validator';
-import { ApiPropertyOptional } from '@nestjs/swagger';
-import { Transform } from 'class-transformer';
-import { parseBoolean } from '@/utils/parse-boolean';
-import { IAccountsStructureType } from '../Accounts.types';
-
-export class GetAccountsQueryDto {
-  @ApiPropertyOptional({
-    type: Boolean,
-    description: 'Filter to show only inactive accounts',
-    default: false,
-  })
-  @IsOptional()
-  @IsBoolean()
-  @Transform(({ value }) => parseBoolean(value, false))
-  onlyInactive?: boolean;
-
-  @ApiPropertyOptional({
-    enum: IAccountsStructureType,
-    description: 'Structure type for the accounts list',
-    default: IAccountsStructureType.Tree,
-  })
-  @IsOptional()
-  @IsEnum(IAccountsStructureType)
-  structure?: IAccountsStructureType;
-}
-

packages/server/src/modules/Accounts/models/Account.meta.ts

@@ -156,7 +156,7 @@ export const AccountMeta = {
       minLength: 3,
       maxLength: 6,
       unique: true,
-      importHint: 'account.field.code_hint',
+      importHint: 'Unique number to identify the account.',
     },
     accountType: {
       name: 'account.field.type',

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

@@ -1,7 +1,7 @@
 import { MiddlewareConsumer, Module, RequestMethod } from '@nestjs/common';
 import { ConfigModule, ConfigService } from '@nestjs/config';
 import { EventEmitterModule } from '@nestjs/event-emitter';
-import { APP_GUARD, APP_INTERCEPTOR, APP_PIPE, APP_FILTER } from '@nestjs/core';
+import { APP_GUARD, APP_INTERCEPTOR } from '@nestjs/core';
 import { join } from 'path';
 import { ServeStaticModule } from '@nestjs/serve-static';
 import { RedisModule } from '@liaoliaots/nestjs-redis';
@@ -36,10 +36,6 @@ import { PdfTemplatesModule } from '../PdfTemplate/PdfTemplates.module';
 import { BranchesModule } from '../Branches/Branches.module';
 import { WarehousesModule } from '../Warehouses/Warehouses.module';
 import { SerializeInterceptor } from '@/common/interceptors/serialize.interceptor';
-import { ToJsonInterceptor } from '@/common/interceptors/to-json.interceptor';
-import { ValidationPipe } from '@/common/pipes/ClassValidation.pipe';
-import { ServiceErrorFilter } from '@/common/filters/service-error.filter';
-import { ModelHasRelationsFilter } from '@/common/filters/model-has-relations.filter';
 import { ChromiumlyTenancyModule } from '../ChromiumlyTenancy/ChromiumlyTenancy.module';
 import { CustomersModule } from '../Customers/Customers.module';
 import { VendorsModule } from '../Vendors/Vendors.module';
@@ -238,10 +234,6 @@ import { AppThrottleModule } from './AppThrottle.module';
   ],
   controllers: [AppController],
   providers: [
-    {
-      provide: APP_PIPE,
-      useClass: ValidationPipe,
-    },
     {
       provide: APP_GUARD,
       useClass: ThrottlerGuard,
@@ -250,10 +242,6 @@ import { AppThrottleModule } from './AppThrottle.module';
       provide: APP_INTERCEPTOR,
       useClass: SerializeInterceptor,
     },
-    {
-      provide: APP_INTERCEPTOR,
-      useClass: ToJsonInterceptor,
-    },
     {
       provide: APP_INTERCEPTOR,
       useClass: UserIpInterceptor,
@@ -262,14 +250,6 @@ import { AppThrottleModule } from './AppThrottle.module';
       provide: APP_INTERCEPTOR,
       useClass: ExcludeNullInterceptor,
     },
-    {
-      provide: APP_FILTER,
-      useClass: ServiceErrorFilter,
-    },
-    {
-      provide: APP_FILTER,
-      useClass: ModelHasRelationsFilter,
-    },
     AppService,
   ],
 })

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

@@ -9,27 +9,6 @@ import { ThrottlerStorageRedisService } from '@nest-lab/throttler-storage-redis'
       imports: [ConfigModule],
       inject: [ConfigService],
       useFactory: (configService: ConfigService) => {
-        // Use in-memory storage with very high limits for test environment
-        const isTest = process.env.NODE_ENV === 'test' || process.env.JEST_WORKER_ID !== undefined;
-
-        if (isTest) {
-          return {
-            throttlers: [
-              {
-                name: 'default',
-                ttl: 60000,
-                limit: 1000000, // Effectively disable throttling in tests
-              },
-              {
-                name: 'auth',
-                ttl: 60000,
-                limit: 1000000, // Effectively disable throttling in tests
-              },
-            ],
-            // No storage specified = uses in-memory storage
-          };
-        }
-
         const host = configService.get<string>('redis.host') || 'localhost';
         const port = Number(configService.get<number>('redis.port') || 6379);
         const password = configService.get<string>('redis.password');

packages/server/src/modules/Auth/AuthApiKeys.controllers.ts

@@ -1,4 +1,4 @@
-import { Controller, Post, Param, Get, Put, Body } from '@nestjs/common';
+import { Controller, Post, Param, Get, Put } from '@nestjs/common';
 import { GenerateApiKey } from './commands/GenerateApiKey.service';
 import { GetApiKeysService } from './queries/GetApiKeys.service';
 import {
@@ -8,8 +8,6 @@ import {
   ApiParam,
   ApiExtraModels,
   getSchemaPath,
-  ApiBody,
-  ApiProperty,
 } from '@nestjs/swagger';
 import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 import {
@@ -18,20 +16,6 @@ import {
   ApiKeyListResponseDto,
   ApiKeyListItemDto,
 } from './dtos/ApiKey.dto';
-import { IsString, MaxLength } from 'class-validator';
-import { IsOptional } from '@/common/decorators/Validators';
-
-class GenerateApiKeyDto {
-  @IsOptional()
-  @IsString()
-  @MaxLength(255)
-  @ApiProperty({
-    description: 'Optional name for the API key',
-    required: false,
-    example: 'My API Key',
-  })
-  name?: string;
-}
 
 @Controller('api-keys')
 @ApiTags('Api keys')
@@ -45,18 +29,17 @@ export class AuthApiKeysController {
   constructor(
     private readonly getApiKeysService: GetApiKeysService,
     private readonly generateApiKeyService: GenerateApiKey,
-  ) { }
+  ) {}
 
   @Post('generate')
   @ApiOperation({ summary: 'Generate a new API key' })
-  @ApiBody({ type: GenerateApiKeyDto })
   @ApiResponse({
     status: 201,
     description: 'The generated API key',
     type: ApiKeyResponseDto,
   })
-  async generate(@Body() body: GenerateApiKeyDto) {
-    return this.generateApiKeyService.generate(body.name);
+  async generate() {
+    return this.generateApiKeyService.generate();
   }
 
   @Put(':id/revoke')

packages/server/src/modules/Auth/commands/AuthSignup.service.ts

@@ -16,7 +16,6 @@ import {
 import { defaultTo } from 'ramda';
 import { ERRORS } from '../Auth.constants';
 import { hashPassword } from '../Auth.utils';
-import { ClsService } from 'nestjs-cls';
 
 @Injectable()
 export class AuthSignupService {
@@ -30,7 +29,6 @@ export class AuthSignupService {
     private readonly configService: ConfigService,
     private readonly eventEmitter: EventEmitter2,
     private readonly tenantsManager: TenantsManagerService,
-    private readonly clsService: ClsService,
 
     @Inject(SystemUser.name)
     private readonly systemUserModel: typeof SystemUser,
@@ -72,11 +70,6 @@ export class AuthSignupService {
       tenantId: tenant.id,
       inviteAcceptedAt,
     });
-    // Set the user in the cls service.
-    this.clsService.set('tenantId', user.tenantId);
-    this.clsService.set('userId', user.id);
-    this.clsService.set('organizationId', tenant.organizationId);
-
     // Triggers signed up event.
     await this.eventEmitter.emitAsync(events.auth.signUp, {
       signupDTO,

packages/server/src/modules/Auth/commands/GenerateApiKey.service.ts

@@ -10,15 +10,14 @@ export class GenerateApiKey {
     private readonly tenancyContext: TenancyContext,
     @Inject(ApiKeyModel.name)
     private readonly apiKeyModel: typeof ApiKeyModel,
-  ) { }
+  ) {}
 
   /**
    * Generates a new secure API key for the current tenant and system user.
    * The key is saved in the database and returned (only the key and id for security).
-   * @param {string} name - Optional name for the API key.
    * @returns {Promise<{ key: string; id: number }>} The generated API key and its database id.
    */
-  async generate(name?: string) {
+  async generate() {
     const tenant = await this.tenancyContext.getTenant();
     const user = await this.tenancyContext.getSystemUser();
 
@@ -27,7 +26,6 @@ export class GenerateApiKey {
     // Save the API key to the database
     const apiKeyRecord = await this.apiKeyModel.query().insert({
       key,
-      name,
       tenantId: tenant.id,
       userId: user.id,
       createdAt: new Date(),

packages/server/src/modules/Auth/dtos/ApiKey.dto.ts

@@ -29,12 +29,6 @@ export class ApiKeyListItemDto {
   @ApiProperty({ example: 'My API Key', description: 'API key name' })
   name?: string;
 
-  @ApiProperty({
-    example: 'bc_1234...',
-    description: 'First 8 characters of the API key token',
-  })
-  token: string;
-
   @ApiProperty({
     example: '2024-01-01T00:00:00.000Z',
     description: 'Creation date',

packages/server/src/modules/Auth/queries/GetApiKeys.transformer.ts

@@ -1,16 +1,7 @@
 import { Transformer } from '@/modules/Transformer/Transformer';
 
 export class GetApiKeysTransformer extends Transformer {
-
-  public includeAttributes = (): string[] => {
-    return ['token'];
-  };
-
   public excludeAttributes = (): string[] => {
     return ['tenantId'];
   };
-
-  public token(apiKey) {
-    return apiKey.key ? `${apiKey.key.substring(0, 8)}...` : '';
-  }
 }

packages/server/src/modules/BankingAccounts/BankAccounts.controller.ts

@@ -1,28 +1,16 @@
 import { Controller, Get, Param, Post, Query } from '@nestjs/common';
 import { BankAccountsApplication } from './BankAccountsApplication.service';
-import { ApiOperation, ApiQuery, ApiResponse, ApiTags } from '@nestjs/swagger';
-import { BankAccountsQueryDto } from './dtos/BankAccountsQuery.dto';
-import { BankAccountResponseDto } from './dtos/BankAccountResponse.dto';
+import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
+import { ICashflowAccountsFilter } from './types/BankAccounts.types';
 
 @Controller('banking/accounts')
 @ApiTags('Bank Accounts')
 export class BankAccountsController {
-  constructor(private bankAccountsApplication: BankAccountsApplication) { }
+  constructor(private bankAccountsApplication: BankAccountsApplication) {}
 
   @Get()
   @ApiOperation({ summary: 'Retrieve the bank accounts.' })
-  @ApiQuery({
-    name: 'query',
-    description: 'Query parameters for the bank accounts list.',
-    type: BankAccountsQueryDto,
-    required: false,
-  })
-  @ApiResponse({
-    status: 200,
-    description: 'List of bank accounts retrieved successfully.',
-    type: [BankAccountResponseDto],
-  })
-  getBankAccounts(@Query() filterDto: BankAccountsQueryDto) {
+  getBankAccounts(@Query() filterDto: ICashflowAccountsFilter) {
     return this.bankAccountsApplication.getBankAccounts(filterDto);
   }
 

packages/server/src/modules/BankingAccounts/BankAccountsApplication.service.ts

@@ -6,7 +6,6 @@ import { PauseBankAccountFeeds } from './commands/PauseBankAccountFeeds.service'
 import { GetBankAccountsService } from './queries/GetBankAccounts';
 import { ICashflowAccountsFilter } from './types/BankAccounts.types';
 import { GetBankAccountSummary } from './queries/GetBankAccountSummary';
-import { BankAccountsQueryDto } from './dtos/BankAccountsQuery.dto';
 
 @Injectable()
 export class BankAccountsApplication {
@@ -17,13 +16,13 @@ export class BankAccountsApplication {
     private readonly refreshBankAccountService: RefreshBankAccountService,
     private readonly resumeBankAccountFeedsService: ResumeBankAccountFeedsService,
     private readonly pauseBankAccountFeedsService: PauseBankAccountFeeds,
-  ) { }
+  ) {}
 
   /**
    * Retrieves the bank accounts.
    * @param {ICashflowAccountsFilter} filterDto -
    */
-  getBankAccounts(filterDto: BankAccountsQueryDto) {
+  getBankAccounts(filterDto: ICashflowAccountsFilter) {
     return this.getBankAccountsService.getCashflowAccounts(filterDto);
   }
 

packages/server/src/modules/BankingAccounts/dtos/BankAccountResponse.dto.ts

@@ -1,166 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-
-/**
- * Bank Account Response DTO
- * Based on AccountResponseDto but excludes fields that are filtered out by CashflowAccountTransformer:
- * - predefined
- * - index
- * - accountTypeLabel
- */
-export class BankAccountResponseDto {
-  @ApiProperty({
-    description: 'The unique identifier of the account',
-    example: 1,
-  })
-  id: number;
-
-  @ApiProperty({
-    description: 'The name of the account',
-    example: 'Cash Account',
-  })
-  name: string;
-
-  @ApiProperty({
-    description: 'The slug of the account',
-    example: 'cash-account',
-  })
-  slug: string;
-
-  @ApiProperty({
-    description: 'The code of the account',
-    example: '1001',
-  })
-  code: string;
-
-  @ApiProperty({
-    description: 'The type of the account',
-    example: 'bank',
-  })
-  accountType: string;
-
-  @ApiProperty({
-    description: 'The parent account ID',
-    example: null,
-  })
-  parentAccountId: number | null;
-
-  @ApiProperty({
-    description: 'The currency code of the account',
-    example: 'USD',
-  })
-  currencyCode: string;
-
-  @ApiProperty({
-    description: 'Whether the account is active',
-    example: true,
-  })
-  active: boolean;
-
-  @ApiProperty({
-    description: 'The bank balance of the account',
-    example: 5000.0,
-  })
-  bankBalance: number;
-
-  @ApiProperty({
-    description: 'The formatted bank balance',
-    example: '$5,000.00',
-  })
-  bankBalanceFormatted: string;
-
-  @ApiProperty({
-    description: 'The last feeds update timestamp',
-    example: '2024-03-20T10:30:00Z',
-  })
-  lastFeedsUpdatedAt: string | Date | null;
-
-  @ApiProperty({
-    description: 'The formatted last feeds update timestamp',
-    example: 'Mar 20, 2024 10:30 AM',
-  })
-  lastFeedsUpdatedAtFormatted: string;
-
-  @ApiProperty({
-    description: 'The last feeds updated from now (relative time)',
-    example: '2 hours ago',
-  })
-  lastFeedsUpdatedFromNow: string;
-
-  @ApiProperty({
-    description: 'The amount of the account',
-    example: 5000.0,
-  })
-  amount: number;
-
-  @ApiProperty({
-    description: 'The formatted amount',
-    example: '$5,000.00',
-  })
-  formattedAmount: string;
-
-  @ApiProperty({
-    description: 'The Plaid item ID',
-    example: 'plaid-item-123',
-  })
-  plaidItemId: string;
-
-  @ApiProperty({
-    description: 'The Plaid account ID',
-    example: 'plaid-account-456',
-  })
-  plaidAccountId: string | null;
-
-  @ApiProperty({
-    description: 'Whether the feeds are active',
-    example: true,
-  })
-  isFeedsActive: boolean;
-
-  @ApiProperty({
-    description: 'Whether the account is syncing owner',
-    example: true,
-  })
-  isSyncingOwner: boolean;
-
-  @ApiProperty({
-    description: 'Whether the feeds are paused',
-    example: false,
-  })
-  isFeedsPaused: boolean;
-
-  @ApiProperty({
-    description: 'The account normal',
-    example: 'debit',
-  })
-  accountNormal: string;
-
-  @ApiProperty({
-    description: 'The formatted account normal',
-    example: 'Debit',
-  })
-  accountNormalFormatted: string;
-
-  @ApiProperty({
-    description: 'The flatten name with all dependant accounts names',
-    example: 'Assets: Cash Account',
-  })
-  flattenName: string;
-
-  @ApiProperty({
-    description: 'The account level in the hierarchy',
-    example: 2,
-  })
-  accountLevel?: number;
-
-  @ApiProperty({
-    description: 'The creation timestamp',
-    example: '2024-03-20T10:00:00Z',
-  })
-  createdAt: Date;
-
-  @ApiProperty({
-    description: 'The update timestamp',
-    example: '2024-03-20T10:30:00Z',
-  })
-  updatedAt: Date;
-}

packages/server/src/modules/BankingAccounts/dtos/BankAccountsQuery.dto.ts

@@ -1,107 +0,0 @@
-import { ApiPropertyOptional } from '@nestjs/swagger';
-import { Transform } from 'class-transformer';
-import { IsArray, IsBoolean, IsEnum, IsInt, IsOptional, IsString, Min } from 'class-validator';
-import { ToNumber } from '@/common/decorators/Validators';
-import { IFilterRole, ISortOrder } from '@/modules/DynamicListing/DynamicFilter/DynamicFilter.types';
-import { parseBoolean } from '@/utils/parse-boolean';
-
-export class BankAccountsQueryDto {
-  @ApiPropertyOptional({
-    description: 'Custom view ID',
-    type: Number,
-    example: 1,
-  })
-  @IsOptional()
-  @ToNumber()
-  @IsInt()
-  customViewId?: number;
-
-  @ApiPropertyOptional({
-    description: 'Filter roles array',
-    type: Array,
-    isArray: true,
-  })
-  @IsArray()
-  @IsOptional()
-  filterRoles?: IFilterRole[];
-
-  @ApiPropertyOptional({
-    description: 'Column to sort by',
-    type: String,
-    example: 'created_at',
-  })
-  @IsOptional()
-  @IsString()
-  columnSortBy?: string;
-
-  @ApiPropertyOptional({
-    description: 'Sort order',
-    enum: ISortOrder,
-    example: ISortOrder.DESC,
-  })
-  @IsOptional()
-  @IsEnum(ISortOrder)
-  sortOrder?: string;
-
-  @ApiPropertyOptional({
-    description: 'Stringified filter roles',
-    type: String,
-    example: '{"fieldKey":"status","value":"active"}',
-  })
-  @IsOptional()
-  @IsString()
-  stringifiedFilterRoles?: string;
-
-  @ApiPropertyOptional({
-    description: 'Search keyword',
-    type: String,
-    example: 'bank account',
-  })
-  @IsOptional()
-  @IsString()
-  searchKeyword?: string;
-
-  @ApiPropertyOptional({
-    description: 'View slug',
-    type: String,
-    example: 'active-accounts',
-  })
-  @IsOptional()
-  @IsString()
-  viewSlug?: string;
-
-  @ApiPropertyOptional({
-    description: 'Page number',
-    type: Number,
-    example: 1,
-    minimum: 1,
-  })
-  @IsOptional()
-  @ToNumber()
-  @IsInt()
-  @Min(1)
-  page?: number;
-
-  @ApiPropertyOptional({
-    description: 'Page size',
-    type: Number,
-    example: 25,
-    minimum: 1,
-  })
-  @IsOptional()
-  @ToNumber()
-  @IsInt()
-  @Min(1)
-  pageSize?: number;
-
-  @ApiPropertyOptional({
-    description: 'Include inactive accounts',
-    type: Boolean,
-    example: false,
-    default: false,
-  })
-  @IsOptional()
-  @Transform(({ value }) => parseBoolean(value, false))
-  @IsBoolean()
-  inactiveMode?: boolean;
-}

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

@@ -6,8 +6,6 @@ import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 import { ICashflowAccountsFilter } from '../types/BankAccounts.types';
 import { TransformerInjectable } from '@/modules/Transformer/TransformerInjectable.service';
 import { DynamicListService } from '@/modules/DynamicListing/DynamicList.service';
-import { BankAccountsQueryDto } from '../dtos/BankAccountsQuery.dto';
-import { IDynamicListFilter } from '@/modules/DynamicListing/DynamicFilter/DynamicFilter.types';
 
 @Injectable()
 export class GetBankAccountsService {
@@ -17,14 +15,14 @@ export class GetBankAccountsService {
 
     @Inject(Account.name)
     private readonly accountModel: TenantModelProxy<typeof Account>,
-  ) { }
+  ) {}
 
   /**
    * Retrieve the cash flow accounts.
    * @param {ICashflowAccountsFilter} filterDTO - Filter DTO.
    * @returns {ICashflowAccount[]}
    */
-  public async getCashflowAccounts(filterDTO: BankAccountsQueryDto) {
+  public async getCashflowAccounts(filterDTO: ICashflowAccountsFilter) {
     const _filterDto = {
       sortOrder: 'desc',
       columnSortBy: 'created_at',
@@ -32,14 +30,12 @@ export class GetBankAccountsService {
       ...filterDTO,
     };
     // Parsees accounts list filter DTO.
-    const filter = this.dynamicListService.parseStringifiedFilter<BankAccountsQueryDto>(
-      _filterDto,
-    );
+    const filter = this.dynamicListService.parseStringifiedFilter(_filterDto);
 
     // Dynamic list service.
     const dynamicList = await this.dynamicListService.dynamicList(
       this.accountModel(),
-      filter as IDynamicListFilter,
+      filter,
     );
     // Retrieve accounts model based on the given query.
     const accounts = await this.accountModel()

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

@@ -1,7 +1,7 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { Knex } from 'knex';
 import * as yup from 'yup';
-import * as uniqid from 'uniqid';
+import uniqid from 'uniqid';
 import { Importable } from '../../Import/Importable';
 import { CreateUncategorizedTransactionService } from './CreateUncategorizedTransaction.service';
 import { ImportableContext } from '../../Import/interfaces';
@@ -9,10 +9,8 @@ import { BankTransactionsSampleData } from '../../BankingTransactions/constants'
 import { Account } from '@/modules/Accounts/models/Account.model';
 import { CreateUncategorizedTransactionDTO } from '../types/BankingCategorize.types';
 import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
-import { ImportableService } from '../../Import/decorators/Import.decorator';
-import { UncategorizedBankTransaction } from '../../BankingTransactions/models/UncategorizedBankTransaction';
+
 @Injectable()
-@ImportableService({ name: UncategorizedBankTransaction.name })
 export class UncategorizedTransactionsImportable extends Importable {
   constructor(
     private readonly createUncategorizedTransaction: CreateUncategorizedTransactionService,

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

@@ -1,5 +1,5 @@
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
-import { Body, Controller, Get, Param, Patch, Post, Query } from '@nestjs/common';
+import { Body, Controller, Get, Param, Post, Query } from '@nestjs/common';
 import { BankingMatchingApplication } from './BankingMatchingApplication';
 import { GetMatchedTransactionsFilter } from './types';
 import { MatchBankTransactionDto } from './dtos/MatchBankTransaction.dto';
@@ -34,7 +34,7 @@ export class BankingMatchingController {
     );
   }
 
-  @Patch('/unmatch/:uncategorizedTransactionId')
+  @Post('/unmatch/:uncategorizedTransactionId')
   @ApiOperation({ summary: 'Unmatch the given uncategorized transaction.' })
   async unmatchMatchedTransaction(
     @Param('uncategorizedTransactionId') uncategorizedTransactionId: number,

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

@@ -1,6 +1,6 @@
 import * as moment from 'moment';
 import * as R from 'ramda';
-import { isEmpty, round, sumBy } from 'lodash';
+import { isEmpty, sumBy } from 'lodash';
 import { ERRORS, MatchedTransactionPOJO } from './types';
 import { ServiceError } from '../Items/ServiceError';
 
@@ -22,24 +22,18 @@ export const sortClosestMatchTransactions = (
 };
 
 export const sumMatchTranasctions = (transactions: Array<any>) => {
-  const total = transactions.reduce(
-    (sum, item) => {
-      const amount = parseFloat(item.amount) || 0;
-      const multiplier = item.transactionNormal === 'debit' ? 1 : -1;
-      return sum + multiplier * amount;
-    },
+  return transactions.reduce(
+    (total, item) =>
+      total +
+      (item.transactionNormal === 'debit' ? 1 : -1) * parseFloat(item.amount),
     0
   );
-  // Round to 2 decimal places to avoid floating-point precision issues
-  return round(total, 2);
 };
 
 export const sumUncategorizedTransactions = (
   uncategorizedTransactions: Array<any>
 ) => {
-  const total = sumBy(uncategorizedTransactions, 'amount');
-  // Round to 2 decimal places to avoid floating-point precision issues
-  return round(total, 2);
+  return sumBy(uncategorizedTransactions, 'amount');
 };
 
 export const validateUncategorizedTransactionsNotMatched = (

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

@@ -34,7 +34,7 @@ export class MatchBankTransactions {
     private readonly uncategorizedBankTransactionModel: TenantModelProxy<
       typeof UncategorizedBankTransaction
     >,
-  ) { }
+  ) {}
 
   /**
    * Validates the match bank transactions DTO.
@@ -100,10 +100,7 @@ export class MatchBankTransactions {
     );
     // Validates the total given matching transcations whether is not equal
     // uncategorized transaction amount.
-    // Use tolerance-based comparison to handle floating-point precision issues
-    const tolerance = 0.01; // Allow 0.01 difference for floating-point precision
-    const difference = Math.abs(totalUncategorizedTransactions - totalMatchedTranasctions);
-    if (difference > tolerance) {
+    if (totalUncategorizedTransactions !== totalMatchedTranasctions) {
       throw new ServiceError(ERRORS.TOTAL_MATCHING_TRANSACTIONS_INVALID);
     }
   }

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

@@ -12,30 +12,24 @@ export class MatchTransactionsTypes {
   private static registry: MatchTransactionsTypesRegistry;
 
   /**
-   * Constructor method.
+   * Consttuctor method.
    */
-  constructor(
-    private readonly getMatchedInvoicesService: GetMatchedTransactionsByInvoices,
-    private readonly getMatchedBillsService: GetMatchedTransactionsByBills,
-    private readonly getMatchedExpensesService: GetMatchedTransactionsByExpenses,
-    private readonly getMatchedManualJournalsService: GetMatchedTransactionsByManualJournals,
-    private readonly getMatchedCashflowService: GetMatchedTransactionsByCashflow,
-  ) {
+  constructor() {
     this.boot();
   }
 
   get registered() {
     return [
-      { type: 'SaleInvoice', service: this.getMatchedInvoicesService },
-      { type: 'Bill', service: this.getMatchedBillsService },
-      { type: 'Expense', service: this.getMatchedExpensesService },
+      { type: 'SaleInvoice', service: GetMatchedTransactionsByInvoices },
+      { type: 'Bill', service: GetMatchedTransactionsByBills },
+      { type: 'Expense', service: GetMatchedTransactionsByExpenses },
       {
         type: 'ManualJournal',
-        service: this.getMatchedManualJournalsService,
+        service: GetMatchedTransactionsByManualJournals,
       },
       {
         type: 'CashflowTransaction',
-        service: this.getMatchedCashflowService,
+        service: GetMatchedTransactionsByCashflow,
       },
     ];
   }
@@ -56,13 +50,14 @@ export class MatchTransactionsTypes {
    * Boots all the registered importables.
    */
   public boot() {
-    const instance = MatchTransactionsTypesRegistry.getInstance();
+    if (!MatchTransactionsTypes.registry) {
+      const instance = MatchTransactionsTypesRegistry.getInstance();
 
-    // Always register services to ensure they're available
-    this.registered.forEach((registered) => {
-      instance.register(registered.type, registered.service);
-    });
-
-    MatchTransactionsTypes.registry = instance;
+      this.registered.forEach((registered) => {
+        // const serviceInstanace = Container.get(registered.service);
+        // instance.register(registered.type, serviceInstanace);
+      });
+      MatchTransactionsTypes.registry = instance;
+    }
   }
 }

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

@@ -83,4 +83,4 @@ const models = [
     CreateBankTransactionService
   ],
 })
-export class BankingTransactionsModule { }
+export class BankingTransactionsModule {}

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

@@ -1,4 +1,4 @@
-import { Transform, Type } from 'class-transformer';
+import { Type } from 'class-transformer';
 import {
   IsBoolean,
   IsEnum,
@@ -7,7 +7,6 @@ import {
   IsPositive,
 } from 'class-validator';
 import { ApiPropertyOptional } from '@nestjs/swagger';
-import { parseBoolean } from '@/utils/parse-boolean';
 
 export class NumberFormatQueryDto {
   @ApiPropertyOptional({
@@ -25,7 +24,6 @@ export class NumberFormatQueryDto {
     example: false,
   })
   @IsBoolean()
-  @Transform(({ value }) => parseBoolean(value, false))
   @IsOptional()
   readonly divideOn1000: boolean;
 
@@ -34,7 +32,6 @@ export class NumberFormatQueryDto {
     example: true,
   })
   @IsBoolean()
-  @Transform(({ value }) => parseBoolean(value, false))
   @IsOptional()
   readonly showZero: boolean;
 

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

@@ -1,72 +0,0 @@
-export const UncategorizedBankTransactionMeta = {
-  defaultFilterField: 'createdAt',
-  defaultSort: {
-    sortOrder: 'DESC',
-    sortField: 'created_at',
-  },
-  importable: true,
-  fields: {
-    date: {
-      name: 'Date',
-      column: 'date',
-      fieldType: 'date',
-    },
-    payee: {
-      name: 'Payee',
-      column: 'payee',
-      fieldType: 'text',
-    },
-    description: {
-      name: 'Description',
-      column: 'description',
-      fieldType: 'text',
-    },
-    referenceNo: {
-      name: 'Reference No.',
-      column: 'reference_no',
-      fieldType: 'text',
-    },
-    amount: {
-      name: 'Amount',
-      column: 'Amount',
-      fieldType: 'numeric',
-      required: true,
-    },
-    account: {
-      name: 'Account',
-      column: 'account_id',
-      fieldType: 'relation',
-      to: { model: 'Account', to: 'id' },
-    },
-    createdAt: {
-      name: 'Created At',
-      column: 'createdAt',
-      fieldType: 'date',
-      importable: false,
-    },
-  },
-  fields2: {
-    date: {
-      name: 'Date',
-      fieldType: 'date',
-      required: true,
-    },
-    payee: {
-      name: 'Payee',
-      fieldType: 'text',
-    },
-    description: {
-      name: 'Description',
-      fieldType: 'text',
-    },
-    referenceNo: {
-      name: 'Reference No.',
-      fieldType: 'text',
-    },
-    amount: {
-      name: 'Amount',
-      fieldType: 'number',
-      required: true,
-    },
-  },
-};

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

@@ -2,10 +2,7 @@
 import * as moment from 'moment';
 import { Model } from 'objection';
 import { TenantBaseModel } from '@/modules/System/models/TenantBaseModel';
-import { UncategorizedBankTransactionMeta } from './UncategorizedBankTransaction.meta';
-import { InjectModelMeta } from '@/modules/Tenancy/TenancyModels/decorators/InjectModelMeta.decorator';
 
-@InjectModelMeta(UncategorizedBankTransactionMeta)
 export class UncategorizedBankTransaction extends TenantBaseModel {
   readonly amount!: number;
   readonly date!: Date | string;

packages/server/src/modules/BankingTransactionsExclude/commands/UnexcludeBankTransaction.service.ts

@@ -4,8 +4,8 @@ import {
   validateTransactionShouldBeExcluded,
 } from './utils';
 import {
-  IBankTransactionUnexcludedEventPayload,
-  IBankTransactionUnexcludingEventPayload,
+  IBankTransactionExcludedEventPayload,
+  IBankTransactionExcludingEventPayload,
 } from '../types/BankTransactionsExclude.types';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { Inject, Injectable } from '@nestjs/common';
@@ -24,7 +24,7 @@ export class UnexcludeBankTransactionService {
     private readonly uncategorizedBankTransactionModel: TenantModelProxy<
       typeof UncategorizedBankTransaction
     >,
-  ) { }
+  ) {}
 
   /**
    * Marks the given bank transaction as excluded.
@@ -50,8 +50,7 @@ export class UnexcludeBankTransactionService {
     return this.uow.withTransaction(async (trx: Knex.Transaction) => {
       await this.eventEmitter.emitAsync(events.bankTransactions.onUnexcluding, {
         uncategorizedTransactionId,
-        trx,
-      } as IBankTransactionUnexcludingEventPayload);
+      } as IBankTransactionExcludingEventPayload);
 
       await this.uncategorizedBankTransactionModel()
         .query(trx)
@@ -62,8 +61,7 @@ export class UnexcludeBankTransactionService {
 
       await this.eventEmitter.emitAsync(events.bankTransactions.onUnexcluded, {
         uncategorizedTransactionId,
-        trx,
-      } as IBankTransactionUnexcludedEventPayload);
+      } as IBankTransactionExcludedEventPayload);
     });
   }
 }

packages/server/src/modules/BankingTransactionsExclude/subscribers/DecrementUncategorizedTransactionOnExclude.ts

@@ -19,7 +19,7 @@ export class DecrementUncategorizedTransactionOnExclude {
     private readonly uncategorizedBankTransaction: TenantModelProxy<
       typeof UncategorizedBankTransaction
     >,
-  ) { }
+  ) {}
 
   /**
    * Validates the cashflow transaction whether matched with bank transaction on deleting.
@@ -50,7 +50,7 @@ export class DecrementUncategorizedTransactionOnExclude {
     trx,
   }: IBankTransactionUnexcludedEventPayload) {
     const transaction = await this.uncategorizedBankTransaction()
-      .query(trx)
+      .query()
       .findById(uncategorizedTransactionId);
     //
     await this.account()

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

@@ -2,11 +2,9 @@ import { forwardRef, Module } from '@nestjs/common';
 import { TransactionLandedCostEntriesService } from './TransactionLandedCostEntries.service';
 import { AllocateLandedCostService } from './commands/AllocateLandedCost.service';
 import { LandedCostGLEntriesSubscriber } from './commands/LandedCostGLEntries.subscriber';
-import { LandedCostGLEntriesService } from './commands/LandedCostGLEntries.service';
+// import { LandedCostGLEntries } from './commands/LandedCostGLEntries.service';
 import { LandedCostSyncCostTransactions } from './commands/LandedCostSyncCostTransactions.service';
-import { LedgerModule } from '../Ledger/Ledger.module';
 import { LandedCostSyncCostTransactionsSubscriber } from './commands/LandedCostSyncCostTransactions.subscriber';
-import { LandedCostInventoryTransactionsSubscriber } from './commands/LandedCostInventoryTransactions.subscriber';
 import { BillAllocatedLandedCostTransactions } from './commands/BillAllocatedLandedCostTransactions.service';
 import { BillAllocateLandedCostController } from './LandedCost.controller';
 import { RevertAllocatedLandedCost } from './commands/RevertAllocatedLandedCost.service';
@@ -18,12 +16,12 @@ import { ExpenseLandedCost } from './commands/ExpenseLandedCost.service';
 import { BillLandedCost } from './commands/BillLandedCost.service';
 
 @Module({
-  imports: [forwardRef(() => InventoryCostModule), LedgerModule],
+  imports: [forwardRef(() => InventoryCostModule)],
   providers: [
     AllocateLandedCostService,
     TransactionLandedCostEntriesService,
     BillAllocatedLandedCostTransactions,
-    LandedCostGLEntriesService,
+    LandedCostGLEntriesSubscriber,
     TransactionLandedCost,
     BillLandedCost,
     ExpenseLandedCost,
@@ -31,8 +29,6 @@ import { BillLandedCost } from './commands/BillLandedCost.service';
     RevertAllocatedLandedCost,
     LandedCostInventoryTransactions,
     LandedCostTranasctions,
-    LandedCostGLEntriesSubscriber,
-    LandedCostInventoryTransactionsSubscriber,
     LandedCostSyncCostTransactionsSubscriber,
   ],
   exports: [TransactionLandedCostEntriesService],

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

@@ -25,7 +25,7 @@ export class BillAllocateLandedCostController {
     private billAllocatedCostTransactions: BillAllocatedLandedCostTransactions,
     private revertAllocatedLandedCost: RevertAllocatedLandedCost,
     private landedCostTransactions: LandedCostTranasctions,
-  ) { }
+  ) {}
 
   @Get('/transactions')
   @ApiOperation({ summary: 'Get landed cost transactions' })

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

@@ -23,9 +23,7 @@ export class AllocateLandedCostService extends BaseLandedCostService {
     private readonly billModel: TenantModelProxy<typeof Bill>,
 
     @Inject(BillLandedCost.name)
-    protected readonly billLandedCostModel: TenantModelProxy<
-      typeof BillLandedCost
-    >,
+    protected readonly billLandedCostModel: TenantModelProxy<typeof BillLandedCost>
   ) {
     super();
   }
@@ -56,8 +54,7 @@ export class AllocateLandedCostService extends BaseLandedCostService {
     const amount = this.getAllocateItemsCostTotal(allocateCostDTO);
 
     // Retrieve the purchase invoice or throw not found error.
-    const bill = await this.billModel()
-      .query()
+    const bill = await this.billModel().query()
       .findById(billId)
       .withGraphFetched('entries')
       .throwIfNotFound();
@@ -92,9 +89,8 @@ export class AllocateLandedCostService extends BaseLandedCostService {
     // unit-of-work eniverment.
     return this.uow.withTransaction(async (trx: Knex.Transaction) => {
       // Save the bill landed cost model.
-      const billLandedCost = await this.billLandedCostModel()
-        .query(trx)
-        .insertGraph(billLandedCostObj);
+      const billLandedCost =
+        await BillLandedCost.query(trx).insertGraph(billLandedCostObj);
       // Triggers `onBillLandedCostCreated` event.
       await this.eventPublisher.emitAsync(events.billLandedCost.onCreated, {
         bill,
@@ -107,5 +103,5 @@ export class AllocateLandedCostService extends BaseLandedCostService {
 
       return billLandedCost;
     });
-  }
+  };
 }

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

@@ -21,7 +21,7 @@ export class BillAllocatedLandedCostTransactions {
     private readonly billLandedCostModel: TenantModelProxy<
       typeof BillLandedCost
     >,
-  ) { }
+  ) {}
 
   /**
    * Retrieve the bill associated landed cost transactions.
@@ -77,13 +77,6 @@ export class BillAllocatedLandedCostTransactions {
       transaction.fromTransactionType,
       transaction,
     );
-    const allocationMethodFormattedKey = transaction.allocationMethodFormatted;
-    const allocationMethodFormatted = allocationMethodFormattedKey
-      ? this.i18nService.t(allocationMethodFormattedKey, {
-        defaultValue: allocationMethodFormattedKey,
-      })
-      : '';
-
     return {
       formattedAmount: formatNumber(transaction.amount, {
         currencyCode: transaction.currencyCode,
@@ -91,14 +84,12 @@ export class BillAllocatedLandedCostTransactions {
       ...omit(transaction, [
         'allocatedFromBillEntry',
         'allocatedFromExpenseEntry',
-        'allocationMethodFormatted',
       ]),
       name,
       description,
       formattedLocalAmount: formatNumber(transaction.localAmount, {
         currencyCode: 'USD',
       }),
-      allocationMethodFormatted,
     };
   };
 

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

@@ -1,188 +1,236 @@
-import { Knex } from 'knex';
-import { Inject, Injectable } from '@nestjs/common';
-import * as moment from 'moment';
-import { BaseLandedCostService } from '../BaseLandedCost.service';
-import { BillLandedCost } from '../models/BillLandedCost';
-import { Bill } from '@/modules/Bills/models/Bill';
-import { BillLandedCostEntry } from '../models/BillLandedCostEntry';
-import { ILedgerEntry } from '@/modules/Ledger/types/Ledger.types';
-import { Ledger } from '@/modules/Ledger/Ledger';
-import { LedgerStorageService } from '@/modules/Ledger/LedgerStorage.service';
-import { AccountNormal } from '@/modules/Accounts/Accounts.types';
-import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
+// 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';
+// import { AccountNormal } from '@/interfaces/Account';
+// import { ILandedCostTransactionEntry } from '../types/BillLandedCosts.types';
 
-@Injectable()
-export class LandedCostGLEntriesService extends BaseLandedCostService {
-  constructor(
-    private readonly ledgerStorage: LedgerStorageService,
+// @Injectable()
+// export class LandedCostGLEntries extends BaseLandedCostService {
+//   constructor(
+//     private readonly journalService: JournalPosterService,
+//     private readonly ledgerRepository: LedgerRepository,
 
-    @Inject(BillLandedCost.name)
-    protected readonly billLandedCostModel: TenantModelProxy<
-      typeof BillLandedCost
-    >,
-  ) {
-    super();
-  }
+//     @Inject(BillLandedCost.name)
+//     private readonly billLandedCostModel: TenantModelProxy<typeof BillLandedCost>,
+//   ) {
+//     super();
+//   }
 
-  /**
-   * Retrieves the landed cost GL common entry.
-   */
-  private getLandedCostGLCommonEntry(
-    bill: Bill,
-    allocatedLandedCost: BillLandedCost,
-  ) {
-    return {
-      date: moment(bill.billDate).format('YYYY-MM-DD'),
-      currencyCode: allocatedLandedCost.currencyCode,
-      exchangeRate: allocatedLandedCost.exchangeRate,
+//   /**
+//    * 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,
+//       transactionType: 'LandedCost',
+//       transactionId: allocatedLandedCost.id,
+//       transactionNumber: bill.billNumber,
 
-      referenceNumber: bill.referenceNo,
+//       referenceNumber: bill.referenceNo,
 
-      branchId: bill.branchId,
-      projectId: bill.projectId,
+//       credit: 0,
+//       debit: 0,
+//     };
+//   };
 
-      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 inventory entry for an allocated item.
-   */
-  private getLandedCostGLInventoryEntry(
-    bill: Bill,
-    allocatedLandedCost: BillLandedCost,
-    allocatedEntry: BillLandedCostEntry,
-    index: number,
-  ): ILedgerEntry {
-    const commonEntry = this.getLandedCostGLCommonEntry(
-      bill,
-      allocatedLandedCost,
-    );
-    const itemEntry = (
-      allocatedEntry as BillLandedCostEntry & {
-        itemEntry?: {
-          item?: { type?: string; inventoryAccountId?: number };
-          costAccountId?: number;
-          itemId?: number;
-        };
-      }
-    ).itemEntry;
-    const item = itemEntry?.item;
-    const isInventory = item && ['inventory'].indexOf(item.type) !== -1;
-    const accountId = isInventory
-      ? item?.inventoryAccountId
-      : itemEntry?.costAccountId;
+//   /**
+//    * 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,
+//     };
+//   };
 
-    if (!accountId) {
-      throw new Error(
-        `Cannot determine GL account for landed cost allocate entry (entryId: ${allocatedEntry.entryId})`,
-      );
-    }
+//   /**
+//    * 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: ILandedCostTransactionEntry,
+//       allocatedEntry: BillLandedCostEntry
+//     ): ILedgerEntry[] => {
+//       const inventoryEntry = this.getLandedCostGLInventoryEntry(
+//         bill,
+//         allocatedLandedCost,
+//         allocatedEntry
+//       );
+//       const costEntry = this.getLandedCostGLCostEntry(
+//         bill,
+//         allocatedLandedCost,
+//         fromTransactionEntry
+//       );
+//       return [inventoryEntry, costEntry];
+//     }
+//   );
 
-    const localAmount =
-      allocatedEntry.cost * (allocatedLandedCost.exchangeRate || 1);
+//   /**
+//    * Compose the landed cost GL entries.
+//    * @param {BillLandedCost} allocatedLandedCost
+//    * @param {Bill} bill
+//    * @param {ILandedCostTransactionEntry} fromTransactionEntry
+//    * @returns {ILedgerEntry[]}
+//    */
+//   public getLandedCostGLEntries = (
+//     allocatedLandedCost: BillLandedCost,
+//     bill: Bill,
+//     fromTransactionEntry: ILandedCostTransactionEntry
+//   ): ILedgerEntry[] => {
+//     const getEntry = this.getLandedCostGLAllocateEntry(
+//       bill,
+//       allocatedLandedCost,
+//       fromTransactionEntry
+//     );
+//     return allocatedLandedCost.allocateEntries.map(getEntry).flat();
+//   };
 
-    return {
-      ...commonEntry,
-      debit: localAmount,
-      accountId,
-      index: index + 1,
-      indexGroup: 10,
-      itemId: itemEntry?.itemId,
-      accountNormal: AccountNormal.DEBIT,
-    };
-  }
+//   /**
+//    * Retrieves the landed cost GL ledger.
+//    * @param {BillLandedCost} allocatedLandedCost
+//    * @param {Bill} bill
+//    * @param {ILandedCostTransactionEntry} fromTransactionEntry
+//    * @returns {ILedger}
+//    */
+//   public getLandedCostLedger = (
+//     allocatedLandedCost: BillLandedCost,
+//     bill: Bill,
+//     fromTransactionEntry: ILandedCostTransactionEntry
+//   ): ILedger => {
+//     const entries = this.getLandedCostGLEntries(
+//       allocatedLandedCost,
+//       bill,
+//       fromTransactionEntry
+//     );
+//     return new Ledger(entries);
+//   };
 
-  /**
-   * Retrieves the landed cost GL cost entry (credit to cost account).
-   */
-  private getLandedCostGLCostEntry(
-    bill: Bill,
-    allocatedLandedCost: BillLandedCost,
-  ): ILedgerEntry {
-    const commonEntry = this.getLandedCostGLCommonEntry(
-      bill,
-      allocatedLandedCost,
-    );
+//   /**
+//    * 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);
+//   };
 
-    return {
-      ...commonEntry,
-      credit: allocatedLandedCost.localAmount,
-      accountId: allocatedLandedCost.costAccountId,
-      index: 1,
-      indexGroup: 20,
-      accountNormal: AccountNormal.CREDIT,
-    };
-  }
+//   /**
+//    * 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');
 
-  /**
-   * Composes the landed cost GL entries.
-   */
-  public getLandedCostGLEntries(
-    allocatedLandedCost: BillLandedCost,
-    bill: Bill,
-  ): ILedgerEntry[] {
-    const inventoryEntries = allocatedLandedCost.allocateEntries.map(
-      (allocatedEntry, index) =>
-        this.getLandedCostGLInventoryEntry(
-          bill,
-          allocatedLandedCost,
-          allocatedEntry,
-          index,
-        ),
-    );
-    const costEntry = this.getLandedCostGLCostEntry(bill, allocatedLandedCost);
+//     // 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
+//     );
+//   };
 
-    return [...inventoryEntries, costEntry];
-  }
-
-  /**
-   * Retrieves the landed cost GL ledger.
-   */
-  public getLandedCostLedger(
-    allocatedLandedCost: BillLandedCost,
-    bill: Bill,
-  ): Ledger {
-    const entries = this.getLandedCostGLEntries(allocatedLandedCost, bill);
-    return new Ledger(entries);
-  }
-
-  /**
-   * Generates and writes GL entries of the given landed cost.
-   */
-  public createLandedCostGLEntries = async (
-    billLandedCostId: number,
-    trx?: Knex.Transaction,
-  ) => {
-    const allocatedLandedCost = await this.billLandedCostModel()
-      .query(trx)
-      .findById(billLandedCostId)
-      .withGraphFetched('bill')
-      .withGraphFetched('allocateEntries.itemEntry.item');
-
-    if (!allocatedLandedCost?.bill) {
-      throw new Error('BillLandedCost or associated Bill not found');
-    }
-
-    const ledger = this.getLandedCostLedger(
-      allocatedLandedCost,
-      allocatedLandedCost.bill,
-    );
-    await this.ledgerStorage.commit(ledger, trx);
-  };
-
-  /**
-   * Reverts GL entries of the given allocated landed cost transaction.
-   */
-  public revertLandedCostGLEntries = async (
-    landedCostId: number,
-    trx?: Knex.Transaction,
-  ) => {
-    await this.ledgerStorage.deleteByReference(landedCostId, 'LandedCost', 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

@@ -3,15 +3,14 @@ import {
   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';
-import { LandedCostGLEntriesService } from './LandedCostGLEntries.service';
 
 @Injectable()
 export class LandedCostGLEntriesSubscriber {
-  constructor(
-    private readonly landedCostGLEntries: LandedCostGLEntriesService,
-  ) {}
+  constructor() // private readonly billLandedCostGLEntries: LandedCostGLEntries,
+  {}
 
   /**
    * Writes GL entries once landed cost transaction created.
@@ -22,10 +21,10 @@ export class LandedCostGLEntriesSubscriber {
     billLandedCost,
     trx,
   }: IAllocatedLandedCostCreatedPayload) {
-    await this.landedCostGLEntries.createLandedCostGLEntries(
-      billLandedCost.id,
-      trx,
-    );
+    // await this.billLandedCostGLEntries.createLandedCostGLEntries(
+    //   billLandedCost.id,
+    //   trx
+    // );
   }
 
   /**
@@ -33,13 +32,13 @@ export class LandedCostGLEntriesSubscriber {
    * @param {IAllocatedLandedCostDeletedPayload} payload -
    */
   @OnEvent(events.billLandedCost.onDeleted)
-  async revertGLEntriesOnceLandedCostDeleted({
+  async revertGLEnteriesOnceLandedCostDeleted({
     oldBillLandedCost,
     trx,
   }: IAllocatedLandedCostDeletedPayload) {
-    await this.landedCostGLEntries.revertLandedCostGLEntries(
-      oldBillLandedCost.id,
-      trx,
-    );
+    // await this.billLandedCostGLEntries.revertLandedCostGLEntries(
+    //   oldBillLandedCost.id,
+    //   trx
+    // );
   }
 }

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

@@ -14,7 +14,7 @@ import { LandedCostTransactionsQueryDto } from '../dtos/LandedCostTransactionsQu
 
 @Injectable()
 export class LandedCostTranasctions {
-  constructor(private readonly transactionLandedCost: TransactionLandedCost) { }
+  constructor(private readonly transactionLandedCost: TransactionLandedCost) {}
 
   /**
    * Retrieve the landed costs based on the given query.
@@ -45,8 +45,8 @@ export class LandedCostTranasctions {
     )(transactionType);
 
     return pipe(
-      R.map(transformLandedCost),
       this.transformLandedCostTransactions,
+      R.map(transformLandedCost),
     )(transactions);
   };
 
@@ -90,7 +90,7 @@ export class LandedCostTranasctions {
     const entries = R.map<
       ILandedCostTransactionEntry,
       ILandedCostTransactionEntryDOJO
-    >(transformLandedCostEntry)(transaction.entries ?? []);
+    >(transformLandedCostEntry)(transaction.entries);
 
     return {
       ...transaction,

packages/server/src/modules/BillLandedCosts/dtos/AllocateBillLandedCost.dto.ts

@@ -4,6 +4,7 @@ import {
   IsOptional,
   IsArray,
   ValidateNested,
+  IsDecimal,
   IsString,
   IsNumber,
 } from 'class-validator';
@@ -16,9 +17,8 @@ export class AllocateBillLandedCostItemDto {
   @ToNumber()
   entryId: number;
 
-  @IsNumber()
-  @ToNumber()
-  cost: number;
+  @IsDecimal()
+  cost: string; // Use string for IsDecimal, or use @IsNumber() if you want a number
 }
 
 export class AllocateBillLandedCostDto {

packages/server/src/modules/BillLandedCosts/models/BillLandedCost.ts

@@ -60,8 +60,8 @@ export class BillLandedCost extends BaseModel {
     const allocationMethod = lowerCase(this.allocationMethod);
 
     const keyLabelsPairs = {
-      value: 'bill.allocation_method.value',
-      quantity: 'bill.allocation_method.quantity',
+      value: 'allocation_method.value.label',
+      quantity: 'allocation_method.quantity.label',
     };
     return keyLabelsPairs[allocationMethod] || '';
   }

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

@@ -14,7 +14,6 @@ import { BranchesSettingsService } from '../Branches/BranchesSettings';
 import { BillPaymentsController } from './BillPayments.controller';
 import { BillPaymentGLEntries } from './commands/BillPaymentGLEntries';
 import { BillPaymentGLEntriesSubscriber } from './subscribers/BillPaymentGLEntriesSubscriber';
-import { BillPaymentBillSyncSubscriber } from './subscribers/BillPaymentBillSyncSubscriber';
 import { LedgerModule } from '../Ledger/Ledger.module';
 import { AccountsModule } from '../Accounts/Accounts.module';
 import { BillPaymentsExportable } from './queries/BillPaymentsExportable';
@@ -40,7 +39,6 @@ import { BillPaymentsPages } from './commands/BillPaymentsPages.service';
     TenancyContext,
     BillPaymentGLEntries,
     BillPaymentGLEntriesSubscriber,
-    BillPaymentBillSyncSubscriber,
     BillPaymentsExportable,
     BillPaymentsImportable,
     GetBillPaymentsService,
@@ -54,4 +52,4 @@ import { BillPaymentsPages } from './commands/BillPaymentsPages.service';
   ],
   controllers: [BillPaymentsController],
 })
-export class BillPaymentsModule { }
+export class BillPaymentsModule {}

packages/server/src/modules/BillPayments/commands/CreateBillPayment.service.ts

@@ -38,7 +38,7 @@ export class CreateBillPaymentService {
 
     @Inject(BillPayment.name)
     private readonly billPaymentModel: TenantModelProxy<typeof BillPayment>,
-  ) { }
+  ) {}
 
   /**
    * Creates a new bill payment transcations and store it to the storage
@@ -103,19 +103,11 @@ export class CreateBillPaymentService {
       } as IBillPaymentCreatingPayload);
 
       // Writes the bill payment graph to the storage.
-      const insertedBillPayment = await this.billPaymentModel()
+      const billPayment = await this.billPaymentModel()
         .query(trx)
         .insertGraphAndFetch({
           ...billPaymentObj,
         });
-
-      // Fetch the bill payment with entries to ensure they're loaded for the subscriber.
-      const billPayment = await this.billPaymentModel()
-        .query(trx)
-        .withGraphFetched('entries')
-        .findById(insertedBillPayment.id)
-        .throwIfNotFound();
-
       // Triggers `onBillPaymentCreated` event.
       await this.eventPublisher.emitAsync(events.billPayment.onCreated, {
         billPayment,

packages/server/src/modules/BillPayments/commands/EditBillPayment.service.ts

@@ -29,7 +29,7 @@ export class EditBillPayment {
 
     @Inject(Vendor.name)
     private readonly vendorModel: TenantModelProxy<typeof Vendor>,
-  ) { }
+  ) {}
 
   /**
    * Edits the details of the given bill payment.
@@ -116,20 +116,12 @@ export class EditBillPayment {
       } as IBillPaymentEditingPayload);
 
       // Edits the bill payment transaction graph on the storage.
-      await this.billPaymentModel()
+      const billPayment = await this.billPaymentModel()
         .query(trx)
-        .upsertGraph({
+        .upsertGraphAndFetch({
           id: billPaymentId,
           ...billPaymentObj,
         });
-
-      // Fetch the bill payment with entries to ensure they're loaded for the subscriber.
-      const billPayment = await this.billPaymentModel()
-        .query(trx)
-        .withGraphFetched('entries')
-        .findById(billPaymentId)
-        .throwIfNotFound();
-
       // Triggers `onBillPaymentEdited` event.
       await this.eventPublisher.emitAsync(events.billPayment.onEdited, {
         billPaymentId,

packages/server/src/modules/BillPayments/dtos/BillPaymentResponse.dto.ts

@@ -104,12 +104,6 @@ export class BillPaymentResponseDto {
   @ApiProperty({ description: 'The formatted amount', example: '100.00 USD' })
   formattedAmount: string;
 
-  @ApiProperty({ description: 'The formatted total', example: '100.00 USD' })
-  formattedTotal: string;
-
-  @ApiProperty({ description: 'The formatted subtotal', example: '100.00 USD' })
-  formattedSubtotal: string;
-
   @ApiProperty({
     description: 'The date when the payment was created',
     example: '2024-01-01T12:00:00Z',

packages/server/src/modules/BillPayments/models/BillPayment.meta.ts

@@ -167,7 +167,7 @@ export const BillPaymentMeta = {
       name: 'bill_payment.field.payment_number',
       fieldType: 'text',
       unique: true,
-      importHint: 'bill_payment.field.payment_number_hint',
+      importHint: 'The payment number should be unique.',
     },
     paymentAccountId: {
       name: 'bill_payment.field.payment_account',
@@ -175,7 +175,7 @@ export const BillPaymentMeta = {
       relationModel: 'Account',
       relationImportMatch: ['name', 'code'],
       required: true,
-      importHint: 'account.field.account_hint',
+      importHint: 'Matches the account name or code.',
     },
     exchangeRate: {
       name: 'bill_payment.field.exchange_rate',
@@ -203,7 +203,7 @@ export const BillPaymentMeta = {
           relationModel: 'Bill',
           relationImportMatch: 'billNumber',
           required: true,
-          importHint: 'bill_payment.field.bill_hint',
+          importHint: 'Matches the bill number.',
         },
         paymentAmount: {
           name: 'bill_payment.field.entries.payment_amount',
@@ -213,7 +213,7 @@ export const BillPaymentMeta = {
       },
     },
     branchId: {
-      name: 'invoice.field.branch',
+      name: 'Branch',
       fieldType: 'relation',
       relationModel: 'Branch',
       relationImportMatch: ['name', 'code'],

packages/server/src/modules/BillPayments/queries/BillPaymentTransformer.ts

@@ -13,8 +13,6 @@ export class BillPaymentTransformer extends Transformer {
       'formattedPaymentDate',
       'formattedCreatedAt',
       'formattedAmount',
-      'formattedTotal',
-      'formattedSubtotal',
       'entries',
       'attachments',
     ];
@@ -49,29 +47,6 @@ export class BillPaymentTransformer extends Transformer {
     });
   };
 
-  /**
-   * Retrieves the formatted total.
-   * @param {IBillPayment} billPayment
-   * @returns {string}
-   */
-  protected formattedTotal = (billPayment: BillPayment): string => {
-    return this.formatNumber(billPayment.amount, {
-      currencyCode: billPayment.currencyCode,
-      money: true,
-    });
-  };
-
-  /**
-   * Retrieves the formatted subtotal.
-   * @param {IBillPayment} billPayment
-   * @returns {string}
-   */
-  protected formattedSubtotal = (billPayment: BillPayment): string => {
-    return this.formatNumber(billPayment.amount, {
-      currencyCode: billPayment.currencyCode,
-    });
-  };
-
   /**
    * Retreives the bill payment entries.
    */

packages/server/src/modules/BillPayments/queries/BillPaymentsExportable.ts

@@ -16,6 +16,8 @@ export class BillPaymentsExportable extends Exportable {
 
   /**
    * Retrieves the accounts data to exportable sheet.
+   * @param {number} tenantId
+   * @returns
    */
   public async exportable(query: any) {
     const filterQuery = (builder) => {

packages/server/src/modules/BillPayments/subscribers/BillPaymentBillSyncSubscriber.ts

@@ -1,80 +0,0 @@
-import {
-  IBillPaymentEventCreatedPayload,
-  IBillPaymentEventDeletedPayload,
-  IBillPaymentEventEditedPayload,
-} from '../types/BillPayments.types';
-import { BillPaymentBillSync } from '../commands/BillPaymentBillSync.service';
-import { Injectable } from '@nestjs/common';
-import { OnEvent } from '@nestjs/event-emitter';
-import { events } from '@/common/events/events';
-
-@Injectable()
-export class BillPaymentBillSyncSubscriber {
-  /**
-   * @param {BillPaymentBillSync} billPaymentBillSync - Bill payment bill sync service.
-   */
-  constructor(private readonly billPaymentBillSync: BillPaymentBillSync) { }
-
-  /**
-   * Handle bill increment/decrement payment amount
-   * once created, edited or deleted.
-   */
-  @OnEvent(events.billPayment.onCreated)
-  async handleBillIncrementPaymentOnceCreated({
-    billPayment,
-    trx,
-  }: IBillPaymentEventCreatedPayload) {
-    // Ensure entries are available - they should be included in insertGraphAndFetch
-    const entries = billPayment.entries || [];
-    await this.billPaymentBillSync.saveChangeBillsPaymentAmount(
-      entries.map((entry) => ({
-        billId: entry.billId,
-        paymentAmount: entry.paymentAmount,
-      })),
-      null,
-      trx,
-    );
-  }
-
-  /**
-   * Handle bill increment/decrement payment amount once edited.
-   */
-  @OnEvent(events.billPayment.onEdited)
-  async handleBillIncrementPaymentOnceEdited({
-    billPayment,
-    oldBillPayment,
-    trx,
-  }: IBillPaymentEventEditedPayload) {
-    const entries = billPayment.entries || [];
-    const oldEntries = oldBillPayment?.entries || null;
-
-    await this.billPaymentBillSync.saveChangeBillsPaymentAmount(
-      entries.map((entry) => ({
-        billId: entry.billId,
-        paymentAmount: entry.paymentAmount,
-      })),
-      oldEntries,
-      trx,
-    );
-  }
-
-  /**
-   * Handle revert bills payment amount once bill payment deleted.
-   */
-  @OnEvent(events.billPayment.onDeleted)
-  async handleBillDecrementPaymentAmount({
-    oldBillPayment,
-    trx,
-  }: IBillPaymentEventDeletedPayload) {
-    const oldEntries = oldBillPayment.entries || [];
-
-    await this.billPaymentBillSync.saveChangeBillsPaymentAmount(
-      oldEntries.map((entry) => ({
-        billId: entry.billId,
-        paymentAmount: 0,
-      })),
-      oldEntries,
-      trx,
-    );
-  }
-}

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

@@ -9,8 +9,6 @@ import { Injectable } from '@nestjs/common';
 import { GetBillsService } from './queries/GetBills.service';
 import { CreateBillDto, EditBillDto } from './dtos/Bill.dto';
 import { GetBillPaymentTransactionsService } from './queries/GetBillPayments';
-import { BulkDeleteBillsService } from './BulkDeleteBills.service';
-import { ValidateBulkDeleteBillsService } from './ValidateBulkDeleteBills.service';
 // import { GetBillPayments } from './queries/GetBillPayments';
 // import { GetBills } from './queries/GetBills';
 
@@ -25,9 +23,7 @@ export class BillsApplication {
     private openBillService: OpenBillService,
     private getBillsService: GetBillsService,
     private getBillPaymentTransactionsService: GetBillPaymentTransactionsService,
-    private bulkDeleteBillsService: BulkDeleteBillsService,
-    private validateBulkDeleteBillsService: ValidateBulkDeleteBillsService,
-  ) { }
+  ) {}
 
   /**
    * Creates a new bill with associated GL entries.
@@ -57,25 +53,6 @@ export class BillsApplication {
     return this.deleteBillService.deleteBill(billId);
   }
 
-  /**
-   * Deletes multiple bills.
-   * @param {number[]} billIds
-   */
-  public bulkDeleteBills(
-    billIds: number[],
-    options?: { skipUndeletable?: boolean },
-  ) {
-    return this.bulkDeleteBillsService.bulkDeleteBills(billIds, options);
-  }
-
-  /**
-   * Validates which bills can be deleted.
-   * @param {number[]} billIds
-   */
-  public validateBulkDeleteBills(billIds: number[]) {
-    return this.validateBulkDeleteBillsService.validateBulkDeleteBills(billIds);
-  }
-
   /**
    * Retrieve bills data table list.
    * @param {IBillsFilter} billsFilter -

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

@@ -11,12 +11,10 @@ import {
   Post,
   Body,
   Put,
-  Patch,
   Param,
   Delete,
   Get,
   Query,
-  HttpCode,
 } from '@nestjs/common';
 import { BillsApplication } from './Bills.application';
 import { IBillsFilter } from './Bills.types';
@@ -24,53 +22,14 @@ import { CreateBillDto, EditBillDto } from './dtos/Bill.dto';
 import { BillResponseDto } from './dtos/BillResponse.dto';
 import { PaginatedResponseDto } from '@/common/dtos/PaginatedResults.dto';
 import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
-import {
-  BulkDeleteDto,
-  ValidateBulkDeleteResponseDto,
-} from '@/common/dtos/BulkDelete.dto';
 
 @Controller('bills')
 @ApiTags('Bills')
 @ApiExtraModels(BillResponseDto)
 @ApiExtraModels(PaginatedResponseDto)
 @ApiCommonHeaders()
-@ApiExtraModels(ValidateBulkDeleteResponseDto)
 export class BillsController {
-  constructor(private billsApplication: BillsApplication) { }
-
-  @Post('validate-bulk-delete')
-  @ApiOperation({
-    summary: 'Validate which bills can be deleted and return the results.',
-  })
-  @HttpCode(200)
-  @ApiResponse({
-    status: 200,
-    description:
-      'Validation completed with counts and IDs of deletable and non-deletable bills.',
-    schema: {
-      $ref: getSchemaPath(ValidateBulkDeleteResponseDto),
-    },
-  })
-  validateBulkDeleteBills(
-    @Body() bulkDeleteDto: BulkDeleteDto,
-  ): Promise<ValidateBulkDeleteResponseDto> {
-    return this.billsApplication.validateBulkDeleteBills(bulkDeleteDto.ids);
-  }
-
-  @Post('bulk-delete')
-  @ApiOperation({ summary: 'Deletes multiple bills.' })
-  @HttpCode(200)
-  @ApiResponse({
-    status: 200,
-    description: 'Bills deleted successfully',
-  })
-  bulkDeleteBills(
-    @Body() bulkDeleteDto: BulkDeleteDto,
-  ): Promise<void> {
-    return this.billsApplication.bulkDeleteBills(bulkDeleteDto.ids, {
-      skipUndeletable: bulkDeleteDto.skipUndeletable ?? false,
-    });
-  }
+  constructor(private billsApplication: BillsApplication) {}
 
   @Post()
   @ApiOperation({ summary: 'Create a new bill.' })
@@ -164,7 +123,7 @@ export class BillsController {
     return this.billsApplication.getBill(billId);
   }
 
-  @Patch(':id/open')
+  @Post(':id/open')
   @ApiOperation({ summary: 'Open the given bill.' })
   @ApiParam({
     name: 'id',

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

@@ -29,8 +29,6 @@ import { InventoryCostModule } from '../InventoryCost/InventoryCost.module';
 import { BillsExportable } from './commands/BillsExportable';
 import { BillsImportable } from './commands/BillsImportable';
 import { GetBillPaymentTransactionsService } from './queries/GetBillPayments';
-import { BulkDeleteBillsService } from './BulkDeleteBills.service';
-import { ValidateBulkDeleteBillsService } from './ValidateBulkDeleteBills.service';
 
 @Module({
   imports: [
@@ -65,10 +63,8 @@ import { ValidateBulkDeleteBillsService } from './ValidateBulkDeleteBills.servic
     BillsExportable,
     BillsImportable,
     GetBillPaymentTransactionsService,
-    BulkDeleteBillsService,
-    ValidateBulkDeleteBillsService,
   ],
   controllers: [BillsController],
   exports: [BillsExportable, BillsImportable],
 })
-export class BillsModule { }
+export class BillsModule {}

packages/server/src/modules/Bills/BulkDeleteBills.service.ts

@@ -1,36 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { Knex } from 'knex';
-import { PromisePool } from '@supercharge/promise-pool';
-import { castArray, uniq } from 'lodash';
-import { DeleteBill } from './commands/DeleteBill.service';
-
-@Injectable()
-export class BulkDeleteBillsService {
-  constructor(private readonly deleteBillService: DeleteBill) { }
-
-  async bulkDeleteBills(
-    billIds: number | Array<number>,
-    options?: { skipUndeletable?: boolean },
-    trx?: Knex.Transaction,
-  ): Promise<void> {
-    const { skipUndeletable = false } = options ?? {};
-    const billsIds = uniq(castArray(billIds));
-
-    const results = await PromisePool.withConcurrency(1)
-      .for(billsIds)
-      .process(async (billId: number) => {
-        try {
-          await this.deleteBillService.deleteBill(billId);
-        } catch (error) {
-          if (!skipUndeletable) {
-            throw error;
-          }
-        }
-      });
-
-    if (!skipUndeletable && results.errors && results.errors.length > 0) {
-      throw results.errors[0].raw;
-    }
-  }
-}
-

packages/server/src/modules/Bills/ValidateBulkDeleteBills.service.ts

@@ -1,51 +0,0 @@
-import { Injectable, Inject } from '@nestjs/common';
-import { Knex } from 'knex';
-import { TENANCY_DB_CONNECTION } from '../Tenancy/TenancyDB/TenancyDB.constants';
-import { DeleteBill } from './commands/DeleteBill.service';
-
-@Injectable()
-export class ValidateBulkDeleteBillsService {
-  constructor(
-    private readonly deleteBillService: DeleteBill,
-    @Inject(TENANCY_DB_CONNECTION)
-    private readonly tenantKnex: () => Knex,
-  ) { }
-
-  public async validateBulkDeleteBills(billIds: number[]): Promise<{
-    deletableCount: number;
-    nonDeletableCount: number;
-    deletableIds: number[];
-    nonDeletableIds: number[];
-  }> {
-    const trx = await this.tenantKnex().transaction({
-      isolationLevel: 'read uncommitted',
-    });
-
-    try {
-      const deletableIds: number[] = [];
-      const nonDeletableIds: number[] = [];
-
-      for (const billId of billIds) {
-        try {
-          await this.deleteBillService.deleteBill(billId, trx);
-          deletableIds.push(billId);
-        } catch (error) {
-          nonDeletableIds.push(billId);
-        }
-      }
-
-      await trx.rollback();
-
-      return {
-        deletableCount: deletableIds.length,
-        nonDeletableCount: nonDeletableIds.length,
-        deletableIds,
-        nonDeletableIds,
-      };
-    } catch (error) {
-      await trx.rollback();
-      throw error;
-    }
-  }
-}
-

packages/server/src/modules/Bills/commands/DeleteBill.service.ts

@@ -29,10 +29,9 @@ export class DeleteBill {
   /**
    * Deletes the bill with associated entries.
    * @param {number} billId
-   * @param {Knex.Transaction} trx - Database transaction instance.
    * @return {void}
    */
-  public async deleteBill(billId: number, trx?: Knex.Transaction) {
+  public async deleteBill(billId: number) {
     // Retrieve the given bill or throw not found error.
     const oldBill = await this.billModel()
       .query()
@@ -76,6 +75,6 @@ export class DeleteBill {
         oldBill,
         trx,
       } as IBIllEventDeletedPayload);
-    }, trx);
+    });
   }
 }

packages/server/src/modules/Bills/models/Bill.meta.ts

@@ -184,76 +184,76 @@ export const BillMeta = {
   },
   fields2: {
     billNumber: {
-      name: 'bill.field.bill_number',
+      name: 'Bill No.',
       fieldType: 'text',
       required: true,
     },
     referenceNo: {
-      name: 'bill.field.reference_no',
+      name: 'Reference No.',
       fieldType: 'text',
     },
     billDate: {
-      name: 'bill.field.bill_date',
+      name: 'Date',
       fieldType: 'date',
       required: true,
     },
     dueDate: {
-      name: 'bill.field.due_date',
+      name: 'Due Date',
       fieldType: 'date',
       required: true,
     },
     vendorId: {
-      name: 'bill.field.vendor',
+      name: 'Vendor',
       fieldType: 'relation',
       relationModel: 'Contact',
       relationImportMatch: 'displayName',
       required: true,
     },
     exchangeRate: {
-      name: 'bill.field.exchange_rate',
+      name: 'Exchange Rate',
       fieldType: 'number',
     },
     note: {
-      name: 'bill.field.note',
+      name: 'Note',
       fieldType: 'text',
     },
     open: {
-      name: 'bill.field.open',
+      name: 'Open',
       fieldType: 'boolean',
     },
     entries: {
-      name: 'bill.field.entries',
+      name: 'Entries',
       fieldType: 'collection',
       collectionOf: 'object',
       collectionMinLength: 1,
       required: true,
       fields: {
         itemId: {
-          name: 'bill.field.item',
+          name: 'Item',
           fieldType: 'relation',
           relationModel: 'Item',
           relationImportMatch: ['name', 'code'],
           required: true,
-          importHint: 'bill.field.item_hint',
+          importHint: 'Matches the item name or code.',
         },
         rate: {
-          name: 'bill.field.rate',
+          name: 'Rate',
           fieldType: 'number',
           required: true,
         },
         quantity: {
-          name: 'bill.field.quantity',
+          name: 'Quantity',
           fieldType: 'number',
           required: true,
         },
         description: {
-          name: 'bill.field.description',
+          name: 'Line Description',
           fieldType: 'text',
         },
       },
     },
     branchId: {
-      name: 'invoice.field.branch',
+      name: 'Branch',
       fieldType: 'relation',
       relationModel: 'Branch',
       relationImportMatch: ['name', 'code'],
@@ -261,7 +261,7 @@ export const BillMeta = {
       required: true,
     },
     warehouseId: {
-      name: 'invoice.field.warehouse',
+      name: 'Warehouse',
       fieldType: 'relation',
       relationModel: 'Warehouse',
       relationImportMatch: ['name', 'code'],

packages/server/src/modules/Bills/models/Bill.ts

@@ -51,7 +51,6 @@ export class Bill extends TenantBaseModel {
   public updatedAt: Date | null;
 
   public entries?: ItemEntry[];
-  public attachments!: Document[];
   public locatedLandedCosts?: BillLandedCost[];
   /**
    * Timestamps columns.
@@ -634,7 +633,7 @@ export class Bill extends TenantBaseModel {
 
     return this.query(trx)
       .where('id', billId)
-    [changeMethod]('payment_amount', Math.abs(amount));
+      [changeMethod]('payment_amount', Math.abs(amount));
   }
 
   /**

packages/server/src/modules/Bills/queries/Bill.transformer.ts

@@ -1,7 +1,5 @@
 import { Transformer } from '@/modules/Transformer/Transformer';
 import { Bill } from '../models/Bill';
-import { ItemEntryTransformer } from '@/modules/TransactionItemEntry/ItemEntry.transformer';
-import { AttachmentTransformer } from '@/modules/Attachments/Attachment.transformer';
 
 export class BillTransformer extends Transformer {
   /**
@@ -96,7 +94,6 @@ export class BillTransformer extends Transformer {
   protected formattedDueAmount = (bill: Bill): string => {
     return this.formatNumber(bill.dueAmount, {
       currencyCode: bill.currencyCode,
-      money: true,
     });
   };
 
@@ -172,7 +169,6 @@ export class BillTransformer extends Transformer {
   protected totalFormatted = (bill: Bill): string => {
     return this.formatNumber(bill.total, {
       currencyCode: bill.currencyCode,
-      money: true,
     });
   };
 
@@ -233,18 +229,20 @@ export class BillTransformer extends Transformer {
   /**
    * Retrieves the entries of the bill.
    * @param {Bill} credit
+   * @returns {}
    */
-  protected entries = (bill: Bill) => {
-    return this.item(bill.entries, new ItemEntryTransformer(), {
-      currencyCode: bill.currencyCode,
-    });
-  };
+  // protected entries = (bill: Bill) => {
+  //   return this.item(bill.entries, new ItemEntryTransformer(), {
+  //     currencyCode: bill.currencyCode,
+  //   });
+  // };
 
   /**
    * Retrieves the bill attachments.
-   * @param {Bill} bill
+   * @param {ISaleInvoice} invoice
+   * @returns
    */
-  protected attachments = (bill: Bill) => {
-    return this.item(bill.attachments, new AttachmentTransformer());
-  };
+  // protected attachments = (bill: Bill) => {
+  //   return this.item(bill.attachments, new AttachmentTransformer());
+  // };
 }

packages/server/src/modules/Branches/subscribers/Validators/BillBranchSubscriber.ts

@@ -17,7 +17,7 @@ export class BillBranchValidateSubscriber {
    * Validate branch existance on bill creating.
    * @param {IBillCreatingPayload} payload
    */
-  @OnEvent(events.bill.onCreating, { suppressErrors: false })
+  @OnEvent(events.bill.onCreating)
   async validateBranchExistanceOnBillCreating({
     billDTO,
   }: IBillCreatingPayload) {
@@ -30,7 +30,7 @@ export class BillBranchValidateSubscriber {
    * Validate branch existance once bill editing.
    * @param {IBillEditingPayload} payload
    */
-  @OnEvent(events.bill.onEditing, { suppressErrors: false })
+  @OnEvent(events.bill.onEditing)
   async validateBranchExistanceOnBillEditing({ billDTO }: IBillEditingPayload) {
     await this.validateBranchExistance.validateTransactionBranchWhenActive(
       billDTO.branchId,

packages/server/src/modules/Branches/subscribers/Validators/CashflowBranchDTOValidatorSubscriber.ts

@@ -14,7 +14,7 @@ export class CashflowBranchDTOValidatorSubscriber {
    * Validate branch existance once cashflow transaction creating.
    * @param {ICommandCashflowCreatingPayload} payload
    */
-  @OnEvent(events.cashflow.onTransactionCreating, { suppressErrors: false })
+  @OnEvent(events.cashflow.onTransactionCreating)
   async validateBranchExistanceOnCashflowTransactionCreating({
     newTransactionDTO,
   }: ICommandCashflowCreatingPayload) {

packages/server/src/modules/Branches/subscribers/Validators/ContactOpeningBalanceBranchSubscriber.ts

@@ -15,13 +15,13 @@ import {
 export class ContactBranchValidateSubscriber {
   constructor(
     private readonly validateBranchExistance: ValidateBranchExistance,
-  ) {}
+  ) { }
 
   /**
    * Validate branch existance on customer creating.
    * @param {ICustomerEventCreatingPayload} payload
    */
-  @OnEvent(events.customers.onCreating, { suppressErrors: false })
+  @OnEvent(events.customers.onCreating)
   async validateBranchExistanceOnCustomerCreating({
     customerDTO,
   }: ICustomerEventCreatingPayload) {
@@ -37,7 +37,7 @@ export class ContactBranchValidateSubscriber {
    * Validate branch existance once customer opening balance editing.
    * @param {ICustomerOpeningBalanceEditingPayload} payload
    */
-  @OnEvent(events.customers.onOpeningBalanceChanging, { suppressErrors: false })
+  @OnEvent(events.customers.onOpeningBalanceChanging)
   async validateBranchExistanceOnCustomerOpeningBalanceEditing({
     openingBalanceEditDTO,
   }: ICustomerOpeningBalanceEditingPayload) {
@@ -52,7 +52,7 @@ export class ContactBranchValidateSubscriber {
    * Validates the branch existance on vendor creating.
    * @param {IVendorEventCreatingPayload} payload
    */
-  @OnEvent(events.vendors.onCreating, { suppressErrors: false })
+  @OnEvent(events.vendors.onCreating)
   async validateBranchExistanceonVendorCreating({
     vendorDTO,
   }: IVendorEventCreatingPayload) {
@@ -68,7 +68,7 @@ export class ContactBranchValidateSubscriber {
    * Validate branch existance once the vendor opening balance editing.
    * @param {IVendorOpeningBalanceEditingPayload} payload
    */
-  @OnEvent(events.vendors.onOpeningBalanceChanging, { suppressErrors: false })
+  @OnEvent(events.vendors.onOpeningBalanceChanging)
   async validateBranchExistanceOnVendorOpeningBalanceEditing({
     openingBalanceEditDTO,
   }: IVendorOpeningBalanceEditingPayload) {