From 848bac2bae6203221149f4b25c14d0f7d7692284 Mon Sep 17 00:00:00 2001 From: Agniva De Sarker Date: Mon, 14 Apr 2025 21:11:59 +0530 Subject: [PATCH] MM-53739: replace store.NewErrNotFound with errors.Wrap in category queries (#30712) It was a mistake to return ANY error as NewErrNotFound. Because this can be a DB timeout, or any other network error. Returning NewErrNotFound would categorize it as 404, eventually printing the error in the DEBUG level. Changing it to normal error fixes this. https://mattermost.atlassian.net/browse/MM-63739 ```release-note NONE ``` --- .../channels/store/sqlstore/channel_store_categories.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/channels/store/sqlstore/channel_store_categories.go b/server/channels/store/sqlstore/channel_store_categories.go index 62ffe3f14e..f35938d3c6 100644 --- a/server/channels/store/sqlstore/channel_store_categories.go +++ b/server/channels/store/sqlstore/channel_store_categories.go @@ -485,7 +485,7 @@ func (s SqlChannelStore) completePopulatingCategoryChannelsT(db dbSelecter, cate } if err := db.Select(&channels, sql, args...); err != nil { - return nil, store.NewErrNotFound("ChannelMembers", "").Wrap(err) + return nil, errors.Wrap(err, "failed to get channel members") } category.Channels = append(channels, category.Channels...) @@ -506,7 +506,7 @@ func (s SqlChannelStore) GetSidebarCategory(categoryId string) (*model.SidebarCa categories := []*sidebarCategoryForJoin{} if err = s.GetReplica().Select(&categories, sql, args...); err != nil { - return nil, store.NewErrNotFound("SidebarCategories", categoryId).Wrap(err) + return nil, errors.Wrap(err, fmt.Sprintf("failed to get category with id=%s", categoryId)) } if len(categories) == 0 { @@ -563,7 +563,7 @@ func (s SqlChannelStore) getSidebarCategoriesT(db dbSelecter, userId string, opt } if err := db.Select(&categories, sql, args...); err != nil { - return nil, store.NewErrNotFound("SidebarCategories", fmt.Sprintf("userId=%s,teamId=%s", userId, opts.TeamID)).Wrap(err) + return nil, errors.Wrap(err, fmt.Sprintf("failed to get categories for userId=%s, teamId=%s", userId, opts.TeamID)) } for _, category := range categories { @@ -624,7 +624,7 @@ func (s SqlChannelStore) GetSidebarCategoryOrder(userId, teamId string) ([]strin } if err := s.GetReplica().Select(&ids, sql, args...); err != nil { - return nil, store.NewErrNotFound("SidebarCategories", fmt.Sprintf("userId=%s,teamId=%s", userId, teamId)).Wrap(err) + return nil, errors.Wrap(err, fmt.Sprintf("failed to get category order for userId=%s, teamId=%s", userId, teamId)) } return ids, nil