IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-55300] Migrate "server/channels/app/post.go" to make use of GenericStoreResult (#25339)

Browse Source 
Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com>
This commit is contained in:
Paul-Stern 2023-11-10 16:41:08 +03:00 committed by GitHub
parent e130a37199
commit 3a373fffc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/channels/app/post.go
View File

@ -214,12 +214,12 @@ func (a *App) CreatePost(c request.CTX, post *model.Post, channel *model.Channel
post.SanitizeProps() post.SanitizeProps()
var pchan chan store.StoreResult var pchan chan store.GenericStoreResult[*model.PostList]
if post.RootId != "" { if post.RootId != "" {
pchan = make(chan store.StoreResult, 1) pchan = make(chan store.GenericStoreResult[*model.PostList], 1)
go func() { go func() {
r, pErr := a.Srv().Store().Post().Get(sqlstore.WithMaster(context.Background()), post.RootId, model.GetPostsOptions{}, "", a.Config().GetSanitizeOptions()) r, pErr := a.Srv().Store().Post().Get(sqlstore.WithMaster(context.Background()), post.RootId, model.GetPostsOptions{}, "", a.Config().GetSanitizeOptions())
pchan <- store.StoreResult{Data: r, NErr: pErr} pchan <- store.GenericStoreResult[*model.PostList]{Data: r, NErr: pErr}
close(pchan) close(pchan)
}() }()
} }
@ -265,7 +265,7 @@ func (a *App) CreatePost(c request.CTX, post *model.Post, channel *model.Channel
if result.NErr != nil { if result.NErr != nil {
return nil, model.NewAppError("createPost", "api.post.create_post.root_id.app_error", nil, "", http.StatusBadRequest) return nil, model.NewAppError("createPost", "api.post.create_post.root_id.app_error", nil, "", http.StatusBadRequest)
} }
parentPostList = result.Data.(*model.PostList) parentPostList = result.Data
if len(parentPostList.Posts) == 0 || !parentPostList.IsChannelId(post.ChannelId) { if len(parentPostList.Posts) == 0 || !parentPostList.IsChannelId(post.ChannelId) {
return nil, model.NewAppError("createPost", "api.post.create_post.channel_root_id.app_error", nil, "", http.StatusInternalServerError) return nil, model.NewAppError("createPost", "api.post.create_post.channel_root_id.app_error", nil, "", http.StatusInternalServerError)
} }
@ -1440,7 +1440,7 @@ func (a *App) parseAndFetchChannelIdByNameFromInFilter(c request.CTX, channelNam
func (a *App) searchPostsInTeam(teamID string, userID string, paramsList []*model.SearchParams, modifierFun func(*model.SearchParams)) (*model.PostList, *model.AppError) { func (a *App) searchPostsInTeam(teamID string, userID string, paramsList []*model.SearchParams, modifierFun func(*model.SearchParams)) (*model.PostList, *model.AppError) {
var wg sync.WaitGroup var wg sync.WaitGroup
pchan := make(chan store.StoreResult, len(paramsList)) pchan := make(chan store.GenericStoreResult[*model.PostList], len(paramsList))
for _, params := range paramsList { for _, params := range paramsList {
// Don't allow users to search for everything. // Don't allow users to search for everything.
@ -1453,7 +1453,7 @@ func (a *App) searchPostsInTeam(teamID string, userID string, paramsList []*mode
go func(params *model.SearchParams) { go func(params *model.SearchParams) {
defer wg.Done() defer wg.Done()
postList, err := a.Srv().Store().Post().Search(teamID, userID, params) postList, err := a.Srv().Store().Post().Search(teamID, userID, params)
pchan <- store.StoreResult{Data: postList, NErr: err} pchan <- store.GenericStoreResult[*model.PostList]{Data: postList, NErr: err}
}(params) }(params)
} }
@ -1466,8 +1466,7 @@ func (a *App) searchPostsInTeam(teamID string, userID string, paramsList []*mode
if result.NErr != nil { if result.NErr != nil {
return nil, model.NewAppError("searchPostsInTeam", "app.post.search.app_error", nil, "", http.StatusInternalServerError).Wrap(result.NErr) return nil, model.NewAppError("searchPostsInTeam", "app.post.search.app_error", nil, "", http.StatusInternalServerError).Wrap(result.NErr)
} }
data := result.Data.(*model.PostList) posts.Extend(result.Data)
posts.Extend(data)
} }
posts.SortByCreateAt() posts.SortByCreateAt()
@ -1663,10 +1662,10 @@ func (a *App) SearchPostsForUser(c request.CTX, terms string, userID string, tea
} }
func (a *App) GetFileInfosForPostWithMigration(rctx request.CTX, postID string, includeDeleted bool) ([]*model.FileInfo, *model.AppError) { func (a *App) GetFileInfosForPostWithMigration(rctx request.CTX, postID string, includeDeleted bool) ([]*model.FileInfo, *model.AppError) {
pchan := make(chan store.StoreResult, 1) pchan := make(chan store.GenericStoreResult[*model.Post], 1)
go func() { go func() {
post, err := a.Srv().Store().Post().GetSingle(postID, includeDeleted) post, err := a.Srv().Store().Post().GetSingle(postID, includeDeleted)
pchan <- store.StoreResult{Data: post, NErr: err} pchan <- store.GenericStoreResult[*model.Post]{Data: post, NErr: err}
close(pchan) close(pchan)
}() }()
@ -1687,7 +1686,7 @@ func (a *App) GetFileInfosForPostWithMigration(rctx request.CTX, postID string,
return nil, model.NewAppError("GetFileInfosForPostWithMigration", "app.post.get.app_error", nil, "", http.StatusInternalServerError).Wrap(result.NErr) return nil, model.NewAppError("GetFileInfosForPostWithMigration", "app.post.get.app_error", nil, "", http.StatusInternalServerError).Wrap(result.NErr)
} }
} }
post := result.Data.(*model.Post) post := result.Data
if len(post.Filenames) > 0 { if len(post.Filenames) > 0 {
a.Srv().Store().FileInfo().InvalidateFileInfosForPostCache(postID, false) a.Srv().Store().FileInfo().InvalidateFileInfosForPostCache(postID, false)