fix(script): setup script

docker/migration/Dockerfile

@@ -35,4 +35,4 @@ WORKDIR /app/packages/server
 RUN git clone https://github.com/vishnubob/wait-for-it.git
 
 # Once we listen the mysql port run the migration task.
-CMD ./wait-for-it/wait-for-it.sh mysql:3306 -- sh -c "node dist/cli.js system:migrate:latest && node dist/cli.js tenants:migrate:latest"
+CMD ./wait-for-it/wait-for-it.sh mysql:3306 -- sh -c "pnpm run system:migrate:latest && pnpm run tenants:migrate:latest"

packages/server/Dockerfile

@@ -75,9 +75,6 @@ COPY --from=builder --chown=nodejs:nodejs /app/packages/server/src/i18n ./packag
 COPY --from=builder --chown=nodejs:nodejs /app/packages/server/public ./packages/server/public
 COPY --from=builder --chown=nodejs:nodejs /app/packages/server/static ./packages/server/static
 
-# Copy database migration files (needed for running migrations)
-COPY --from=builder --chown=nodejs:nodejs /app/packages/server/src/database ./packages/server/src/database
-
 # Copy built shared packages (dist folders and package.json for module resolution)
 COPY --from=builder --chown=nodejs:nodejs /app/shared/bigcapital-utils/dist ./shared/bigcapital-utils/dist
 COPY --from=builder --chown=nodejs:nodejs /app/shared/pdf-templates/dist ./shared/pdf-templates/dist

packages/server/nest-cli.json

@@ -2,23 +2,10 @@
   "$schema": "https://json.schemastore.org/nest-cli",
   "collection": "@nestjs/schematics",
   "sourceRoot": "src",
-  "entryFile": "main",
   "compilerOptions": {
     "deleteOutDir": true,
     "assets": [
-      { "include": "i18n/**/*", "watchAssets": true },
+      { "include": "i18n/**/*", "watchAssets": true }
-      { "include": "database/**/*", "exclude": "**/*.ts", "watchAssets": true }
     ]
-  },
-  "projects": {
-    "cli": {
-      "type": "application",
-      "root": "src",
-      "entryFile": "cli",
-      "sourceRoot": "src",
-      "compilerOptions": {
-        "tsConfigPath": "tsconfig.json"
-      }
-    }
   }
 }

packages/server/src/modules/Auth/processors/SendResetPasswordMail.processor.ts

@@ -1,6 +1,10 @@
 import { Processor, WorkerHost } from '@nestjs/bullmq';
 import { Scope } from '@nestjs/common';
-import { SendResetPasswordMailQueue } from '../Auth.constants';
+import {
+  SendResetPasswordMailJob,
+  SendResetPasswordMailQueue,
+} from '../Auth.constants';
+import { Process } from '@nestjs/bull';
 import { Job } from 'bullmq';
 import { AuthenticationMailMesssages } from '../AuthMailMessages.esrvice';
 import { MailTransporter } from '@/modules/Mail/MailTransporter.service';
@@ -19,6 +23,7 @@ export class SendResetPasswordMailProcessor extends WorkerHost {
     super();
   }
 
+  @Process(SendResetPasswordMailJob)
   async process(job: Job<SendResetPasswordMailJobPayload>) {
     try {
       await this.authMailMesssages.sendResetPasswordMail(

packages/server/src/modules/Auth/processors/SendSignupVerificationMail.processor.ts

@@ -1,7 +1,11 @@
 import { Scope } from '@nestjs/common';
 import { Job } from 'bullmq';
+import { Process } from '@nestjs/bull';
 import { Processor, WorkerHost } from '@nestjs/bullmq';
-import { SendSignupVerificationMailQueue } from '../Auth.constants';
+import {
+  SendSignupVerificationMailJob,
+  SendSignupVerificationMailQueue,
+} from '../Auth.constants';
 import { MailTransporter } from '@/modules/Mail/MailTransporter.service';
 import { AuthenticationMailMesssages } from '../AuthMailMessages.esrvice';
 
@@ -17,6 +21,7 @@ export class SendSignupVerificationMailProcessor extends WorkerHost {
     super();
   }
 
+  @Process(SendSignupVerificationMailJob)
   async process(job: Job<SendSignupVerificationMailJobPayload>) {
     try {
       await this.authMailMesssages.sendSignupVerificationMail(

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

@@ -1,9 +1,11 @@
+import { Process } from '@nestjs/bull';
 import { UseCls } from 'nestjs-cls';
 import { Processor, WorkerHost } from '@nestjs/bullmq';
 import { Scope } from '@nestjs/common';
 import { Job } from 'bullmq';
 import {
   PlaidFetchTransitonsEventPayload,
+  UpdateBankingPlaidTransitionsJob,
   UpdateBankingPlaidTransitionsQueueJob,
 } from '../types/BankingPlaid.types';
 import { PlaidUpdateTransactions } from '../command/PlaidUpdateTransactions';
@@ -26,6 +28,7 @@ export class PlaidFetchTransactionsProcessor extends WorkerHost {
   /**
    * Triggers the function.
    */
+  @Process(UpdateBankingPlaidTransitionsJob)
   @UseCls()
   async process(job: Job<PlaidFetchTransitonsEventPayload>) {
     const { plaidItemId } = job.data;

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

@@ -7,6 +7,7 @@ import {
   RecognizeUncategorizedTransactionsJobPayload,
   RecognizeUncategorizedTransactionsQueue,
 } from '../_types';
+import { Process } from '@nestjs/bull';
 
 @Processor({
   name: RecognizeUncategorizedTransactionsQueue,
@@ -27,6 +28,7 @@ export class RegonizeTransactionsPrcessor extends WorkerHost {
   /**
    * Triggers sending invoice mail.
    */
+  @Process(RecognizeUncategorizedTransactionsQueue)
   @UseCls()
   async process(job: Job<RecognizeUncategorizedTransactionsJobPayload>) {
     const { ruleId, transactionsCriteria } = job.data;

packages/server/src/modules/CLI/commands/BaseCommand.ts

@@ -22,7 +22,6 @@ export abstract class BaseCommand extends CommandRunner {
       },
       migrations: {
         directory: this.configService.get('systemDatabase.migrationDir'),
-        loadExtensions: ['.js'],
       },
       seeds: {
         directory: this.configService.get('systemDatabase.seedsDir'),
@@ -44,7 +43,6 @@ export abstract class BaseCommand extends CommandRunner {
       },
       migrations: {
         directory: this.configService.get('tenantDatabase.migrationsDir') || './src/database/migrations',
-        loadExtensions: ['.js'],
       },
       seeds: {
         directory: this.configService.get('tenantDatabase.seedsDir') || './src/database/seeds/core',

packages/server/src/modules/InventoryCost/processors/ComputeItemCost.processor.ts

@@ -7,7 +7,11 @@ import * as moment from 'moment';
 import { TenantJobPayload } from '@/interfaces/Tenant';
 import { InventoryComputeCostService } from '../commands/InventoryComputeCost.service';
 import { events } from '@/common/events/events';
-import { ComputeItemCostQueue } from '../types/InventoryCost.types';
+import {
+  ComputeItemCostQueue,
+  ComputeItemCostQueueJob,
+} from '../types/InventoryCost.types';
+import { Process } from '@nestjs/bull';
 
 interface ComputeItemCostJobPayload extends TenantJobPayload {
   itemId: number;
@@ -35,6 +39,7 @@ export class ComputeItemCostProcessor extends WorkerHost {
    * Process the compute item cost job.
    * @param {Job<ComputeItemCostJobPayload>} job - The job to process
    */
+  @Process(ComputeItemCostQueueJob)
   @UseCls()
   async process(job: Job<ComputeItemCostJobPayload>) {
     const { itemId, startingDate, organizationId, userId } = job.data;

packages/server/src/modules/InventoryCost/processors/WriteInventoryTransactionsGLEntries.processor.ts

@@ -1,4 +1,8 @@
-import { WriteInventoryTransactionsGLEntriesQueue } from '../types/InventoryCost.types';
+import { Process } from '@nestjs/bull';
+import {
+  WriteInventoryTransactionsGLEntriesQueue,
+  WriteInventoryTransactionsGLEntriesQueueJob,
+} from '../types/InventoryCost.types';
 import { Processor, WorkerHost } from '@nestjs/bullmq';
 import { Scope } from '@nestjs/common';
 
@@ -11,5 +15,6 @@ export class WriteInventoryTransactionsGLEntriesProcessor extends WorkerHost {
     super();
   }
 
+  @Process(WriteInventoryTransactionsGLEntriesQueueJob)
   async process() {}
 }

packages/server/src/modules/Organization/processors/OrganizationBuild.processor.ts

@@ -2,8 +2,10 @@ import { Processor, WorkerHost } from '@nestjs/bullmq';
 import { Scope } from '@nestjs/common';
 import { Job } from 'bullmq';
 import { ClsService, UseCls } from 'nestjs-cls';
+import { Process } from '@nestjs/bull';
 import {
   OrganizationBuildQueue,
+  OrganizationBuildQueueJob,
   OrganizationBuildQueueJobPayload,
 } from '../Organization.types';
 import { BuildOrganizationService } from '../commands/BuildOrganization.service';
@@ -20,6 +22,7 @@ export class OrganizationBuildProcessor extends WorkerHost {
     super();
   }
 
+  @Process(OrganizationBuildQueueJob)
   @UseCls()
   async process(job: Job<OrganizationBuildQueueJobPayload>) {
     console.log('Processing organization build job:', job.id);

packages/server/src/modules/System/SystemDB/SystemDB.module.ts

@@ -22,7 +22,6 @@ const providers = [
       },
       migrations: {
         directory: configService.get('systemDatabase.migrationDir'),
-        loadExtensions: ['.js'],
       },
       seeds: {
         directory: configService.get('systemDatabase.seedsDir'),

packages/server/src/modules/Tenancy/TenancyDB/TenancyDB.module.ts

@@ -33,7 +33,6 @@ export const TenancyDatabaseProxyProvider = ClsModule.forFeatureAsync({
       },
       migrations: {
         directory: configService.get('tenantDatabase.migrationsDir'),
-        loadExtensions: ['.js'],
       },
       seeds: {
         directory: configService.get('tenantDatabase.seedsDir'),

packages/webapp/src/hooks/useQueryRequest.tsx

@@ -3,7 +3,6 @@ import { useQuery } from 'react-query';
 import { castArray, defaultTo } from 'lodash';
 import { useAuthOrganizationId } from './state';
 import useApiRequest from './useRequest';
-import { normalizeApiPath } from '../utils';
 import { useRef } from 'react';
 
 /**
@@ -20,11 +19,7 @@ export function useRequestQuery(query, axios, props) {
 
   const states = useQuery(
     query,
-    () =>
+    () => apiRequest.http({ ...axios, url: `/api/${axios.url}` }),
-      apiRequest.http({
-        ...axios,
-        url: `/api/${normalizeApiPath(axios.url)}`,
-      }),
     props,
   );
   // Momerize the default data.

packages/webapp/src/hooks/useRequest.tsx

@@ -7,7 +7,7 @@ import {
   useSetGlobalErrors,
   useAuthToken,
 } from './state';
-import { getCookie, normalizeApiPath } from '../utils';
+import { getCookie } from '../utils';
 
 export default function useApiRequest() {
   const setGlobalErrors = useSetGlobalErrors();
@@ -93,27 +93,27 @@ export default function useApiRequest() {
       http,
 
       get(resource, params) {
-        return http.get(`/api/${normalizeApiPath(resource)}`, params);
+        return http.get(`/api/${resource}`, params);
       },
 
       post(resource, params, config) {
-        return http.post(`/api/${normalizeApiPath(resource)}`, params, config);
+        return http.post(`/api/${resource}`, params, config);
       },
 
       update(resource, slug, params) {
-        return http.put(`/api/${normalizeApiPath(resource)}/${slug}`, params);
+        return http.put(`/api/${resource}/${slug}`, params);
       },
 
       put(resource, params) {
-        return http.put(`/api/${normalizeApiPath(resource)}`, params);
+        return http.put(`/api/${resource}`, params);
       },
 
       patch(resource, params, config) {
-        return http.patch(`/api/${normalizeApiPath(resource)}`, params, config);
+        return http.patch(`/api/${resource}`, params, config);
       },
 
       delete(resource, params) {
-        return http.delete(`/api/${normalizeApiPath(resource)}`, params);
+        return http.delete(`/api/${resource}`, params);
       },
     }),
     [http],
@@ -130,22 +130,22 @@ export function useAuthApiRequest() {
     () => ({
       http,
       get(resource, params) {
-        return http.get(`/api/${normalizeApiPath(resource)}`, params);
+        return http.get(`/api/${resource}`, params);
       },
       post(resource, params, config) {
-        return http.post(`/api/${normalizeApiPath(resource)}`, params, config);
+        return http.post(`/api/${resource}`, params, config);
       },
       update(resource, slug, params) {
-        return http.put(`/api/${normalizeApiPath(resource)}/${slug}`, params);
+        return http.put(`/api/${resource}/${slug}`, params);
       },
       put(resource, params) {
-        return http.put(`/api/${normalizeApiPath(resource)}`, params);
+        return http.put(`/api/${resource}`, params);
       },
       patch(resource, params, config) {
-        return http.patch(`/api/${normalizeApiPath(resource)}`, params, config);
+        return http.patch(`/api/${resource}`, params, config);
       },
       delete(resource, params) {
-        return http.delete(`/api/${normalizeApiPath(resource)}`, params);
+        return http.delete(`/api/${resource}`, params);
       },
     }),
     [http],

packages/webapp/src/utils/index.tsx

@@ -13,9 +13,6 @@ import jsCookie from 'js-cookie';
 import { deepMapKeys } from './map-key-deep';
 export * from './deep';
 
-/** Strips leading slash from a path segment to avoid double slashes when joining with a base (e.g. `/api/` + path). */
-export const normalizeApiPath = (path) => (path || '').replace(/^\//, '');
-
 export const getCookie = (name, defaultValue) =>
   _.defaultTo(jsCookie.get(name), defaultValue);