From 5682d0e721f30137477a2c6599d98d6cada71127 Mon Sep 17 00:00:00 2001 From: Deluan Date: Mon, 11 May 2020 10:53:09 -0400 Subject: [PATCH] Remove tracks from Playlist's GetAll --- model/playlist.go | 2 +- persistence/playlist_repository.go | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/model/playlist.go b/model/playlist.go index 9ae775dfe..e9f59a999 100644 --- a/model/playlist.go +++ b/model/playlist.go @@ -14,7 +14,7 @@ type Playlist struct { SongCount int `json:"songCount"` Owner string `json:"owner"` Public bool `json:"public"` - Tracks MediaFiles `json:"tracks"` + Tracks MediaFiles `json:"tracks,omitempty"` CreatedAt time.Time `json:"createdAt"` UpdatedAt time.Time `json:"updatedAt"` } diff --git a/persistence/playlist_repository.go b/persistence/playlist_repository.go index 63e501a1d..ecf92da46 100644 --- a/persistence/playlist_repository.go +++ b/persistence/playlist_repository.go @@ -74,11 +74,6 @@ func (r *playlistRepository) GetAll(options ...model.QueryOptions) (model.Playli sel := r.newSelect(options...).Columns("*") var res model.Playlists err := r.queryAll(sel, &res) - if err != nil { - return nil, err - } - // TODO Maybe the tracks are not required when retrieving all playlists? - err = r.loadAllTracks(res) return res, err } @@ -128,15 +123,6 @@ func (r *playlistRepository) updateTracks(id string, tracks model.MediaFiles) er return err } -func (r *playlistRepository) loadAllTracks(all model.Playlists) error { - for i := range all { - if err := r.loadTracks(&all[i]); err != nil { - return err - } - } - return nil -} - func (r *playlistRepository) loadTracks(pls *model.Playlist) (err error) { tracksQuery := Select().From("playlist_tracks"). LeftJoin("annotation on ("+