Add created and changed fields to playlists responses

persistence/playlist_repository.go

@@ -3,20 +3,24 @@ package persistence
 import (
 	"context"
 	"strings"
+	"time"
 
 	. "github.com/Masterminds/squirrel"
 	"github.com/astaxie/beego/orm"
+	"github.com/deluan/navidrome/log"
 	"github.com/deluan/navidrome/model"
 )
 
 type playlist struct {
-	ID       string `orm:"column(id)"`
-	Name     string
-	Comment  string
-	Duration float32
-	Owner    string
-	Public   bool
-	Tracks   string
+	ID        string `orm:"column(id)"`
+	Name      string
+	Comment   string
+	Duration  float32
+	Owner     string
+	Public    bool
+	Tracks    string
+	CreatedAt time.Time
+	UpdatedAt time.Time
 }
 
 type playlistRepository struct {
@@ -44,6 +48,10 @@ func (r *playlistRepository) Delete(id string) error {
 }
 
 func (r *playlistRepository) Put(p *model.Playlist) error {
+	if p.ID == "" {
+		p.CreatedAt = time.Now()
+	}
+	p.UpdatedAt = time.Now()
 	pls := r.fromModel(p)
 	_, err := r.put(pls.ID, pls)
 	return err
@@ -62,18 +70,11 @@ func (r *playlistRepository) GetWithTracks(id string) (*model.Playlist, error) {
 	if err != nil {
 		return nil, err
 	}
-	mfRepo := NewMediaFileRepository(r.ctx, r.ormer)
 	pls.Duration = 0
-	newTracks := model.MediaFiles{}
+	pls.Tracks = r.loadTracks(pls)
 	for _, t := range pls.Tracks {
-		mf, err := mfRepo.Get(t.ID)
-		if err != nil {
-			continue
-		}
-		pls.Duration += mf.Duration
-		newTracks = append(newTracks, *mf)
+		pls.Duration += t.Duration
 	}
-	pls.Tracks = newTracks
 	return pls, err
 }
 
@@ -94,12 +95,14 @@ func (r *playlistRepository) toModels(all []playlist) model.Playlists {
 
 func (r *playlistRepository) toModel(p *playlist) model.Playlist {
 	pls := model.Playlist{
-		ID:       p.ID,
-		Name:     p.Name,
-		Comment:  p.Comment,
-		Duration: p.Duration,
-		Owner:    p.Owner,
-		Public:   p.Public,
+		ID:        p.ID,
+		Name:      p.Name,
+		Comment:   p.Comment,
+		Duration:  p.Duration,
+		Owner:     p.Owner,
+		Public:    p.Public,
+		CreatedAt: p.CreatedAt,
+		UpdatedAt: p.UpdatedAt,
 	}
 	if strings.TrimSpace(p.Tracks) != "" {
 		tracks := strings.Split(p.Tracks, ",")
@@ -107,24 +110,44 @@ func (r *playlistRepository) toModel(p *playlist) model.Playlist {
 			pls.Tracks = append(pls.Tracks, model.MediaFile{ID: t})
 		}
 	}
+	pls.Tracks = r.loadTracks(&pls)
 	return pls
 }
 
 func (r *playlistRepository) fromModel(p *model.Playlist) playlist {
 	pls := playlist{
-		ID:       p.ID,
-		Name:     p.Name,
-		Comment:  p.Comment,
-		Duration: p.Duration,
-		Owner:    p.Owner,
-		Public:   p.Public,
+		ID:        p.ID,
+		Name:      p.Name,
+		Comment:   p.Comment,
+		Owner:     p.Owner,
+		Public:    p.Public,
+		CreatedAt: p.CreatedAt,
+		UpdatedAt: p.UpdatedAt,
 	}
+	p.Tracks = r.loadTracks(p)
 	var newTracks []string
 	for _, t := range p.Tracks {
 		newTracks = append(newTracks, t.ID)
+		pls.Duration += t.Duration
 	}
 	pls.Tracks = strings.Join(newTracks, ",")
 	return pls
 }
 
+func (r *playlistRepository) loadTracks(p *model.Playlist) model.MediaFiles {
+	mfRepo := NewMediaFileRepository(r.ctx, r.ormer)
+	var ids []string
+	for _, t := range p.Tracks {
+		ids = append(ids, t.ID)
+	}
+	idsFilter := Eq{"id": ids}
+	tracks, err := mfRepo.GetAll(model.QueryOptions{Filters: idsFilter})
+	if err == nil {
+		return tracks
+	} else {
+		log.Error(r.ctx, "Could not load playlist's tracks", "playlistName", p.Name, "playlistId", p.ID, err)
+	}
+	return nil
+}
+
 var _ model.PlaylistRepository = (*playlistRepository)(nil)