Add created and changed fields to playlists responses

server/subsonic/playlists.go

@@ -36,6 +36,8 @@ func (c *PlaylistsController) GetPlaylists(w http.ResponseWriter, r *http.Reques
 		playlists[i].Duration = int(p.Duration)
 		playlists[i].Owner = p.Owner
 		playlists[i].Public = p.Public
+		playlists[i].Created = &p.CreatedAt
+		playlists[i].Changed = &p.UpdatedAt
 	}
 	response := NewResponse()
 	response.Playlists = &responses.Playlists{Playlist: playlists}
@@ -58,7 +60,7 @@ func (c *PlaylistsController) GetPlaylist(w http.ResponseWriter, r *http.Request
 	}
 
 	response := NewResponse()
-	response.Playlist = c.buildPlaylist(r.Context(), pinfo)
+	response.Playlist = c.buildPlaylistWithSongs(r.Context(), pinfo)
 	return response, nil
 }
 
@@ -125,15 +127,24 @@ func (c *PlaylistsController) UpdatePlaylist(w http.ResponseWriter, r *http.Requ
 	return NewResponse(), nil
 }
 
-func (c *PlaylistsController) buildPlaylist(ctx context.Context, d *engine.PlaylistInfo) *responses.PlaylistWithSongs {
-	pls := &responses.PlaylistWithSongs{}
+func (c *PlaylistsController) buildPlaylistWithSongs(ctx context.Context, d *engine.PlaylistInfo) *responses.PlaylistWithSongs {
+	pls := &responses.PlaylistWithSongs{
+		Playlist: *c.buildPlaylist(d),
+	}
+	pls.Entry = ToChildren(ctx, d.Entries)
+	return pls
+}
+
+func (c *PlaylistsController) buildPlaylist(d *engine.PlaylistInfo) *responses.Playlist {
+	pls := &responses.Playlist{}
 	pls.Id = d.Id
 	pls.Name = d.Name
+	pls.Comment = d.Comment
 	pls.SongCount = d.SongCount
 	pls.Owner = d.Owner
 	pls.Duration = d.Duration
 	pls.Public = d.Public
-
-	pls.Entry = ToChildren(ctx, d.Entries)
+	pls.Created = &d.Created
+	pls.Changed = &d.Changed
 	return pls
 }

server/subsonic/responses/.snapshots/responses-snapshotMatcher-Match-Responses Playlists with data should match .JSON

@@ -1 +1 @@
-{"status":"ok","version":"1.8.0","type":"navidrome","serverVersion":"v0.0.0","playlists":{"playlist":[{"id":"111","name":"aaa"},{"id":"222","name":"bbb"}]}}
+{"status":"ok","version":"1.8.0","type":"navidrome","serverVersion":"v0.0.0","playlists":{"playlist":[{"id":"111","name":"aaa","comment":"comment","songCount":2,"duration":120,"public":true,"owner":"admin","created":"0001-01-01T00:00:00Z","changed":"0001-01-01T00:00:00Z"},{"id":"222","name":"bbb"}]}}

server/subsonic/responses/.snapshots/responses-snapshotMatcher-Match-Responses Playlists with data should match .XML

@@ -1 +1 @@
-<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.8.0" type="navidrome" serverVersion="v0.0.0"><playlists><playlist id="111" name="aaa"></playlist><playlist id="222" name="bbb"></playlist></playlists></subsonic-response>
+<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.8.0" type="navidrome" serverVersion="v0.0.0"><playlists><playlist id="111" name="aaa" comment="comment" songCount="2" duration="120" public="true" owner="admin" created="0001-01-01T00:00:00Z" changed="0001-01-01T00:00:00Z"></playlist><playlist id="222" name="bbb"></playlist></playlists></subsonic-response>

server/subsonic/responses/responses.go

@@ -188,22 +188,20 @@ type AlbumList struct {
 }
 
 type Playlist struct {
-	Id        string `xml:"id,attr"                                 json:"id"`
-	Name      string `xml:"name,attr"                               json:"name"`
-	Comment   string `xml:"comment,attr,omitempty"                  json:"comment,omitempty"`
-	SongCount int    `xml:"songCount,attr,omitempty"                json:"songCount,omitempty"`
-	Duration  int    `xml:"duration,attr,omitempty"                 json:"duration,omitempty"`
-	Public    bool   `xml:"public,attr,omitempty"                   json:"public,omitempty"`
-	Owner     string `xml:"owner,attr,omitempty"                    json:"owner,omitempty"`
+	Id        string     `xml:"id,attr"                                 json:"id"`
+	Name      string     `xml:"name,attr"                               json:"name"`
+	Comment   string     `xml:"comment,attr,omitempty"                  json:"comment,omitempty"`
+	SongCount int        `xml:"songCount,attr,omitempty"                json:"songCount,omitempty"`
+	Duration  int        `xml:"duration,attr,omitempty"                 json:"duration,omitempty"`
+	Public    bool       `xml:"public,attr,omitempty"                   json:"public,omitempty"`
+	Owner     string     `xml:"owner,attr,omitempty"                    json:"owner,omitempty"`
+	Created   *time.Time `xml:"created,attr,omitempty"                  json:"created,omitempty"`
+	Changed   *time.Time `xml:"changed,attr,omitempty"                  json:"changed,omitempty"`
 	/*
 		<xs:sequence>
 		    <xs:element name="allowedUser" type="xs:string" minOccurs="0" maxOccurs="unbounded"/> <!--Added in 1.8.0-->
 		</xs:sequence>
-		<xs:attribute name="comment" type="xs:string" use="optional"/>   <!--Added in 1.8.0-->
-		<xs:attribute name="created" type="xs:dateTime" use="required"/> <!--Added in 1.8.0-->
-		<xs:attribute name="changed" type="xs:dateTime" use="required"/> <!--Added in 1.13.0-->
 		<xs:attribute name="coverArt" type="xs:string" use="optional"/>  <!--Added in 1.11.0-->
-
 	*/
 }
 

server/subsonic/responses/responses_test.go

@@ -235,9 +235,20 @@ var _ = Describe("Responses", func() {
 		})
 
 		Context("with data", func() {
+			timestamp, _ := time.Parse(time.RFC3339, "2020-04-11T16:43:00Z04:00")
 			BeforeEach(func() {
 				pls := make([]Playlist, 2)
-				pls[0] = Playlist{Id: "111", Name: "aaa"}
+				pls[0] = Playlist{
+					Id:        "111",
+					Name:      "aaa",
+					Comment:   "comment",
+					SongCount: 2,
+					Duration:  120,
+					Public:    true,
+					Owner:     "admin",
+					Created:   &timestamp,
+					Changed:   &timestamp,
+				}
 				pls[1] = Playlist{Id: "222", Name: "bbb"}
 				response.Playlists.Playlist = pls
 			})