From 75ea7a75e125c4858e2198bb7c6bba8fc2e298ce Mon Sep 17 00:00:00 2001 From: Tomokazu Tantaka Date: Wed, 19 Feb 2025 20:49:20 +0900 Subject: [PATCH] Update user role with maintainer --- account/accountusecase/accountinteractor/usecase.go | 1 - account/accountusecase/operator.go | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/account/accountusecase/accountinteractor/usecase.go b/account/accountusecase/accountinteractor/usecase.go index 6106e72d..5c11aa73 100644 --- a/account/accountusecase/accountinteractor/usecase.go +++ b/account/accountusecase/accountinteractor/usecase.go @@ -83,7 +83,6 @@ func Run3[A, B, C any](ctx context.Context, op *accountusecase.Operator, r *acco if e.tx { tr = r.Transaction } - return usecasex.Run3(ctx, f, usecasex.TxUsecase{Transaction: tr}.UseTx(), e.EnsurePermission(op)) } diff --git a/account/accountusecase/operator.go b/account/accountusecase/operator.go index 4881c791..9e3b1f29 100644 --- a/account/accountusecase/operator.go +++ b/account/accountusecase/operator.go @@ -47,7 +47,7 @@ func (o *Operator) AllMaintainingWorkspaces() accountdomain.WorkspaceIDList { } func (o *Operator) AllOwningWorkspaces() accountdomain.WorkspaceIDList { - return o.OwningWorkspaces + return o.OwningWorkspaces.Concat(o.MaintainableWorkspaces) } func (o *Operator) IsReadableWorkspace(ws ...accountdomain.WorkspaceID) bool { @@ -58,8 +58,8 @@ func (o *Operator) IsWritableWorkspace(ws ...accountdomain.WorkspaceID) bool { return o.AllWritableWorkspaces().Intersect(ws).Len() > 0 } -func (o *Operator) IsMaintainingWorkspace(workspace ...accountdomain.WorkspaceID) bool { - return o.AllMaintainingWorkspaces().Intersect(workspace).Len() > 0 +func (o *Operator) IsMaintainingWorkspace(ws ...accountdomain.WorkspaceID) bool { + return o.AllMaintainingWorkspaces().Intersect(ws).Len() > 0 } func (o *Operator) IsOwningWorkspace(ws ...accountdomain.WorkspaceID) bool {