ammar/backend
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/backend.git synced 2025-07-16 10:46:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update user spaces retrieval based on user status

Browse Source
This commit is contained in:
faris Aljohari
2025-01-04 06:21:39 -06:00
parent c616547f9b
commit 687d88ea2e
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/project/services/project-user.service.ts
View File

@ -3,12 +3,15 @@ import { BaseResponseDto } from '@app/common/dto/base.response.dto';
import { SuccessResponseDto } from '@app/common/dto/success.response.dto'; import { SuccessResponseDto } from '@app/common/dto/success.response.dto';
import { InviteUserRepository } from '@app/common/modules/Invite-user/repositiories'; import { InviteUserRepository } from '@app/common/modules/Invite-user/repositiories';
import { ProjectService } from './project.service'; import { ProjectService } from './project.service';
import { UserStatusEnum } from '@app/common/constants/user-status.enum';
import { UserSpaceRepository } from '@app/common/modules/user/repositories';
@Injectable() @Injectable()
export class ProjectUserService { export class ProjectUserService {
constructor( constructor(
private readonly inviteUserRepository: InviteUserRepository, private readonly inviteUserRepository: InviteUserRepository,
private readonly projectService: ProjectService, private readonly projectService: ProjectService,
private readonly userSpaceRepository: UserSpaceRepository,
) {} ) {}
async getUsersByProject(uuid: string): Promise<BaseResponseDto> { async getUsersByProject(uuid: string): Promise<BaseResponseDto> {
@ -70,6 +73,7 @@ export class ProjectUserService {
invitedUserUuid: string, invitedUserUuid: string,
): Promise<BaseResponseDto> { ): Promise<BaseResponseDto> {
try { try {
let userSpaces;
const user = await this.inviteUserRepository.findOne({ const user = await this.inviteUserRepository.findOne({
where: { where: {
project: { uuid: projectUuid }, project: { uuid: projectUuid },
@ -96,6 +100,15 @@ export class ProjectUserService {
HttpStatus.NOT_FOUND, 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 createdAt = new Date(user.createdAt);
const createdDate = createdAt.toLocaleDateString(); const createdDate = createdAt.toLocaleDateString();
const createdTime = createdAt.toLocaleTimeString(); const createdTime = createdAt.toLocaleTimeString();
@ -106,7 +119,7 @@ export class ProjectUserService {
roleType: user.roleType.type, roleType: user.roleType.type,
createdDate, createdDate,
createdTime, createdTime,
spaces: user.spaces.map((space) => space.space), spaces: userSpaces,
}, },
statusCode: HttpStatus.OK, statusCode: HttpStatus.OK,
}); });