mirror of
https://github.com/SyncrowIOT/backend.git
synced 2025-11-26 08:54:54 +00:00
Include spaces and userSpaces in user relations
This commit is contained in:
@ -101,7 +101,7 @@ export class ProjectUserService {
|
||||
'invitedBy',
|
||||
'isEnabled',
|
||||
],
|
||||
relations: ['roleType'],
|
||||
relations: ['roleType', 'spaces'],
|
||||
});
|
||||
if (!user) {
|
||||
user = await this.userRepository.findOne({
|
||||
@ -111,7 +111,7 @@ export class ProjectUserService {
|
||||
isActive: true,
|
||||
},
|
||||
select: ['uuid', 'firstName', 'lastName', 'email', 'createdAt'],
|
||||
relations: ['roleType'],
|
||||
relations: ['roleType', 'userSpaces'],
|
||||
});
|
||||
}
|
||||
if (!user) {
|
||||
@ -154,6 +154,7 @@ export class ProjectUserService {
|
||||
phoneNumber: user.phoneNumber ?? null,
|
||||
jobTitle: user.jobTitle ?? null,
|
||||
roleType: user.roleType?.type ?? null,
|
||||
spaces: user.spaces ?? user.userSpaces,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user