refactor: remove space link

libs/common/src/database/database.module.ts

@@ -125,7 +125,7 @@ import { VisitorPasswordEntity } from '../modules/visitor-password/entities';
           logger: typeOrmLogger,
           extra: {
             charset: 'utf8mb4',
-            max: 50, // set pool max size
+            max: 20, // set pool max size
             idleTimeoutMillis: 5000, // close idle clients after 5 second
             connectionTimeoutMillis: 12_000, // return an error after 11 second if connection could not be established
             maxUses: 7500, // close (and replace) a connection after it has been used 7500 times (see below for discussion)

libs/common/src/util/email.service.ts

@@ -1,7 +1,7 @@
 import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
-import axios from 'axios';
 import * as nodemailer from 'nodemailer';
+import axios from 'axios';
 import {
   SEND_EMAIL_API_URL_DEV,
   SEND_EMAIL_API_URL_PROD,
@@ -83,17 +83,12 @@ export class EmailService {
       );
     }
   }
-  async sendEmailWithTemplate({
-    email,
-    name,
-    isEnable,
-    isDelete,
-  }: {
-    email: string;
-    name: string;
-    isEnable: boolean;
-    isDelete: boolean;
-  }): Promise<void> {
+  async sendEmailWithTemplate(
+    email: string,
+    name: string,
+    isEnable: boolean,
+    isDelete: boolean,
+  ): Promise<void> {
     const isProduction = process.env.NODE_ENV === 'production';
     const API_TOKEN = this.configService.get<string>(
       'email-config.MAILTRAP_API_TOKEN',

src/community/services/community.service.ts

@@ -207,8 +207,7 @@ export class CommunityService {
 
       if (search) {
         qb.andWhere(
-          `c.name ILIKE :search ${includeSpaces ? 'OR space.space_name ILIKE :search' : ''}`,
-          { search: `%${search}%` },
+          `c.name ILIKE '%${search}%' ${includeSpaces ? "OR space.space_name ILIKE '%" + search + "%'" : ''}`,
         );
       }
 
@@ -216,22 +215,12 @@ export class CommunityService {
 
       const { baseResponseDto, paginationResponseDto } =
         await customModel.findAll({ ...pageable, modelName: 'community' }, qb);
-
-      if (includeSpaces) {
-        baseResponseDto.data = baseResponseDto.data.map((community) => ({
-          ...community,
-          spaces: this.spaceService.buildSpaceHierarchy(community.spaces || []),
-        }));
-      }
       return new PageResponse<CommunityDto>(
         baseResponseDto,
         paginationResponseDto,
       );
     } catch (error) {
       // Generic error handling
-      if (error instanceof HttpException) {
-        throw error;
-      }
       throw new HttpException(
         error.message || 'An error occurred while fetching communities.',
         HttpStatus.INTERNAL_SERVER_ERROR,

src/invite-user/services/invite-user.service.ts

@@ -1,42 +1,36 @@
-import { RoleType } from '@app/common/constants/role.type.enum';
-import { UserStatusEnum } from '@app/common/constants/user-status.enum';
+import {
+  Injectable,
+  HttpException,
+  HttpStatus,
+  BadRequestException,
+} from '@nestjs/common';
+import { AddUserInvitationDto } from '../dtos';
 import { BaseResponseDto } from '@app/common/dto/base.response.dto';
+import { UserStatusEnum } from '@app/common/constants/user-status.enum';
 import { SuccessResponseDto } from '@app/common/dto/success.response.dto';
 import { generateRandomString } from '@app/common/helper/randomString';
-import { InviteUserEntity } from '@app/common/modules/Invite-user/entities';
+import { EntityManager, In, IsNull, Not, QueryRunner } from 'typeorm';
+import { DataSource } from 'typeorm';
+import { UserEntity } from '@app/common/modules/user/entities';
+import { RoleType } from '@app/common/constants/role.type.enum';
 import {
   InviteUserRepository,
   InviteUserSpaceRepository,
 } from '@app/common/modules/Invite-user/repositiories';
-import { RoleTypeRepository } from '@app/common/modules/role-type/repositories';
-import { SpaceRepository } from '@app/common/modules/space';
-import { SpaceEntity } from '@app/common/modules/space/entities/space.entity';
-import { UserEntity } from '@app/common/modules/user/entities';
+import { CheckEmailDto } from '../dtos/check-email.dto';
 import { UserRepository } from '@app/common/modules/user/repositories';
 import { EmailService } from '@app/common/util/email.service';
-import {
-  BadRequestException,
-  HttpException,
-  HttpStatus,
-  Injectable,
-} from '@nestjs/common';
-import { SpaceUserService } from 'src/space/services';
-import { UserSpaceService } from 'src/users/services';
-import {
-  DataSource,
-  EntityManager,
-  In,
-  IsNull,
-  Not,
-  QueryRunner,
-} from 'typeorm';
-import { AddUserInvitationDto } from '../dtos';
+import { SpaceRepository } from '@app/common/modules/space';
 import { ActivateCodeDto } from '../dtos/active-code.dto';
-import { CheckEmailDto } from '../dtos/check-email.dto';
+import { UserSpaceService } from 'src/users/services';
+import { SpaceUserService } from 'src/space/services';
 import {
   DisableUserInvitationDto,
   UpdateUserInvitationDto,
 } from '../dtos/update.invite-user.dto';
+import { RoleTypeRepository } from '@app/common/modules/role-type/repositories';
+import { InviteUserEntity } from '@app/common/modules/Invite-user/entities';
+import { SpaceEntity } from '@app/common/modules/space/entities/space.entity';
 
 @Injectable()
 export class InviteUserService {
@@ -664,12 +658,12 @@ export class InviteUserService {
           HttpStatus.BAD_REQUEST,
         );
       }
-      await this.emailService.sendEmailWithTemplate({
-        email: userData.email,
-        name: userData.firstName,
-        isEnable: !disable,
-        isDelete: false,
-      });
+      await this.emailService.sendEmailWithTemplate(
+        userData.email,
+        userData.firstName,
+        disable,
+        false,
+      );
       await queryRunner.commitTransaction();
 
       return new SuccessResponseDto({
@@ -803,12 +797,12 @@ export class InviteUserService {
           { isActive: false },
         );
       }
-      await this.emailService.sendEmailWithTemplate({
-        email: userData.email,
-        name: userData.firstName,
-        isEnable: false,
-        isDelete: true,
-      });
+      await this.emailService.sendEmailWithTemplate(
+        userData.email,
+        userData.firstName,
+        false,
+        true,
+      );
       await queryRunner.commitTransaction();
 
       return new SuccessResponseDto({

src/main.ts

@@ -1,14 +1,15 @@
-import { RequestContextMiddleware } from '@app/common/middleware/request-context.middleware';
-import { SeederService } from '@app/common/seed/services/seeder.service';
-import { Logger, ValidationPipe } from '@nestjs/common';
 import { NestFactory } from '@nestjs/core';
-import { json, urlencoded } from 'body-parser';
+import { AppModule } from './app.module';
 import rateLimit from 'express-rate-limit';
 import helmet from 'helmet';
-import { WINSTON_MODULE_NEST_PROVIDER } from 'nest-winston';
 import { setupSwaggerAuthentication } from '../libs/common/src/util/user-auth.swagger.utils';
-import { AppModule } from './app.module';
+import { ValidationPipe } from '@nestjs/common';
+import { json, urlencoded } from 'body-parser';
+import { SeederService } from '@app/common/seed/services/seeder.service';
 import { HttpExceptionFilter } from './common/filters/http-exception/http-exception.filter';
+import { Logger } from '@nestjs/common';
+import { WINSTON_MODULE_NEST_PROVIDER } from 'nest-winston';
+import { RequestContextMiddleware } from '@app/common/middleware/request-context.middleware';
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
@@ -29,13 +30,6 @@ async function bootstrap() {
     }),
   );
 
-  app.use((req, res, next) => {
-    console.log('Real IP:', req.ip);
-    next();
-  });
-
-  // app.getHttpAdapter().getInstance().set('trust proxy', 1);
-
   app.use(
     helmet({
       contentSecurityPolicy: false,

src/space/services/space.service.ts

@@ -681,7 +681,7 @@ export class SpaceService {
     }
   }
 
-  buildSpaceHierarchy(spaces: SpaceEntity[]): SpaceEntity[] {
+  private buildSpaceHierarchy(spaces: SpaceEntity[]): SpaceEntity[] {
     const map = new Map<string, SpaceEntity>();
 
     // Step 1: Create a map of spaces by UUID