@@ -45,19 +45,19 @@ func (i *Workspace) Create(ctx context.Context, name string, firstUser workspace
45
45
return nil , accountinterfaces .ErrInvalidOperator
46
46
}
47
47
48
- return Run1 (ctx , operator , i .repos , Usecase ().Transaction (), func (ctx context.Context ) (* workspace.Workspace , error ) {
49
- if len (strings .TrimSpace (name )) == 0 {
50
- return nil , user .ErrInvalidName
51
- }
48
+ if len (strings .TrimSpace (name )) == 0 {
49
+ return nil , user .ErrInvalidName
50
+ }
52
51
53
- firstUsers , err := i .userquery .FetchByID (ctx , []user.ID {firstUser })
54
- if err != nil || len (firstUsers ) == 0 {
55
- if err == nil {
56
- return nil , rerror .ErrNotFound
57
- }
58
- return nil , err
52
+ firstUsers , err := i .userquery .FetchByID (ctx , []user.ID {firstUser })
53
+ if err != nil || len (firstUsers ) == 0 {
54
+ if err == nil {
55
+ return nil , rerror .ErrNotFound
59
56
}
57
+ return nil , err
58
+ }
60
59
60
+ return Run1 (ctx , operator , i .repos , Usecase ().Transaction (), func (ctx context.Context ) (* workspace.Workspace , error ) {
61
61
ws , err := workspace .New ().
62
62
NewID ().
63
63
Name (name ).
@@ -119,6 +119,11 @@ func (i *Workspace) AddUserMember(ctx context.Context, workspaceID workspace.ID,
119
119
return nil , accountinterfaces .ErrInvalidOperator
120
120
}
121
121
122
+ ul , err := i .userquery .FetchByID (ctx , maps .Keys (users ))
123
+ if err != nil {
124
+ return nil , err
125
+ }
126
+
122
127
return Run1 (ctx , operator , i .repos , Usecase ().Transaction ().WithOwnableWorkspaces (workspaceID ), func (ctx context.Context ) (* workspace.Workspace , error ) {
123
128
ws , err := i .repos .Workspace .FindByID (ctx , workspaceID )
124
129
if err != nil {
@@ -129,11 +134,6 @@ func (i *Workspace) AddUserMember(ctx context.Context, workspaceID workspace.ID,
129
134
return nil , workspace .ErrCannotModifyPersonalWorkspace
130
135
}
131
136
132
- ul , err := i .userquery .FetchByID (ctx , maps .Keys (users ))
133
- if err != nil {
134
- return nil , err
135
- }
136
-
137
137
if i .enforceMemberCount != nil {
138
138
if err := i .enforceMemberCount (ctx , ws , ul , operator ); err != nil {
139
139
return nil , err
0 commit comments