ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2024-12-26 13:29:05 +01:00
Code Issues Packages Releases Activity

Show correct count of jobs/tags

Browse Source
This commit is contained in:
Lou Knauer 2022-02-16 09:32:38 +01:00
parent 319cdfd069
commit b85832646f
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
graph/resolver.go
View File

@ -102,6 +102,7 @@ func (r *Resolver) queryJobs(ctx context.Context, filters []*model.JobFilter, pa
for _, f := range filters { for _, f := range filters {
query = buildWhereClause(f, query) query = buildWhereClause(f, query)
} }
query = securityCheck(ctx, query)
var count int var count int
if err := query.RunWith(r.DB).Scan(&count); err != nil { if err := query.RunWith(r.DB).Scan(&count); err != nil {
return nil, 0, err return nil, 0, err

10
repository/job.go
View File

@ -154,7 +154,7 @@ func (r *JobRepository) CreateTag(tagType string, tagName string) (tagId int64,
return res.LastInsertId() return res.LastInsertId()
} }
func (r *JobRepository) GetTags() (tags []schema.Tag, counts map[string]int, err error) { func (r *JobRepository) GetTags(user *string) (tags []schema.Tag, counts map[string]int, err error) {
tags = make([]schema.Tag, 0, 100) tags = make([]schema.Tag, 0, 100)
xrows, err := r.DB.Queryx("SELECT * FROM tag") xrows, err := r.DB.Queryx("SELECT * FROM tag")
if err != nil { if err != nil {
@ -173,11 +173,13 @@ func (r *JobRepository) GetTags() (tags []schema.Tag, counts map[string]int, err
From("tag t"). From("tag t").
LeftJoin("jobtag jt ON t.id = jt.tag_id"). LeftJoin("jobtag jt ON t.id = jt.tag_id").
GroupBy("t.tag_name") GroupBy("t.tag_name")
if user != nil {
q = q.Where("jt.job_id IN (SELECT id FROM job WHERE job.user = ?)", *user)
}
qs, _, _ := q.ToSql() rows, err := q.RunWith(r.DB).Query()
rows, err := r.DB.Query(qs)
if err != nil { if err != nil {
fmt.Println(err) return nil, nil, err
} }
counts = make(map[string]int) counts = make(map[string]int)

2
repository/job_test.go
View File

@ -57,7 +57,7 @@ func TestFindById(t *testing.T) {
func TestGetTags(t *testing.T) { func TestGetTags(t *testing.T) {
r := setup(t) r := setup(t)
tags, counts, err := r.GetTags() tags, counts, err := r.GetTags(nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

12
server.go
View File

@ -154,8 +154,18 @@ func setupAnalysisRoute(i InfoType, r *http.Request) InfoType {
} }
func setupTaglistRoute(i InfoType, r *http.Request) InfoType { func setupTaglistRoute(i InfoType, r *http.Request) InfoType {
tags, counts, _ := jobRepo.GetTags() var username *string = nil
if user := auth.GetUser(r.Context()); user != nil && !user.HasRole(auth.RoleAdmin) {
username = &user.Username
}
tags, counts, err := jobRepo.GetTags(username)
tagMap := make(map[string][]map[string]interface{}) tagMap := make(map[string][]map[string]interface{})
if err != nil {
log.Errorf("GetTags failed: %s", err.Error())
i["tagmap"] = tagMap
return i
}
for _, tag := range tags { for _, tag := range tags {
tagItem := map[string]interface{}{ tagItem := map[string]interface{}{