github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-04 09:52:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor OR pr label filter to AND filter (#2433)

Browse Source 
* Refactor OR pr label filter to AND filter
This commit is contained in:
Darko Draskovic 2024-08-09 11:23:46 +00:00 committed by Harness
parent 008aa5c17a
commit d2fe8b7da0
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/store/database/pullreq.go
View File

@ -575,26 +575,28 @@ func setLabelKeyQuery(stmt *squirrel.SelectBuilder, opts *types.PullReqFilter) {
return return
} }
*stmt = stmt.InnerJoin("pullreq_labels ON pullreq_label_pullreq_id = pullreq_id") *stmt = stmt.InnerJoin("pullreq_labels ON pullreq_label_pullreq_id = pullreq_id").
GroupBy("pullreq_id")
if len(opts.LabelID) > 0 && len(opts.ValueID) == 0 { switch {
case len(opts.LabelID) > 0 && len(opts.ValueID) == 0:
*stmt = stmt.Where( *stmt = stmt.Where(
squirrel.Eq{"pullreq_label_label_id": opts.LabelID}, squirrel.Eq{"pullreq_label_label_id": opts.LabelID},
) )
return
}
if len(opts.LabelID) == 0 && len(opts.ValueID) > 0 { case len(opts.LabelID) == 0 && len(opts.ValueID) > 0:
*stmt = stmt.Where( *stmt = stmt.Where(
squirrel.Eq{"pullreq_label_label_value_id": opts.ValueID}, squirrel.Eq{"pullreq_label_label_value_id": opts.ValueID},
) )
return
default:
*stmt = stmt.Where(squirrel.Or{
squirrel.Eq{"pullreq_label_label_id": opts.LabelID},
squirrel.Eq{"pullreq_label_label_value_id": opts.ValueID},
})
} }
*stmt = stmt.Where(squirrel.Or{ *stmt = stmt.Having("COUNT(pullreq_label_pullreq_id) = ?", len(opts.LabelID)+len(opts.ValueID))
squirrel.Eq{"pullreq_label_label_id": opts.LabelID},
squirrel.Eq{"pullreq_label_label_value_id": opts.ValueID},
})
} }
func mapPullReq(pr *pullReq) *types.PullReq { func mapPullReq(pr *pullReq) *types.PullReq {