From bc58437e63342b4f0fd33e311e63a27a69de9d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ayd=C4=B1n=20Davuto=C4=9Flu?= <48082353+Davut97@users.noreply.github.com> Date: Tue, 14 Nov 2023 17:13:40 +0300 Subject: [PATCH] [MM-55302]Migrate server/channels/app/user.go to make use of GenericStoreResult (#25409) --- server/channels/app/user.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/channels/app/user.go b/server/channels/app/user.go index a658bda8fa..785e341e70 100644 --- a/server/channels/app/user.go +++ b/server/channels/app/user.go @@ -1604,17 +1604,17 @@ func (a *App) UpdateUserRolesWithUser(c request.CTX, user *model.User, newRoles } user.Roles = newRoles - uchan := make(chan store.StoreResult, 1) + uchan := make(chan store.GenericStoreResult[*model.UserUpdate], 1) go func() { userUpdate, err := a.Srv().Store().User().Update(user, true) - uchan <- store.StoreResult{Data: userUpdate, NErr: err} + uchan <- store.GenericStoreResult[*model.UserUpdate]{Data: userUpdate, NErr: err} close(uchan) }() - schan := make(chan store.StoreResult, 1) + schan := make(chan store.GenericStoreResult[string], 1) go func() { id, err := a.Srv().Store().Session().UpdateRoles(user.Id, newRoles) - schan <- store.StoreResult{Data: id, NErr: err} + schan <- store.GenericStoreResult[string]{Data: id, NErr: err} close(schan) }() @@ -1631,7 +1631,7 @@ func (a *App) UpdateUserRolesWithUser(c request.CTX, user *model.User, newRoles return nil, model.NewAppError("UpdateUserRoles", "app.user.update.finding.app_error", nil, "", http.StatusInternalServerError).Wrap(result.NErr) } } - ruser := result.Data.(*model.UserUpdate).New + ruser := result.Data.New if result := <-schan; result.NErr != nil { // soft error since the user roles were still updated