refactor(playlist): refactor of playlist feature, and PR #3776

pkg/api/api.go

@@ -189,8 +189,8 @@ func Register(r *macaron.Macaron) {
 			r.Get("/:id/items", ValidateOrgPlaylist, wrap(GetPlaylistItems))
 			r.Get("/:id/dashboards", ValidateOrgPlaylist, wrap(GetPlaylistDashboards))
 			r.Delete("/:id", reqEditorRole, ValidateOrgPlaylist, wrap(DeletePlaylist))
-			r.Put("/:id", reqEditorRole, bind(m.UpdatePlaylistQuery{}), ValidateOrgPlaylist, wrap(UpdatePlaylist))
-			r.Post("/", reqEditorRole, bind(m.CreatePlaylistQuery{}), wrap(CreatePlaylist))
+			r.Put("/:id", reqEditorRole, bind(m.UpdatePlaylistCommand{}), ValidateOrgPlaylist, wrap(UpdatePlaylist))
+			r.Post("/", reqEditorRole, bind(m.CreatePlaylistCommand{}), wrap(CreatePlaylist))
 		})
 
 		// Search

pkg/api/playlist.go

@@ -2,11 +2,12 @@ package api
 
 import (
 	"errors"
+	"strconv"
+
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/middleware"
 	m "github.com/grafana/grafana/pkg/models"
-	"strconv"
 )
 
 func ValidateOrgPlaylist(c *middleware.Context) {
@@ -33,8 +34,8 @@ func SearchPlaylists(c *middleware.Context) Response {
 		limit = 1000
 	}
 
-	searchQuery := m.PlaylistQuery{
-		Title: query,
+	searchQuery := m.GetPlaylistsQuery{
+		Name:  query,
 		Limit: limit,
 		OrgId: c.OrgId,
 	}
@@ -59,7 +60,7 @@ func GetPlaylist(c *middleware.Context) Response {
 
 	dto := &m.PlaylistDTO{
 		Id:       cmd.Result.Id,
-		Title:    cmd.Result.Title,
+		Name:     cmd.Result.Name,
 		Interval: cmd.Result.Interval,
 		OrgId:    cmd.Result.OrgId,
 		Items:    playlistDTOs,
@@ -159,7 +160,7 @@ func GetPlaylistDashboards(c *middleware.Context) Response {
 func DeletePlaylist(c *middleware.Context) Response {
 	id := c.ParamsInt64(":id")
 
-	cmd := m.DeletePlaylistQuery{Id: id}
+	cmd := m.DeletePlaylistCommand{Id: id, OrgId: c.OrgId}
 	if err := bus.Dispatch(&cmd); err != nil {
 		return ApiError(500, "Failed to delete playlist", err)
 	}
@@ -167,28 +168,27 @@ func DeletePlaylist(c *middleware.Context) Response {
 	return Json(200, "")
 }
 
-func CreatePlaylist(c *middleware.Context, query m.CreatePlaylistQuery) Response {
-	query.OrgId = c.OrgId
-	err := bus.Dispatch(&query)
-	if err != nil {
+func CreatePlaylist(c *middleware.Context, cmd m.CreatePlaylistCommand) Response {
+	cmd.OrgId = c.OrgId
+
+	if err := bus.Dispatch(&cmd); err != nil {
 		return ApiError(500, "Failed to create playlist", err)
 	}
 
-	return Json(200, query.Result)
+	return Json(200, cmd.Result)
 }
 
-func UpdatePlaylist(c *middleware.Context, query m.UpdatePlaylistQuery) Response {
-	err := bus.Dispatch(&query)
+func UpdatePlaylist(c *middleware.Context, cmd m.UpdatePlaylistCommand) Response {
+	cmd.OrgId = c.OrgId
+	if err := bus.Dispatch(&cmd); err != nil {
+		return ApiError(500, "Failed to save playlist", err)
+	}
+
+	playlistDTOs, err := LoadPlaylistItemDTOs(cmd.Id)
 	if err != nil {
 		return ApiError(500, "Failed to save playlist", err)
 	}
 
-	playlistDTOs, err := LoadPlaylistItemDTOs(query.Id)
-	if err != nil {
-		return ApiError(500, "Failed to save playlist", err)
-	}
-
-	query.Result.Items = playlistDTOs
-
-	return Json(200, query.Result)
+	cmd.Result.Items = playlistDTOs
+	return Json(200, cmd.Result)
 }