ammar/backend
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/backend.git synced 2025-11-27 09:34:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #194 from SyncrowIOT/fix-get-user-by-uuid-in-project

Browse Source 
Update user relations and formatUserResponse method
This commit is contained in:
hannathkadher
2025-01-03 08:05:13 +04:00
committed by GitHub
parent 12d1d8b35b ff30d36f8e
commit 3f73106eb0
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',
'isEnabled',
],
relations: ['roleType', 'spaces'],
relations: ['roleType', 'spaces.space'],
});
if (!user) {
user = await this.userRepository.findOne({
@ -120,7 +120,7 @@ export class ProjectUserService {
isActive: true,
},
select: ['uuid', 'firstName', 'lastName', 'email', 'createdAt'],
relations: ['roleType', 'userSpaces'],
relations: ['roleType', 'userSpaces.space'],
});
}
if (!user) {
@ -149,7 +149,10 @@ export class ProjectUserService {
private formatUserResponse(user: any) {
const createdAt = new Date(user.createdAt);
return {
...user,
uuid: user.uuid,
firstName: user.firstName,
lastName: user.lastName,
email: user.email,
createdDate: createdAt.toLocaleDateString(),
createdTime: createdAt.toLocaleTimeString(),
...this.normalizeUserProperties(user),
@ -163,7 +166,9 @@ export class ProjectUserService {
phoneNumber: user.phoneNumber ?? null,
jobTitle: user.jobTitle ?? 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),
};
}
}