From b2abd533a1a5ccf9466944cc385443a061aafaa8 Mon Sep 17 00:00:00 2001 From: Syed Fazil <84120587+fazil-syed@users.noreply.github.com> Date: Fri, 3 Nov 2023 17:20:25 +0530 Subject: [PATCH] [MM-55212] Migrate server/channels/app/channel.go to make use of GenericStoreResult (#25262) * Make use of GenericStoreResult in channels/app/channel.go * Make use of GenericStoreResult in channels/app/channel.go * Make use of GenericStoreResult in channels/app/channel.go * Make use of GenericStoreResult in channels/app/channel.go * Make use of GenericStoreResult in channels/app/channel.go * Make use of GenericStoreResult in channels/app/channel.go * Make use of GenericStoreResult in channels/app/channel.go --------- Co-authored-by: fazil-syed Co-authored-by: Mattermost Build --- server/channels/app/channel.go | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/server/channels/app/channel.go b/server/channels/app/channel.go index 2ed21ae2e4..e03a088e7e 100644 --- a/server/channels/app/channel.go +++ b/server/channels/app/channel.go @@ -2193,16 +2193,16 @@ func (a *App) GetChannelUnread(c request.CTX, channelID, userID string) (*model. } func (a *App) JoinChannel(c request.CTX, channel *model.Channel, userID string) *model.AppError { - userChan := make(chan store.StoreResult, 1) - memberChan := make(chan store.StoreResult, 1) + userChan := make(chan store.GenericStoreResult[*model.User], 1) + memberChan := make(chan store.GenericStoreResult[*model.ChannelMember], 1) go func() { user, err := a.Srv().Store().User().Get(context.Background(), userID) - userChan <- store.StoreResult{Data: user, NErr: err} + userChan <- store.GenericStoreResult[*model.User]{Data: user, NErr: err} close(userChan) }() go func() { member, err := a.Srv().Store().Channel().GetMember(context.Background(), channel.Id, userID) - memberChan <- store.StoreResult{Data: member, NErr: err} + memberChan <- store.GenericStoreResult[*model.ChannelMember]{Data: member, NErr: err} close(memberChan) }() @@ -2223,7 +2223,7 @@ func (a *App) JoinChannel(c request.CTX, channel *model.Channel, userID string) return nil } - user := uresult.Data.(*model.User) + user := uresult.Data if channel.Type != model.ChannelTypeOpen { return model.NewAppError("JoinChannel", "api.channel.join_channel.permissions.app_error", nil, "", http.StatusBadRequest) @@ -2294,24 +2294,24 @@ func (a *App) postJoinTeamMessage(c request.CTX, user *model.User, channel *mode } func (a *App) LeaveChannel(c request.CTX, channelID string, userID string) *model.AppError { - sc := make(chan store.StoreResult, 1) + sc := make(chan store.GenericStoreResult[*model.Channel], 1) go func() { channel, err := a.Srv().Store().Channel().Get(channelID, true) - sc <- store.StoreResult{Data: channel, NErr: err} + sc <- store.GenericStoreResult[*model.Channel]{Data: channel, NErr: err} close(sc) }() - uc := make(chan store.StoreResult, 1) + uc := make(chan store.GenericStoreResult[*model.User], 1) go func() { user, err := a.Srv().Store().User().Get(context.Background(), userID) - uc <- store.StoreResult{Data: user, NErr: err} + uc <- store.GenericStoreResult[*model.User]{Data: user, NErr: err} close(uc) }() - mcc := make(chan store.StoreResult, 1) + mcc := make(chan store.GenericStoreResult[int64], 1) go func() { count, err := a.Srv().Store().Channel().GetMemberCount(channelID, false) - mcc <- store.StoreResult{Data: count, NErr: err} + mcc <- store.GenericStoreResult[int64]{Data: count, NErr: err} close(mcc) }() @@ -2340,9 +2340,9 @@ func (a *App) LeaveChannel(c request.CTX, channelID string, userID string) *mode return model.NewAppError("LeaveChannel", "app.channel.get_member_count.app_error", nil, "", http.StatusInternalServerError).Wrap(ccresult.NErr) } - channel := cresult.Data.(*model.Channel) - user := uresult.Data.(*model.User) - membersCount := ccresult.Data.(int64) + channel := cresult.Data + user := uresult.Data + membersCount := ccresult.Data if channel.IsGroupOrDirect() { err := model.NewAppError("LeaveChannel", "api.channel.leave.direct.app_error", nil, "", http.StatusBadRequest)