diff --git a/src/project/services/project-user.service.ts b/src/project/services/project-user.service.ts index 290f606..5564f13 100644 --- a/src/project/services/project-user.service.ts +++ b/src/project/services/project-user.service.ts @@ -3,7 +3,6 @@ import { BaseResponseDto } from '@app/common/dto/base.response.dto'; import { SuccessResponseDto } from '@app/common/dto/success.response.dto'; import { InviteUserRepository } from '@app/common/modules/Invite-user/repositiories'; import { ProjectService } from './project.service'; -import { UserStatusEnum } from '@app/common/constants/user-status.enum'; import { UserSpaceRepository } from '@app/common/modules/user/repositories'; @Injectable() @@ -74,7 +73,6 @@ export class ProjectUserService { invitedUserUuid: string, ): Promise { try { - let userSpaces; const user = await this.inviteUserRepository.findOne({ where: { project: { uuid: projectUuid }, @@ -102,15 +100,7 @@ export class ProjectUserService { HttpStatus.NOT_FOUND, ); } - if (user.status === UserStatusEnum.ACTIVE) { - const spaces = await this.userSpaceRepository.find({ - where: { user: { inviteUser: { uuid: invitedUserUuid } } }, - relations: ['space'], - }); - userSpaces = spaces.map((space) => space.space); - } else { - userSpaces = user.spaces.map((space) => space.space); - } + const createdAt = new Date(user.createdAt); const createdDate = createdAt.toLocaleDateString(); const createdTime = createdAt.toLocaleTimeString(); @@ -121,7 +111,7 @@ export class ProjectUserService { roleType: user.roleType.type, createdDate, createdTime, - spaces: userSpaces, + spaces: user.spaces.map((space) => space.space), }, statusCode: HttpStatus.OK, });