mirror of
https://github.com/aykhans/slash-e.git
synced 2025-06-14 20:07:50 +00:00
feat: add member list to workspace
This commit is contained in:
@ -34,8 +34,9 @@ func (raw *workspaceRaw) toWorkspace() *api.Workspace {
|
||||
UpdatedTs: raw.UpdatedTs,
|
||||
RowStatus: raw.RowStatus,
|
||||
|
||||
Name: raw.Name,
|
||||
Description: raw.Description,
|
||||
Name: raw.Name,
|
||||
Description: raw.Description,
|
||||
WorkspaceUserList: []*api.WorkspaceUser{},
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -37,9 +37,26 @@ func (s *Store) ComposeWorkspaceUser(ctx context.Context, workspaceUser *api.Wor
|
||||
return err
|
||||
}
|
||||
|
||||
user.OpenID = ""
|
||||
user.UserSettingList = nil
|
||||
workspaceUser.User = user
|
||||
workspaceUser.Email = user.Email
|
||||
workspaceUser.Name = user.Name
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Store) ComposeWorkspaceUserListForWorkspace(ctx context.Context, workspace *api.Workspace) error {
|
||||
workspaceUserList, err := s.FindWordspaceUserList(ctx, &api.WorkspaceUserFind{
|
||||
WorkspaceID: &workspace.ID,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for _, workspaceUser := range workspaceUserList {
|
||||
if err := s.ComposeWorkspaceUser(ctx, workspaceUser); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
workspace.WorkspaceUserList = workspaceUserList
|
||||
|
||||
return nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user