Merge pull request #908 from bigcapitalhq/feature/20260121133953

fix: bill response with entries

.env.example

@@ -35,17 +35,10 @@ 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=

docker-compose.prod.yml

@@ -32,11 +32,9 @@ services:
       - '3000'
     links:
       - mysql
-      - mongo
       - redis
     depends_on:
       - mysql
-      - mongo
       - redis
     restart: on-failure
     networks:
@@ -66,16 +64,9 @@ 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}
@@ -122,7 +113,7 @@ services:
       - S3_SECRET_ACCESS_KEY=${S3_SECRET_ACCESS_KEY}
       - 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}
@@ -166,17 +157,6 @@ 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
@@ -202,10 +182,6 @@ 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,25 +24,13 @@ 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:
@@ -52,7 +40,7 @@ services:
   gotenberg:
     image: gotenberg/gotenberg:7
     ports:
-      - "9000:3000"
+      - '9000:3000'
 
 # Volumes
 volumes:
@@ -60,10 +48,6 @@ 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

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

packages/server/.env.example

@@ -35,17 +35,10 @@ 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

@@ -0,0 +1,100 @@
+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/src/common/interceptors/to-json.interceptor.ts

@@ -5,15 +5,18 @@ import {
   NestInterceptor,
 } from '@nestjs/common';
 import { Observable, map } from 'rxjs';
-import { mapValues, mapValuesDeep } from '@/utils/deepdash';
+import { 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 && typeof value.toJSON === 'function') {
+          if (value !== null && value !== undefined && typeof value.toJSON === 'function') {
             return value.toJSON();
           }
           return value;

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

@@ -22,6 +22,9 @@
   "field.status.unpaid": "Unpaid",
   "field.status.opened": "Opened",
   "field.status.draft": "Draft",
-  "field.created_at": "Created At"
+  "field.created_at": "Created At",
+  "allocation_method": "Allocation Method",
+  "allocation_method.quantity": "Quantity",
+  "allocation_method.value": "Valuation"
 }
 

packages/server/src/main.ts

@@ -4,10 +4,6 @@ import { ClsMiddleware } from 'nestjs-cls';
 import * as path from 'path';
 import './utils/moment-mysql';
 import { AppModule } from './modules/App/App.module';
-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';
 import { NestExpressApplication } from '@nestjs/platform-express';
 
 global.__public_dirname = path.join(__dirname, '..', 'public');
@@ -25,11 +21,6 @@ async function bootstrap() {
   // 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')
@@ -39,9 +30,6 @@ 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/modules/Accounts/Accounts.controller.ts

@@ -8,6 +8,7 @@ import {
   Query,
   ParseIntPipe,
   Put,
+  HttpCode,
 } from '@nestjs/common';
 import { AccountsApplication } from './AccountsApplication.service';
 import { CreateAccountDTO } from './CreateAccount.dto';
@@ -43,6 +44,7 @@ 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.',
@@ -64,6 +66,7 @@ export class AccountsController {
   }
 
   @Post('bulk-delete')
+  @HttpCode(200)
   @ApiOperation({ summary: 'Deletes multiple accounts in bulk.' })
   @ApiResponse({
     status: 200,
@@ -125,6 +128,7 @@ export class AccountsController {
   }
 
   @Post(':id/activate')
+  @HttpCode(200)
   @ApiOperation({ summary: 'Activate the given account.' })
   @ApiResponse({
     status: 200,
@@ -142,6 +146,7 @@ export class AccountsController {
   }
 
   @Post(':id/inactivate')
+  @HttpCode(200)
   @ApiOperation({ summary: 'Inactivate the given account.' })
   @ApiResponse({
     status: 200,

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.
@@ -57,7 +57,10 @@ export class DeleteAccount {
     trx?: Knex.Transaction,
   ): Promise<void> => {
     // Retrieve account or not found service error.
-    const oldAccount = await this.accountModel().query().findById(accountId);
+    const oldAccount = await this.accountModel()
+      .query()
+      .findById(accountId)
+      .throwIfNotFound();
 
     // Authorize before delete account.
     await this.authorize(accountId, oldAccount);

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 } from '@nestjs/core';
+import { APP_GUARD, APP_INTERCEPTOR, APP_PIPE, APP_FILTER } from '@nestjs/core';
 import { join } from 'path';
 import { ServeStaticModule } from '@nestjs/serve-static';
 import { RedisModule } from '@liaoliaots/nestjs-redis';
@@ -36,6 +36,10 @@ 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';
@@ -234,6 +238,10 @@ import { AppThrottleModule } from './AppThrottle.module';
   ],
   controllers: [AppController],
   providers: [
+    {
+      provide: APP_PIPE,
+      useClass: ValidationPipe,
+    },
     {
       provide: APP_GUARD,
       useClass: ThrottlerGuard,
@@ -242,6 +250,10 @@ import { AppThrottleModule } from './AppThrottle.module';
       provide: APP_INTERCEPTOR,
       useClass: SerializeInterceptor,
     },
+    {
+      provide: APP_INTERCEPTOR,
+      useClass: ToJsonInterceptor,
+    },
     {
       provide: APP_INTERCEPTOR,
       useClass: UserIpInterceptor,
@@ -250,6 +262,14 @@ 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,6 +9,27 @@ 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/BankingAccounts/BankAccounts.controller.ts

@@ -1,16 +1,28 @@
 import { Controller, Get, Param, Post, Query } from '@nestjs/common';
 import { BankAccountsApplication } from './BankAccountsApplication.service';
-import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
-import { ICashflowAccountsFilter } from './types/BankAccounts.types';
+import { ApiOperation, ApiQuery, ApiResponse, ApiTags } from '@nestjs/swagger';
+import { BankAccountsQueryDto } from './dtos/BankAccountsQuery.dto';
+import { BankAccountResponseDto } from './dtos/BankAccountResponse.dto';
 
 @Controller('banking/accounts')
 @ApiTags('Bank Accounts')
 export class BankAccountsController {
-  constructor(private bankAccountsApplication: BankAccountsApplication) {}
+  constructor(private bankAccountsApplication: BankAccountsApplication) { }
 
   @Get()
   @ApiOperation({ summary: 'Retrieve the bank accounts.' })
-  getBankAccounts(@Query() filterDto: ICashflowAccountsFilter) {
+  @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) {
     return this.bankAccountsApplication.getBankAccounts(filterDto);
   }
 

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

@@ -6,6 +6,7 @@ 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 {
@@ -16,13 +17,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: ICashflowAccountsFilter) {
+  getBankAccounts(filterDto: BankAccountsQueryDto) {
     return this.getBankAccountsService.getCashflowAccounts(filterDto);
   }
 

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

@@ -0,0 +1,166 @@
+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

@@ -0,0 +1,107 @@
+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,6 +6,8 @@ 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 {
@@ -15,14 +17,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: ICashflowAccountsFilter) {
+  public async getCashflowAccounts(filterDTO: BankAccountsQueryDto) {
     const _filterDto = {
       sortOrder: 'desc',
       columnSortBy: 'created_at',
@@ -30,12 +32,14 @@ export class GetBankAccountsService {
       ...filterDTO,
     };
     // Parsees accounts list filter DTO.
-    const filter = this.dynamicListService.parseStringifiedFilter(_filterDto);
+    const filter = this.dynamicListService.parseStringifiedFilter<BankAccountsQueryDto>(
+      _filterDto,
+    );
 
     // Dynamic list service.
     const dynamicList = await this.dynamicListService.dynamicList(
       this.accountModel(),
-      filter,
+      filter as IDynamicListFilter,
     );
     // Retrieve accounts model based on the given query.
     const accounts = await this.accountModel()

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

@@ -1,5 +1,5 @@
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
-import { Body, Controller, Get, Param, Post, Query } from '@nestjs/common';
+import { Body, Controller, Get, Param, Patch, 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 {
     );
   }
 
-  @Post('/unmatch/:uncategorizedTransactionId')
+  @Patch('/unmatch/:uncategorizedTransactionId')
   @ApiOperation({ summary: 'Unmatch the given uncategorized transaction.' })
   async unmatchMatchedTransaction(
     @Param('uncategorizedTransactionId') uncategorizedTransactionId: number,

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

@@ -4,8 +4,8 @@ import {
   validateTransactionShouldBeExcluded,
 } from './utils';
 import {
-  IBankTransactionExcludedEventPayload,
-  IBankTransactionExcludingEventPayload,
+  IBankTransactionUnexcludedEventPayload,
+  IBankTransactionUnexcludingEventPayload,
 } 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,7 +50,8 @@ export class UnexcludeBankTransactionService {
     return this.uow.withTransaction(async (trx: Knex.Transaction) => {
       await this.eventEmitter.emitAsync(events.bankTransactions.onUnexcluding, {
         uncategorizedTransactionId,
-      } as IBankTransactionExcludingEventPayload);
+        trx,
+      } as IBankTransactionUnexcludingEventPayload);
 
       await this.uncategorizedBankTransactionModel()
         .query(trx)
@@ -61,7 +62,8 @@ export class UnexcludeBankTransactionService {
 
       await this.eventEmitter.emitAsync(events.bankTransactions.onUnexcluded, {
         uncategorizedTransactionId,
-      } as IBankTransactionExcludedEventPayload);
+        trx,
+      } as IBankTransactionUnexcludedEventPayload);
     });
   }
 }

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()
+      .query(trx)
       .findById(uncategorizedTransactionId);
     //
     await this.account()

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/BillAllocatedLandedCostTransactions.service.ts

@@ -21,7 +21,7 @@ export class BillAllocatedLandedCostTransactions {
     private readonly billLandedCostModel: TenantModelProxy<
       typeof BillLandedCost
     >,
-  ) {}
+  ) { }
 
   /**
    * Retrieve the bill associated landed cost transactions.
@@ -77,6 +77,13 @@ 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,
@@ -84,12 +91,14 @@ export class BillAllocatedLandedCostTransactions {
       ...omit(transaction, [
         'allocatedFromBillEntry',
         'allocatedFromExpenseEntry',
+        'allocationMethodFormatted',
       ]),
       name,
       description,
       formattedLocalAmount: formatNumber(transaction.localAmount, {
         currencyCode: 'USD',
       }),
+      allocationMethodFormatted,
     };
   };
 

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(
-      this.transformLandedCostTransactions,
       R.map(transformLandedCost),
+      this.transformLandedCostTransactions,
     )(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,7 +4,6 @@ import {
   IsOptional,
   IsArray,
   ValidateNested,
-  IsDecimal,
   IsString,
   IsNumber,
 } from 'class-validator';
@@ -17,8 +16,9 @@ export class AllocateBillLandedCostItemDto {
   @ToNumber()
   entryId: number;
 
-  @IsDecimal()
-  cost: string; // Use string for IsDecimal, or use @IsNumber() if you want a number
+  @IsNumber()
+  @ToNumber()
+  cost: 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: 'allocation_method.value.label',
-      quantity: 'allocation_method.quantity.label',
+      value: 'bill.allocation_method.value',
+      quantity: 'bill.allocation_method.quantity',
     };
     return keyLabelsPairs[allocationMethod] || '';
   }

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

@@ -11,10 +11,12 @@ import {
   Post,
   Body,
   Put,
+  Patch,
   Param,
   Delete,
   Get,
   Query,
+  HttpCode,
 } from '@nestjs/common';
 import { BillsApplication } from './Bills.application';
 import { IBillsFilter } from './Bills.types';
@@ -40,6 +42,7 @@ export class BillsController {
   @ApiOperation({
     summary: 'Validate which bills can be deleted and return the results.',
   })
+  @HttpCode(200)
   @ApiResponse({
     status: 200,
     description:
@@ -56,6 +59,7 @@ export class BillsController {
 
   @Post('bulk-delete')
   @ApiOperation({ summary: 'Deletes multiple bills.' })
+  @HttpCode(200)
   @ApiResponse({
     status: 200,
     description: 'Bills deleted successfully',
@@ -160,7 +164,7 @@ export class BillsController {
     return this.billsApplication.getBill(billId);
   }
 
-  @Post(':id/open')
+  @Patch(':id/open')
   @ApiOperation({ summary: 'Open the given bill.' })
   @ApiParam({
     name: 'id',

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

@@ -51,6 +51,7 @@ export class Bill extends TenantBaseModel {
   public updatedAt: Date | null;
 
   public entries?: ItemEntry[];
+  public attachments!: Document[];
   public locatedLandedCosts?: BillLandedCost[];
   /**
    * Timestamps columns.
@@ -633,7 +634,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,5 +1,7 @@
 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 {
   /**
@@ -231,20 +233,18 @@ 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 {ISaleInvoice} invoice
-   * @returns
+   * @param {Bill} bill
    */
-  // 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/Contacts/Contacts.controller.ts

@@ -3,7 +3,7 @@ import {
   Get,
   Query,
   Param,
-  Post,
+  Patch,
   ParseIntPipe,
 } from '@nestjs/common';
 import { ApiTags, ApiOperation, ApiParam } from '@nestjs/swagger';
@@ -27,7 +27,7 @@ export class ContactsController {
     return this.getAutoCompleteService.autocompleteContacts(query);
   }
 
-  @Post(':id/activate')
+  @Patch(':id/activate')
   @ApiOperation({ summary: 'Activate a contact' })
   @ApiParam({ name: 'id', type: 'number', description: 'Contact ID' })
   async activateContact(@Param('id', ParseIntPipe) contactId: number) {
@@ -35,7 +35,7 @@ export class ContactsController {
     return { id: contactId, activated: true };
   }
 
-  @Post(':id/inactivate')
+  @Patch(':id/inactivate')
   @ApiOperation({ summary: 'Inactivate a contact' })
   @ApiParam({ name: 'id', type: 'number', description: 'Contact ID' })
   async inactivateContact(@Param('id', ParseIntPipe) contactId: number) {

packages/server/src/modules/DynamicListing/DynamicList.service.ts

@@ -16,7 +16,7 @@ export class DynamicListService {
     private dynamicListSearch: DynamicListSearch,
     private dynamicListSortBy: DynamicListSortBy,
     private dynamicListView: DynamicListCustomView,
-  ) {}
+  ) { }
 
   /**
    * Parses filter DTO.
@@ -31,9 +31,9 @@ export class DynamicListService {
       // Merges the default properties with filter object.
       ...(model.defaultSort
         ? {
-            sortOrder: model.defaultSort.sortOrder,
-            columnSortBy: model.defaultSort.sortOrder,
-          }
+          sortOrder: model.defaultSort.sortOrder,
+          columnSortBy: model.defaultSort.sortOrder,
+        }
         : {}),
       ...filterDTO,
     };
@@ -93,7 +93,7 @@ export class DynamicListService {
    * Parses stringified filter roles.
    * @param {string} stringifiedFilterRoles - Stringified filter roles.
    */
-  public parseStringifiedFilter<T extends IDynamicListFilter>(
+  public parseStringifiedFilter<T extends { stringifiedFilterRoles?: string }>(
     filterRoles: T,
   ): T {
     return {

packages/server/src/modules/FinancialStatements/modules/APAgingSummary/APAgingSummary.controller.ts

@@ -16,7 +16,7 @@ import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 @ApiTags('Reports')
 @ApiCommonHeaders()
 export class APAgingSummaryController {
-  constructor(private readonly APAgingSummaryApp: APAgingSummaryApplication) {}
+  constructor(private readonly APAgingSummaryApp: APAgingSummaryApplication) { }
 
   @Get()
   @ApiOperation({ summary: 'Get payable aging summary' })
@@ -37,12 +37,13 @@ export class APAgingSummaryController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the json table format.
-    if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.APAgingSummaryApp.table(filter);
 
       // Retrieves the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const csv = await this.APAgingSummaryApp.csv(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -50,7 +51,7 @@ export class APAgingSummaryController {
 
       res.send(csv);
       // Retrieves the xlsx format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.APAgingSummaryApp.xlsx(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -60,7 +61,7 @@ export class APAgingSummaryController {
       );
       res.send(buffer);
       // Retrieves the pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.APAgingSummaryApp.pdf(filter);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/ARAgingSummary/ARAgingSummary.controller.ts

@@ -38,8 +38,9 @@ export class ARAgingSummaryController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the xlsx format.
-    if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.ARAgingSummaryApp.xlsx(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -49,11 +50,11 @@ export class ARAgingSummaryController {
       );
       res.send(buffer);
       // Retrieves the table format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    } else if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.ARAgingSummaryApp.table(filter);
 
       // Retrieves the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.ARAgingSummaryApp.csv(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -61,7 +62,7 @@ export class ARAgingSummaryController {
 
       res.send(buffer);
       // Retrieves the pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.ARAgingSummaryApp.pdf(filter);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/BalanceSheet/BalanceSheet.controller.ts

@@ -43,13 +43,14 @@ export class BalanceSheetStatementController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the json table format.
-    if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    if (accept.includes(AcceptType.ApplicationJsonTable)) {
       const table = await this.balanceSheetApp.table(query);
 
       return table;
       // Retrieves the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.balanceSheetApp.csv(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -57,7 +58,7 @@ export class BalanceSheetStatementController {
 
       res.send(buffer);
       // Retrieves the xlsx format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.balanceSheetApp.xlsx(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -67,7 +68,7 @@ export class BalanceSheetStatementController {
       );
       res.send(buffer);
       // Retrieves the pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.balanceSheetApp.pdf(query);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/CashFlowStatement/Cashflow.controller.ts

@@ -16,7 +16,7 @@ import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 @ApiTags('Reports')
 @ApiCommonHeaders()
 export class CashflowController {
-  constructor(private readonly cashflowSheetApp: CashflowSheetApplication) {}
+  constructor(private readonly cashflowSheetApp: CashflowSheetApplication) { }
 
   @Get()
   @ApiResponse({
@@ -37,11 +37,12 @@ export class CashflowController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the json table format.
-    if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.cashflowSheetApp.table(query);
       // Retrieves the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.cashflowSheetApp.csv(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -49,7 +50,7 @@ export class CashflowController {
 
       res.status(200).send(buffer);
       // Retrieves the pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.cashflowSheetApp.xlsx(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -59,7 +60,7 @@ export class CashflowController {
       );
       res.send(buffer);
       // Retrieves the pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.cashflowSheetApp.pdf(query);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/CustomerBalanceSummary/CustomerBalanceSummary.controller.ts

@@ -34,8 +34,9 @@ export class CustomerBalanceSummaryController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the xlsx format.
-    if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.customerBalanceSummaryApp.xlsx(filter);
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
       res.setHeader(
@@ -44,18 +45,18 @@ export class CustomerBalanceSummaryController {
       );
       res.send(buffer);
       // Retrieves the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.customerBalanceSummaryApp.csv(filter);
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
       res.setHeader('Content-Type', 'text/csv');
 
       res.send(buffer);
       // Retrieves the json table format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    } else if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.customerBalanceSummaryApp.table(filter);
 
       // Retrieves the pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const buffer = await this.customerBalanceSummaryApp.pdf(filter);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/GeneralLedger/GeneralLedger.controller.ts

@@ -39,11 +39,12 @@ export class GeneralLedgerController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the table format.
-    if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.generalLedgerApplication.table(query);
       // Retrieves the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.generalLedgerApplication.csv(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -51,7 +52,7 @@ export class GeneralLedgerController {
 
       res.send(buffer);
       // Retrieves the xlsx format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.generalLedgerApplication.xlsx(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -61,7 +62,7 @@ export class GeneralLedgerController {
       );
       res.send(buffer);
       // Retrieves the pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.generalLedgerApplication.pdf(query);
       res.set({
         'Content-Type': 'application/pdf',

packages/server/src/modules/FinancialStatements/modules/InventoryItemDetails/InventoryItemDetails.controller.ts

@@ -21,7 +21,8 @@ export class InventoryItemDetailsController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
-    if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    const accept = acceptHeader || '';
+    if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.inventoryItemDetailsApp.csv(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -29,7 +30,7 @@ export class InventoryItemDetailsController {
 
       res.send(buffer);
       // Retrieves the xlsx format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.inventoryItemDetailsApp.xlsx(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -39,10 +40,10 @@ export class InventoryItemDetailsController {
       );
       res.send(buffer);
       // Retrieves the json table format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    } else if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.inventoryItemDetailsApp.table(query);
       // Retrieves the pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const buffer = await this.inventoryItemDetailsApp.pdf(query);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/InventoryValuationSheet/InventoryValuation.controller.ts

@@ -37,11 +37,12 @@ export class InventoryValuationController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the json table format.
-    if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.inventoryValuationApp.table(query);
       // Retrieves the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.inventoryValuationApp.csv(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -49,7 +50,7 @@ export class InventoryValuationController {
 
       res.send(buffer);
       // Retrieves the xslx buffer format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.inventoryValuationApp.xlsx(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -59,7 +60,7 @@ export class InventoryValuationController {
       );
       res.send(buffer);
       // Retrieves the pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.inventoryValuationApp.pdf(query);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/JournalSheet/JournalSheet.controller.ts

@@ -37,12 +37,13 @@ export class JournalSheetController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the json table format.
-    if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.journalSheetApp.table(query);
 
       // Retrieves the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.journalSheetApp.csv(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -50,7 +51,7 @@ export class JournalSheetController {
 
       res.send(buffer);
       // Retrieves the xlsx format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.journalSheetApp.xlsx(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -60,7 +61,7 @@ export class JournalSheetController {
       );
       res.send(buffer);
       // Retrieves the json format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.journalSheetApp.pdf(query);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/ProfitLossSheet/ProfitLossSheet.controller.ts

@@ -45,8 +45,9 @@ export class ProfitLossSheetController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the csv format.
-    if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    if (accept.includes(AcceptType.ApplicationCsv)) {
       const sheet = await this.profitLossSheetApp.csv(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -54,11 +55,11 @@ export class ProfitLossSheetController {
 
       res.send(sheet);
       // Retrieves the json table format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    } else if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.profitLossSheetApp.table(query);
 
       // Retrieves the xlsx format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const sheet = await this.profitLossSheetApp.xlsx(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -68,7 +69,7 @@ export class ProfitLossSheetController {
       );
       res.send(sheet);
       // Retrieves the json format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.profitLossSheetApp.pdf(query);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/PurchasesByItems/PurchasesByItems.controller.ts

@@ -22,11 +22,12 @@ export class PurchasesByItemReportController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // JSON table response format.
-    if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.purchasesByItemsApp.table(filter);
       // CSV response format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.purchasesByItemsApp.csv(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -34,7 +35,7 @@ export class PurchasesByItemReportController {
 
       res.send(buffer);
       // Xlsx response format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.purchasesByItemsApp.xlsx(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -44,7 +45,7 @@ export class PurchasesByItemReportController {
       );
       res.send(buffer);
       // PDF response format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.purchasesByItemsApp.pdf(filter);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/SalesByItems/SalesByItems.controller.ts

@@ -31,8 +31,9 @@ export class SalesByItemsController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the csv format.
-    if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.salesByItemsApp.csv(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -40,10 +41,10 @@ export class SalesByItemsController {
 
       res.send(buffer);
       // Retrieves the json table format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    } else if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.salesByItemsApp.table(filter);
       // Retrieves the xlsx format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = this.salesByItemsApp.xlsx(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -53,7 +54,7 @@ export class SalesByItemsController {
       );
       res.send(buffer);
       // Retrieves the json format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.salesByItemsApp.pdf(filter);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/SalesTaxLiabilitySummary/SalesTaxLiabilitySummary.controller.ts

@@ -37,11 +37,12 @@ export class SalesTaxLiabilitySummaryController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the json table format.
-    if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.salesTaxLiabilitySummaryApp.table(query);
       // Retrieves the xlsx format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.salesTaxLiabilitySummaryApp.xlsx(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -51,14 +52,14 @@ export class SalesTaxLiabilitySummaryController {
       );
       res.send(buffer);
       // Retrieves the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.salesTaxLiabilitySummaryApp.csv(query);
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
       res.setHeader('Content-Type', 'text/csv');
 
       res.send(buffer);
       // Retrieves the json format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.salesTaxLiabilitySummaryApp.pdf(query);
       res.set({
         'Content-Type': 'application/pdf',

packages/server/src/modules/FinancialStatements/modules/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryRepository.ts

@@ -9,17 +9,18 @@ import { TaxRateModel } from '@/modules/TaxRates/models/TaxRate.model';
 import { AccountTransaction } from '@/modules/Accounts/models/AccountTransaction.model';
 import { Account } from '@/modules/Accounts/models/Account.model';
 import { ModelObject } from 'objection';
+import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 
 @Injectable({ scope: Scope.TRANSIENT })
 export class SalesTaxLiabilitySummaryRepository {
   @Inject(TaxRateModel.name)
-  private readonly taxRateModel: typeof TaxRateModel;
+  private readonly taxRateModel: TenantModelProxy<typeof TaxRateModel>;
 
   @Inject(AccountTransaction.name)
-  private readonly accountTransactionModel: typeof AccountTransaction;
+  private readonly accountTransactionModel: TenantModelProxy<typeof AccountTransaction>;
 
   @Inject(Account.name)
-  private readonly accountModel: typeof Account;
+  private readonly accountModel: TenantModelProxy<typeof Account>;
 
   /**
    * @param {SalesTaxLiabilitySummarySalesById}
@@ -77,7 +78,7 @@ export class SalesTaxLiabilitySummaryRepository {
    * @returns {Promise<TaxRate[]>}
    */
   public getTaxRates = () => {
-    return this.taxRateModel.query().orderBy('name', 'desc');
+    return this.taxRateModel().query().orderBy('name', 'desc');
   };
 
   /**
@@ -86,13 +87,13 @@ export class SalesTaxLiabilitySummaryRepository {
    */
   public async getTaxesPayableSumGroupedByRateId(): Promise<SalesTaxLiabilitySummaryPayableById> {
     // Retrieves tax payable accounts.
-    const taxPayableAccounts = await this.accountModel
+    const taxPayableAccounts = await this.accountModel()
       .query()
       .whereIn('accountType', [ACCOUNT_TYPE.TAX_PAYABLE]);
 
     const payableAccountsIds = taxPayableAccounts.map((account) => account.id);
 
-    const groupedTaxesById = await this.accountTransactionModel
+    const groupedTaxesById = await this.accountTransactionModel()
       .query()
       .whereIn('account_id', payableAccountsIds)
       .whereNot('tax_rate_id', null)
@@ -110,7 +111,7 @@ export class SalesTaxLiabilitySummaryRepository {
    */
   public taxesSalesSumGroupedByRateId =
     async (): Promise<SalesTaxLiabilitySummarySalesById> => {
-      const incomeAccounts = await this.accountModel
+      const incomeAccounts = await this.accountModel()
         .query()
         .whereIn('accountType', [
           ACCOUNT_TYPE.INCOME,
@@ -118,7 +119,7 @@ export class SalesTaxLiabilitySummaryRepository {
         ]);
       const incomeAccountsIds = incomeAccounts.map((account) => account.id);
 
-      const groupedTaxesById = await this.accountTransactionModel
+      const groupedTaxesById = await this.accountTransactionModel()
         .query()
         .whereIn('account_id', incomeAccountsIds)
         .whereNot('tax_rate_id', null)

packages/server/src/modules/FinancialStatements/modules/TransactionsByCustomer/TransactionsByCustomer.controller.ts

@@ -23,12 +23,13 @@ export class TransactionsByCustomerController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the json table format.
-    if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.transactionsByCustomersApp.table(filter);
 
       // Retrieve the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const csv = await this.transactionsByCustomersApp.csv(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -37,7 +38,7 @@ export class TransactionsByCustomerController {
       res.send(csv);
 
       // Retrieve the xlsx format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.transactionsByCustomersApp.xlsx(filter);
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
       res.setHeader(
@@ -47,7 +48,7 @@ export class TransactionsByCustomerController {
       res.send(buffer);
 
       // Retrieve the json format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.transactionsByCustomersApp.pdf(filter);
       res.set({
         'Content-Type': 'application/pdf',

packages/server/src/modules/FinancialStatements/modules/TransactionsByReference/TransactionByReference.module.ts

@@ -4,8 +4,11 @@ import { TransactionsByReferenceRepository } from './TransactionsByReferenceRepo
 import { TransactionsByReferenceService } from './TransactionsByReference.service';
 import { TransactionsByReferenceController } from './TransactionsByReference.controller';
 import { TenancyContext } from '@/modules/Tenancy/TenancyContext.service';
+import { FinancialSheetCommonModule } from '../../common/FinancialSheetCommon.module';
+import { AccountsModule } from '@/modules/Accounts/Accounts.module';
 
 @Module({
+  imports: [FinancialSheetCommonModule, AccountsModule],
   providers: [
     TransactionsByReferenceRepository,
     TransactionsByReferenceApplication,
@@ -14,4 +17,4 @@ import { TenancyContext } from '@/modules/Tenancy/TenancyContext.service';
   ],
   controllers: [TransactionsByReferenceController],
 })
-export class TransactionsByReferenceModule {}
+export class TransactionsByReferenceModule { }

packages/server/src/modules/FinancialStatements/modules/TransactionsByReference/TransactionsByReference.controller.ts

@@ -1,6 +1,6 @@
 import { Controller, Get, Query } from '@nestjs/common';
 import { TransactionsByReferenceApplication } from './TransactionsByReferenceApplication';
-import { ITransactionsByReferenceQuery } from './TransactionsByReference.types';
+import { TransactionsByReferenceQueryDto } from './TransactionsByReferenceQuery.dto';
 import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
 
 @Controller('reports/transactions-by-reference')
@@ -8,13 +8,13 @@ import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
 export class TransactionsByReferenceController {
   constructor(
     private readonly transactionsByReferenceApp: TransactionsByReferenceApplication,
-  ) {}
+  ) { }
 
   @Get()
   @ApiResponse({ status: 200, description: 'Transactions by reference' })
   @ApiOperation({ summary: 'Get transactions by reference' })
   async getTransactionsByReference(
-    @Query() query: ITransactionsByReferenceQuery,
+    @Query() query: TransactionsByReferenceQueryDto,
   ) {
     const data = await this.transactionsByReferenceApp.getTransactions(query);
 

packages/server/src/modules/FinancialStatements/modules/TransactionsByReference/TransactionsByReference.service.ts

@@ -1,27 +1,27 @@
-import { Injectable } from '@nestjs/common';
+import { BadRequestException, Injectable } from '@nestjs/common';
 import {
   ITransactionsByReferencePojo,
-  ITransactionsByReferenceQuery,
 } from './TransactionsByReference.types';
 import { TransactionsByReferenceRepository } from './TransactionsByReferenceRepository';
 import { TransactionsByReference } from './TransactionsByReferenceReport';
 import { getTransactionsByReferenceQuery } from './_utils';
 import { TenancyContext } from '@/modules/Tenancy/TenancyContext.service';
+import { TransactionsByReferenceQueryDto } from './TransactionsByReferenceQuery.dto';
 
 @Injectable()
 export class TransactionsByReferenceService {
   constructor(
     private readonly repository: TransactionsByReferenceRepository,
     private readonly tenancyContext: TenancyContext
-  ) {}
+  ) { }
 
   /**
    * Retrieve accounts transactions by given reference id and type.
-   * @param {ITransactionsByReferenceQuery} filter - Transactions by reference query.
+   * @param {TransactionsByReferenceQueryDto} filter - Transactions by reference query.
    * @returns {Promise<ITransactionsByReferencePojo>}
    */
   public async getTransactionsByReference(
-    query: ITransactionsByReferenceQuery
+    query: TransactionsByReferenceQueryDto
   ): Promise<ITransactionsByReferencePojo> {
     const filter = {
       ...getTransactionsByReferenceQuery(),
@@ -31,7 +31,7 @@ export class TransactionsByReferenceService {
 
     // Retrieve the accounts transactions of the given reference.
     const transactions = await this.repository.getTransactions(
-      Number(filter.referenceId),
+      query.referenceId,
       filter.referenceType
     );
     // Transactions by reference report.

packages/server/src/modules/FinancialStatements/modules/TransactionsByReference/TransactionsByReferenceApplication.ts

@@ -1,19 +1,19 @@
 import { Injectable } from '@nestjs/common';
 import { TransactionsByReferenceService } from './TransactionsByReference.service';
-import { ITransactionsByReferenceQuery } from './TransactionsByReference.types';
+import { TransactionsByReferenceQueryDto } from './TransactionsByReferenceQuery.dto';
 
 @Injectable()
 export class TransactionsByReferenceApplication {
   constructor(
     private readonly transactionsByReferenceService: TransactionsByReferenceService,
-  ) {}
+  ) { }
 
   /**
    * Retrieve accounts transactions by given reference id and type.
-   * @param {ITransactionsByReferenceQuery} query - Transactions by reference query.
+   * @param {TransactionsByReferenceQueryDto} query - Transactions by reference query.
    * @returns {Promise<ITransactionsByReferencePojo>}
    */
-  public async getTransactions(query: ITransactionsByReferenceQuery) {
+  public async getTransactions(query: TransactionsByReferenceQueryDto) {
     return this.transactionsByReferenceService.getTransactionsByReference(
       query,
     );

packages/server/src/modules/FinancialStatements/modules/TransactionsByReference/TransactionsByReferenceQuery.dto.ts

@@ -0,0 +1,22 @@
+import { IsNotEmpty, IsString } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+
+export class TransactionsByReferenceQueryDto {
+  @IsString()
+  @IsNotEmpty()
+  @ApiProperty({
+    description: 'The type of the reference (e.g., SaleInvoice, Bill, etc.)',
+    example: 'SaleInvoice',
+    required: true,
+  })
+  referenceType: string;
+
+  @IsString()
+  @IsNotEmpty()
+  @ApiProperty({
+    description: 'The ID of the reference',
+    example: '1',
+    required: true,
+  })
+  referenceId: number;
+}

packages/server/src/modules/FinancialStatements/modules/TransactionsByReference/TransactionsByReferenceReport.ts

@@ -1,27 +1,27 @@
 import {
-  ITransactionsByReferenceQuery,
   ITransactionsByReferenceTransaction,
 } from './TransactionsByReference.types';
 import { FinancialSheet } from '../../common/FinancialSheet';
 import { ModelObject } from 'objection';
 import { AccountTransaction } from '@/modules/Accounts/models/AccountTransaction.model';
 import { INumberFormatQuery } from '../../types/Report.types';
+import { TransactionsByReferenceQueryDto } from './TransactionsByReferenceQuery.dto';
 
 export class TransactionsByReference extends FinancialSheet {
   readonly transactions: ModelObject<AccountTransaction>[];
-  readonly query: ITransactionsByReferenceQuery;
+  readonly query: TransactionsByReferenceQueryDto;
   readonly baseCurrency: string;
   readonly numberFormat: INumberFormatQuery;
 
   /**
    * Constructor method.
    * @param {ModelObject<AccountTransaction>[]} transactions
-   * @param {ITransactionsByReferenceQuery} query
+   * @param {TransactionsByVendorQueryDto} query
    * @param {string} baseCurrency
    */
   constructor(
     transactions: ModelObject<AccountTransaction>[],
-    query: ITransactionsByReferenceQuery,
+    query: TransactionsByReferenceQueryDto,
     baseCurrency: string
   ) {
     super();
@@ -46,19 +46,16 @@ export class TransactionsByReference extends FinancialSheet {
       credit: this.getAmountMeta(transaction.credit, { money: false }),
       debit: this.getAmountMeta(transaction.debit, { money: false }),
 
-      // @ts-ignore
-      // referenceTypeFormatted: transaction.referenceTypeFormatted,
-      referenceTypeFormatted: '',
-
       referenceType: transaction.referenceType,
       referenceId: transaction.referenceId,
+      formattedReferenceType: transaction.referenceTypeFormatted,
 
       contactId: transaction.contactId,
       contactType: transaction.contactType,
-      contactTypeFormatted: transaction.contactType,
+      formattedContactType: transaction.contactType || '',
 
-      accountName: transaction.account.name,
-      accountCode: transaction.account.code,
+      accountName: transaction.account?.name || '',
+      accountCode: transaction.account?.code || '',
       accountId: transaction.accountId,
     };
   };

packages/server/src/modules/FinancialStatements/modules/TransactionsByReference/TransactionsByReferenceRepository.ts

@@ -24,6 +24,7 @@ export class TransactionsByReferenceRepository {
   ): Promise<Array<ModelObject<AccountTransaction>>> {
     return this.accountTransactionModel()
       .query()
+      .skipUndefined()
       .where('reference_id', referenceId)
       .where('reference_type', referenceType)
       .withGraphFetched('account');

packages/server/src/modules/FinancialStatements/modules/TransactionsByVendor/TransactionsByVendor.controller.ts

@@ -23,8 +23,9 @@ export class TransactionsByVendorController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the xlsx format.
-    if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.transactionsByVendorsApp.xlsx(filter);
 
       res.setHeader('Content-Type', 'application/vnd.openxmlformats');
@@ -32,7 +33,7 @@ export class TransactionsByVendorController {
 
       res.send(buffer);
       // Retrieves the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.transactionsByVendorsApp.csv(filter);
 
       res.setHeader('Content-Type', 'text/csv');
@@ -40,10 +41,10 @@ export class TransactionsByVendorController {
 
       res.send(buffer);
       // Retrieves the json table format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    } else if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.transactionsByVendorsApp.table(filter);
       // Retrieves the pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.transactionsByVendorsApp.pdf(filter);
       res.set({
         'Content-Type': 'application/pdf',

packages/server/src/modules/FinancialStatements/modules/TransactionsByVendor/TransactionsByVendorInjectable.ts

@@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common';
 import { I18nService } from 'nestjs-i18n';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import {
-  ITransactionsByVendorsFilter,
   ITransactionsByVendorsStatement,
 } from './TransactionsByVendor.types';
 import { TransactionsByVendor } from './TransactionsByVendor';
@@ -10,6 +9,7 @@ import { TransactionsByVendorRepository } from './TransactionsByVendorRepository
 import { TransactionsByVendorMeta } from './TransactionsByVendorMeta';
 import { getTransactionsByVendorDefaultQuery } from './utils';
 import { events } from '@/common/events/events';
+import { TransactionsByVendorQueryDto } from './TransactionsByVendorQuery.dto';
 
 @Injectable()
 export class TransactionsByVendorsInjectable {
@@ -18,15 +18,15 @@ export class TransactionsByVendorsInjectable {
     private readonly transactionsByVendorMeta: TransactionsByVendorMeta,
     private readonly eventPublisher: EventEmitter2,
     private readonly i18n: I18nService,
-  ) {}
+  ) { }
 
   /**
    * Retrieve transactions by by the customers.
-   * @param {ITransactionsByVendorsFilter} query - Transactions by vendors filter.
+   * @param {TransactionsByVendorQueryDto} query - Transactions by vendors filter.
    * @return {Promise<ITransactionsByVendorsStatement>}
    */
   public async transactionsByVendors(
-    query: ITransactionsByVendorsFilter,
+    query: TransactionsByVendorQueryDto,
   ): Promise<ITransactionsByVendorsStatement> {
     const filter = { ...getTransactionsByVendorDefaultQuery(), ...query };
 

packages/server/src/modules/FinancialStatements/modules/TransactionsByVendor/TransactionsByVendorTableInjectable.ts

@@ -1,26 +1,26 @@
 import { TransactionsByVendorsTable } from './TransactionsByVendorTable';
 import {
   ITransactionsByVendorTable,
-  ITransactionsByVendorsFilter,
 } from './TransactionsByVendor.types';
 import { TransactionsByVendorsInjectable } from './TransactionsByVendorInjectable';
 import { Injectable } from '@nestjs/common';
 import { I18nService } from 'nestjs-i18n';
+import { TransactionsByVendorQueryDto } from './TransactionsByVendorQuery.dto';
 
 @Injectable()
 export class TransactionsByVendorTableInjectable {
   constructor(
     private readonly transactionsByVendor: TransactionsByVendorsInjectable,
     private readonly i18n: I18nService
-  ) {}
+  ) { }
 
   /**
    * Retrieves the transactions by vendor in table format.
-   * @param {ITransactionsByReferenceQuery} query - The filter query.
+   * @param {TransactionsByVendorQueryDto} query - The filter query.
    * @returns {Promise<ITransactionsByVendorTable>}
    */
   public async table(
-    query: ITransactionsByVendorsFilter
+    query: TransactionsByVendorQueryDto
   ): Promise<ITransactionsByVendorTable> {
     const sheet = await this.transactionsByVendor.transactionsByVendors(
       query

packages/server/src/modules/FinancialStatements/modules/TrialBalanceSheet/TrialBalanceSheet.controller.ts

@@ -40,15 +40,16 @@ export class TrialBalanceSheetController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     const filter = {
       ...query,
       accountIds: castArray(query.accountIds),
     };
     // Retrieves in json table format.
-    if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.trialBalanceSheetApp.table(filter);
       // Retrieves in xlsx format
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.trialBalanceSheetApp.xlsx(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -58,7 +59,7 @@ export class TrialBalanceSheetController {
       );
       res.send(buffer);
       // Retrieves in csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.trialBalanceSheetApp.csv(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -66,7 +67,7 @@ export class TrialBalanceSheetController {
 
       res.send(buffer);
       // Retrieves in pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.trialBalanceSheetApp.pdf(filter);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/VendorBalanceSummary/VendorBalanceSummary.controller.ts

@@ -35,15 +35,16 @@ export class VendorBalanceSummaryController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the csv format.
-    if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.vendorBalanceSummaryApp.csv(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
       res.setHeader('Content-Type', 'text/csv');
 
       res.send(buffer);
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.vendorBalanceSummaryApp.xlsx(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -52,10 +53,10 @@ export class VendorBalanceSummaryController {
       res.send(buffer);
 
       // Retrieves the json table format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    } else if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.vendorBalanceSummaryApp.table(filter);
       // Retrieves the pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.vendorBalanceSummaryApp.pdf(filter);
 
       res.set({

packages/server/src/modules/Items/BulkDeleteItems.service.ts

@@ -6,7 +6,7 @@ import { DeleteItemService } from './DeleteItem.service';
 
 @Injectable()
 export class BulkDeleteItemsService {
-  constructor(private readonly deleteItemService: DeleteItemService) {}
+  constructor(private readonly deleteItemService: DeleteItemService) { }
 
   /**
    * Deletes multiple items.

packages/server/src/modules/Items/DeleteItem.service.ts

@@ -25,7 +25,7 @@ export class DeleteItemService {
 
     @Inject(Item.name)
     private readonly itemModel: TenantModelProxy<typeof Item>,
-  ) {}
+  ) { }
 
   /**
    * Delete the given item from the storage.

packages/server/src/modules/Items/Item.controller.ts

@@ -8,6 +8,7 @@ import {
   Get,
   Put,
   Query,
+  HttpCode,
 } from '@nestjs/common';
 import { TenantController } from '../Tenancy/Tenant.controller';
 import { ItemsApplicationService } from './ItemsApplication.service';
@@ -156,9 +157,45 @@ export class ItemsController extends TenantController {
   async editItem(
     @Param('id') id: string,
     @Body() editItemDto: EditItemDto,
-  ): Promise<number> {
+  ): Promise<{ id: number; message: string }> {
     const itemId = parseInt(id, 10);
-    return this.itemsApplication.editItem(itemId, editItemDto);
+    await this.itemsApplication.editItem(itemId, editItemDto);
+    return { id: itemId, message: 'The item has been successfully updated.' };
+  }
+
+  @Post('validate-bulk-delete')
+  @HttpCode(200)
+  @ApiOperation({
+    summary:
+      'Validates which items can be deleted and returns counts of deletable and non-deletable items.',
+  })
+  @ApiResponse({
+    status: 200,
+    description:
+      'Validation completed. Returns counts and IDs of deletable and non-deletable items.',
+    schema: {
+      $ref: getSchemaPath(ValidateBulkDeleteItemsResponseDto),
+    },
+  })
+  async validateBulkDeleteItems(
+    @Body() bulkDeleteDto: BulkDeleteItemsDto,
+  ): Promise<ValidateBulkDeleteItemsResponseDto> {
+    return this.itemsApplication.validateBulkDeleteItems(bulkDeleteDto.ids);
+  }
+
+  @Post('bulk-delete')
+  @HttpCode(200)
+  @ApiOperation({ summary: 'Deletes multiple items in bulk.' })
+  @ApiResponse({
+    status: 200,
+    description: 'The items have been successfully deleted.',
+  })
+  async bulkDeleteItems(
+    @Body() bulkDeleteDto: BulkDeleteItemsDto,
+  ): Promise<void> {
+    return this.itemsApplication.bulkDeleteItems(bulkDeleteDto.ids, {
+      skipUndeletable: bulkDeleteDto.skipUndeletable ?? false,
+    });
   }
 
   @Post()
@@ -168,8 +205,12 @@ export class ItemsController extends TenantController {
     description: 'The item has been successfully created.',
   })
   // @UsePipes(new ZodValidationPipe(createItemSchema))
-  async createItem(@Body() createItemDto: CreateItemDto): Promise<number> {
-    return this.itemsApplication.createItem(createItemDto);
+  async createItem(
+    @Body() createItemDto: CreateItemDto,
+  ): Promise<{ id: number; message: string }> {
+    const itemId = await this.itemsApplication.createItem(createItemDto);
+
+    return { id: itemId, message: 'The item has been successfully created.' };
   }
 
   @Delete(':id')
@@ -346,36 +387,4 @@ export class ItemsController extends TenantController {
     return this.itemsApplication.getItemReceiptsTransactions(itemId);
   }
 
-  @Post('validate-bulk-delete')
-  @ApiOperation({
-    summary:
-      'Validates which items can be deleted and returns counts of deletable and non-deletable items.',
-  })
-  @ApiResponse({
-    status: 200,
-    description:
-      'Validation completed. Returns counts and IDs of deletable and non-deletable items.',
-    schema: {
-      $ref: getSchemaPath(ValidateBulkDeleteItemsResponseDto),
-    },
-  })
-  async validateBulkDeleteItems(
-    @Body() bulkDeleteDto: BulkDeleteItemsDto,
-  ): Promise<ValidateBulkDeleteItemsResponseDto> {
-    return this.itemsApplication.validateBulkDeleteItems(bulkDeleteDto.ids);
-  }
-
-  @Post('bulk-delete')
-  @ApiOperation({ summary: 'Deletes multiple items in bulk.' })
-  @ApiResponse({
-    status: 200,
-    description: 'The items have been successfully deleted.',
-  })
-  async bulkDeleteItems(
-    @Body() bulkDeleteDto: BulkDeleteItemsDto,
-  ): Promise<void> {
-    return this.itemsApplication.bulkDeleteItems(bulkDeleteDto.ids, {
-      skipUndeletable: bulkDeleteDto.skipUndeletable ?? false,
-    });
-  }
 }

packages/server/src/modules/Items/ItemsEntries.service.ts

@@ -28,7 +28,7 @@ export class ItemsEntriesService {
 
     @Inject(ItemEntry.name)
     private readonly itemEntryModel: TenantModelProxy<typeof ItemEntry>,
-  ) {}
+  ) { }
 
   /**
    * Retrieve the inventory items entries of the reference id and type.
@@ -226,6 +226,10 @@ export class ItemsEntriesService {
     return entries.map((entry) => {
       const item = items.find((i) => i.id === entry.itemId);
 
+      if (!item) {
+        throw new Error(`Item with id ${entry.itemId} not found`);
+      }
+
       return {
         ...entry,
         sellAccountId: entry.sellAccountId || item.sellAccountId,

packages/server/src/modules/Organization/commands/UpdateOrganization.service.ts

@@ -13,9 +13,8 @@ export class UpdateOrganizationService {
     private readonly tenancyContext: TenancyContext,
     private readonly eventEmitter: EventEmitter2,
     private readonly commandOrganizationValidators: CommandOrganizationValidators,
-
     private readonly tenantRepository: TenantRepository,
-  ) {}
+  ) { }
 
   /**
    * Updates organization information.

packages/server/src/modules/PaymentReceived/PaymentsReceived.controller.ts

@@ -229,7 +229,7 @@ export class PaymentReceivesController {
     @Headers('accept') acceptHeader: string,
     @Res({ passthrough: true }) res: Response,
   ) {
-    if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    if (acceptHeader?.includes(AcceptType.ApplicationPdf)) {
       const [pdfContent, filename] = await this.paymentReceivesApplication.getPaymentReceivePdf(
         paymentReceiveId,
       );
@@ -239,7 +239,7 @@ export class PaymentReceivesController {
         'Content-Disposition': `attachment; filename="${filename}"`,
       });
       res.send(pdfContent);
-    } else if (acceptHeader.includes(AcceptType.ApplicationTextHtml)) {
+    } else if (acceptHeader?.includes(AcceptType.ApplicationTextHtml)) {
       const htmlContent =
         await this.paymentReceivesApplication.getPaymentReceivedHtml(
           paymentReceiveId,

packages/server/src/modules/PaymentReceived/commands/PaymentReceivedValidators.service.ts

@@ -32,7 +32,7 @@ export class PaymentReceivedValidators {
 
     @Inject(Account.name)
     private readonly accountModel: TenantModelProxy<typeof Account>,
-  ) {}
+  ) { }
 
   /**
    * Validates the payment existance.
@@ -76,9 +76,14 @@ export class PaymentReceivedValidators {
     customerId: number,
     paymentReceiveEntries: { invoiceId: number }[],
   ): Promise<SaleInvoice[]> {
-    const invoicesIds = paymentReceiveEntries.map(
-      (e: { invoiceId: number }) => e.invoiceId,
-    );
+    const invoicesIds = paymentReceiveEntries
+      .map((e: { invoiceId: number }) => e.invoiceId)
+      .filter((id): id is number => id !== undefined && id !== null);
+
+    if (invoicesIds.length === 0) {
+      throw new ServiceError(ERRORS.INVOICES_IDS_NOT_FOUND);
+    }
+
     const storedInvoices = await this.saleInvoiceModel()
       .query()
       .whereIn('id', invoicesIds)

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

@@ -1,15 +1,14 @@
 import {
   Controller,
   Post,
+  Put,
   Get,
   Delete,
   Param,
   Body,
-  Next,
   HttpStatus,
   ParseIntPipe,
 } from '@nestjs/common';
-import { NextFunction } from 'express';
 import { CreateRoleDto, EditRoleDto } from './dtos/Role.dto';
 import { RolesApplication } from './Roles.application';
 import {
@@ -29,7 +28,7 @@ import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 @ApiExtraModels(RoleResponseDto)
 @ApiCommonHeaders()
 export class RolesController {
-  constructor(private readonly rolesApp: RolesApplication) {}
+  constructor(private readonly rolesApp: RolesApplication) { }
 
   @Post()
   @ApiOperation({ summary: 'Create a new role' })
@@ -38,19 +37,16 @@ export class RolesController {
     status: HttpStatus.OK,
     description: 'Role created successfully',
   })
-  async createRole(
-    @Next() next: NextFunction,
-    @Body() createRoleDto: CreateRoleDto,
-  ) {
+  async createRole(@Body() createRoleDto: CreateRoleDto) {
     const role = await this.rolesApp.createRole(createRoleDto);
 
     return {
-      data: { roleId: role.id },
+      data: { id: role.id },
       message: 'The role has been created successfully.',
     };
   }
 
-  @Post(':id')
+  @Put(':id')
   @ApiOperation({ summary: 'Edit an existing role' })
   @ApiParam({ name: 'id', description: 'Role ID' })
   @ApiBody({ type: EditRoleDto })
@@ -65,7 +61,7 @@ export class RolesController {
     const role = await this.rolesApp.editRole(roleId, editRoleDto);
 
     return {
-      data: { roleId },
+      data: { id: role.id },
       message: 'The given role has been updated successfully.',
     };
   }
@@ -81,7 +77,7 @@ export class RolesController {
     await this.rolesApp.deleteRole(roleId);
 
     return {
-      data: { roleId },
+      data: { id: roleId },
       message: 'The given role has been deleted successfully.',
     };
   }

packages/server/src/modules/Roles/commands/EditRole.service.ts

@@ -17,7 +17,7 @@ export class EditRoleService {
 
     @Inject(Role.name)
     private readonly roleModel: TenantModelProxy<typeof Role>,
-  ) {}
+  ) { }
 
   /**
    * Edits details of the given role on the storage.
@@ -30,7 +30,13 @@ export class EditRoleService {
 
     // Retrieve the given role or throw not found serice error.
     const oldRole = await this.roleModel().query().findById(roleId);
-    const permissions = editRoleDTO.permissions;
+    // Transform permissions: map permissionId to id for Objection.js upsertGraph
+    const permissions = editRoleDTO.permissions.map((perm) => ({
+      id: perm.permissionId,
+      subject: perm.subject,
+      ability: perm.ability,
+      value: perm.value,
+    }));
 
     // Updates the role on the storage.
     return this.uow.withTransaction(async (trx: Knex.Transaction) => {

packages/server/src/modules/Roles/dtos/Role.dto.ts

@@ -38,7 +38,7 @@ export class CommandRolePermissionDto {
   value: boolean;
 }
 
-export class CreateRolePermissionDto extends CommandRolePermissionDto {}
+export class CreateRolePermissionDto extends CommandRolePermissionDto { }
 export class EditRolePermissionDto extends CommandRolePermissionDto {
   @IsNumber()
   @IsNotEmpty()
@@ -83,9 +83,9 @@ export class EditRoleDto extends CommandRoleDto {
   @IsArray()
   @ArrayMinSize(1)
   @ValidateNested({ each: true })
-  @Type(() => CommandRolePermissionDto)
+  @Type(() => EditRolePermissionDto)
   @ApiProperty({
-    type: [CommandRolePermissionDto],
+    type: [EditRolePermissionDto],
     description: 'The permissions of the role',
   })
   permissions: Array<EditRolePermissionDto>;

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

@@ -210,7 +210,7 @@ export class SaleInvoicesController {
     @Headers('accept') acceptHeader: string,
     @Res({ passthrough: true }) res: Response,
   ) {
-    if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    if (acceptHeader?.includes(AcceptType.ApplicationPdf)) {
       const [pdfContent, filename] =
         await this.saleInvoiceApplication.saleInvoicePdf(id);
 
@@ -219,7 +219,7 @@ export class SaleInvoicesController {
         'Content-Length': pdfContent.length,
       });
       res.send(pdfContent);
-    } else if (acceptHeader.includes(AcceptType.ApplicationTextHtml)) {
+    } else if (acceptHeader?.includes(AcceptType.ApplicationTextHtml)) {
       const htmlContent = await this.saleInvoiceApplication.saleInvoiceHtml(id);
       return { htmlContent };
     } else {

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

@@ -168,7 +168,7 @@ export class SaleReceiptsController {
     @Headers('accept') acceptHeader: string,
     @Res({ passthrough: true }) res: Response,
   ) {
-    if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    if (acceptHeader?.includes(AcceptType.ApplicationPdf)) {
       const [pdfContent] =
         await this.saleReceiptApplication.getSaleReceiptPdf(id);
 
@@ -177,7 +177,7 @@ export class SaleReceiptsController {
         'Content-Length': pdfContent.length,
       });
       res.send(pdfContent);
-    } else if (acceptHeader.includes(AcceptType.ApplicationTextHtml)) {
+    } else if (acceptHeader?.includes(AcceptType.ApplicationTextHtml)) {
       const htmlContent =
         await this.saleReceiptApplication.getSaleReceiptHtml(id);
 

packages/server/src/modules/SaleReceipts/commands/CreateSaleReceipt.service.ts

@@ -38,7 +38,7 @@ export class CreateSaleReceipt {
 
     @Inject(Customer.name)
     private readonly customerModel: TenantModelProxy<typeof Customer>,
-  ) {}
+  ) { }
 
   /**
    * Creates a new sale receipt with associated entries.
@@ -89,7 +89,7 @@ export class CreateSaleReceipt {
 
       // Inserts the sale receipt graph to the storage.
       const saleReceipt = await this.saleReceiptModel()
-        .query()
+        .query(trx)
         .upsertGraph({
           ...saleReceiptObj,
         });

packages/server/src/modules/UsersModule/UsersInvite.controller.ts

@@ -1,4 +1,4 @@
-import { Body, Controller, Get, Param, Post } from '@nestjs/common';
+import { Body, Controller, Get, Param, Patch, Post } from '@nestjs/common';
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { UsersApplication } from './Users.application';
 import { InviteUserDto, SendInviteUserDto } from './dtos/InviteUser.dto';
@@ -38,7 +38,7 @@ export class UsersInviteController {
   /**
    * Send an invitation to a new user.
    */
-  @Post()
+  @Patch()
   @ApiOperation({ summary: 'Send an invitation to a new user.' })
   async sendInvite(@Body() sendInviteDTO: SendInviteUserDto) {
     const result = await this.usersApplication.sendInvite(sendInviteDTO);

packages/server/src/modules/UsersModule/commands/EditUser.service.ts

@@ -18,7 +18,7 @@ export class EditUserService {
     private readonly tenantUserModel: TenantModelProxy<typeof TenantUser>,
     private readonly eventEmitter: EventEmitter2,
     private readonly tenancyContext: TenancyContext,
-  ) {}
+  ) { }
 
   /**
    * Creates a new user.
@@ -52,7 +52,10 @@ export class EditUserService {
     const tenantUser = await this.tenantUserModel()
       .query()
       .updateAndFetchById(userId, {
-        ...editUserDTO,
+        firstName: editUserDTO.firstName,
+        lastName: editUserDTO.lastName,
+        email: editUserDTO.email,
+        roleId: editUserDTO.roleId,
       });
     // Triggers `onTenantUserEdited` event.
     await this.eventEmitter.emitAsync(events.tenantUser.onEdited, {

packages/server/test/accounts.e2e-spec.ts

@@ -0,0 +1,182 @@
+import * as request from 'supertest';
+import { faker } from '@faker-js/faker';
+import {
+  app,
+  AuthorizationHeader,
+  orgainzationId,
+} from './init-app-test';
+
+const makeAccountRequest = () => ({
+  name: `${faker.finance.accountName()} ${Date.now()}-${faker.string.alphanumeric({ length: 4 })}`,
+  accountType: 'cash',
+  code: faker.string.alphanumeric({ length: 6 }).toUpperCase(),
+});
+
+describe.only('Accounts (e2e)', () => {
+  it('/accounts (POST)', () => {
+    return request(app.getHttpServer())
+      .post('/accounts')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(makeAccountRequest())
+      .expect(201);
+  });
+
+  it('/accounts (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/accounts')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/accounts/:id (GET)', async () => {
+    const response = await request(app.getHttpServer())
+      .post('/accounts')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(makeAccountRequest())
+      .expect(201);
+
+    const accountId = response.body.id;
+
+    return request(app.getHttpServer())
+      .get(`/accounts/${accountId}`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/accounts/:id (PUT)', async () => {
+    const response = await request(app.getHttpServer())
+      .post('/accounts')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(makeAccountRequest())
+      .expect(201);
+    const accountId = response.body.id;
+
+    return request(app.getHttpServer())
+      .put(`/accounts/${accountId}`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(makeAccountRequest())
+      .expect(200);
+  });
+
+  it('/accounts/:id (DELETE)', async () => {
+    const response = await request(app.getHttpServer())
+      .post('/accounts')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(makeAccountRequest())
+      .expect(201);
+    const accountId = response.body.id;
+
+    return request(app.getHttpServer())
+      .delete(`/accounts/${accountId}`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/accounts/:id/activate (POST)', async () => {
+    const response = await request(app.getHttpServer())
+      .post('/accounts')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({
+        ...makeAccountRequest(),
+        active: false,
+      })
+      .expect(201);
+    const accountId = response.body.id;
+
+    return request(app.getHttpServer())
+      .post(`/accounts/${accountId}/activate`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/accounts/:id/inactivate (POST)', async () => {
+    const response = await request(app.getHttpServer())
+      .post('/accounts')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({
+        ...makeAccountRequest(),
+        active: true,
+      })
+      .expect(201);
+    const accountId = response.body.id;
+
+    return request(app.getHttpServer())
+      .post(`/accounts/${accountId}/inactivate`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/accounts/types (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/accounts/types')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/accounts/validate-bulk-delete (POST)', async () => {
+    const response1 = await request(app.getHttpServer())
+      .post('/accounts')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(makeAccountRequest())
+      .expect(201);
+    const accountId1 = response1.body.id;
+
+    const response2 = await request(app.getHttpServer())
+      .post('/accounts')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(makeAccountRequest())
+      .expect(201);
+    const accountId2 = response2.body.id;
+
+    return request(app.getHttpServer())
+      .post('/accounts/validate-bulk-delete')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({
+        ids: [accountId1, accountId2],
+      })
+      .expect(200);
+  });
+
+  it('/accounts/bulk-delete (POST)', async () => {
+    const response1 = await request(app.getHttpServer())
+      .post('/accounts')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(makeAccountRequest())
+      .expect(201);
+    const accountId1 = response1.body.id;
+
+    const response2 = await request(app.getHttpServer())
+      .post('/accounts')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(makeAccountRequest())
+      .expect(201);
+    const accountId2 = response2.body.id;
+
+    return request(app.getHttpServer())
+      .post('/accounts/bulk-delete')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({
+        ids: [accountId1, accountId2],
+      })
+      .expect(200);
+  });
+});

packages/server/test/api-keys.e2e-spec.ts

@@ -0,0 +1,24 @@
+import * as request from 'supertest';
+import { faker } from '@faker-js/faker';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+describe('API Keys (e2e)', () => {
+  it('/api-keys (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/api-keys')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/api-keys/generate (POST)', () => {
+    return request(app.getHttpServer())
+      .post('/api-keys/generate')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({
+        name: faker.string.alphanumeric(10),
+      })
+      .expect(201);
+  });
+});

packages/server/test/attachments.e2e-spec.ts

@@ -0,0 +1,12 @@
+import * as request from 'supertest';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+describe('Attachments (e2e)', () => {
+  it('/attachments/:id/presigned-url (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/attachments/test-id/presigned-url')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+});

packages/server/test/banking-accounts.e2e-spec.ts

@@ -0,0 +1,49 @@
+import * as request from 'supertest';
+import { faker } from '@faker-js/faker';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+describe('Banking Accounts (e2e)', () => {
+  it('/banking/accounts (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/banking/accounts')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/banking/accounts/:bankAccountId/summary (GET)', async () => {
+    // First, get the list of bank accounts
+    const accountsResponse = await request(app.getHttpServer())
+      .get('/banking/accounts')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+
+    let bankAccountId: number;
+
+    // If there are no bank accounts, create one
+    if (accountsResponse.body.length === 0) {
+      const createResponse = await request(app.getHttpServer())
+        .post('/accounts')
+        .set('organization-id', orgainzationId)
+        .set('Authorization', AuthorizationHeader)
+        .send({
+          name: `${faker.finance.accountName()} ${Date.now()}-${faker.string.alphanumeric({ length: 4 })}`,
+          accountType: 'bank',
+          code: faker.string.alphanumeric({ length: 6 }).toUpperCase(),
+        })
+        .expect(201);
+
+      bankAccountId = createResponse.body.id;
+    } else {
+      // Use the first bank account's ID
+      bankAccountId = accountsResponse.body[0].id;
+    }
+
+    return request(app.getHttpServer())
+      .get(`/banking/accounts/${bankAccountId}/summary`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+});

packages/server/test/banking-categorize.e2e-spec.ts

@@ -0,0 +1,34 @@
+import * as request from 'supertest';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+describe('Banking Categorize (e2e)', () => {
+  it('/banking/categorize (POST)', () => {
+    return request(app.getHttpServer())
+      .post('/banking/categorize')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({
+        uncategorizedTransactionIds: [1],
+        accountId: 1000,
+        categoryId: 1,
+      })
+      .expect(200);
+  });
+
+  it('/banking/categorize/:id (DELETE)', () => {
+    return request(app.getHttpServer())
+      .delete('/banking/categorize/1')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/banking/categorize/bulk (DELETE)', () => {
+    return request(app.getHttpServer())
+      .delete('/banking/categorize/bulk')
+      .query({ uncategorizedTransactionIds: [1, 2] })
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+});

packages/server/test/banking-exclude.e2e-spec.ts

@@ -0,0 +1,46 @@
+import * as request from 'supertest';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+describe('Banking Exclude (e2e)', () => {
+  it('/banking/exclude (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/banking/exclude')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/banking/exclude/:id (PUT)', () => {
+    return request(app.getHttpServer())
+      .put('/banking/exclude/1')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/banking/exclude/bulk (PUT)', () => {
+    return request(app.getHttpServer())
+      .put('/banking/exclude/bulk')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({ ids: [1, 2] })
+      .expect(200);
+  });
+
+  it('/banking/exclude/:id (DELETE)', () => {
+    return request(app.getHttpServer())
+      .delete('/banking/exclude/1')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/banking/exclude/bulk (DELETE)', () => {
+    return request(app.getHttpServer())
+      .delete('/banking/exclude/bulk')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({ ids: [1, 2] })
+      .expect(200);
+  });
+});

packages/server/test/banking-matching.e2e-spec.ts

@@ -0,0 +1,32 @@
+import * as request from 'supertest';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+describe('Banking Matching (e2e)', () => {
+  it('/banking/matching/matched (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/banking/matching/matched')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/banking/matching/match (POST)', () => {
+    return request(app.getHttpServer())
+      .post('/banking/matching/match')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({
+        uncategorizedTransactions: [1],
+        matchedTransactions: [1],
+      })
+      .expect(200);
+  });
+
+  it('/banking/matching/unmatch/:uncategorizedTransactionId (PATCH)', () => {
+    return request(app.getHttpServer())
+      .patch('/banking/matching/unmatch/1')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+});

packages/server/test/banking-pending.e2e-spec.ts

@@ -0,0 +1,12 @@
+import * as request from 'supertest';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+describe('Banking Pending Transactions (e2e)', () => {
+  it('/banking/pending (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/banking/pending')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+});

packages/server/test/banking-recognized.e2e-spec.ts

@@ -0,0 +1,20 @@
+import * as request from 'supertest';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+describe('Banking Recognized Transactions (e2e)', () => {
+  it('/banking/recognized (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/banking/recognized')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/banking/recognized/:recognizedTransactionId (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/banking/recognized/1')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+});

packages/server/test/banking-uncategorized.e2e-spec.ts

@@ -0,0 +1,29 @@
+import * as request from 'supertest';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+describe('Banking Uncategorized Transactions (e2e)', () => {
+  it('/banking/uncategorized/:uncategorizedTransactionId (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/banking/uncategorized/1')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/banking/uncategorized/accounts/:accountId (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/banking/uncategorized/accounts/1')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/banking/uncategorized/autofill (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/banking/uncategorized/autofill')
+      .query({ uncategorizedTransactionIds: [1] })
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+});

packages/server/test/bill-landed-costs.e2e-spec.ts

@@ -0,0 +1,20 @@
+import * as request from 'supertest';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+describe('Bill Landed Costs (e2e)', () => {
+  it('/landed-cost/transactions (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/landed-cost/transactions')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/landed-cost/bills/:billId/transactions (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/landed-cost/bills/1/transactions')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+});

packages/server/test/bill-payments.e2e-spec.ts

@@ -0,0 +1,174 @@
+import * as request from 'supertest';
+import { faker } from '@faker-js/faker';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+let vendorId;
+let billId;
+let itemId;
+
+const createBillPaymentRequest = () => ({
+  vendorId: vendorId,
+  paymentAccountId: 1000,
+  paymentDate: '2023-01-01',
+  paymentNumber: faker.string.alphanumeric(10),
+  entries: [
+    {
+      billId: billId,
+      paymentAmount: 1000,
+    },
+  ],
+});
+
+describe('Bill Payments (e2e)', () => {
+  beforeAll(async () => {
+    const vendor = await request(app.getHttpServer())
+      .post('/vendors')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({ displayName: 'Test Vendor' });
+
+    vendorId = vendor.body.id;
+
+    const item = await request(app.getHttpServer())
+      .post('/items')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({
+        name: faker.commerce.productName(),
+        sellable: true,
+        purchasable: true,
+        sellAccountId: 1026,
+        costAccountId: 1019,
+        costPrice: 100,
+        sellPrice: 100,
+      });
+    itemId = parseInt(item.body.id, 10);
+
+    const bill = await request(app.getHttpServer())
+      .post('/bills')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({
+        vendorId: vendorId,
+        billDate: '2023-01-01',
+        dueDate: '2023-02-01',
+        billNumber: faker.string.alphanumeric(10),
+        // branchId: 1,
+        // warehouseId: 1,
+        entries: [
+          {
+            index: 1,
+            itemId: itemId,
+            quantity: 2,
+            rate: 1000,
+            description: 'Item description...',
+          },
+        ],
+      });
+    billId = bill.body.id;
+  });
+
+  it('/bill-payments (POST)', async () => {
+    const response = await request(app.getHttpServer())
+      .post('/bill-payments')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(createBillPaymentRequest())
+      .expect(201);
+
+    console.log(response.body);
+  });
+
+  it('/bill-payments (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/bill-payments')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/bill-payments/:id (GET)', async () => {
+    const response = await request(app.getHttpServer())
+      .post('/bill-payments')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(createBillPaymentRequest());
+    const billPaymentId = response.body.id;
+
+    return request(app.getHttpServer())
+      .get(`/bill-payments/${billPaymentId}`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/bill-payments/:id (PUT)', async () => {
+    const response = await request(app.getHttpServer())
+      .post('/bill-payments')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(createBillPaymentRequest());
+    const billPaymentId = response.body.id;
+
+    return request(app.getHttpServer())
+      .put(`/bill-payments/${billPaymentId}`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(createBillPaymentRequest())
+      .expect(200);
+  });
+
+  it('/bill-payments/:id (DELETE)', async () => {
+    const response = await request(app.getHttpServer())
+      .post('/bill-payments')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(createBillPaymentRequest());
+    const billPaymentId = response.body.id;
+
+    return request(app.getHttpServer())
+      .delete(`/bill-payments/${billPaymentId}`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/bill-payments/:id/bills (GET)', async () => {
+    const response = await request(app.getHttpServer())
+      .post('/bill-payments')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(createBillPaymentRequest());
+    const billPaymentId = response.body.id;
+
+    return request(app.getHttpServer())
+      .get(`/bill-payments/${billPaymentId}/bills`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/bill-payments/new-page/entries (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/bill-payments/new-page/entries')
+      .query({ vendorId: vendorId })
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/bill-payments/:id/edit-page (GET)', async () => {
+    const response = await request(app.getHttpServer())
+      .post('/bill-payments')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(createBillPaymentRequest());
+    const billPaymentId = response.body.id;
+
+    return request(app.getHttpServer())
+      .get(`/bill-payments/${billPaymentId}/edit-page`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+});

packages/server/test/bills.e2e-spec.ts

@@ -0,0 +1,195 @@
+import * as request from 'supertest';
+import { faker } from '@faker-js/faker';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+let vendorId;
+let itemId;
+
+const createBillRequest = () => ({
+  vendorId: vendorId,
+  billDate: '2023-01-01',
+  dueDate: '2023-02-01',
+  billNumber: faker.string.alphanumeric(10),
+  referenceNo: 'REF-000201',
+  branchId: 1,
+  warehouseId: 1,
+  entries: [
+    {
+      index: 1,
+      itemId: itemId,
+      quantity: 2,
+      rate: 1000,
+      description: 'Item description...',
+    },
+  ],
+});
+
+describe('Bills (e2e)', () => {
+  beforeAll(async () => {
+    const vendor = await request(app.getHttpServer())
+      .post('/vendors')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({ displayName: 'Test Vendor' });
+
+    vendorId = vendor.body.id;
+
+    const item = await request(app.getHttpServer())
+      .post('/items')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({
+        name: faker.commerce.productName(),
+        sellable: true,
+        purchasable: true,
+        sellAccountId: 1026,
+        costAccountId: 1019,
+        costPrice: 100,
+        sellPrice: 100,
+      });
+    itemId = parseInt(item.body.id, 10);
+  });
+
+  it('/bills (POST)', () => {
+    return request(app.getHttpServer())
+      .post('/bills')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(createBillRequest())
+      .expect(201);
+  });
+
+  it('/bills (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/bills')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/bills/:id (GET)', async () => {
+    const response = await request(app.getHttpServer())
+      .post('/bills')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(createBillRequest());
+    const billId = response.body.id;
+
+    return request(app.getHttpServer())
+      .get(`/bills/${billId}`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/bills/:id (PUT)', async () => {
+    const response = await request(app.getHttpServer())
+      .post('/bills')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(createBillRequest());
+    const billId = response.body.id;
+
+    return request(app.getHttpServer())
+      .put(`/bills/${billId}`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(createBillRequest())
+      .expect(200);
+  });
+
+  it('/bills/:id (DELETE)', async () => {
+    const response = await request(app.getHttpServer())
+      .post('/bills')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(createBillRequest());
+    const billId = response.body.id;
+
+    return request(app.getHttpServer())
+      .delete(`/bills/${billId}`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/bills/:id/open (PATCH)', async () => {
+    const response = await request(app.getHttpServer())
+      .post('/bills')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(createBillRequest());
+    const billId = response.body.id;
+
+    return request(app.getHttpServer())
+      .patch(`/bills/${billId}/open`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/bills/:id/payment-transactions (GET)', async () => {
+    const response = await request(app.getHttpServer())
+      .post('/bills')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(createBillRequest());
+    const billId = response.body.id;
+
+    return request(app.getHttpServer())
+      .get(`/bills/${billId}/payment-transactions`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/bills/validate-bulk-delete (POST)', async () => {
+    const response1 = await request(app.getHttpServer())
+      .post('/bills')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(createBillRequest());
+    const billId1 = response1.body.id;
+
+    const response2 = await request(app.getHttpServer())
+      .post('/bills')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(createBillRequest());
+    const billId2 = response2.body.id;
+
+    return request(app.getHttpServer())
+      .post('/bills/validate-bulk-delete')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({
+        ids: [billId1, billId2],
+      })
+      .expect(200);
+  });
+
+  it('/bills/bulk-delete (POST)', async () => {
+    const response1 = await request(app.getHttpServer())
+      .post('/bills')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(createBillRequest());
+    const billId1 = response1.body.id;
+
+    const response2 = await request(app.getHttpServer())
+      .post('/bills')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(createBillRequest());
+    const billId2 = response2.body.id;
+
+    return request(app.getHttpServer())
+      .post('/bills/bulk-delete')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({
+        ids: [billId1, billId2],
+      })
+      .expect(200);
+  });
+});

packages/server/test/contacts.e2e-spec.ts

@@ -0,0 +1,50 @@
+import * as request from 'supertest';
+import { faker } from '@faker-js/faker';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+let customerId;
+let vendorId;
+
+describe('Contacts (e2e)', () => {
+  beforeAll(async () => {
+    const customer = await request(app.getHttpServer())
+      .post('/customers')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({ displayName: 'Test Customer' });
+
+    customerId = customer.body.id;
+
+    const vendor = await request(app.getHttpServer())
+      .post('/vendors')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({ displayName: 'Test Vendor' });
+
+    vendorId = vendor.body.id;
+  });
+
+  it('/contacts/auto-complete (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/contacts/auto-complete')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/contacts/:id/activate (PATCH)', () => {
+    return request(app.getHttpServer())
+      .patch(`/contacts/${customerId}/activate`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/contacts/:id/inactivate (PATCH)', () => {
+    return request(app.getHttpServer())
+      .patch(`/contacts/${vendorId}/inactivate`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+});

packages/server/test/credit-note-refunds.e2e-spec.ts

@@ -0,0 +1,12 @@
+import * as request from 'supertest';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+describe('Credit Note Refunds (e2e)', () => {
+  it('/credit-notes/:creditNoteId/refunds (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/credit-notes/1/refunds')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+});

packages/server/test/credit-notes-apply-invoice.e2e-spec.ts

@@ -0,0 +1,12 @@
+import * as request from 'supertest';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+describe('Credit Notes Apply Invoice (e2e)', () => {
+  it('/credit-notes/:creditNoteId/applied-invoices (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/credit-notes/1/applied-invoices')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+});

packages/server/test/credit-notes.e2e-spec.ts

@@ -46,7 +46,7 @@ describe('Credit Notes (e2e)', () => {
         costPrice: 100,
         sellPrice: 100,
       });
-    itemId = parseInt(item.text, 10);
+    itemId = parseInt(item.body.id, 10);
   });
 
   it('/credit-notes (POST)', () => {

packages/server/test/currencies.e2e-spec.ts

@@ -0,0 +1,79 @@
+import * as request from 'supertest';
+import { faker } from '@faker-js/faker';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+const createCurrencyRequest = () => ({
+  currencyName: faker.finance.currencyName(),
+  currencyCode: faker.string.alpha({ length: 3 }).toUpperCase(),
+  currencySign: faker.finance.currencySymbol(),
+});
+
+describe('Currencies (e2e)', () => {
+  it('/currencies (POST)', () => {
+    return request(app.getHttpServer())
+      .post('/currencies')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(createCurrencyRequest())
+      .expect(201);
+  });
+
+  it('/currencies (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/currencies')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/currencies/:currencyCode (GET)', async () => {
+    const currency = createCurrencyRequest();
+    await request(app.getHttpServer())
+      .post('/currencies')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(currency);
+
+    return request(app.getHttpServer())
+      .get(`/currencies/${currency.currencyCode}`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/currencies/:id (PUT)', async () => {
+    const currency = createCurrencyRequest();
+    const response = await request(app.getHttpServer())
+      .post('/currencies')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(currency);
+    const currencyId = response.body.id;
+
+    return request(app.getHttpServer())
+      .put(`/currencies/${currencyId}`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({
+        currencyName: faker.finance.currencyName(),
+        currencyCode: currency.currencyCode,
+        currencySign: faker.finance.currencySymbol(),
+      })
+      .expect(200);
+  });
+
+  it('/currencies/:code (DELETE)', async () => {
+    const currency = createCurrencyRequest();
+    await request(app.getHttpServer())
+      .post('/currencies')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(currency);
+
+    return request(app.getHttpServer())
+      .delete(`/currencies/${currency.currencyCode}`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+});

packages/server/test/dashboard.e2e-spec.ts

@@ -0,0 +1,12 @@
+import * as request from 'supertest';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+describe('Dashboard (e2e)', () => {
+  it('/dashboard/boot (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/dashboard/boot')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+});

packages/server/test/export.e2e-spec.ts

@@ -0,0 +1,14 @@
+import * as request from 'supertest';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+describe('Export (e2e)', () => {
+  it('/export (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/export')
+      .query({ resource: 'items' })
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .set('Accept', 'application/json')
+      .expect(200);
+  });
+});

packages/server/test/financial-statements.e2e-spec.ts

@@ -0,0 +1,175 @@
+import * as request from 'supertest';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+describe('Financial Statements (e2e)', () => {
+  const baseQuery = {
+    fromDate: '2023-01-01',
+    toDate: '2023-12-31',
+  };
+
+  it('/reports/balance-sheet (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/reports/balance-sheet')
+      .query(baseQuery)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/reports/profit-loss-sheet (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/reports/profit-loss-sheet')
+      .query(baseQuery)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/reports/trial-balance-sheet (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/reports/trial-balance-sheet')
+      .query(baseQuery)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/reports/general-ledger (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/reports/general-ledger')
+      .query(baseQuery)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/reports/journal (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/reports/journal')
+      .query(baseQuery)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/reports/cashflow-statement (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/reports/cashflow-statement')
+      .query(baseQuery)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/reports/receivable-aging-summary (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/reports/receivable-aging-summary')
+      .query(baseQuery)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/reports/payable-aging-summary (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/reports/payable-aging-summary')
+      .query(baseQuery)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/reports/customer-balance-summary (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/reports/customer-balance-summary')
+      .query(baseQuery)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/reports/vendor-balance-summary (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/reports/vendor-balance-summary')
+      .query(baseQuery)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/reports/sales-by-items (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/reports/sales-by-items')
+      .query(baseQuery)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/reports/purchases-by-items (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/reports/purchases-by-items')
+      .query(baseQuery)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/reports/inventory-valuation (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/reports/inventory-valuation')
+      .query(baseQuery)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/reports/inventory-item-details (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/reports/inventory-item-details')
+      .query(baseQuery)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/reports/sales-tax-liability-summary (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/reports/sales-tax-liability-summary')
+      .query(baseQuery)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/reports/transactions-by-customers (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/reports/transactions-by-customers')
+      .query(baseQuery)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/reports/transactions-by-vendors (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/reports/transactions-by-vendors')
+      .query(baseQuery)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/reports/transactions-by-reference (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/reports/transactions-by-reference')
+      .query({
+        ...baseQuery,
+        referenceId: '1',
+        referenceType: 'SaleInvoice',
+      })
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+});

packages/server/test/import.e2e-spec.ts

@@ -0,0 +1,13 @@
+import * as request from 'supertest';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+describe('Import (e2e)', () => {
+  it('/import/sample (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/import/sample')
+      .query({ resource: 'items', format: 'csv' })
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+});

packages/server/test/init-app-test.ts

@@ -5,10 +5,10 @@ import { AppModule } from '../src/modules/App/App.module';
 
 let app: INestApplication;
 
-const email = 'ahmed@sa1234dsad.com';
+const email = 'bigcapital@bigcapital.com';
 const password = '123123123';
 
-let orgainzationId = 'hpgpqfqom8zic574';
+let orgainzationId = '';
 let authenticationToken = '';
 let AuthorizationHeader = '';
 
@@ -22,16 +22,16 @@ beforeAll(async () => {
 
   const signinResponse = await request(app.getHttpServer())
     .post('/auth/signin')
-    .send({ email, password })
-    .expect(201);
+    .send({ email, password });
 
   authenticationToken = signinResponse.body.access_token;
   AuthorizationHeader = `Bearer ${authenticationToken}`;
+  orgainzationId = signinResponse.body.organization_id;
 });
 
 afterAll(async () => {
   await app.close();
 });
-// jest.retryTimes(3, { logErrorsBeforeRetry: true });
+jest.retryTimes(3, { logErrorsBeforeRetry: true });
 
 export { app, orgainzationId, authenticationToken, AuthorizationHeader };

packages/server/test/inventory-adjustment.e2e-spec.ts

@@ -33,7 +33,7 @@ describe('Inventory Adjustments (e2e)', () => {
       .send(makeItemRequest())
       .expect(201);
 
-    const itemId = itemResponse.text;
+    const itemId = itemResponse.body.id;
 
     return request(app.getHttpServer())
       .post('/inventory-adjustments/quick')
@@ -51,7 +51,7 @@ describe('Inventory Adjustments (e2e)', () => {
       .send(makeItemRequest())
       .expect(201);
 
-    const itemId = itemResponse.text;
+    const itemId = itemResponse.body.id;
 
     const inventoryAdjustmentResponse = await request(app.getHttpServer())
       .post('/inventory-adjustments/quick')
@@ -77,7 +77,7 @@ describe('Inventory Adjustments (e2e)', () => {
       .send(makeItemRequest())
       .expect(201);
 
-    const itemId = itemResponse.text;
+    const itemId = itemResponse.body.id;
     const inventoryAdjustmentResponse = await request(app.getHttpServer())
       .post('/inventory-adjustments/quick')
       .set('organization-id', orgainzationId)
@@ -102,7 +102,7 @@ describe('Inventory Adjustments (e2e)', () => {
       .send(makeItemRequest())
       .expect(201);
 
-    const itemId = itemResponse.text;
+    const itemId = itemResponse.body.id;
     const inventoryAdjustmentResponse = await request(app.getHttpServer())
       .post('/inventory-adjustments/quick')
       .set('organization-id', orgainzationId)

packages/server/test/inventory-cost.e2e-spec.ts

@@ -0,0 +1,13 @@
+import * as request from 'supertest';
+import { app, AuthorizationHeader, orgainzationId } from './init-app-test';
+
+describe('Inventory Cost (e2e)', () => {
+  it('/inventory-cost/items (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/inventory-cost/items')
+      .query({ itemsIds: [1], date: '2023-01-01' })
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+});

packages/server/test/items.e2e-spec.ts

@@ -12,12 +12,12 @@ const makeItemRequest = () => ({
   type: 'service',
 });
 
-describe('Items (e2e)', () => {
+describe.only('Items (e2e)', () => {
   it('/items (POST)', () => {
     return request(app.getHttpServer())
       .post('/items')
       .set('organization-id', orgainzationId)
-      .set('Authorization', `Bearer ${authenticationToken}`)
+      .set('Authorization', AuthorizationHeader)
       .send(makeItemRequest())
       .expect(201);
   });
@@ -28,13 +28,38 @@ describe('Items (e2e)', () => {
       .set('organization-id', orgainzationId)
       .set('Authorization', AuthorizationHeader)
       .send(makeItemRequest());
+
     const itemId = response.body.id;
 
     return request(app.getHttpServer())
       .put(`/items/${itemId}`)
       .set('organization-id', orgainzationId)
       .set('Authorization', AuthorizationHeader)
+      .send(makeItemRequest())
+      .expect(200);
+  });
+
+  it('/items (GET)', () => {
+    return request(app.getHttpServer())
+      .get('/items')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
+  });
+
+  it('/items/:id (GET)', async () => {
+    const response = await request(app.getHttpServer())
+      .post('/items')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
       .send(makeItemRequest());
+    const itemId = response.body.id;
+
+    return request(app.getHttpServer())
+      .get(`/items/${itemId}`)
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .expect(200);
   });
 
   it('/items/:id/inactivate (PATCH)', async () => {
@@ -43,7 +68,7 @@ describe('Items (e2e)', () => {
       .set('organization-id', orgainzationId)
       .set('Authorization', AuthorizationHeader)
       .send(makeItemRequest());
-    const itemId = response.text;
+    const itemId = response.body.id;
 
     return request(app.getHttpServer())
       .patch(`/items/${itemId}/inactivate`)
@@ -57,8 +82,11 @@ describe('Items (e2e)', () => {
       .post('/items')
       .set('organization-id', orgainzationId)
       .set('Authorization', AuthorizationHeader)
-      .send(makeItemRequest());
-    const itemId = response.text;
+      .send({
+        ...makeItemRequest(),
+        active: false,
+      });
+    const itemId = response.body.id;
 
     return request(app.getHttpServer())
       .patch(`/items/${itemId}/activate`)
@@ -73,7 +101,7 @@ describe('Items (e2e)', () => {
       .set('organization-id', orgainzationId)
       .set('Authorization', AuthorizationHeader)
       .send(makeItemRequest());
-    const itemId = response.text;
+    const itemId = response.body.id;
 
     return request(app.getHttpServer())
       .delete(`/items/${itemId}`)
@@ -88,8 +116,7 @@ describe('Items (e2e)', () => {
       .set('organization-id', orgainzationId)
       .set('Authorization', AuthorizationHeader)
       .send(makeItemRequest());
-
-    const itemId = response.text;
+    const itemId = response.body.id;
 
     return request(app.getHttpServer())
       .get(`/items/${itemId}/invoices`)
@@ -104,8 +131,7 @@ describe('Items (e2e)', () => {
       .set('organization-id', orgainzationId)
       .set('Authorization', AuthorizationHeader)
       .send(makeItemRequest());
-
-    const itemId = response.text;
+    const itemId = response.body.id;
 
     return request(app.getHttpServer())
       .get(`/items/${itemId}/bills`)
@@ -120,8 +146,7 @@ describe('Items (e2e)', () => {
       .set('organization-id', orgainzationId)
       .set('Authorization', AuthorizationHeader)
       .send(makeItemRequest());
-
-    const itemId = response.text;
+    const itemId = response.body.id;
 
     return request(app.getHttpServer())
       .get(`/items/${itemId}/estimates`)
@@ -136,8 +161,7 @@ describe('Items (e2e)', () => {
       .set('organization-id', orgainzationId)
       .set('Authorization', AuthorizationHeader)
       .send(makeItemRequest());
-
-    const itemId = response.text;
+    const itemId = response.body.id;
 
     return request(app.getHttpServer())
       .get(`/items/${itemId}/receipts`)
@@ -145,4 +169,54 @@ describe('Items (e2e)', () => {
       .set('Authorization', AuthorizationHeader)
       .expect(200);
   });
+
+  it('/items/validate-bulk-delete (POST)', async () => {
+    const response1 = await request(app.getHttpServer())
+      .post('/items')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(makeItemRequest());
+    const itemId1 = response1.body.id;
+
+    const response2 = await request(app.getHttpServer())
+      .post('/items')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(makeItemRequest());
+    const itemId2 = response2.body.id;
+
+    return request(app.getHttpServer())
+      .post('/items/validate-bulk-delete')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({
+        ids: [itemId1, itemId2],
+      })
+      .expect(200);
+  });
+
+  it('/items/bulk-delete (POST)', async () => {
+    const response1 = await request(app.getHttpServer())
+      .post('/items')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(makeItemRequest());
+    const itemId1 = response1.body.id;
+
+    const response2 = await request(app.getHttpServer())
+      .post('/items')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send(makeItemRequest());
+    const itemId2 = response2.body.id;
+
+    return request(app.getHttpServer())
+      .post('/items/bulk-delete')
+      .set('organization-id', orgainzationId)
+      .set('Authorization', AuthorizationHeader)
+      .send({
+        ids: [itemId1, itemId2],
+      })
+      .expect(200);
+  });
 });

packages/server/test/manual-journal.e2e-spec.ts

@@ -23,7 +23,7 @@ const makeManualJournalRequest = () => ({
   ],
 });
 
-describe.only('Manual Journals (e2e)', () => {
+describe('Manual Journals (e2e)', () => {
   it('/manual-journals (POST)', () => {
     return request(app.getHttpServer())
       .post('/manual-journals')
@@ -85,7 +85,7 @@ describe.only('Manual Journals (e2e)', () => {
       .expect(200);
   });
 
-  it('/manual-journals/:id/publish (PUT)', async () => {
+  it('/manual-journals/:id/publish (PATCH)', async () => {
     const response = await request(app.getHttpServer())
       .post('/manual-journals')
       .set('organization-id', orgainzationId)
@@ -95,7 +95,7 @@ describe.only('Manual Journals (e2e)', () => {
     const journalId = response.body.id;
 
     return request(app.getHttpServer())
-      .put(`/manual-journals/${journalId}/publish`)
+      .patch(`/manual-journals/${journalId}/publish`)
       .set('organization-id', orgainzationId)
       .set('Authorization', AuthorizationHeader)
       .send()