IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

API: Fix status code when starring already starred dashboard (#63478)

Browse Source 
Fixes #63133
This commit is contained in:
Sanghyuk Chris Lee 2023-05-11 04:37:36 -04:00 committed by GitHub
parent c3a0b75357
commit b10b290213
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/services/star/starimpl/sqlx_store.go
View File

@ -5,12 +5,14 @@ import (
"database/sql"
"errors"
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/services/sqlstore/session"
"github.com/grafana/grafana/pkg/services/star"
)
type sqlxStore struct {
sess *session.SessionDB
db db.DB
}
func (s *sqlxStore) Get(ctx context.Context, query *star.IsStarredByUserQuery) (bool, error) {
@ -31,6 +33,9 @@ func (s *sqlxStore) Insert(ctx context.Context, cmd *star.StarDashboardCommand)
DashboardID: cmd.DashboardID,
}
_, err := s.sess.NamedExec(ctx, `INSERT INTO star (user_id, dashboard_id) VALUES (:user_id, :dashboard_id)`, entity)
if s.db.GetDialect().IsUniqueConstraintViolation(err) {
return nil
}
if err != nil {
return err
}

2
pkg/services/star/starimpl/sqlx_store_test.go
View File

@ -11,6 +11,6 @@ func TestIntegrationSQLxUserStarsDataAccess(t *testing.T) {
t.Skip("skipping integration test")
}
testIntegrationUserStarsDataAccess(t, func(ss db.DB) store {
return &sqlxStore{sess: ss.GetSqlxSession()}
return &sqlxStore{sess: ss.GetSqlxSession(), db: ss}
})
}

1
pkg/services/star/starimpl/star.go
View File

@ -18,6 +18,7 @@ func ProvideService(db db.DB, cfg *setting.Cfg) star.Service {
return &Service{
store: &sqlxStore{
sess: db.GetSqlxSession(),
db: db,
},
}
}

4
pkg/services/star/starimpl/xorm_store.go
View File

@ -35,6 +35,10 @@ func (s *sqlStore) Insert(ctx context.Context, cmd *star.StarDashboardCommand) e
}
_, err := sess.Insert(&entity)
if s.db.GetDialect().IsUniqueConstraintViolation(err) {
return nil
}
return err
})
}