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

Update user relations and formatUserResponse method

Browse Source
This commit is contained in:
faris Aljohari
2025-01-02 20:41:58 -06:00
parent 12d1d8b35b
commit ff30d36f8e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,7 @@ export class ProjectUserService {
'invitedBy', 'invitedBy',
'isEnabled', 'isEnabled',
], ],
relations: ['roleType', 'spaces'], relations: ['roleType', 'spaces.space'],
}); });
if (!user) { if (!user) {
user = await this.userRepository.findOne({ user = await this.userRepository.findOne({
@ -120,7 +120,7 @@ export class ProjectUserService {
isActive: true, isActive: true,
}, },
select: ['uuid', 'firstName', 'lastName', 'email', 'createdAt'], select: ['uuid', 'firstName', 'lastName', 'email', 'createdAt'],
relations: ['roleType', 'userSpaces'], relations: ['roleType', 'userSpaces.space'],
}); });
} }
if (!user) { if (!user) {
@ -149,7 +149,10 @@ export class ProjectUserService {
private formatUserResponse(user: any) { private formatUserResponse(user: any) {
const createdAt = new Date(user.createdAt); const createdAt = new Date(user.createdAt);
return { return {
...user, uuid: user.uuid,
firstName: user.firstName,
lastName: user.lastName,
email: user.email,
createdDate: createdAt.toLocaleDateString(), createdDate: createdAt.toLocaleDateString(),
createdTime: createdAt.toLocaleTimeString(), createdTime: createdAt.toLocaleTimeString(),
...this.normalizeUserProperties(user), ...this.normalizeUserProperties(user),
@ -163,7 +166,9 @@ export class ProjectUserService {
phoneNumber: user.phoneNumber ?? null, phoneNumber: user.phoneNumber ?? null,
jobTitle: user.jobTitle ?? null, jobTitle: user.jobTitle ?? null,
roleType: user.roleType?.type ?? null, roleType: user.roleType?.type ?? null,
spaces: user.spaces ?? user.userSpaces, spaces:
user?.spaces?.map((space: any) => space?.space) ??
user?.userSpaces?.map((space: any) => space?.space),
}; };
} }
} }