From a602dcdfb2c31ceab60b692e68d42813a2456f35 Mon Sep 17 00:00:00 2001 From: Paul-Stern Date: Fri, 10 Nov 2023 16:43:39 +0300 Subject: [PATCH] [MM-55305] Migrate "server/channels/store/sqlstore/post_store.go" to use GenericStoreResult (#25344) Co-authored-by: Ben Schumacher --- server/channels/store/sqlstore/post_store.go | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/server/channels/store/sqlstore/post_store.go b/server/channels/store/sqlstore/post_store.go index 9df833e82d..9d4e51d12b 100644 --- a/server/channels/store/sqlstore/post_store.go +++ b/server/channels/store/sqlstore/post_store.go @@ -1206,16 +1206,16 @@ func (s *SqlPostStore) GetPosts(options model.GetPostsOptions, _ bool, sanitizeO } offset := options.PerPage * options.Page - rpc := make(chan store.StoreResult, 1) + rpc := make(chan store.GenericStoreResult[[]*model.Post], 1) go func() { posts, err := s.getRootPosts(options.ChannelId, offset, options.PerPage, options.SkipFetchThreads, options.IncludeDeleted) - rpc <- store.StoreResult{Data: posts, NErr: err} + rpc <- store.GenericStoreResult[[]*model.Post]{Data: posts, NErr: err} close(rpc) }() - cpc := make(chan store.StoreResult, 1) + cpc := make(chan store.GenericStoreResult[[]*model.Post], 1) go func() { posts, err := s.getParentsPosts(options.ChannelId, offset, options.PerPage, options.SkipFetchThreads, options.IncludeDeleted) - cpc <- store.StoreResult{Data: posts, NErr: err} + cpc <- store.GenericStoreResult[[]*model.Post]{Data: posts, NErr: err} close(cpc) }() @@ -1231,8 +1231,8 @@ func (s *SqlPostStore) GetPosts(options model.GetPostsOptions, _ bool, sanitizeO return nil, cpr.NErr } - posts := rpr.Data.([]*model.Post) - parents := cpr.Data.([]*model.Post) + posts := rpr.Data + parents := cpr.Data for _, p := range posts { list.AddPost(p) @@ -2728,7 +2728,7 @@ func (s *SqlPostStore) SearchPostsForUser(paramsList []*model.SearchParams, user var wg sync.WaitGroup - pchan := make(chan store.StoreResult, len(paramsList)) + pchan := make(chan store.GenericStoreResult[*model.PostList], len(paramsList)) for _, params := range paramsList { // remove any unquoted term that contains only non-alphanumeric chars @@ -2740,7 +2740,7 @@ func (s *SqlPostStore) SearchPostsForUser(paramsList []*model.SearchParams, user go func(params *model.SearchParams) { defer wg.Done() postList, err := s.search(teamId, userId, params, false, false) - pchan <- store.StoreResult{Data: postList, NErr: err} + pchan <- store.GenericStoreResult[*model.PostList]{Data: postList, NErr: err} }(params) } @@ -2753,8 +2753,7 @@ func (s *SqlPostStore) SearchPostsForUser(paramsList []*model.SearchParams, user if result.NErr != nil { return nil, result.NErr } - data := result.Data.(*model.PostList) - posts.Extend(data) + posts.Extend(result.Data) } posts.SortByCreateAt()