ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2025-10-26 14:25:06 +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
Download Patch File Download Diff File Expand all files Collapse all files

10
repository/job.go
View File

@@ -154,7 +154,7 @@ func (r *JobRepository) CreateTag(tagType string, tagName string) (tagId int64,
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)
xrows, err := r.DB.Queryx("SELECT * FROM tag")
if err != nil {
@@ -173,11 +173,13 @@ func (r *JobRepository) GetTags() (tags []schema.Tag, counts map[string]int, err
From("tag t").
LeftJoin("jobtag jt ON t.id = jt.tag_id").
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 := r.DB.Query(qs)
rows, err := q.RunWith(r.DB).Query()
if err != nil {
fmt.Println(err)
return nil, nil, err
}
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) {
r := setup(t)
tags, counts, err := r.GetTags()
tags, counts, err := r.GetTags(nil)
if err != nil {
t.Fatal(err)
}