Refactor activation code handling and user space verification

src/users/controllers/user-space.controller.ts

@@ -1,20 +1,11 @@
 import { ControllerRoute } from '@app/common/constants/controller-route';
 import { EnableDisableStatusEnum } from '@app/common/constants/days.enum';
-import {
-  Body,
-  Controller,
-  Get,
-  HttpException,
-  HttpStatus,
-  Param,
-  Post,
-  UseGuards,
-} from '@nestjs/common';
+import { Controller, Get, Param, UseGuards } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { UserSpaceService } from '../services';
 import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard';
 import { BaseResponseDto } from '@app/common/dto/base.response.dto';
-import { AddUserSpaceUsingCodeDto, UserParamDto } from '../dtos';
+import { UserParamDto } from '../dtos';
 
 @ApiTags('User Module')
 @Controller({
@@ -36,36 +27,4 @@ export class UserSpaceController {
   ): Promise<BaseResponseDto> {
     return this.userSpaceService.getSpacesForUser(params.userUuid);
   }
-
-  @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
-  @Post('/verify-code')
-  @ApiOperation({
-    summary:
-      ControllerRoute.USER_SPACE.ACTIONS.VERIFY_CODE_AND_ADD_USER_SPACE_SUMMARY,
-    description:
-      ControllerRoute.USER_SPACE.ACTIONS
-        .VERIFY_CODE_AND_ADD_USER_SPACE_DESCRIPTION,
-  })
-  async verifyCodeAndAddUserSpace(
-    @Body() dto: AddUserSpaceUsingCodeDto,
-    @Param() params: UserParamDto,
-  ) {
-    try {
-      await this.userSpaceService.verifyCodeAndAddUserSpace(
-        dto,
-        params.userUuid,
-      );
-      return {
-        statusCode: HttpStatus.CREATED,
-        success: true,
-        message: 'user space added successfully',
-      };
-    } catch (error) {
-      throw new HttpException(
-        error.message || 'Internal server error',
-        error.status || HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
-  }
 }

src/users/services/user-space.service.ts

@@ -1,4 +1,9 @@
-import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
+import {
+  BadRequestException,
+  HttpException,
+  HttpStatus,
+  Injectable,
+} from '@nestjs/common';
 import { UserSpaceRepository } from '@app/common/modules/user/repositories';
 import { SuccessResponseDto } from '@app/common/dto/success.response.dto';
 import { BaseResponseDto } from '@app/common/dto/base.response.dto';
@@ -11,6 +16,10 @@ import { CommonErrorCodes } from '@app/common/constants/error-codes.enum';
 import { UserDevicePermissionService } from 'src/user-device-permission/services';
 import { PermissionType } from '@app/common/constants/permission-type.enum';
 import { InviteSpaceEntity } from '@app/common/modules/space/entities/invite-space.entity';
+import { UserService } from './user.service';
+import { RoleType } from '@app/common/constants/role.type.enum';
+import { InviteUserRepository } from '@app/common/modules/Invite-user/repositiories';
+import { UserStatusEnum } from '@app/common/constants/user-status.enum';
 
 @Injectable()
 export class UserSpaceService {
@@ -18,6 +27,8 @@ export class UserSpaceService {
     private readonly userSpaceRepository: UserSpaceRepository,
     private readonly spaceRepository: SpaceRepository,
     private readonly inviteSpaceRepository: InviteSpaceRepository,
+    private readonly userService: UserService,
+    private readonly inviteUserRepository: InviteUserRepository,
     private readonly userDevicePermissionService: UserDevicePermissionService,
   ) {}
 
@@ -41,17 +52,24 @@ export class UserSpaceService {
     params: AddUserSpaceUsingCodeDto,
     userUuid: string,
   ) {
+    const { inviteCode } = params;
     try {
-      const inviteSpace = await this.findInviteSpaceByInviteCode(
-        params.inviteCode,
+      const inviteSpace = await this.findInviteSpaceByInviteCode(inviteCode);
+      const user = await this.userService.getUserDetailsByUserUuid(
+        userUuid,
+        true,
       );
-
+      await this.checkSpaceMemberRole(user);
       await this.addUserToSpace(userUuid, inviteSpace.space.uuid);
 
       const deviceUUIDs = await this.getDeviceUUIDsForSpace(inviteSpace.uuid);
 
       await this.addUserPermissionsToDevices(userUuid, deviceUUIDs);
-
+      await this.addUserAsActiveInvitation(
+        user,
+        inviteSpace.space.uuid,
+        inviteCode,
+      );
       await this.clearSpaceInvitationCode(inviteSpace.uuid);
     } catch (err) {
       if (err instanceof HttpException) {
@@ -64,7 +82,20 @@ export class UserSpaceService {
       }
     }
   }
-
+  private async checkSpaceMemberRole(user: any) {
+    try {
+      if (user.role.type !== RoleType.SPACE_MEMBER) {
+        throw new BadRequestException(
+          'You have to be a space member to join this space',
+        );
+      }
+    } catch (err) {
+      throw new HttpException(
+        err.message || 'User not found',
+        err.status || HttpStatus.NOT_FOUND,
+      );
+    }
+  }
   private async findInviteSpaceByInviteCode(
     inviteCode: string,
   ): Promise<InviteSpaceEntity> {
@@ -90,7 +121,47 @@ export class UserSpaceService {
       { isActive: false },
     );
   }
+  async getProjectBySpaceUuid(spaceUuid: string) {
+    try {
+      const project = await this.spaceRepository.findOne({
+        where: {
+          uuid: spaceUuid,
+        },
+        relations: ['community.project'],
+      });
+      return project;
+    } catch (error) {
+      throw new HttpException('Space not found', HttpStatus.NOT_FOUND);
+    }
+  }
+  private async addUserAsActiveInvitation(
+    user: any,
+    spaceUuid: string,
+    inviteCode: string,
+  ) {
+    try {
+      const space = await this.getProjectBySpaceUuid(spaceUuid);
 
+      const inviteUser = this.inviteUserRepository.create({
+        firstName: user.firstName,
+        lastName: user.lastName,
+        email: user.email,
+        jobTitle: null,
+        phoneNumber: null,
+        roleType: { uuid: user.role.uuid },
+        status: UserStatusEnum.ACTIVE,
+        invitationCode: inviteCode,
+        invitedBy: RoleType.SPACE_OWNER,
+        project: { uuid: space.community.project.uuid },
+      });
+      await this.inviteUserRepository.save(inviteUser);
+    } catch (err) {
+      throw new HttpException(
+        err.message || 'Internal Server Error',
+        HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+  }
   private async addUserToSpace(userUuid: string, spaceUuid: string) {
     try {
       const user = await this.addUserSpace({ userUuid, spaceUuid });

src/users/services/user.service.ts

@@ -23,13 +23,15 @@ export class UserService {
     private readonly regionRepository: RegionRepository,
     private readonly timeZoneRepository: TimeZoneRepository,
   ) {}
-  async getUserDetailsByUserUuid(userUuid: string) {
+  async getUserDetailsByUserUuid(userUuid: string, withRole = false) {
     try {
       const user = await this.userRepository.findOne({
         where: {
           uuid: userUuid,
         },
-        relations: ['region', 'timezone'],
+        ...(withRole
+          ? { relations: ['roleType'] }
+          : { relations: ['region', 'timezone'] }),
       });
       if (!user) {
         throw new BadRequestException('Invalid room UUID');
@@ -39,13 +41,14 @@ export class UserService {
       const cleanedProfilePicture = removeBase64Prefix(user.profilePicture);
 
       return {
-        uuid: user.uuid,
-        email: user.email,
-        firstName: user.firstName,
-        lastName: user.lastName,
+        uuid: user?.uuid,
+        email: user?.email,
+        firstName: user?.firstName,
+        lastName: user?.lastName,
         profilePicture: cleanedProfilePicture,
-        region: user.region,
-        timeZone: user.timezone,
+        region: user?.region,
+        timeZone: user?.timezone,
+        ...(withRole && { role: user?.roleType }),
       };
     } catch (err) {
       if (err instanceof BadRequestException) {

src/users/user.module.ts

@@ -19,6 +19,7 @@ import {
 import { UserDevicePermissionService } from 'src/user-device-permission/services';
 import { DeviceUserPermissionRepository } from '@app/common/modules/device/repositories';
 import { PermissionTypeRepository } from '@app/common/modules/permission/repositories';
+import { InviteUserRepository } from '@app/common/modules/Invite-user/repositiories';
 
 @Module({
   imports: [ConfigModule, CommunityModule],
@@ -36,6 +37,7 @@ import { PermissionTypeRepository } from '@app/common/modules/permission/reposit
     PermissionTypeRepository,
     UserSpaceService,
     InviteSpaceRepository,
+    InviteUserRepository,
   ],
   exports: [UserService],
 })