IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-16 11:42:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

SQLstore: Fix fetching an inexistent playlist response (#51962)

Browse Source 
* SQLstore: Fix fetching and deleting an inexistent playlist

xorm's session.Get() does not return an error if the raw does not exist.
It returns a boolean instead.
The playlist `sqlstore.GetPlaylist()` used to check only the error and in case
of inexistent UID didn't return an error.
This commit is contained in:
Sofia Papagiannaki 2022-07-13 13:00:03 +03:00 committed by GitHub
parent 169a1c5b0f
commit 4ff0f006dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/services/sqlstore/playlist.go
View File

@ -103,7 +103,10 @@ func (ss *SQLStore) GetPlaylist(ctx context.Context, query *models.GetPlaylistBy
return ss.WithDbSession(ctx, func(sess *DBSession) error { return ss.WithDbSession(ctx, func(sess *DBSession) error {
playlist := models.Playlist{UID: query.UID, OrgId: query.OrgId} playlist := models.Playlist{UID: query.UID, OrgId: query.OrgId}
_, err := sess.Get(&playlist) exists, err := sess.Get(&playlist)
if !exists {
return models.ErrPlaylistNotFound
}
query.Result = &playlist query.Result = &playlist
return err return err

20
pkg/services/sqlstore/playlist_test.go
View File

@ -25,6 +25,15 @@ func TestIntegrationPlaylistDataAccess(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
uid := cmd.Result.UID uid := cmd.Result.UID
t.Run("Can get playlist", func(t *testing.T) {
get := &models.GetPlaylistByUidQuery{UID: uid, OrgId: 1}
err = ss.GetPlaylist(context.Background(), get)
require.NoError(t, err)
require.NotNil(t, get.Result)
require.Equal(t, get.Result.Name, "NYC office")
require.Equal(t, get.Result.Interval, "10m")
})
t.Run("Can get playlist items", func(t *testing.T) { t.Run("Can get playlist items", func(t *testing.T) {
get := &models.GetPlaylistItemsByUidQuery{PlaylistUID: uid, OrgId: 1} get := &models.GetPlaylistItemsByUidQuery{PlaylistUID: uid, OrgId: 1}
err = ss.GetPlaylistItem(context.Background(), get) err = ss.GetPlaylistItem(context.Background(), get)
@ -49,11 +58,18 @@ func TestIntegrationPlaylistDataAccess(t *testing.T) {
getQuery := models.GetPlaylistByUidQuery{UID: uid, OrgId: 1} getQuery := models.GetPlaylistByUidQuery{UID: uid, OrgId: 1}
err = ss.GetPlaylist(context.Background(), &getQuery) err = ss.GetPlaylist(context.Background(), &getQuery)
require.NoError(t, err) require.Error(t, err)
require.Equal(t, uid, getQuery.Result.UID, "playlist should've been removed") require.ErrorIs(t, err, models.ErrPlaylistNotFound)
}) })
}) })
t.Run("Get playlist that doesn't exist", func(t *testing.T) {
get := &models.GetPlaylistByUidQuery{UID: "unknown", OrgId: 1}
err := ss.GetPlaylist(context.Background(), get)
require.Error(t, err)
require.ErrorIs(t, err, models.ErrPlaylistNotFound)
})
t.Run("Delete playlist that doesn't exist", func(t *testing.T) { t.Run("Delete playlist that doesn't exist", func(t *testing.T) {
deleteQuery := models.DeletePlaylistCommand{UID: "654312", OrgId: 1} deleteQuery := models.DeletePlaylistCommand{UID: "654312", OrgId: 1}
err := ss.DeletePlaylist(context.Background(), &deleteQuery) err := ss.DeletePlaylist(context.Background(), &deleteQuery)