chore: update Nest 9 to 10

apps/api/package.json

@@ -47,11 +47,11 @@
 		"yargs": "^17.5.0"
 	},
 	"devDependencies": {
-		"@nestjs/schematics": "^9.0.3",
-		"@nestjs/testing": "^9.2.1",
+		"@nestjs/schematics": "^10.0.3",
+		"@nestjs/testing": "^10.3.0",
 		"nodemon": "^2.0.7",
 		"pm2": "^4.5.1",
 		"ts-node": "^9.1.1",
-		"typescript": "4.5.5"
+		"typescript": "4.8.4"
 	}
 }

apps/desktop/package.json

@@ -48,7 +48,7 @@
 		"@nebular/eva-icons": "^9.0.3",
 		"@nebular/security": "^9.0.3",
 		"@nebular/theme": "^9.0.3",
-		"@nestjs/typeorm": "^9.0.1",
+		"@nestjs/typeorm": "^10.0.1",
 		"@ng-select/ng-select": "^8.1.1",
 		"@ngneat/until-destroy": "^9.2.0",
 		"@ngx-translate/core": "^14.0.0",

apps/desktop/src/package.json

@@ -140,7 +140,7 @@
 		"@gauzy/desktop-libs": "^0.1.0",
 		"@gauzy/desktop-window": "^0.1.0",
 		"@gauzy/knowledge-base": "^0.1.0",
-		"@nestjs/platform-express": "^9.2.1",
+		"@nestjs/platform-express": "^10.3.0",
 		"@sentry/electron": "^4.15.1",
 		"@sentry/node": "^7.90.0",
 		"@sentry/tracing": "^7.90.0",

apps/server/package.json

@@ -47,7 +47,7 @@
 		"@nebular/eva-icons": "^9.0.3",
 		"@nebular/security": "^9.0.3",
 		"@nebular/theme": "^9.0.3",
-		"@nestjs/typeorm": "^9.0.1",
+		"@nestjs/typeorm": "^10.0.1",
 		"@ng-select/ng-select": "^8.1.1",
 		"@ngneat/until-destroy": "^9.2.0",
 		"@ngx-translate/core": "^14.0.0",

apps/server/src/package.json

@@ -135,7 +135,7 @@
 		"@gauzy/desktop-libs": "^0.1.0",
 		"@gauzy/desktop-window": "^0.1.0",
 		"@gauzy/knowledge-base": "^0.1.0",
-		"@nestjs/platform-express": "^9.2.1",
+		"@nestjs/platform-express": "^10.3.0",
 		"@sentry/electron": "^4.15.1",
 		"@sentry/node": "^7.90.0",
 		"@sentry/tracing": "^7.90.0",

nest-cli.json

@@ -1,5 +1,7 @@
 {
 	"language": "ts",
+	"builder": "swc",
+	"typeCheck": true,
 	"collection": "@nestjs/schematics",
 	"sourceRoot": "apps/api/src",
 	"compilerOptions": {

packages/auth/package.json

@@ -29,8 +29,8 @@
 		"@gauzy/common": "^0.1.0",
 		"@gauzy/config": "^0.1.0",
 		"@gauzy/contracts": "^0.1.0",
-		"@nestjs/axios": "^3.0.0",
-		"@nestjs/passport": "^9.0.3",
+		"@nestjs/axios": "^3.0.1",
+		"@nestjs/passport": "^10.0.3",
 		"bcrypt": "^5.1.0",
 		"dotenv": "^16.0.3",
 		"passport": "^0.6.0",
@@ -53,6 +53,6 @@
 		"@types/passport-google-oauth20": "^2.0.6",
 		"@types/passport-jwt": "^3.0.6",
 		"rimraf": "^3.0.2",
-		"typescript": "4.5.5"
+		"typescript": "4.8.4"
 	}
 }

packages/common-angular/package.json

@@ -40,7 +40,7 @@
 		"@types/node": "^17.0.33",
 		"@types/moment-duration-format": "^2.2.3",
 		"rimraf": "^3.0.2",
-		"typescript": "4.5.5"
+		"typescript": "4.8.4"
 	},
 	"jest": {
 		"moduleFileExtensions": [

packages/common/package.json

@@ -34,7 +34,7 @@
 	"devDependencies": {
 		"@types/node": "^17.0.33",
 		"rimraf": "^3.0.2",
-		"typescript": "4.5.5"
+		"typescript": "4.8.4"
 	},
 	"jest": {
 		"moduleFileExtensions": [

packages/config/package.json

@@ -28,13 +28,13 @@
 	},
 	"keywords": [],
 	"dependencies": {
-		"@nestjs/config": "^2.2.0",
+		"@nestjs/config": "^3.1.1",
 		"dotenv": "^16.0.3"
 	},
 	"devDependencies": {
 		"@gauzy/common": "^0.1.0",
 		"@types/node": "^17.0.33",
 		"rimraf": "^3.0.2",
-		"typescript": "4.5.5"
+		"typescript": "4.8.4"
 	}
 }

packages/config/src/environments/environment.prod.ts

@@ -51,7 +51,7 @@ export const environment: IEnvironment = {
 	/**
 	 * Throttler (Rate Limiting) Options
 	 */
-	THROTTLE_TTL: parseInt(process.env.THROTTLE_TTL) || 60, // now it's 60 seconds, but in future versions of Throttle going to be 60ms!
+	THROTTLE_TTL: parseInt(process.env.THROTTLE_TTL) || 60 * 1000,
 	THROTTLE_LIMIT: parseInt(process.env.THROTTLE_LIMIT) || 60000,
 
 	/**

packages/config/src/environments/environment.ts

@@ -55,7 +55,7 @@ export const environment: IEnvironment = {
 	/**
 	 * Throttler (Rate Limiting) Options
 	 */
-	THROTTLE_TTL: parseInt(process.env.THROTTLE_TTL) || 60, // now it's 60 seconds, but in future versions of Throttle going to be 60ms!
+	THROTTLE_TTL: parseInt(process.env.THROTTLE_TTL) || 60 * 1000,
 	THROTTLE_LIMIT: parseInt(process.env.THROTTLE_LIMIT) || 60000,
 	THROTTLE_ENABLED: process.env.THROTTLE_ENABLED == 'true',
 

packages/contracts/package.json

@@ -30,7 +30,7 @@
 	"devDependencies": {
 		"@types/node": "^17.0.33",
 		"rimraf": "^3.0.2",
-		"typescript": "4.5.5"
+		"typescript": "4.8.4"
 	},
 	"jest": {
 		"moduleFileExtensions": [

packages/core/package.json

@@ -56,26 +56,26 @@
 		"@godaddy/terminus": "^4.12.1",
 		"@grpc/grpc-js": "^1.6.7",
 		"@jitsu/js": "^1.3.0",
-		"@nestjs/apollo": "^10.1.6",
-		"@nestjs/axios": "^3.0.0",
-		"@nestjs/common": "^9.2.1",
+		"@nestjs/apollo": "^12.0.11",
+		"@nestjs/axios": "^3.0.1",
+		"@nestjs/common": "^10.3.0",
 		"@nestjs/cache-manager": "^2.1.1",
 		"cache-manager-redis-yet": "^4.1.2",
-		"@nestjs/core": "^9.2.1",
-		"@nestjs/cqrs": "^9.0.3",
-		"@nestjs/graphql": "^10.1.6",
-		"@nestjs/jwt": "^10.0.2",
-		"@nestjs/mapped-types": "^1.2.2",
-		"@nestjs/microservices": "^9.2.1",
-		"@nestjs/passport": "^9.0.3",
-		"@nestjs/platform-express": "^9.2.1",
-		"@nestjs/platform-socket.io": "^9.2.1",
-		"@nestjs/serve-static": "^3.0.1",
-		"@nestjs/swagger": "^6.2.1",
-		"@nestjs/terminus": "^9.2.1",
-		"@nestjs/throttler": "^4.0.0",
-		"@nestjs/typeorm": "^9.0.1",
-		"@nestjs/websockets": "^9.2.1",
+		"@nestjs/core": "^10.3.0",
+		"@nestjs/cqrs": "^10.2.6",
+		"@nestjs/graphql": "^12.0.11",
+		"@nestjs/jwt": "^10.2.0",
+		"@nestjs/mapped-types": "^2.0.4",
+		"@nestjs/microservices": "^10.3.0",
+		"@nestjs/passport": "^10.0.3",
+		"@nestjs/platform-express": "^10.3.0",
+		"@nestjs/platform-socket.io": "^10.3.0",
+		"@nestjs/serve-static": "^4.0.0",
+		"@nestjs/swagger": "^7.1.17",
+		"@nestjs/terminus": "^10.2.0",
+		"@nestjs/throttler": "^5.1.1",
+		"@nestjs/typeorm": "^10.0.1",
+		"@nestjs/websockets": "^10.3.0",
 		"@nestjsx/crud": "^5.0.0-alpha.3",
 		"@nestjsx/crud-typeorm": "^5.0.0-alpha.3",
 		"@opentelemetry/api": "^1.7.0",
@@ -90,6 +90,7 @@
 		"@sentry/types": "^7.90.0",
 		"@sentry/profiling-node": "^1.3.2",
 		"@sentry/hub": "^7.90.0",
+		"@apollo/server": "^4.9.5",
 		"apollo-server-core": "^3.10.1",
 		"apollo-server-express": "^3.5.0",
 		"apollo-server-fastify": "^3.5.0",
@@ -141,8 +142,7 @@
 		"multer-storage-cloudinary": "^4.0.0",
 		"mysql": "^2.18.1",
 		"nats": "^2.6.1",
-		"nest-router": "^1.0.9",
-		"nestjs-i18n": "^9.0.12",
+		"nestjs-i18n": "^10.4.0",
 		"node-fetch": "^2.6.7",
 		"nodemailer": "^6.4.11",
 		"nodemailer-handlebars": "^1.0.1",
@@ -161,7 +161,7 @@
 		"sql.js": "^1.5.0",
 		"sqlite3": "^5.1.5",
 		"streamifier": "^0.1.1",
-		"swagger-ui-express": "^4.1.4",
+		"swagger-ui-express": "^5.0.0",
 		"typeorm": "^0.3.17",
 		"underscore": "^1.13.3",
 		"unleash-client": "^3.16.1",
@@ -172,9 +172,9 @@
 		"yargs": "^17.5.0"
 	},
 	"devDependencies": {
-		"@nestjs/cli": "^9.1.5",
-		"@nestjs/schematics": "^9.0.3",
-		"@nestjs/testing": "^9.2.1",
+		"@nestjs/cli": "^10.2.1",
+		"@nestjs/schematics": "^10.0.3",
+		"@nestjs/testing": "^10.3.0",
 		"@types/bcrypt": "^5.0.0",
 		"@types/email-templates": "^7.1.0",
 		"@types/express": "^4.17.13",
@@ -204,7 +204,7 @@
 		"ts-node": "^10.2.1",
 		"tslint": "^6.1.3",
 		"tslint-config-prettier": "^1.18.0",
-		"typescript": "4.5.5"
+		"typescript": "4.8.4"
 	},
 	"jest": {
 		"moduleFileExtensions": [

packages/core/src/accounting-template/accounting-template.module.ts

@@ -1,7 +1,7 @@
 import { forwardRef, Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CqrsModule } from '@nestjs/cqrs';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { TenantModule } from '../tenant/tenant.module';
 import { UserModule } from './../user/user.module';
 import { AccountingTemplate } from './accounting-template.entity';
@@ -11,19 +11,14 @@ import { QueryHandlers } from './queries/handlers';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/accounting-template', module: AccountingTemplateModule }
-		]),
+		RouterModule.register([{ path: '/accounting-template', module: AccountingTemplateModule }]),
 		forwardRef(() => TypeOrmModule.forFeature([AccountingTemplate])),
 		forwardRef(() => TenantModule),
 		forwardRef(() => UserModule),
-		CqrsModule,
+		CqrsModule
 	],
 	controllers: [AccountingTemplateController],
-	providers: [
-		AccountingTemplateService,
-		...QueryHandlers
-	],
+	providers: [AccountingTemplateService, ...QueryHandlers],
 	exports: [AccountingTemplateService]
 })
 export class AccountingTemplateModule {}

packages/core/src/app.module.ts

@@ -408,11 +408,18 @@ function createSentryOptions(host: HttpAdapterHost): SentryModuleOptions {
 			? [
 					ThrottlerModule.forRootAsync({
 						inject: [ConfigService],
-						useFactory: (config: ConfigService): ThrottlerModuleOptions =>
-							({
-								ttl: config.get('THROTTLE_TTL'),
-								limit: config.get('THROTTLE_LIMIT')
-							} as ThrottlerModuleOptions)
+						useFactory: (config: ConfigService) => [
+							{
+								ttl: () => {
+									const ttlValue = config.get<number>('THROTTLE_TTL') as number;
+									return ttlValue;
+								},
+								limit: () => {
+									const limitValue = config.get<number>('THROTTLE_LIMIT') as number;
+									return limitValue;
+								}
+							}
+						]
 					})
 			  ]
 			: []),

packages/core/src/appointment-employees/appointment-employees.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { AppointmentEmployee } from './appointment-employees.entity';
 import { AppointmentEmployeesController } from './appointment-employees.controller';
 import { AppointmentEmployeesService } from './appointment-employees.service';
@@ -8,7 +8,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/appointment-employees',
 				module: AppointmentEmployeesModule

packages/core/src/approval-policy/approval-policy.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CqrsModule } from '@nestjs/cqrs';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { ApprovalPolicy } from './approval-policy.entity';
 import { ApprovalPolicyController } from './approval-policy.controller';
 import { ApprovalPolicyService } from './approval-policy.service';
@@ -11,25 +11,14 @@ import { CommandHandlers } from './commands/handlers';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/approval-policy', module: ApprovalPolicyModule }
-		]),
-		TypeOrmModule.forFeature([
-			ApprovalPolicy
-		]),
+		RouterModule.register([{ path: '/approval-policy', module: ApprovalPolicyModule }]),
+		TypeOrmModule.forFeature([ApprovalPolicy]),
 		TenantModule,
 		UserModule,
 		CqrsModule
 	],
-	controllers: [
-		ApprovalPolicyController
-	],
-	providers: [
-		ApprovalPolicyService,
-		...CommandHandlers
-	],
-	exports: [
-		ApprovalPolicyService
-	]
+	controllers: [ApprovalPolicyController],
+	providers: [ApprovalPolicyService, ...CommandHandlers],
+	exports: [ApprovalPolicyService]
 })
 export class ApprovalPolicyModule {}

packages/core/src/auth/auth.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CqrsModule } from '@nestjs/cqrs';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { SocialAuthModule } from '@gauzy/auth';
 import { Organization, OrganizationTeam, UserOrganization } from './../core/entities/internal';
 import { EmailSendModule } from './../email-send/email-send.module';
@@ -17,33 +17,22 @@ import { EmailConfirmationService } from './email-confirmation.service';
 import { EmailVerificationController } from './email-verification.controller';
 import { FeatureModule } from './../feature/feature.module';
 
-const providers = [
-	AuthService,
-	EmailConfirmationService,
-	UserOrganizationService
-];
+const providers = [AuthService, EmailConfirmationService, UserOrganizationService];
 
-const strategies = [
-	JwtStrategy,
-	JwtRefreshTokenStrategy
-];
+const strategies = [JwtStrategy, JwtRefreshTokenStrategy];
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/auth',
 				module: AuthModule,
-				children: [
-					{ path: '/', module: SocialAuthModule }
-				]
+				children: [{ path: '/', module: SocialAuthModule }]
 			}
 		]),
 		SocialAuthModule.registerAsync({
 			imports: [
-				TypeOrmModule.forFeature([
-					OrganizationTeam
-				]),
+				TypeOrmModule.forFeature([OrganizationTeam]),
 				AuthModule,
 				EmailSendModule,
 				UserModule,
@@ -53,11 +42,7 @@ const strategies = [
 			],
 			useClass: AuthService
 		}),
-		TypeOrmModule.forFeature([
-			UserOrganization,
-			Organization,
-			OrganizationTeam
-		]),
+		TypeOrmModule.forFeature([UserOrganization, Organization, OrganizationTeam]),
 		EmailSendModule,
 		UserModule,
 		RoleModule,
@@ -69,4 +54,4 @@ const strategies = [
 	providers: [...providers, ...CommandHandlers, ...strategies],
 	exports: [...providers]
 })
-export class AuthModule { }
+export class AuthModule {}

packages/core/src/availability-slots/availability-slots.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CqrsModule } from '@nestjs/cqrs';
 import { AvailabilitySlot } from './availability-slots.entity';
 import { AvailabilitySlotsService } from './availability-slots.service';
@@ -13,23 +13,16 @@ import { TenantModule } from './../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/availability-slots', module: AvailabilitySlotsModule }
-		]),
+		RouterModule.register([{ path: '/availability-slots', module: AvailabilitySlotsModule }]),
 		UserModule,
-		TypeOrmModule.forFeature([
-			AvailabilitySlot
-		]),
+		TypeOrmModule.forFeature([AvailabilitySlot]),
 		CqrsModule,
 		TenantModule,
 		EmployeeModule,
 		OrganizationModule
 	],
 	controllers: [AvailabilitySlotsController],
-	providers: [
-		AvailabilitySlotsService,
-		...CommandHandlers
-	],
+	providers: [AvailabilitySlotsService, ...CommandHandlers],
 	exports: [AvailabilitySlotsService]
 })
 export class AvailabilitySlotsModule {}

packages/core/src/candidate-criterions-rating/candidate-criterion-rating.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CqrsModule } from '@nestjs/cqrs';
 import { TenantModule } from './../tenant/tenant.module';
 import { UserModule } from './../user/user.module';
@@ -11,13 +11,13 @@ import { CommandHandlers } from './commands/handlers';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/candidate-criterions-rating',
 				module: CandidateCriterionsRatingModule
 			}
 		]),
-		TypeOrmModule.forFeature([ CandidateCriterionsRating ]),
+		TypeOrmModule.forFeature([CandidateCriterionsRating]),
 		TenantModule,
 		UserModule,
 		CqrsModule

packages/core/src/candidate-documents/candidate-documents.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CandidateDocumentsController } from './candidate-documents.controller';
 import { CandidateDocument } from './candidate-documents.entity';
 import { CandidateDocumentsService } from './candidate-documents.service';
@@ -9,10 +9,8 @@ import { UserModule } from './../user/user.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/candidate-documents', module: CandidateDocumentsModule }
-		]),
-		TypeOrmModule.forFeature([ CandidateDocument ]),
+		RouterModule.register([{ path: '/candidate-documents', module: CandidateDocumentsModule }]),
+		TypeOrmModule.forFeature([CandidateDocument]),
 		TenantModule,
 		UserModule
 	],

packages/core/src/candidate-education/candidate-education.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CandidateEducationService } from './candidate-education.service';
 import { CandidateEducation } from './candidate-education.entity';
 import { CandidateEducationController } from './candidate-education.controller';
@@ -9,20 +9,13 @@ import { UserModule } from './../user/user.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/candidate-educations', module: CandidateEducationModule }
-		]),
-		TypeOrmModule.forFeature([
-			CandidateEducation
-		]),
+		RouterModule.register([{ path: '/candidate-educations', module: CandidateEducationModule }]),
+		TypeOrmModule.forFeature([CandidateEducation]),
 		TenantModule,
 		UserModule
 	],
 	controllers: [CandidateEducationController],
 	providers: [CandidateEducationService],
-	exports: [
-		TypeOrmModule,
-		CandidateEducationService
-	]
+	exports: [TypeOrmModule, CandidateEducationService]
 })
 export class CandidateEducationModule {}

packages/core/src/candidate-experience/candidate-experience.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CandidateExperience } from './candidate-experience.entity';
 import { CandidateExperienceService } from './candidate-experience.service';
 import { CandidateExperienceController } from './candidate-experience.controller';
@@ -8,9 +8,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/candidate-experience', module: CandidateExperienceModule }
-		]),
+		RouterModule.register([{ path: '/candidate-experience', module: CandidateExperienceModule }]),
 		TypeOrmModule.forFeature([CandidateExperience]),
 		TenantModule
 	],

packages/core/src/candidate-feedbacks/candidate-feedbacks.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CqrsModule } from '@nestjs/cqrs';
 import { TenantModule } from '../tenant/tenant.module';
 import { UserModule } from './../user/user.module';
@@ -12,20 +12,15 @@ import { CommandHandlers } from './commands/handlers';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/candidate-feedbacks', module: CandidateFeedbacksModule }
-		]),
-		TypeOrmModule.forFeature([ CandidateFeedback ]),
+		RouterModule.register([{ path: '/candidate-feedbacks', module: CandidateFeedbacksModule }]),
+		TypeOrmModule.forFeature([CandidateFeedback]),
 		TenantModule,
 		UserModule,
 		CandidateInterviewModule,
 		CqrsModule
 	],
-	providers: [
-		CandidateFeedbacksService,
-		...CommandHandlers
-	],
+	providers: [CandidateFeedbacksService, ...CommandHandlers],
 	controllers: [CandidateFeedbacksController],
 	exports: [CandidateFeedbacksService]
 })
-export class CandidateFeedbacksModule {}
+export class CandidateFeedbacksModule {}

packages/core/src/candidate-interview/candidate-interview.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CandidateInterviewService } from './candidate-interview.service';
 import { CandidateInterviewController } from './candidate-interview.controller';
 import { CandidateInterview } from './candidate-interview.entity';
@@ -9,10 +9,8 @@ import { UserModule } from './../user/user.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/candidate-interview', module: CandidateInterviewModule }
-		]),
-		TypeOrmModule.forFeature([ CandidateInterview ]),
+		RouterModule.register([{ path: '/candidate-interview', module: CandidateInterviewModule }]),
+		TypeOrmModule.forFeature([CandidateInterview]),
 		TenantModule,
 		UserModule
 	],

packages/core/src/candidate-interviewers/candidate-interviewers.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CqrsModule } from '@nestjs/cqrs';
 import { CandidateInterviewers } from './candidate-interviewers.entity';
 import { CandidateInterviewersService } from './candidate-interviewers.service';
@@ -11,24 +11,19 @@ import { CommandHandlers } from './commands/handlers';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/candidate-interviewers',
 				module: CandidateInterviewersModule
 			}
 		]),
-		TypeOrmModule.forFeature([
-			CandidateInterviewers
-		]),
+		TypeOrmModule.forFeature([CandidateInterviewers]),
 		TenantModule,
 		UserModule,
-		CqrsModule,
+		CqrsModule
 	],
 	controllers: [CandidateInterviewersController],
 	providers: [CandidateInterviewersService, ...CommandHandlers],
-	exports: [
-		TypeOrmModule,
-		CandidateInterviewersService
-	]
+	exports: [TypeOrmModule, CandidateInterviewersService]
 })
 export class CandidateInterviewersModule {}

packages/core/src/candidate-personal-qualities/candidate-personal-qualities.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CandidatePersonalQualitiesService } from './candidate-personal-qualities.service';
 import { CandidatePersonalQualitiesController } from './candidate-personal-qualities.controller';
 import { CandidatePersonalQualities } from './candidate-personal-qualities.entity';
@@ -10,20 +10,17 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/candidate-personal-qualities',
 				module: CandidatePersonalQualitiesModule
 			}
 		]),
-		TypeOrmModule.forFeature([ CandidatePersonalQualities ]),
+		TypeOrmModule.forFeature([CandidatePersonalQualities]),
 		TenantModule,
 		CqrsModule
 	],
-	providers: [
-		CandidatePersonalQualitiesService,
-		...CommandHandlers
-	],
+	providers: [CandidatePersonalQualitiesService, ...CommandHandlers],
 	controllers: [CandidatePersonalQualitiesController],
 	exports: [TypeOrmModule, CandidatePersonalQualitiesService]
 })

packages/core/src/candidate-skill/candidate-skill.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { TenantModule } from '../tenant/tenant.module';
 import { CandidateSkill } from './candidate-skill.entity';
 import { CandidateSkillService } from './candidate-skill.service';
@@ -9,10 +9,8 @@ import { UserModule } from './../user/user.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/candidate-skills', module: CandidateSkillModule }
-		]),
-		TypeOrmModule.forFeature([ CandidateSkill ]),
+		RouterModule.register([{ path: '/candidate-skills', module: CandidateSkillModule }]),
+		TypeOrmModule.forFeature([CandidateSkill]),
 		TenantModule,
 		UserModule
 	],

packages/core/src/candidate-source/candidate-source.module.ts

@@ -1,5 +1,5 @@
 import { Module } from '@nestjs/common';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CandidateSourceService } from './candidate-source.service';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CandidateSource } from './candidate-source.entity';
@@ -9,9 +9,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/candidate-source', module: CandidateSourceModule }
-		]),
+		RouterModule.register([{ path: '/candidate-source', module: CandidateSourceModule }]),
 		TypeOrmModule.forFeature([CandidateSource]),
 		UserModule,
 		TenantModule

packages/core/src/candidate-technologies/candidate-technologies.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CqrsModule } from '@nestjs/cqrs';
 import { TenantModule } from '../tenant/tenant.module';
 import { CandidateTechnologiesController } from './candidate-technologies.controller';
@@ -10,13 +10,13 @@ import { CandidateTechnologies } from './../core/entities/internal';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/candidate-technologies',
 				module: CandidateTechnologiesModule
 			}
 		]),
-		TypeOrmModule.forFeature([ CandidateTechnologies ]),
+		TypeOrmModule.forFeature([CandidateTechnologies]),
 		TenantModule,
 		CqrsModule
 	],

packages/core/src/candidate/candidate.module.ts

@@ -1,6 +1,6 @@
 import { CqrsModule } from '@nestjs/cqrs';
 import { Module } from '@nestjs/common';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CandidateController } from './candidate.controller';
 import { CandidateService } from './candidate.service';
@@ -16,9 +16,7 @@ import { RoleModule } from './../role/role.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/candidate', module: CandidateModule }
-		]),
+		RouterModule.register([{ path: '/candidate', module: CandidateModule }]),
 		TypeOrmModule.forFeature([Candidate]),
 		EmailSendModule,
 		CqrsModule,
@@ -30,10 +28,7 @@ import { RoleModule } from './../role/role.module';
 		AuthModule
 	],
 	controllers: [CandidateController],
-	providers: [
-		CandidateService,
-		...CommandHandlers
-	],
+	providers: [CandidateService, ...CommandHandlers],
 	exports: [TypeOrmModule, CandidateService]
 })
-export class CandidateModule { }
+export class CandidateModule {}

packages/core/src/contact/contact.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CqrsModule } from '@nestjs/cqrs';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { Contact } from './contact.entity';
 import { ContactController } from './contact.controller';
 import { ContactService } from './contact.service';
@@ -10,9 +10,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/contact', module: ContactModule }
-		]),
+		RouterModule.register([{ path: '/contact', module: ContactModule }]),
 		TypeOrmModule.forFeature([Contact]),
 		TenantModule,
 		CqrsModule
@@ -21,4 +19,4 @@ import { TenantModule } from '../tenant/tenant.module';
 	providers: [ContactService, ...CommandHandlers],
 	exports: [TypeOrmModule, ContactService]
 })
-export class ContactModule {}
+export class ContactModule {}

packages/core/src/country/country.module.ts

@@ -1,13 +1,13 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { Country } from './country.entity';
 import { CountryController } from './country.controller';
 import { CountryService } from './country.service';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([{ path: '/country', module: CountryModule }]),
+		RouterModule.register([{ path: '/country', module: CountryModule }]),
 		TypeOrmModule.forFeature([Country])
 	],
 	controllers: [CountryController],

packages/core/src/currency/currency.module.ts

@@ -1,13 +1,13 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { Currency } from './currency.entity';
 import { CurrencyController } from './currency.controller';
 import { CurrencyService } from './currency.service';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([{ path: '/currency', module: CurrencyModule }]),
+		RouterModule.register([{ path: '/currency', module: CurrencyModule }]),
 		TypeOrmModule.forFeature([Currency])
 	],
 	controllers: [CurrencyController],

packages/core/src/custom-smtp/custom-smtp.module.ts

@@ -1,6 +1,6 @@
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { forwardRef, Module } from '@nestjs/common';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CqrsModule } from '@nestjs/cqrs';
 import { CustomSmtp } from './custom-smtp.entity';
 import { CustomSmtpController } from './custom-smtp.controller';
@@ -11,9 +11,7 @@ import { CommandHandlers } from './commands';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/smtp', module: CustomSmtpModule }
-		]),
+		RouterModule.register([{ path: '/smtp', module: CustomSmtpModule }]),
 		TypeOrmModule.forFeature([CustomSmtp]),
 		forwardRef(() => TenantModule),
 		forwardRef(() => UserModule),
@@ -23,4 +21,4 @@ import { CommandHandlers } from './commands';
 	providers: [CustomSmtpService, ...CommandHandlers],
 	exports: [TypeOrmModule, CustomSmtpService]
 })
-export class CustomSmtpModule {}
+export class CustomSmtpModule {}

packages/core/src/deal/deal.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { Deal } from './deal.entity';
 import { StageModule } from '../pipeline-stage/pipeline-stage.module';
 import { AuthModule } from '../auth/auth.module';
@@ -10,7 +10,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([{ path: '/deals', module: DealModule }]),
+		RouterModule.register([{ path: '/deals', module: DealModule }]),
 		TypeOrmModule.forFeature([Deal]),
 		StageModule,
 		AuthModule,

packages/core/src/email-history/email-history.module.ts

@@ -2,7 +2,7 @@ import { forwardRef, Module } from '@nestjs/common';
 import { CqrsModule } from '@nestjs/cqrs';
 
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { EmailHistory } from './email-history.entity';
 import { EmailHistoryController } from './email-history.controller';
 import { TenantModule } from '../tenant/tenant.module';
@@ -13,27 +13,15 @@ import { EmailSendModule } from 'email-send/email-send.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/email', module: EmailHistoryModule }
-		]),
-		TypeOrmModule.forFeature([
-			EmailHistory
-		]),
+		RouterModule.register([{ path: '/email', module: EmailHistoryModule }]),
+		TypeOrmModule.forFeature([EmailHistory]),
 		forwardRef(() => TenantModule),
 		forwardRef(() => UserModule),
 		forwardRef(() => EmailSendModule),
-		CqrsModule,
-
-
+		CqrsModule
 	],
 	controllers: [EmailHistoryController],
-	providers: [
-		EmailHistoryService,
-		...CommandHandlers
-	],
-	exports: [
-		TypeOrmModule,
-		EmailHistoryService
-	]
+	providers: [EmailHistoryService, ...CommandHandlers],
+	exports: [TypeOrmModule, EmailHistoryService]
 })
-export class EmailHistoryModule { }
+export class EmailHistoryModule {}

packages/core/src/email-template/email-template.module.ts

@@ -1,7 +1,7 @@
 import { forwardRef, Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CqrsModule } from '@nestjs/cqrs';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { EmailTemplate } from './email-template.entity';
 import { EmailTemplateService } from './email-template.service';
 import { EmailTemplateReaderService } from './email-template-reader.service';
@@ -13,26 +13,14 @@ import { UserModule } from './../user/user.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/email-template', module: EmailTemplateModule }
-		]),
-		forwardRef(() => TypeOrmModule.forFeature([
-			EmailTemplate
-		])),
+		RouterModule.register([{ path: '/email-template', module: EmailTemplateModule }]),
+		forwardRef(() => TypeOrmModule.forFeature([EmailTemplate])),
 		forwardRef(() => TenantModule),
 		forwardRef(() => UserModule),
 		CqrsModule
 	],
 	controllers: [EmailTemplateController],
-	providers: [
-		EmailTemplateService,
-		EmailTemplateReaderService,
-		...QueryHandlers,
-		...CommandHandlers
-	],
-	exports: [
-		TypeOrmModule,
-		EmailTemplateService
-	]
+	providers: [EmailTemplateService, EmailTemplateReaderService, ...QueryHandlers, ...CommandHandlers],
+	exports: [TypeOrmModule, EmailTemplateService]
 })
-export class EmailTemplateModule { }
+export class EmailTemplateModule {}

packages/core/src/employee-appointment/employee-appointment.module.ts

@@ -1,6 +1,6 @@
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { Module } from '@nestjs/common';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CqrsModule } from '@nestjs/cqrs';
 import { EmployeeAppointment } from './employee-appointment.entity';
 import { EmployeeAppointmentController } from './employee-appointment.controller';
@@ -13,12 +13,8 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/employee-appointment', module: EmployeeAppointmentModule }
-		]),
-		TypeOrmModule.forFeature([
-			EmployeeAppointment
-		]),
+		RouterModule.register([{ path: '/employee-appointment', module: EmployeeAppointmentModule }]),
+		TypeOrmModule.forFeature([EmployeeAppointment]),
 		EmailSendModule,
 		EmployeeModule,
 		OrganizationModule,
@@ -26,10 +22,7 @@ import { TenantModule } from '../tenant/tenant.module';
 		TenantModule
 	],
 	controllers: [EmployeeAppointmentController],
-	providers: [
-		EmployeeAppointmentService,
-		...CommandHandlers
-	],
+	providers: [EmployeeAppointmentService, ...CommandHandlers],
 	exports: [EmployeeAppointmentService]
 })
-export class EmployeeAppointmentModule { }
+export class EmployeeAppointmentModule {}

packages/core/src/employee-award/employee-award.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { EmployeeAward } from './employee-award.entity';
 import { EmployeeAwardController } from './employee-award.controller';
 import { EmployeeAwardService } from './employee-award.service';
@@ -9,9 +9,7 @@ import { UserModule } from './../user/user.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/employee-award', module: EmployeeAwardModule }
-		]),
+		RouterModule.register([{ path: '/employee-award', module: EmployeeAwardModule }]),
 		TypeOrmModule.forFeature([EmployeeAward]),
 		TenantModule,
 		UserModule

packages/core/src/employee-job-preset/employee-job-preset.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { CqrsModule } from '@nestjs/cqrs';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { GauzyAIModule } from '@gauzy/integration-ai';
 import { EmployeeModule } from './../employee/employee.module';
 import { Handlers } from './commands/handlers';
@@ -20,9 +20,7 @@ import { JobSearchPresetController } from './job-search-preset.controller';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/job-preset', module: EmployeeJobPresetModule }
-		]),
+		RouterModule.register([{ path: '/job-preset', module: EmployeeJobPresetModule }]),
 		TypeOrmModule.forFeature([
 			JobPreset,
 			JobPresetUpworkJobSearchCriterion,
@@ -40,16 +38,7 @@ import { JobSearchPresetController } from './job-search-preset.controller';
 		EmployeePresetController,
 		JobSearchPresetController
 	],
-	providers: [
-		...Handlers,
-		JobPresetService,
-		JobSearchCategoryService,
-		JobSearchOccupationService
-	],
-	exports: [
-		JobPresetService,
-		JobSearchCategoryService,
-		JobSearchOccupationService
-	]
+	providers: [...Handlers, JobPresetService, JobSearchCategoryService, JobSearchOccupationService],
+	exports: [JobPresetService, JobSearchCategoryService, JobSearchOccupationService]
 })
-export class EmployeeJobPresetModule { }
+export class EmployeeJobPresetModule {}

packages/core/src/employee-job/employee-job.module.ts

@@ -1,5 +1,5 @@
 import { Module } from '@nestjs/common';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { GauzyAIModule } from '@gauzy/integration-ai';
 import { EmployeeJobPostService } from './employee-job.service';
 import { EmployeeJobPostController } from './employee-job.controller';
@@ -9,9 +9,7 @@ import { IntegrationTenantModule } from './../integration-tenant/integration-ten
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/employee-job', module: EmployeeJobPostModule }
-		]),
+		RouterModule.register([{ path: '/employee-job', module: EmployeeJobPostModule }]),
 		CountryModule,
 		EmployeeModule,
 		IntegrationTenantModule,
@@ -21,4 +19,4 @@ import { IntegrationTenantModule } from './../integration-tenant/integration-ten
 	providers: [EmployeeJobPostService],
 	exports: [EmployeeJobPostService]
 })
-export class EmployeeJobPostModule { }
+export class EmployeeJobPostModule {}

packages/core/src/employee-level/employee-level.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CqrsModule } from '@nestjs/cqrs';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { EmployeeLevelController } from './employee-level.controller';
 import { EmployeeLevelService } from './employee-level.service';
 import { EmployeeLevel } from './employee-level.entity';
@@ -9,9 +9,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/employee-level', module: EmployeeLevelModule }
-		]),
+		RouterModule.register([{ path: '/employee-level', module: EmployeeLevelModule }]),
 		TypeOrmModule.forFeature([EmployeeLevel]),
 		CqrsModule,
 		TenantModule

packages/core/src/employee-proposal-template/employee-proposal-template.module.ts

@@ -1,7 +1,7 @@
 import { forwardRef, Module } from '@nestjs/common';
 import { CqrsModule } from '@nestjs/cqrs';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { UserModule } from './../user/user.module';
 import { TenantModule } from './../tenant/tenant.module';
 import { EmployeeProposalTemplateController } from './employee-proposal-template.controller';
@@ -10,10 +10,8 @@ import { EmployeeProposalTemplateService } from './employee-proposal-template.se
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/employee-proposal-template', module: EmployeeProposalTemplateModule }
-		]),
-		TypeOrmModule.forFeature([ EmployeeProposalTemplate ]),
+		RouterModule.register([{ path: '/employee-proposal-template', module: EmployeeProposalTemplateModule }]),
+		TypeOrmModule.forFeature([EmployeeProposalTemplate]),
 		forwardRef(() => TenantModule),
 		forwardRef(() => UserModule),
 		CqrsModule

packages/core/src/employee-recurring-expense/employee-recurring-expense.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { CqrsModule } from '@nestjs/cqrs';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CommandHandlers } from './commands/handlers';
 import { EmployeeRecurringExpenseController } from './employee-recurring-expense.controller';
 import { EmployeeRecurringExpense } from './employee-recurring-expense.entity';
@@ -13,7 +13,7 @@ import { TaskModule } from '../tasks/task.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/employee-recurring-expense',
 				module: EmployeeRecurringExpenseModule

packages/core/src/employee-setting/employee-setting.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { EmployeeSetting } from './employee-setting.entity';
 import { EmployeeSettingService } from './employee-setting.service';
 import { EmployeeSettingController } from './employee-setting.controller';
@@ -8,9 +8,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/employee-settings', module: EmployeeSettingModule }
-		]),
+		RouterModule.register([{ path: '/employee-settings', module: EmployeeSettingModule }]),
 		TypeOrmModule.forFeature([EmployeeSetting]),
 		TenantModule
 	],

packages/core/src/employee-statistics/employee-statistics.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { CqrsModule } from '@nestjs/cqrs';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { Employee } from '../employee/employee.entity';
 import { EmployeeService } from '../employee/employee.service';
 import { EmployeeRecurringExpense } from '../employee-recurring-expense/employee-recurring-expense.entity';
@@ -21,9 +21,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/employee-statistics', module: EmployeeStatisticsModule }
-		]),
+		RouterModule.register([{ path: '/employee-statistics', module: EmployeeStatisticsModule }]),
 		TypeOrmModule.forFeature([
 			Income,
 			Expense,

packages/core/src/employee/employee.module.ts

@@ -1,7 +1,7 @@
 import { forwardRef, Module } from '@nestjs/common';
 import { CqrsModule } from '@nestjs/cqrs';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { GauzyAIModule } from '@gauzy/integration-ai';
 import { TimeLog } from './../core/entities/internal';
 import { Employee } from './employee.entity';
@@ -17,13 +17,8 @@ import { RoleModule } from './../role/role.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/employee', module: EmployeeModule }
-		]),
-		TypeOrmModule.forFeature([
-			Employee,
-			TimeLog
-		]),
+		RouterModule.register([{ path: '/employee', module: EmployeeModule }]),
+		TypeOrmModule.forFeature([Employee, TimeLog]),
 		forwardRef(() => EmailSendModule),
 		forwardRef(() => UserOrganizationModule),
 		forwardRef(() => TenantModule),
@@ -35,6 +30,6 @@ import { RoleModule } from './../role/role.module';
 	],
 	controllers: [EmployeeController],
 	providers: [EmployeeService, ...CommandHandlers],
-	exports: [TypeOrmModule, EmployeeService],
+	exports: [TypeOrmModule, EmployeeService]
 })
-export class EmployeeModule { }
+export class EmployeeModule {}

packages/core/src/equipment-sharing-policy/equipment-sharing-policy.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { EquipmentSharingPolicyController } from './equipment-sharing-policy.controller';
 import { EquipmentSharingPolicyService } from './equipment-sharing-policy.service';
 import { EquipmentSharingPolicy } from './equipment-sharing-policy.entity';
@@ -11,18 +11,18 @@ import { TaskModule } from '../tasks/task.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/equipment-sharing-policy',
-				module: EquipmentSharingPolicyModule,
-			},
+				module: EquipmentSharingPolicyModule
+			}
 		]),
 		TypeOrmModule.forFeature([User, EquipmentSharingPolicy]),
 		TenantModule,
-		TaskModule,
+		TaskModule
 	],
 	controllers: [EquipmentSharingPolicyController],
 	providers: [EquipmentSharingPolicyService, UserService],
-	exports: [TypeOrmModule, EquipmentSharingPolicyService],
+	exports: [TypeOrmModule, EquipmentSharingPolicyService]
 })
 export class EquipmentSharingPolicyModule {}

packages/core/src/equipment-sharing/equipment-sharing.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CqrsModule } from '@nestjs/cqrs';
 import { EquipmentSharing } from './equipment-sharing.entity';
 import { EquipmentSharingController } from './equipment-sharing.controller';
@@ -12,9 +12,7 @@ import { UserModule } from './../user/user.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/equipment-sharing', module: EquipmentSharingModule }
-		]),
+		RouterModule.register([{ path: '/equipment-sharing', module: EquipmentSharingModule }]),
 		TypeOrmModule.forFeature([RequestApproval, EquipmentSharing]),
 		CqrsModule,
 		TenantModule,

packages/core/src/equipment/equipment.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { Equipment } from './equipment.entity';
 import { EquipmentController } from './equipment.controller';
 import { EquipmentService } from './equipment.service';
@@ -8,9 +8,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/equipment', module: EquipmentModule }
-		]),
+		RouterModule.register([{ path: '/equipment', module: EquipmentModule }]),
 		TypeOrmModule.forFeature([Equipment]),
 		TenantModule
 	],

packages/core/src/estimate-email/estimate-email.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { User } from '../user/user.entity';
 import { UserService } from '../user/user.service';
 import { EstimateEmailController } from './estimate-email.controller';
@@ -13,15 +13,13 @@ import { TaskModule } from '../tasks/task.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/estimate-email', module: EstimateEmailModule },
-		]),
+		RouterModule.register([{ path: '/estimate-email', module: EstimateEmailModule }]),
 		TypeOrmModule.forFeature([User, EstimateEmail, Invoice, Organization]),
 		TenantModule,
-		TaskModule,
+		TaskModule
 	],
 	controllers: [EstimateEmailController],
 	providers: [EstimateEmailService, UserService],
-	exports: [EstimateEmailService, UserService],
+	exports: [EstimateEmailService, UserService]
 })
 export class EstimateEmailModule {}

packages/core/src/event-types/event-type.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CqrsModule } from '@nestjs/cqrs';
 import { EventType } from './event-type.entity';
 import { EventTypeService } from './event-type.service';
@@ -15,21 +15,14 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/event-type', module: EventTypeModule }
-		]),
+		RouterModule.register([{ path: '/event-type', module: EventTypeModule }]),
 		UserModule,
 		TypeOrmModule.forFeature([EventType, Employee, Organization]),
 		CqrsModule,
 		TenantModule
 	],
 	controllers: [EventTypeController],
-	providers: [
-		EventTypeService,
-		EmployeeService,
-		OrganizationService,
-		...CommandHandlers
-	],
+	providers: [EventTypeService, EmployeeService, OrganizationService, ...CommandHandlers],
 	exports: [EventTypeService]
 })
 export class EventTypeModule {}

packages/core/src/expense-categories/expense-categories.module.ts

@@ -1,7 +1,7 @@
 import { forwardRef, Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CqrsModule } from '@nestjs/cqrs';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { ExpenseCategory } from './expense-category.entity';
 import { ExpenseCategoriesService } from './expense-categories.service';
 import { ExpenseCategoriesController } from './expense-categories.controller';
@@ -11,22 +11,14 @@ import { CommandHandlers } from './commands/handlers';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/expense-categories', module: ExpenseCategoriesModule }
-		]),
+		RouterModule.register([{ path: '/expense-categories', module: ExpenseCategoriesModule }]),
 		TypeOrmModule.forFeature([ExpenseCategory]),
 		forwardRef(() => TenantModule),
 		forwardRef(() => UserModule),
-		CqrsModule,
+		CqrsModule
 	],
 	controllers: [ExpenseCategoriesController],
-	providers: [
-		ExpenseCategoriesService,
-		...CommandHandlers
-	],
-	exports: [
-		TypeOrmModule,
-		ExpenseCategoriesService
-	]
+	providers: [ExpenseCategoriesService, ...CommandHandlers],
+	exports: [TypeOrmModule, ExpenseCategoriesService]
 })
 export class ExpenseCategoriesModule {}

packages/core/src/expense/expense.module.ts

@@ -1,6 +1,6 @@
 import { forwardRef, Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CqrsModule } from '@nestjs/cqrs';
 import { Expense } from './expense.entity';
 import { ExpenseService } from './expense.service';
@@ -18,10 +18,8 @@ import { OrganizationRecurringExpenseModule } from './../organization-recurring-
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/expense', module: ExpenseModule }
-		]),
-		TypeOrmModule.forFeature([ Expense ]),
+		RouterModule.register([{ path: '/expense', module: ExpenseModule }]),
+		TypeOrmModule.forFeature([Expense]),
 		forwardRef(() => EmployeeStatisticsModule),
 		forwardRef(() => EmployeeRecurringExpenseModule),
 		forwardRef(() => OrganizationRecurringExpenseModule),
@@ -32,15 +30,7 @@ import { OrganizationRecurringExpenseModule } from './../organization-recurring-
 		CqrsModule
 	],
 	controllers: [ExpenseController],
-	providers: [
-		ExpenseService,
-		ExpenseMapService,
-		...CommandHandlers,
-		...QueryHandlers
-	],
-	exports: [
-		ExpenseService,
-		ExpenseMapService
-	]
+	providers: [ExpenseService, ExpenseMapService, ...CommandHandlers, ...QueryHandlers],
+	exports: [ExpenseService, ExpenseMapService]
 })
 export class ExpenseModule {}

packages/core/src/export-import/export/export.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { CqrsModule } from '@nestjs/cqrs';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { getEntitiesFromPlugins } from '@gauzy/plugin';
 import { getConfig } from '@gauzy/config';
 import { coreEntities } from '../../core/entities';
@@ -12,23 +12,14 @@ import { ExportService } from './export.service';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/export', module: ExportModule }
-		]),
-		TypeOrmModule.forFeature([
-			...coreEntities,
-			...getEntitiesFromPlugins(getConfig().plugins)
-		]),
+		RouterModule.register([{ path: '/export', module: ExportModule }]),
+		TypeOrmModule.forFeature([...coreEntities, ...getEntitiesFromPlugins(getConfig().plugins)]),
 		TenantModule,
 		UserModule,
 		CqrsModule
 	],
-	controllers: [
-		ExportController
-	],
-	providers: [
-		ExportService
-	],
+	controllers: [ExportController],
+	providers: [ExportService],
 	exports: []
 })
-export class ExportModule { }
+export class ExportModule {}

packages/core/src/export-import/import/import.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { CqrsModule } from '@nestjs/cqrs';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { getConfig } from '@gauzy/config';
 import { getEntitiesFromPlugins } from '@gauzy/plugin';
@@ -15,18 +15,14 @@ import { UserModule } from '../../user/user.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
-				path: '/import', module: ImportModule,
-				children: [
-					{ path: '/history', module: ImportHistoryModule }
-				]
+				path: '/import',
+				module: ImportModule,
+				children: [{ path: '/history', module: ImportHistoryModule }]
 			}
 		]),
-		TypeOrmModule.forFeature([
-			...coreEntities,
-			...getEntitiesFromPlugins(getConfig().plugins)
-		]),
+		TypeOrmModule.forFeature([...coreEntities, ...getEntitiesFromPlugins(getConfig().plugins)]),
 		TenantModule,
 		UserModule,
 		ImportRecordModule,
@@ -34,10 +30,7 @@ import { UserModule } from '../../user/user.module';
 		CqrsModule
 	],
 	controllers: [ImportController],
-	providers: [
-		ImportService,
-		...CommandHandlers
-	],
+	providers: [ImportService, ...CommandHandlers],
 	exports: []
 })
-export class ImportModule { }
+export class ImportModule {}

packages/core/src/feature/feature.module.ts

@@ -1,7 +1,7 @@
 import { forwardRef, Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CqrsModule } from '@nestjs/cqrs';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { Feature } from './feature.entity';
 import { FeatureOrganization } from './feature-organization.entity';
 import { FeatureToggleController } from './feature-toggle.controller';
@@ -13,9 +13,7 @@ import { CommandHandlers } from './commands/handlers';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/feature/toggle', module: FeatureModule }
-		]),
+		RouterModule.register([{ path: '/feature/toggle', module: FeatureModule }]),
 		TypeOrmModule.forFeature([Feature, FeatureOrganization]),
 		forwardRef(() => TenantModule),
 		forwardRef(() => UserModule),

packages/core/src/gauzy-cloud/gauzy-cloud.module.ts

@@ -1,7 +1,7 @@
 import { forwardRef, Module } from '@nestjs/common';
 import { CqrsModule } from '@nestjs/cqrs';
 import { HttpModule } from '@nestjs/axios';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { ConfigModule, ConfigService } from '@gauzy/config';
 import { TenantModule } from './../tenant/tenant.module';
 import { RoleModule } from './../role/role.module';
@@ -13,9 +13,7 @@ import { CommandHandlers } from './commands/handlers';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/cloud/migrate', module: GauzyCloudModule },
-		]),
+		RouterModule.register([{ path: '/cloud/migrate', module: GauzyCloudModule }]),
 		HttpModule.registerAsync({
 			imports: [ConfigModule],
 			useFactory: async (configService: ConfigService) => ({
@@ -23,19 +21,19 @@ import { CommandHandlers } from './commands/handlers';
 				timeout: 60 * 5 * 1000,
 				maxRedirects: 5,
 				headers: {
-					'Content-Type': 'application/json',
-				},
+					'Content-Type': 'application/json'
+				}
 			}),
-			inject: [ConfigService],
+			inject: [ConfigService]
 		}),
 		CqrsModule,
 		forwardRef(() => UserModule),
 		TenantModule,
 		RoleModule,
-		RolePermissionModule,
+		RolePermissionModule
 	],
 	controllers: [GauzyCloudController],
 	providers: [GauzyCloudService, ...CommandHandlers],
-	exports: [],
+	exports: []
 })
 export class GauzyCloudModule {}

packages/core/src/goal-general-setting/goal-general-setting.module.ts

@@ -1,5 +1,5 @@
 import { Module } from '@nestjs/common';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { GoalGeneralSettingController } from './goal-general-setting.controller';
 import { GoalGeneralSetting } from './goal-general-setting.entity';
@@ -8,9 +8,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/goal-general-setting', module: GoalGeneralSettingModule }
-		]),
+		RouterModule.register([{ path: '/goal-general-setting', module: GoalGeneralSettingModule }]),
 		TypeOrmModule.forFeature([GoalGeneralSetting]),
 		TenantModule
 	],

packages/core/src/goal-kpi-template/goal-kpi-template.module.ts

@@ -1,5 +1,5 @@
 import { Module } from '@nestjs/common';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { GoalKpiTemplateController } from './goal-kpi-template.controller';
 import { GoalKpiTemplateService } from './goal-kpi-template.service';
@@ -8,9 +8,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/goal-kpi-template', module: GoalKpiTemplateModule }
-		]),
+		RouterModule.register([{ path: '/goal-kpi-template', module: GoalKpiTemplateModule }]),
 		TypeOrmModule.forFeature([GoalKPITemplate]),
 		TenantModule
 	],

packages/core/src/goal-kpi/goal-kpi.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { GoalKpiController } from './goal-kpi.controller';
 import { GoalKpiService } from './goal-kpi.service';
 import { GoalKPI } from './goal-kpi.entity';
@@ -8,7 +8,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([{ path: '/goal-kpi', module: GoalKpiModule }]),
+		RouterModule.register([{ path: '/goal-kpi', module: GoalKpiModule }]),
 		TypeOrmModule.forFeature([GoalKPI]),
 		TenantModule
 	],

packages/core/src/goal-template/goal-template.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { GoalTemplateController } from './goal-template.controller';
 import { GoalTemplateService } from './goal-template.service';
 import { GoalTemplate } from './goal-template.entity';
@@ -8,9 +8,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/goal-templates', module: GoalTemplateModule }
-		]),
+		RouterModule.register([{ path: '/goal-templates', module: GoalTemplateModule }]),
 		TypeOrmModule.forFeature([GoalTemplate]),
 		TenantModule
 	],

packages/core/src/goal-time-frame/goal-time-frame.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { GoalTimeFrameController } from './goal-time-frame.controller';
 import { GoalTimeFrameService } from './goal-time-frame.service';
 import { GoalTimeFrame } from './goal-time-frame.entity';
@@ -8,9 +8,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/goal-time-frame', module: GoalTimeFrameModule }
-		]),
+		RouterModule.register([{ path: '/goal-time-frame', module: GoalTimeFrameModule }]),
 		TypeOrmModule.forFeature([GoalTimeFrame]),
 		TenantModule
 	],

packages/core/src/goal/goal.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { GoalController } from './goal.controller';
 import { Goal } from './goal.entity';
 import { GoalService } from './goal.service';
@@ -8,7 +8,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([{ path: '/goals', module: GoalModule }]),
+		RouterModule.register([{ path: '/goals', module: GoalModule }]),
 		TypeOrmModule.forFeature([Goal]),
 		TenantModule
 	],

packages/core/src/image-asset/image-asset.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { CqrsModule } from '@nestjs/cqrs';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { TenantModule } from '../tenant/tenant.module';
 import { UserModule } from '../user/user.module';
 import { CommandHandlers } from './commands/handlers';
@@ -11,25 +11,14 @@ import { ImageAssetService } from './image-asset.service';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/image-assets', module: ImageAssetModule }
-		]),
-		TypeOrmModule.forFeature([
-			ImageAsset
-		]),
+		RouterModule.register([{ path: '/image-assets', module: ImageAssetModule }]),
+		TypeOrmModule.forFeature([ImageAsset]),
 		CqrsModule,
 		TenantModule,
 		UserModule
 	],
-	controllers: [
-		ImageAssetController
-	],
-	providers: [
-		ImageAssetService,
-		...CommandHandlers
-	],
-	exports: [
-		ImageAssetService
-	]
+	controllers: [ImageAssetController],
+	providers: [ImageAssetService, ...CommandHandlers],
+	exports: [ImageAssetService]
 })
-export class ImageAssetModule { }
+export class ImageAssetModule {}

packages/core/src/income/income.module.ts

@@ -1,7 +1,7 @@
 import { forwardRef, Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CqrsModule } from '@nestjs/cqrs';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { Income } from './income.entity';
 import { IncomeService } from './income.service';
 import { IncomeController } from './income.controller';
@@ -16,10 +16,8 @@ import { OrganizationRecurringExpenseModule } from './../organization-recurring-
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/income', module: IncomeModule }
-		]),
-		TypeOrmModule.forFeature([ Income ]),
+		RouterModule.register([{ path: '/income', module: IncomeModule }]),
+		TypeOrmModule.forFeature([Income]),
 		forwardRef(() => TenantModule),
 		forwardRef(() => UserModule),
 		forwardRef(() => EmployeeModule),
@@ -30,10 +28,7 @@ import { OrganizationRecurringExpenseModule } from './../organization-recurring-
 		CqrsModule
 	],
 	controllers: [IncomeController],
-	providers: [
-		IncomeService,
-		...CommandHandlers
-	],
+	providers: [IncomeService, ...CommandHandlers],
 	exports: [IncomeService]
 })
 export class IncomeModule {}

packages/core/src/integration-entity-setting-tied/integration-entity-setting-tied.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CqrsModule } from '@nestjs/cqrs';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { IntegrationEntitySettingTied } from './integration-entity-setting-tied.entity';
 import { IntegrationEntitySettingTiedController } from './integration-entity-setting-tied.controller';
 import { IntegrationEntitySettingTiedService } from './integration-entity-setting-tied.service';
@@ -10,28 +10,19 @@ import { UserModule } from './../user/user.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/integration-entity-setting-tied',
 				module: IntegrationEntitySettingTiedModule
 			}
 		]),
-		TypeOrmModule.forFeature([
-			IntegrationEntitySettingTied
-		]),
+		TypeOrmModule.forFeature([IntegrationEntitySettingTied]),
 		TenantModule,
 		UserModule,
 		CqrsModule
 	],
-	controllers: [
-		IntegrationEntitySettingTiedController
-	],
-	providers: [
-		IntegrationEntitySettingTiedService
-	],
-	exports: [
-		TypeOrmModule,
-		IntegrationEntitySettingTiedService
-	]
+	controllers: [IntegrationEntitySettingTiedController],
+	providers: [IntegrationEntitySettingTiedService],
+	exports: [TypeOrmModule, IntegrationEntitySettingTiedService]
 })
-export class IntegrationEntitySettingTiedModule { }
+export class IntegrationEntitySettingTiedModule {}

packages/core/src/integration-entity-setting/integration-entity-setting.module.ts

@@ -1,7 +1,7 @@
 import { Module, forwardRef } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CqrsModule } from '@nestjs/cqrs';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { TenantModule } from './../tenant/tenant.module';
 import { UserModule } from './../user/user.module';
 import { IntegrationTenantModule } from './../integration-tenant/integration-tenant.module';
@@ -12,30 +12,20 @@ import { IntegrationEntitySettingService } from './integration-entity-setting.se
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/integration-entity-setting',
 				module: IntegrationEntitySettingModule
 			}
 		]),
-		TypeOrmModule.forFeature([
-			IntegrationEntitySetting
-		]),
+		TypeOrmModule.forFeature([IntegrationEntitySetting]),
 		forwardRef(() => IntegrationTenantModule),
 		TenantModule,
 		UserModule,
 		CqrsModule
 	],
-	controllers: [
-		IntegrationEntitySettingController
-	],
-	providers: [
-		IntegrationEntitySettingService,
-		...CommandHandlers
-	],
-	exports: [
-		TypeOrmModule,
-		IntegrationEntitySettingService
-	]
+	controllers: [IntegrationEntitySettingController],
+	providers: [IntegrationEntitySettingService, ...CommandHandlers],
+	exports: [TypeOrmModule, IntegrationEntitySettingService]
 })
-export class IntegrationEntitySettingModule { }
+export class IntegrationEntitySettingModule {}

packages/core/src/integration-map/integration-map.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CqrsModule } from '@nestjs/cqrs';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { TenantModule } from 'tenant/tenant.module';
 import { UserModule } from 'user/user.module';
 import { TaskModule } from 'tasks/task.module';
@@ -13,31 +13,21 @@ import { IntegrationMap } from './integration-map.entity';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/integration-map',
 				module: IntegrationMapModule
 			}
 		]),
-		TypeOrmModule.forFeature([
-			IntegrationMap
-		]),
+		TypeOrmModule.forFeature([IntegrationMap]),
 		TenantModule,
 		UserModule,
 		TaskModule,
 		TagModule,
 		CqrsModule
 	],
-	controllers: [
-		IntegrationMapController
-	],
-	providers: [
-		IntegrationMapService,
-		...CommandHandlers
-	],
-	exports: [
-		TypeOrmModule,
-		IntegrationMapService
-	]
+	controllers: [IntegrationMapController],
+	providers: [IntegrationMapService, ...CommandHandlers],
+	exports: [TypeOrmModule, IntegrationMapService]
 })
-export class IntegrationMapModule { }
+export class IntegrationMapModule {}

packages/core/src/integration-tenant/integration-tenant.module.ts

@@ -1,6 +1,6 @@
 import { forwardRef, Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CqrsModule } from '@nestjs/cqrs';
 import { IntegrationTenantController } from './integration-tenant.controller';
 import { IntegrationTenantService } from './integration-tenant.service';
@@ -15,12 +15,8 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/integration-tenant', module: IntegrationTenantModule }
-		]),
-		TypeOrmModule.forFeature([
-			IntegrationTenant
-		]),
+		RouterModule.register([{ path: '/integration-tenant', module: IntegrationTenantModule }]),
+		TypeOrmModule.forFeature([IntegrationTenant]),
 		TenantModule,
 		UserModule,
 		RoleModule,
@@ -29,15 +25,8 @@ import { TenantModule } from '../tenant/tenant.module';
 		forwardRef(() => IntegrationEntitySettingModule),
 		CqrsModule
 	],
-	exports: [
-		IntegrationTenantService
-	],
-	controllers: [
-		IntegrationTenantController
-	],
-	providers: [
-		IntegrationTenantService,
-		...CommandHandlers
-	]
+	exports: [IntegrationTenantService],
+	controllers: [IntegrationTenantController],
+	providers: [IntegrationTenantService, ...CommandHandlers]
 })
-export class IntegrationTenantModule { }
+export class IntegrationTenantModule {}

packages/core/src/integration/gauzy-ai/integration-ai.module.ts

@@ -1,6 +1,5 @@
 import { MiddlewareConsumer, Module, NestModule, RequestMethod, forwardRef } from '@nestjs/common';
 import { CqrsModule } from '@nestjs/cqrs';
-import { RouterModule } from 'nest-router';
 import { GauzyAIModule } from '@gauzy/integration-ai';
 import { TenantModule } from './../../tenant/tenant.module';
 import { UserModule } from './../../user/user.module';
@@ -9,7 +8,6 @@ import { IntegrationAIService } from './integration-ai.service';
 import { IntegrationModule } from './../integration.module';
 import { IntegrationTenantModule } from './../../integration-tenant/integration-tenant.module';
 import { IntegrationAIMiddleware } from './integration-ai.middleware';
-import { EmployeeJobPostController } from './../../employee-job/employee-job.controller';
 
 @Module({
 	imports: [
@@ -20,22 +18,40 @@ import { EmployeeJobPostController } from './../../employee-job/employee-job.con
 		forwardRef(() => IntegrationModule),
 		CqrsModule
 	],
-	controllers: [
-		IntegrationAIController
-	],
-	providers: [
-		IntegrationAIService,
-		IntegrationAIMiddleware
-	]
+	controllers: [IntegrationAIController],
+	providers: [IntegrationAIService, IntegrationAIMiddleware]
 })
 export class IntegrationAIModule implements NestModule {
-
 	configure(consumer: MiddlewareConsumer) {
-		// Apply middlewares to specific controllers
-		consumer.apply(IntegrationAIMiddleware).forRoutes(
-			RouterModule.resolvePath(EmployeeJobPostController) // Apply to EmployeeJobPostController
-		);
 		consumer.apply(IntegrationAIMiddleware).forRoutes(
+			{
+				path: '/employee-job',
+				method: RequestMethod.GET
+			},
+			{
+				path: '/employee-job/apply',
+				method: RequestMethod.POST
+			},
+			{
+				path: '/employee-job/updateApplied',
+				method: RequestMethod.POST
+			},
+			{
+				path: '/employee-job/hide',
+				method: RequestMethod.POST
+			},
+			{
+				path: '/employee-job/pre-process',
+				method: RequestMethod.POST
+			},
+			{
+				path: '/employee-job/application/:employeeJobApplicationId',
+				method: RequestMethod.GET
+			},
+			{
+				path: '/employee-job/generate-proposal/:employeeJobApplicationId',
+				method: RequestMethod.POST
+			},
 			{
 				path: '/employee/job-statistics',
 				method: RequestMethod.GET
@@ -60,6 +76,6 @@ export class IntegrationAIModule implements NestModule {
 				path: '/timesheet/screenshot',
 				method: RequestMethod.POST
 			}
-		); // Apply to specific routes and methods
+		);
 	}
 }

packages/core/src/integration/integration.module.ts

@@ -1,6 +1,6 @@
 import { Module, forwardRef } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CqrsModule } from '@nestjs/cqrs';
 import { TenantModule } from 'tenant/tenant.module';
 import { UserModule } from 'user/user.module';
@@ -16,9 +16,10 @@ import { IntegrationAIModule } from './gauzy-ai/integration-ai.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
-				path: '/integration', module: IntegrationModule,
+				path: '/integration',
+				module: IntegrationModule,
 				children: [
 					{ path: '/hubstaff', module: HubstaffModule },
 					{ path: '/github', module: GithubModule },
@@ -27,10 +28,7 @@ import { IntegrationAIModule } from './gauzy-ai/integration-ai.module';
 				]
 			}
 		]),
-		TypeOrmModule.forFeature([
-			Integration,
-			IntegrationType
-		]),
+		TypeOrmModule.forFeature([Integration, IntegrationType]),
 		IntegrationTenantModule,
 		TenantModule,
 		UserModule,
@@ -39,16 +37,8 @@ import { IntegrationAIModule } from './gauzy-ai/integration-ai.module';
 		forwardRef(() => IntegrationAIModule),
 		CqrsModule
 	],
-	controllers: [
-		IntegrationController
-	],
-	providers: [
-		IntegrationService,
-		...CommandHandlers
-	],
-	exports: [
-		TypeOrmModule,
-		IntegrationService
-	]
+	controllers: [IntegrationController],
+	providers: [IntegrationService, ...CommandHandlers],
+	exports: [TypeOrmModule, IntegrationService]
 })
-export class IntegrationModule { }
+export class IntegrationModule {}

packages/core/src/invite/invite.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { CqrsModule } from '@nestjs/cqrs';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { AuthModule } from '../auth/auth.module';
 import { CommandHandlers } from './commands/handlers';
 import { QueryHandlers } from './queries/handlers';
@@ -24,12 +24,8 @@ import { EmailSendModule } from './../email-send/email-send.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/invite', module: InviteModule }
-		]),
-		TypeOrmModule.forFeature([
-			Invite
-		]),
+		RouterModule.register([{ path: '/invite', module: InviteModule }]),
+		TypeOrmModule.forFeature([Invite]),
 		CqrsModule,
 		EmailSendModule,
 		TenantModule,
@@ -47,14 +43,7 @@ import { EmailSendModule } from './../email-send/email-send.module';
 		OrganizationTeamEmployeeModule
 	],
 	controllers: [InviteController],
-	providers: [
-		InviteService,
-		...CommandHandlers,
-		...QueryHandlers
-	],
-	exports: [
-		TypeOrmModule,
-		InviteService
-	]
+	providers: [InviteService, ...CommandHandlers, ...QueryHandlers],
+	exports: [TypeOrmModule, InviteService]
 })
-export class InviteModule { }
+export class InviteModule {}

packages/core/src/invoice-estimate-history/invoice-estimate-history.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { InvoiceEstimateHistoryController } from './invoice-estimate-history.controller';
 import { InvoiceEstimateHistoryService } from './invoice-estimate-history.service';
 import { InvoiceEstimateHistory } from './invoice-estimate-history.entity';
@@ -11,18 +11,18 @@ import { TaskModule } from '../tasks/task.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/invoice-estimate-history',
-				module: InvoiceEstimateHistoryModule,
-			},
+				module: InvoiceEstimateHistoryModule
+			}
 		]),
 		TypeOrmModule.forFeature([User, InvoiceEstimateHistory]),
 		TenantModule,
-		TaskModule,
+		TaskModule
 	],
 	controllers: [InvoiceEstimateHistoryController],
 	providers: [InvoiceEstimateHistoryService, UserService],
-	exports: [InvoiceEstimateHistoryService, UserService],
+	exports: [InvoiceEstimateHistoryService, UserService]
 })
 export class InvoiceEstimateHistoryModule {}

packages/core/src/invoice-item/invoice-item.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CqrsModule } from '@nestjs/cqrs';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { InvoiceItem } from './invoice-item.entity';
 import { InvoiceItemController } from './invoice-item.controller';
 import { InvoiceItemService } from './invoice-item.service';
@@ -13,16 +13,14 @@ import { TaskModule } from '../tasks/task.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/invoice-item', module: InvoiceItemModule },
-		]),
+		RouterModule.register([{ path: '/invoice-item', module: InvoiceItemModule }]),
 		TypeOrmModule.forFeature([InvoiceItem, User]),
 		CqrsModule,
 		TenantModule,
-		TaskModule,
+		TaskModule
 	],
 	controllers: [InvoiceItemController],
 	providers: [InvoiceItemService, UserService, ...CommandHandlers],
-	exports: [InvoiceItemService],
+	exports: [InvoiceItemService]
 })
 export class InvoiceItemModule {}

packages/core/src/invoice/invoice.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CqrsModule } from '@nestjs/cqrs';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import * as moment from 'moment';
 import { InvoiceController } from './invoice.controller';
 import { InvoiceService } from './invoice.service';
@@ -16,18 +16,14 @@ import { UserModule } from './../user/user.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/invoices', module: InvoiceModule }
-		]),
-		TypeOrmModule.forFeature([
-			Invoice
-		]),
+		RouterModule.register([{ path: '/invoices', module: InvoiceModule }]),
+		TypeOrmModule.forFeature([Invoice]),
 		EmailSendModule,
 		EstimateEmailModule,
 		TenantModule,
 		UserModule,
 		OrganizationModule,
-		CqrsModule,
+		CqrsModule
 	],
 	controllers: [InvoiceController],
 	providers: [
@@ -37,12 +33,8 @@ import { UserModule } from './../user/user.module';
 		{
 			provide: 'MomentWrapper',
 			useValue: moment
-		},
+		}
 	],
-	exports: [
-		TypeOrmModule,
-		InvoiceService,
-		PdfmakerService
-	]
+	exports: [TypeOrmModule, InvoiceService, PdfmakerService]
 })
-export class InvoiceModule { }
+export class InvoiceModule {}

packages/core/src/keyresult-template/keyresult-template.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { KeyresultTemplateController } from './keyresult-template.controller';
 import { KeyresultTemplateService } from './keyresult-template.service';
 import { KeyResultTemplate } from './keyresult-template.entity';
@@ -8,9 +8,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/key-result-templates', module: KeyresultTemplateModule }
-		]),
+		RouterModule.register([{ path: '/key-result-templates', module: KeyresultTemplateModule }]),
 		TypeOrmModule.forFeature([KeyResultTemplate]),
 		TenantModule
 	],

packages/core/src/keyresult-update/keyresult-update.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CqrsModule } from '@nestjs/cqrs';
 import { KeyResultUpdateService } from './keyresult-update.service';
 import { KeyResultUpdateController } from './keyresult-update.controller';
@@ -10,9 +10,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/key-result-updates', module: KeyResultUpdateModule }
-		]),
+		RouterModule.register([{ path: '/key-result-updates', module: KeyResultUpdateModule }]),
 		TypeOrmModule.forFeature([KeyResultUpdate]),
 		CqrsModule,
 		TenantModule

packages/core/src/keyresult/keyresult.module.ts

@@ -1,5 +1,5 @@
 import { Module } from '@nestjs/common';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CqrsModule } from '@nestjs/cqrs';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { KeyResult } from './keyresult.entity';
@@ -9,9 +9,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/key-results', module: KeyResultModule }
-		]),
+		RouterModule.register([{ path: '/key-results', module: KeyResultModule }]),
 		TypeOrmModule.forFeature([KeyResult]),
 		CqrsModule,
 		TenantModule

packages/core/src/language/language.module.ts

@@ -1,6 +1,6 @@
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { Module } from '@nestjs/common';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { LanguageService } from './language.service';
 import { LanguageController } from './language.controller';
 import { Language } from './language.entity';
@@ -8,9 +8,7 @@ import { UserModule } from '../user/user.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/languages', module: LanguageModule }
-		]),
+		RouterModule.register([{ path: '/languages', module: LanguageModule }]),
 		TypeOrmModule.forFeature([Language]),
 		UserModule
 	],

packages/core/src/merchant/merchant.module.ts

@@ -1,5 +1,5 @@
 import { Module } from '@nestjs/common';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { Merchant } from './merchant.entity';
 import { MerchantController } from './merchant.controller';
@@ -11,9 +11,7 @@ import { ImageAssetModule } from './../image-asset/image-asset.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/merchants', module: MerchantModule }
-		]),
+		RouterModule.register([{ path: '/merchants', module: MerchantModule }]),
 		TypeOrmModule.forFeature([Merchant]),
 		TenantModule,
 		UserModule,
@@ -24,4 +22,4 @@ import { ImageAssetModule } from './../image-asset/image-asset.module';
 	providers: [MerchantService],
 	exports: [MerchantService]
 })
-export class MerchantModule {}
+export class MerchantModule {}

packages/core/src/organization-award/organization-award.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { OrganizationAward } from './organization-award.entity';
 import { OrganizationAwardController } from './organization-award.controller';
 import { OrganizationAwardService } from './organization-award.service';
@@ -8,9 +8,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/organization-awards', module: OrganizationAwardModule }
-		]),
+		RouterModule.register([{ path: '/organization-awards', module: OrganizationAwardModule }]),
 		TypeOrmModule.forFeature([OrganizationAward]),
 		TenantModule
 	],

packages/core/src/organization-contact/organization-contact.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CqrsModule } from '@nestjs/cqrs';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { OrganizationContact } from './organization-contact.entity';
 import { OrganizationContactController } from './organization-contact.controller';
 import { OrganizationContactService } from './organization-contact.service';
@@ -13,31 +13,21 @@ import { UserModule } from './../user/user.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/organization-contact',
-				module: OrganizationContactModule,
+				module: OrganizationContactModule
 			}
 		]),
-		TypeOrmModule.forFeature([
-			OrganizationContact
-		]),
+		TypeOrmModule.forFeature([OrganizationContact]),
 		TenantModule,
 		UserModule,
 		OrganizationModule,
 		OrganizationProjectModule,
 		CqrsModule
 	],
-	controllers: [
-		OrganizationContactController
-	],
-	providers: [
-		OrganizationContactService,
-		...CommandHandlers
-	],
-	exports: [
-		TypeOrmModule,
-		OrganizationContactService
-	]
+	controllers: [OrganizationContactController],
+	providers: [OrganizationContactService, ...CommandHandlers],
+	exports: [TypeOrmModule, OrganizationContactService]
 })
-export class OrganizationContactModule { }
+export class OrganizationContactModule {}

packages/core/src/organization-department/organization-department.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CqrsModule } from '@nestjs/cqrs';
 import { OrganizationDepartment } from './organization-department.entity';
 import { OrganizationDepartmentController } from './organization-department.controller';
@@ -11,7 +11,7 @@ import { UserModule } from './../user/user.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/organization-department',
 				module: OrganizationDepartmentModule
@@ -24,9 +24,6 @@ import { UserModule } from './../user/user.module';
 	],
 	controllers: [OrganizationDepartmentController],
 	providers: [OrganizationDepartmentService, ...CommandHandlers],
-	exports: [
-		TypeOrmModule,
-		OrganizationDepartmentService
-	]
+	exports: [TypeOrmModule, OrganizationDepartmentService]
 })
 export class OrganizationDepartmentModule {}

packages/core/src/organization-document/organization-document.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { OrganizationDocument } from './organization-document.entity';
 import { OrganizationDocumentService } from './organization-document.service';
 import { OrganizationDocumentController } from './organization-document.controller';
@@ -8,7 +8,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/organization-documents',
 				module: OrganizationDocumentModule

packages/core/src/organization-employment-type/organization-employment-type.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { TenantModule } from '../tenant/tenant.module';
 import { OrganizationEmploymentTypeController } from './organization-employment-type.controller';
 import { OrganizationEmploymentType } from './organization-employment-type.entity';
@@ -8,7 +8,7 @@ import { OrganizationEmploymentTypeService } from './organization-employment-typ
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/organization-employment-type',
 				module: OrganizationEmploymentTypeModule

packages/core/src/organization-language/organization-language.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { OrganizationLanguage } from './organization-language.entity';
 import { OrganizationLanguageController } from './organization-language.controller';
 import { OrganizationLanguageService } from './organization-language.service';
@@ -8,7 +8,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/organization-languages',
 				module: OrganizationLanguageModule

packages/core/src/organization-position/organization-position.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { OrganizationPosition } from './organization-position.entity';
 import { OrganizationPositionController } from './organization-position.controller';
 import { OrganizationPositionService } from './organization-position.service';
@@ -8,7 +8,7 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/organization-positions',
 				module: OrganizationPositionModule

packages/core/src/organization-project/organization-project.module.ts

@@ -1,6 +1,6 @@
 import { forwardRef, Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CqrsModule } from '@nestjs/cqrs';
 import { OrganizationProject } from './organization-project.entity';
 import { OrganizationProjectController } from './organization-project.controller';
@@ -11,19 +11,19 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/organization-projects',
-				module: OrganizationProjectModule,
-			},
+				module: OrganizationProjectModule
+			}
 		]),
 		TypeOrmModule.forFeature([OrganizationProject]),
 		CqrsModule,
 		forwardRef(() => TenantModule),
-		forwardRef(() => UserModule),
+		forwardRef(() => UserModule)
 	],
 	controllers: [OrganizationProjectController],
 	providers: [OrganizationProjectService, ...CommandHandlers],
-	exports: [TypeOrmModule, OrganizationProjectService],
+	exports: [TypeOrmModule, OrganizationProjectService]
 })
 export class OrganizationProjectModule {}

packages/core/src/organization-recurring-expense/organization-recurring-expense.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { CqrsModule } from '@nestjs/cqrs';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { CommandHandlers } from './commands/handlers';
 import { OrganizationRecurringExpenseController } from './organization-recurring-expense.controller';
 import { OrganizationRecurringExpense } from './organization-recurring-expense.entity';
@@ -15,17 +15,13 @@ import { TenantModule } from '../tenant/tenant.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/organization-recurring-expense',
 				module: OrganizationRecurringExpenseModule
 			}
 		]),
-		TypeOrmModule.forFeature([
-			OrganizationRecurringExpense,
-			Organization,
-			Employee
-		]),
+		TypeOrmModule.forFeature([OrganizationRecurringExpense, Organization, Employee]),
 		CqrsModule,
 		TenantModule
 	],

packages/core/src/organization-sprint/organization-sprint.module.ts

@@ -1,7 +1,7 @@
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { Module } from '@nestjs/common';
 import { CqrsModule } from '@nestjs/cqrs';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { OrganizationSprintService } from './organization-sprint.service';
 import { OrganizationSprintController } from './organization-sprint.controller';
 import { OrganizationSprint } from './organization-sprint.entity';
@@ -12,9 +12,7 @@ import { UserModule } from '../user/user.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/organization-sprint', module: OrganizationSprintModule }
-		]),
+		RouterModule.register([{ path: '/organization-sprint', module: OrganizationSprintModule }]),
 		TypeOrmModule.forFeature([OrganizationSprint, Task]),
 		CqrsModule,
 		TenantModule,

packages/core/src/organization-task-setting/organization-task-setting.module.ts

@@ -1,7 +1,7 @@
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { Module } from '@nestjs/common';
 import { CqrsModule } from '@nestjs/cqrs';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { OrganizationTaskSettingController } from './organization-task-setting.controller';
 import { OrganizationTaskSettingService } from './organization-task-setting.service';
 import { TenantModule } from '../tenant/tenant.module';
@@ -11,27 +11,19 @@ import { CommandHandlers } from './commands/handlers';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/organization-task-setting',
-				module: OrganizationTaskSettingModule,
+				module: OrganizationTaskSettingModule
 			}
 		]),
-		TypeOrmModule.forFeature([
-			OrganizationTaskSetting
-		]),
+		TypeOrmModule.forFeature([OrganizationTaskSetting]),
 		TenantModule,
 		UserModule,
 		CqrsModule
 	],
 	controllers: [OrganizationTaskSettingController],
-	providers: [
-		OrganizationTaskSettingService,
-		...CommandHandlers
-	],
-	exports: [
-		TypeOrmModule,
-		OrganizationTaskSettingService
-	],
+	providers: [OrganizationTaskSettingService, ...CommandHandlers],
+	exports: [TypeOrmModule, OrganizationTaskSettingService]
 })
 export class OrganizationTaskSettingModule {}

packages/core/src/organization-team-employee/organization-team-employee.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { UserModule } from './../user/user.module';
 import { TenantModule } from './../tenant/tenant.module';
 import { OrganizationTeamEmployeeController } from './organization-team-employee.controller';
@@ -10,19 +10,19 @@ import { TaskModule } from './../tasks/task.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/organization-team-employee',
-				module: OrganizationTeamEmployeeModule,
-			},
+				module: OrganizationTeamEmployeeModule
+			}
 		]),
 		TypeOrmModule.forFeature([OrganizationTeamEmployee]),
 		TenantModule,
 		UserModule,
-		TaskModule,
+		TaskModule
 	],
 	controllers: [OrganizationTeamEmployeeController],
 	providers: [OrganizationTeamEmployeeService],
-	exports: [TypeOrmModule, OrganizationTeamEmployeeService],
+	exports: [TypeOrmModule, OrganizationTeamEmployeeService]
 })
 export class OrganizationTeamEmployeeModule {}

packages/core/src/organization-team-join-request/organization-team-join-request.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { CqrsModule } from '@nestjs/cqrs';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { EmailSendModule } from './../email-send/email-send.module';
 import { TenantModule } from '../tenant/tenant.module';
 import { UserModule } from './../user/user.module';
@@ -16,26 +16,23 @@ import { RoleModule } from 'role/role.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
+		RouterModule.register([
 			{
 				path: '/organization-team-join',
-				module: OrganizationTeamJoinRequestModule,
-			},
-		]),
-		TypeOrmModule.forFeature([
-			OrganizationTeamJoinRequest,
-			OrganizationTeamEmployee,
+				module: OrganizationTeamJoinRequestModule
+			}
 		]),
+		TypeOrmModule.forFeature([OrganizationTeamJoinRequest, OrganizationTeamEmployee]),
 		CqrsModule,
 		TenantModule,
 		UserModule,
 		OrganizationTeamModule,
 		EmailSendModule,
 		InviteModule,
-		RoleModule,
+		RoleModule
 	],
 	controllers: [OrganizationTeamJoinRequestController],
 	providers: [OrganizationTeamJoinRequestService, ...CommandHandlers],
-	exports: [TypeOrmModule, OrganizationTeamJoinRequestService],
+	exports: [TypeOrmModule, OrganizationTeamJoinRequestService]
 })
-export class OrganizationTeamJoinRequestModule { }
+export class OrganizationTeamJoinRequestModule {}

packages/core/src/organization-team/organization-team.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CqrsModule } from '@nestjs/cqrs';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { TenantModule } from '../tenant/tenant.module';
 import { RoleModule } from './../role/role.module';
 import { UserModule } from './../user/user.module';
@@ -19,9 +19,7 @@ import { TaskModule } from './../tasks/task.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/organization-team', module: OrganizationTeamModule },
-		]),
+		RouterModule.register([{ path: '/organization-team', module: OrganizationTeamModule }]),
 		TypeOrmModule.forFeature([OrganizationTeam]),
 		OrganizationTeamEmployeeModule,
 		TenantModule,
@@ -32,10 +30,10 @@ import { TaskModule } from './../tasks/task.module';
 		TimerModule,
 		CqrsModule,
 		StatisticModule,
-		TaskModule,
+		TaskModule
 	],
 	controllers: [OrganizationTeamController],
 	providers: [...QueryHandlers, ...CommandHandlers, OrganizationTeamService],
-	exports: [TypeOrmModule, OrganizationTeamService],
+	exports: [TypeOrmModule, OrganizationTeamService]
 })
 export class OrganizationTeamModule {}

packages/core/src/organization-vendor/organization-vendor.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { OrganizationVendor } from './organization-vendor.entity';
 import { OrganizationVendorController } from './organization-vendor.controller';
 import { OrganizationVendorService } from './organization-vendor.service';
@@ -9,17 +9,12 @@ import { CommandHandlers } from './commands/handlers';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/organization-vendors', module: OrganizationVendorModule }
-		]),
+		RouterModule.register([{ path: '/organization-vendors', module: OrganizationVendorModule }]),
 		TypeOrmModule.forFeature([OrganizationVendor]),
 		TenantModule
 	],
 	controllers: [OrganizationVendorController],
-	providers: [
-		OrganizationVendorService,
-		...CommandHandlers
-	],
+	providers: [OrganizationVendorService, ...CommandHandlers],
 	exports: [TypeOrmModule, OrganizationVendorService]
 })
 export class OrganizationVendorModule {}

packages/core/src/organization/organization.module.ts

@@ -1,7 +1,7 @@
 import { forwardRef, Module } from '@nestjs/common';
 import { CqrsModule } from '@nestjs/cqrs';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { UserOrganizationModule } from './../user-organization/user-organization.module';
 import { TenantModule } from '../tenant/tenant.module';
 import { UserModule } from './../user/user.module';
@@ -12,23 +12,15 @@ import { OrganizationService } from './organization.service';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/organization', module: OrganizationModule }
-		]),
-		TypeOrmModule.forFeature([ Organization ]),
+		RouterModule.register([{ path: '/organization', module: OrganizationModule }]),
+		TypeOrmModule.forFeature([Organization]),
 		forwardRef(() => TenantModule),
 		forwardRef(() => UserOrganizationModule),
 		forwardRef(() => UserModule),
-		CqrsModule,
+		CqrsModule
 	],
 	controllers: [OrganizationController],
-	providers: [
-		OrganizationService,
-		...CommandHandlers
-	],
-	exports: [
-		TypeOrmModule,
-		OrganizationService
-	]
+	providers: [OrganizationService, ...CommandHandlers],
+	exports: [TypeOrmModule, OrganizationService]
 })
 export class OrganizationModule {}

packages/core/src/payment/payment.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { RouterModule } from 'nest-router';
+import { RouterModule } from '@nestjs/core';
 import { Payment } from './payment.entity';
 import { PaymentController } from './payment.controller';
 import { PaymentService } from './payment.service';
@@ -11,12 +11,8 @@ import { EmailSendModule } from './../email-send/email-send.module';
 
 @Module({
 	imports: [
-		RouterModule.forRoutes([
-			{ path: '/payments', module: PaymentModule }
-		]),
-		TypeOrmModule.forFeature([
-			Payment
-		]),
+		RouterModule.register([{ path: '/payments', module: PaymentModule }]),
+		TypeOrmModule.forFeature([Payment]),
 		TenantModule,
 		UserModule,
 		EmailSendModule
@@ -25,4 +21,4 @@ import { EmailSendModule } from './../email-send/email-send.module';
 	providers: [PaymentService, PaymentMapService],
 	exports: [TypeOrmModule, PaymentService, PaymentMapService]
 })
-export class PaymentModule { }
+export class PaymentModule {}