Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace SearchBoardsForUserInTeam query with a more efficient one #4308

Merged
merged 2 commits into from
Dec 7, 2022
Merged

Replace SearchBoardsForUserInTeam query with a more efficient one #4308

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
294ff71
Replace SearchBoardsForUserInTeam query with a more efficient one
mgdelacroix Dec 7, 2022
6281ce9
Fix linter
mgdelacroix Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Replace SearchBoardsForUserInTeam query with a more efficient one
  • Loading branch information
@mgdelacroix
mgdelacroix committed Dec 7, 2022
commit 294ff718126756862a101d6797251f245ff47698
57 changes: 46 additions & 11 deletions server/services/store/mattermostauthlayer/mattermostauthlayer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,17 +748,33 @@ func (s *MattermostAuthLayer) SearchBoardsForUser(term, userID string, includePu
// they're open, regardless of the user membership.
// Search is case-insensitive.
func (s *MattermostAuthLayer) SearchBoardsForUserInTeam(teamID, term, userID string) ([]*model.Board, error) {
query := s.getQueryBuilder().
openBoardsQ := s.getQueryBuilder().
Select(boardFields("b.")...).
From(s.tablePrefix + "boards as b").
LeftJoin(s.tablePrefix + "board_members as bm on b.id=bm.board_id").
LeftJoin("ChannelMembers as cm on cm.channelId=b.channel_id").
Where(sq.Eq{"b.is_template": false}).
Where(sq.Eq{"b.team_id": teamID}).
Where(sq.Or{
sq.Eq{"b.type": model.BoardTypeOpen},
sq.Eq{"bm.user_id": userID},
sq.Eq{"cm.userId": userID},
Where(sq.Eq{
"b.is_template": false,
"b.team_id": teamID,
"b.type": model.BoardTypeOpen,
})

memberBoardsQ := s.getQueryBuilder().
Select(boardFields("b.")...).
From(s.tablePrefix + "boards AS b").
Join(s.tablePrefix + "board_members AS bm on b.id = bm.board_id").
Where(sq.Eq{
"b.is_template": false,
"b.team_id": teamID,
"bm.user_id": userID,
})

channelMemberBoardsQ := s.getQueryBuilder().
Select(boardFields("b.")...).
From(s.tablePrefix + "boards AS b").
Join("ChannelMembers AS cm on cm.channelId = b.channel_id").
Where(sq.Eq{
"b.is_template": false,
"b.team_id": teamID,
"cm.userId": userID,
})

if term != "" {
Expand All @@ -774,10 +790,29 @@ func (s *MattermostAuthLayer) SearchBoardsForUserInTeam(teamID, term, userID str
conditions = append(conditions, sq.Like{"lower(b.title)": "%" + strings.ToLower(word) + "%"})
}

query = query.Where(conditions)
openBoardsQ = openBoardsQ.Where(conditions)
memberBoardsQ = memberBoardsQ.Where(conditions)
channelMemberBoardsQ = channelMemberBoardsQ.Where(conditions)
}

rows, err := query.Query()
memberBoardsSql, memberBoardsArgs, err := memberBoardsQ.ToSql()
if err != nil {
s.logger.Error(`searchBoardsForUser ERROR getting memberBoardsSql`, mlog.Err(err))
return nil, err
}

channelMemberBoardsSql, channelMemberBoardsArgs, err := channelMemberBoardsQ.ToSql()
if err != nil {
s.logger.Error(`searchBoardsForUser ERROR getting channelMemberBoardsSql`, mlog.Err(err))
return nil, err
}

unionQ := openBoardsQ.
Prefix("(").
Suffix(") UNION ("+memberBoardsSql, memberBoardsArgs...).
Suffix(") UNION ("+channelMemberBoardsSql+")", channelMemberBoardsArgs...)

rows, err := unionQ.Query()
if err != nil {
s.logger.Error(`searchBoardsForUser ERROR`, mlog.Err(err))
return nil, err
Expand Down