backend: ユーザ一覧を返す

Changes

3 changed files (+24/-5)

• packages/backend/services/workspace/get.go
  • @@ -71,7 +71,19 @@ },
    }), nil } - if err := event.UpdateProjections(tx, workspace, secret); err != nil { + users, err := projection.GetUsers(tx) + if err != nil { + logger.Error("Failed to read users projection", "error", err) + return connect.NewResponse(&workspaceV2.GetResponse{ + Result: &workspaceV2.GetResponse_SystemError{ + SystemError: &errorV1.SystemError{ + Message: proto.String("Database error"), + }, + }, + }), nil + } + + if err := event.UpdateProjections(tx, workspace, secret, users); err != nil { logger.Error("Failed to update projections", "error", err) return connect.NewResponse(&workspaceV2.GetResponse{ Result: &workspaceV2.GetResponse_SystemError{
  • @@ -93,7 +105,7 @@ }
    return connect.NewResponse(&workspaceV2.GetResponse{ Result: &workspaceV2.GetResponse_Ok{ - Ok: projectionWorkspaceToMessage(workspace.Projection), + Ok: projectionWorkspaceToMessage(workspace.Projection, users.Projection), }, }), nil }
• packages/backend/services/workspace/helpers.go
  • @@ -47,7 +47,13 @@ Permissions: &permissions,
    } } - func projectionWorkspaceToMessage(p *projection.Workspace) *workspaceV2.Workspace { + func projectionWorkspaceToMessage(p *projection.Workspace, u *projection.Users) *workspaceV2.Workspace { + users := make([]*workspaceV2.User, len(u.Users)) + + for i, user := range u.Users { + users[i] = projectionUserToMessage(user) + } + return &workspaceV2.Workspace{ DisplayName: p.DisplayName, HasAdmin: proto.Bool(p.GetNumberOfAdmins() > 0),
  • @@ -57,5 +63,6 @@ Worked: p.Abbreviations.Worked,
    SkipWork: p.Abbreviations.SkipWork, PaidLeave: p.Abbreviations.PaidLeave, }, + Users: users, } }
• packages/backend/services/workspace/update.go
  • @@ -141,7 +141,7 @@
    if len(events) == 0 { return connect.NewResponse(&workspaceV2.UpdateResponse{ Result: &workspaceV2.UpdateResponse_Ok{ - Ok: projectionWorkspaceToMessage(workspace.Projection), + Ok: projectionWorkspaceToMessage(workspace.Projection, users.Projection), }, }), nil }
  • @@ -181,7 +181,7 @@ }
    return connect.NewResponse(&workspaceV2.UpdateResponse{ Result: &workspaceV2.UpdateResponse_Ok{ - Ok: projectionWorkspaceToMessage(workspace.Projection), + Ok: projectionWorkspaceToMessage(workspace.Projection, users.Projection), }, }), nil }