diff --git a/engine/playlists.go b/engine/playlists.go index 409188d4..65eadb84 100644 --- a/engine/playlists.go +++ b/engine/playlists.go @@ -124,7 +124,7 @@ type PlaylistInfo struct { } func (p *playlists) Get(ctx context.Context, id string) (*PlaylistInfo, error) { - pl, err := p.ds.Playlist(ctx).GetWithTracks(id) + pl, err := p.ds.Playlist(ctx).Get(id) if err != nil { return nil, err } diff --git a/model/playlist.go b/model/playlist.go index 45605212..d5d8b671 100644 --- a/model/playlist.go +++ b/model/playlist.go @@ -19,7 +19,6 @@ type PlaylistRepository interface { Exists(id string) (bool, error) Put(pls *Playlist) error Get(id string) (*Playlist, error) - GetWithTracks(id string) (*Playlist, error) GetAll(options ...QueryOptions) (Playlists, error) Delete(id string) error } diff --git a/persistence/playlist_repository.go b/persistence/playlist_repository.go index 8a7f1d68..1e3fa303 100644 --- a/persistence/playlist_repository.go +++ b/persistence/playlist_repository.go @@ -65,19 +65,6 @@ func (r *playlistRepository) Get(id string) (*model.Playlist, error) { return &pls, err } -func (r *playlistRepository) GetWithTracks(id string) (*model.Playlist, error) { - pls, err := r.Get(id) - if err != nil { - return nil, err - } - pls.Duration = 0 - pls.Tracks = r.loadTracks(pls) - for _, t := range pls.Tracks { - pls.Duration += t.Duration - } - return pls, err -} - func (r *playlistRepository) GetAll(options ...model.QueryOptions) (model.Playlists, error) { sel := r.newSelect(options...).Columns("*") var res []playlist diff --git a/persistence/playlist_repository_test.go b/persistence/playlist_repository_test.go index bfbbe7ad..186c4dce 100644 --- a/persistence/playlist_repository_test.go +++ b/persistence/playlist_repository_test.go @@ -49,6 +49,15 @@ var _ = Describe("PlaylistRepository", func() { _, err := repo.Get("666") Expect(err).To(MatchError(model.ErrNotFound)) }) + It("returns all tracks", func() { + pls, err := repo.Get("10") + Expect(err).To(BeNil()) + Expect(pls.Name).To(Equal(plsBest.Name)) + Expect(pls.Tracks).To(Equal(model.MediaFiles{ + songDayInALife, + songRadioactivity, + })) + }) }) Describe("Put/Exists/Delete", func() { @@ -70,18 +79,6 @@ var _ = Describe("PlaylistRepository", func() { }) }) - Describe("GetWithTracks", func() { - It("returns an existing playlist", func() { - pls, err := repo.GetWithTracks("10") - Expect(err).To(BeNil()) - Expect(pls.Name).To(Equal(plsBest.Name)) - Expect(pls.Tracks).To(Equal(model.MediaFiles{ - songDayInALife, - songRadioactivity, - })) - }) - }) - Describe("GetAll", func() { It("returns all playlists from DB", func() { all, err := repo.GetAll()