Ryan/docmost-ryan
1
0
Fork 0
mirror of https://github.com/Shadowfita/docmost.git synced 2025-11-15 09:11:11 +10:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Philipinho
2024-04-04 21:25:20 +01:00
parent 409850b22a
commit cab5e67055
3 changed files with 52 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
apps/server/src/kysely/repos/space/space-member.repo.ts
View File

@ -36,16 +36,13 @@ export class SpaceMemberRepo {
.leftJoin('users', 'users.id', 'spaceMembers.userId')
.leftJoin('groups', 'groups.id', 'spaceMembers.groupId')
.select([
'groups.id as group_id',
'groups.name as group_name',
'groups.isDefault as group_isDefault',
'groups.id as groups_id',
'groups.id as groups_id',
'groups.id as groups_id',
'users.id as user_id',
'users.name as user_name',
'users.avatarUrl as user_avatarUrl',
'users.email as user_email',
'groups.id as groupId',
'groups.name as groupName',
'groups.isDefault as groupIsDefault',
'users.id as userId',
'users.name as userName',
'users.avatarUrl as userAvatarUrl',
'users.email as userEmail',
'spaceMembers.role',
])
.where('spaceId', '=', spaceId)
@ -59,19 +56,20 @@ export class SpaceMemberRepo {
let memberInfo: MemberInfo;
const members = result.items.map((member) => {
if (member.user_id) {
if (member.userId) {
memberInfo = {
id: member.user_id,
name: member.user_name,
email: member.user_email,
avatarUrl: member.user_avatarUrl,
id: member.userId,
name: member.userName,
email: member.userEmail,
avatarUrl: member.userAvatarUrl,
type: 'user',
};
} else if (member.group_id) {
} else if (member.groupId) {
// todo: get group member count
memberInfo = {
id: member.group_id,
name: member.group_name,
isDefault: member.group_isDefault,
id: member.groupId,
name: member.groupName,
isDefault: member.groupIsDefault,
type: 'group',
};
}