opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 01:52:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

style(playlist): abstract DTO creation

Browse Source
This commit is contained in:
bergquist
2016-01-12 08:36:25 +01:00
parent 7e7d9457ea
commit b79f04493d
1 changed files with 26 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
pkg/api/playlist.go
View File

@ -55,23 +55,7 @@ func GetPlaylist(c *middleware.Context) Response {
return ApiError(500, "Playlist not found", err) return ApiError(500, "Playlist not found", err)
} }
itemQuery := m.GetPlaylistItemsByIdQuery{PlaylistId: id} playlistDTOs, _ := LoadPlaylistItemDTOs(id)
if err := bus.Dispatch(&itemQuery); err != nil {
log.Warn("itemQuery failed: %v", err)
return ApiError(500, "Playlist items not found", err)
}
playlistDTOs := make([]m.PlaylistItemDTO, 0)
for _, item := range *itemQuery.Result {
playlistDTOs = append(playlistDTOs, m.PlaylistItemDTO{
Id: item.Id,
PlaylistId: item.PlaylistId,
Type: item.Type,
Value: item.Value,
Order: item.Order,
})
}
dto := &m.PlaylistDTO{ dto := &m.PlaylistDTO{
Id: cmd.Result.Id, Id: cmd.Result.Id,
@ -84,6 +68,29 @@ func GetPlaylist(c *middleware.Context) Response {
return Json(200, dto) return Json(200, dto)
} }
func LoadPlaylistItemDTOs(id int64) ([]m.PlaylistItemDTO, error) {
playlistitems, err := LoadPlaylistItems(id)
if err != nil {
return nil, err
}
playlistDTOs := make([]m.PlaylistItemDTO, 0)
for _, item := range playlistitems {
playlistDTOs = append(playlistDTOs, m.PlaylistItemDTO{
Id: item.Id,
PlaylistId: item.PlaylistId,
Type: item.Type,
Value: item.Value,
Order: item.Order,
Title: item.Title,
})
}
return playlistDTOs, nil
}
func LoadPlaylistItems(id int64) ([]m.PlaylistItem, error) { func LoadPlaylistItems(id int64) ([]m.PlaylistItem, error) {
itemQuery := m.GetPlaylistItemsByIdQuery{PlaylistId: id} itemQuery := m.GetPlaylistItemsByIdQuery{PlaylistId: id}
if err := bus.Dispatch(&itemQuery); err != nil { if err := bus.Dispatch(&itemQuery); err != nil {
@ -130,25 +137,12 @@ func LoadPlaylistDashboards(id int64) ([]m.PlaylistDashboardDto, error) {
func GetPlaylistItems(c *middleware.Context) Response { func GetPlaylistItems(c *middleware.Context) Response {
id := c.ParamsInt64(":id") id := c.ParamsInt64(":id")
items, err := LoadPlaylistItems(id) playlistDTOs, err := LoadPlaylistItemDTOs(id)
if err != nil { if err != nil {
return ApiError(500, "Could not load playlist items", err) return ApiError(500, "Could not load playlist items", err)
} }
playlistDTOs := make([]m.PlaylistItemDTO, 0)
for _, item := range items {
playlistDTOs = append(playlistDTOs, m.PlaylistItemDTO{
Id: item.Id,
PlaylistId: item.PlaylistId,
Type: item.Type,
Value: item.Value,
Order: item.Order,
Title: item.Title,
})
}
return Json(200, playlistDTOs) return Json(200, playlistDTOs)
} }
@ -190,20 +184,7 @@ func UpdatePlaylist(c *middleware.Context, query m.UpdatePlaylistQuery) Response
return ApiError(500, "Failed to save playlist", err) return ApiError(500, "Failed to save playlist", err)
} }
items, err := LoadPlaylistItems(query.Id) playlistDTOs, err := LoadPlaylistItemDTOs(query.Id)
playlistDTOs := make([]m.PlaylistItemDTO, 0)
for _, item := range items {
playlistDTOs = append(playlistDTOs, m.PlaylistItemDTO{
Id: item.Id,
PlaylistId: item.PlaylistId,
Type: item.Type,
Value: item.Value,
Order: item.Order,
})
}
if err != nil { if err != nil {
return ApiError(500, "Failed to save playlist", err) return ApiError(500, "Failed to save playlist", err)
} }