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

Include spaces and userSpaces in user relations

Browse Source
This commit is contained in:
faris Aljohari
2024-12-30 19:53:31 -06:00
parent 7e6e34a3de
commit 337539c293
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,7 +101,7 @@ export class ProjectUserService {
'invitedBy', 'invitedBy',
'isEnabled', 'isEnabled',
], ],
relations: ['roleType'], relations: ['roleType', 'spaces'],
}); });
if (!user) { if (!user) {
user = await this.userRepository.findOne({ user = await this.userRepository.findOne({
@ -111,7 +111,7 @@ export class ProjectUserService {
isActive: true, isActive: true,
}, },
select: ['uuid', 'firstName', 'lastName', 'email', 'createdAt'], select: ['uuid', 'firstName', 'lastName', 'email', 'createdAt'],
relations: ['roleType'], relations: ['roleType', 'userSpaces'],
}); });
} }
if (!user) { if (!user) {
@ -154,6 +154,7 @@ 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,
}; };
} }
} }