ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2025-07-23 21:01:40 +02:00
Code Issues Packages Releases Activity

Better implementation for querying multiple users

Browse Source
This commit is contained in:
Christoph Kluge
2023-02-20 10:20:08 +01:00
parent bf6ec1bc98
commit 09bcf9f355
6 changed files with 41 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/repository/query.go
View File

@@ -118,13 +118,6 @@ func BuildWhereClause(filter *model.JobFilter, query sq.SelectBuilder) sq.Select
if filter.User != nil {
query = buildStringCondition("job.user", filter.User, query)
}
if filter.MultiUser != nil {
queryUsers := make([]string, len(filter.MultiUser))
for i, val := range filter.MultiUser {
queryUsers[i] = *val
}
query = query.Where(sq.Or{sq.Eq{"job.user": queryUsers}})
}
if filter.Project != nil {
query = buildStringCondition("job.project", filter.Project, query)
}
@@ -213,6 +206,13 @@ func buildStringCondition(field string, cond *model.StringInput, query sq.Select
if cond.Contains != nil {
return query.Where(field+" LIKE ?", fmt.Sprint("%", *cond.Contains, "%"))
}
if cond.In != nil {
queryUsers := make([]string, len(cond.In))
for i, val := range cond.In {
queryUsers[i] = val
}
return query.Where(sq.Or{sq.Eq{"job.user": queryUsers}})
}
return query
}