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

fix: persist tags in meta.json

Browse Source
This commit is contained in:
Lou Knauer 2022-02-23 14:18:55 +01:00
parent ef089a7f2b
commit f304698823
2 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
graph/schema.resolvers.go
View File

@ -42,28 +42,19 @@ func (r *mutationResolver) AddTagsToJob(ctx context.Context, job string, tagIds
return nil, err return nil, err
} }
tags := []*schema.Tag{}
for _, tagId := range tagIds { for _, tagId := range tagIds {
tid, err := strconv.ParseInt(tagId, 10, 64) tid, err := strconv.ParseInt(tagId, 10, 64)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if err := r.Repo.AddTag(jid, tid); err != nil { if tags, err = r.Repo.AddTag(jid, tid); err != nil {
return nil, err return nil, err
} }
} }
j, err := r.Query().Job(ctx, job) return tags, nil
if err != nil {
return nil, err
}
j.Tags, err = r.Repo.GetTags(&jid)
if err != nil {
return nil, err
}
return j.Tags, metricdata.UpdateTags(j, j.Tags)
} }
func (r *mutationResolver) RemoveTagsFromJob(ctx context.Context, job string, tagIds []string) ([]*schema.Tag, error) { func (r *mutationResolver) RemoveTagsFromJob(ctx context.Context, job string, tagIds []string) ([]*schema.Tag, error) {
@ -72,30 +63,19 @@ func (r *mutationResolver) RemoveTagsFromJob(ctx context.Context, job string, ta
return nil, err return nil, err
} }
tags := []*schema.Tag{}
for _, tagId := range tagIds { for _, tagId := range tagIds {
tid, err := strconv.ParseInt(tagId, 10, 64) tid, err := strconv.ParseInt(tagId, 10, 64)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if err := r.Repo.RemoveTag(jid, tid); err != nil { if tags, err = r.Repo.RemoveTag(jid, tid); err != nil {
return nil, err return nil, err
} }
} }
dummyJob := schema.Job{} return tags, nil
dummyJob.ID = int64(jid)
tags, err := r.Job().Tags(ctx, &dummyJob)
if err != nil {
return nil, err
}
jobObj, err := r.Query().Job(ctx, job)
if err != nil {
return nil, err
}
return tags, metricdata.UpdateTags(jobObj, tags)
} }
func (r *mutationResolver) UpdateConfiguration(ctx context.Context, name string, value string) (*string, error) { func (r *mutationResolver) UpdateConfiguration(ctx context.Context, name string, value string) (*string, error) {

45
repository/tags.go
View File

@ -3,20 +3,47 @@ package repository
import ( import (
"fmt" "fmt"
"github.com/ClusterCockpit/cc-backend/metricdata"
"github.com/ClusterCockpit/cc-backend/schema" "github.com/ClusterCockpit/cc-backend/schema"
sq "github.com/Masterminds/squirrel" sq "github.com/Masterminds/squirrel"
) )
// Add the tag with id `tagId` to the job with the database id `jobId`. // Add the tag with id `tagId` to the job with the database id `jobId`.
func (r *JobRepository) AddTag(jobId int64, tagId int64) error { func (r *JobRepository) AddTag(job int64, tag int64) ([]*schema.Tag, error) {
_, err := r.stmtCache.Exec(`INSERT INTO jobtag (job_id, tag_id) VALUES ($1, $2)`, jobId, tagId) if _, err := r.stmtCache.Exec(`INSERT INTO jobtag (job_id, tag_id) VALUES ($1, $2)`, job, tag); err != nil {
return err return nil, err
}
j, err := r.FindById(job)
if err != nil {
return nil, err
}
tags, err := r.GetTags(&job)
if err != nil {
return nil, err
}
return tags, metricdata.UpdateTags(j, tags)
} }
// Removes a tag from a job // Removes a tag from a job
func (r *JobRepository) RemoveTag(job, tag int64) error { func (r *JobRepository) RemoveTag(job, tag int64) ([]*schema.Tag, error) {
_, err := r.stmtCache.Exec("DELETE FROM jobtag WHERE jobtag.job_id = $1 AND jobtag.tag_id = $2", job, tag) if _, err := r.stmtCache.Exec("DELETE FROM jobtag WHERE jobtag.job_id = $1 AND jobtag.tag_id = $2", job, tag); err != nil {
return err return nil, err
}
j, err := r.FindById(job)
if err != nil {
return nil, err
}
tags, err := r.GetTags(&job)
if err != nil {
return nil, err
}
return tags, metricdata.UpdateTags(j, tags)
} }
// CreateTag creates a new tag with the specified type and name and returns its database id. // CreateTag creates a new tag with the specified type and name and returns its database id.
@ -83,7 +110,11 @@ func (r *JobRepository) AddTagOrCreate(jobId int64, tagType string, tagName stri
} }
} }
return tagId, r.AddTag(jobId, tagId) if _, err := r.AddTag(jobId, tagId); err != nil {
return 0, err
}
return tagId, nil
} }
// TagId returns the database id of the tag with the specified type and name. // TagId returns the database id of the tag with the specified type and name.