feat: add CreatedAt to albums (#159)

This change will make the GetAlbumList views with the "newest" type work as expected.
sentriz · Oct 4, 2021 · 848d85d · 848d85d
1 parent ea141cf
commit 848d85d
Show file tree

Hide file tree

Showing 16 changed files with 171 additions and 147 deletions.
diff --git a/server/ctrlsubsonic/handlers_by_tags.go b/server/ctrlsubsonic/handlers_by_tags.go
@@ -132,7 +132,7 @@ func (c *Controller) ServeGetAlbumListTwo(r *http.Request) *spec.Response {
 			user.ID)
 		q = q.Order("plays.count DESC")
 	case "newest":
-		q = q.Order("modified_at DESC")
+		q = q.Order("created_at DESC")
 	case "random":
 		q = q.Order(gorm.Expr("random()"))
 	case "recent":

diff --git a/server/ctrlsubsonic/spec/construct_by_folder.go b/server/ctrlsubsonic/spec/construct_by_folder.go
@@ -15,6 +15,7 @@ func NewAlbumByFolder(f *db.Album) *Album {
 		Title:      f.RightPath,
 		TrackCount: f.ChildCount,
 		Duration:   f.Duration,
+		Created:    f.CreatedAt,
 	}
 	if f.Cover != "" {
 		a.CoverID = f.SID()
@@ -28,7 +29,7 @@ func NewTCAlbumByFolder(f *db.Album) *TrackChild {
 		IsDir:     true,
 		Title:     f.RightPath,
 		ParentID:  f.ParentSID(),
-		CreatedAt: f.UpdatedAt,
+		CreatedAt: f.CreatedAt,
 	}
 	if f.Cover != "" {
 		trCh.CoverID = f.SID()

diff --git a/server/ctrlsubsonic/spec/construct_by_tags.go b/server/ctrlsubsonic/spec/construct_by_tags.go
@@ -9,7 +9,7 @@ import (
 
 func NewAlbumByTags(a *db.Album, artist *db.Artist) *Album {
 	ret := &Album{
-		Created:    a.ModifiedAt,
+		Created:    a.CreatedAt,
 		ID:         a.SID(),
 		Name:       a.TagTitle,
 		Year:       a.TagYear,

diff --git a/server/ctrlsubsonic/spec/spec.go b/server/ctrlsubsonic/spec/spec.go
@@ -94,6 +94,7 @@ type Album struct {
 	CoverID  *specid.ID `xml:"coverArt,attr,omitempty" json:"coverArt,omitempty"`
 	ArtistID *specid.ID `xml:"artistId,attr,omitempty" json:"artistId,omitempty"`
 	Artist   string     `xml:"artist,attr,omitempty"   json:"artist,omitempty"`
+	Created  time.Time  `xml:"created,attr,omitempty"  json:"created,omitempty"`
 	// browsing by folder (eg. getAlbumList)
 	Title    string     `xml:"title,attr,omitempty"  json:"title"`
 	Album    string     `xml:"album,attr,omitempty"  json:"album"`
@@ -103,7 +104,6 @@ type Album struct {
 	Name       string        `xml:"name,attr"              json:"name"`
 	TrackCount int           `xml:"songCount,attr"         json:"songCount"`
 	Duration   int           `xml:"duration,attr"          json:"duration"`
-	Created    time.Time     `xml:"created,attr,omitempty" json:"created,omitempty"`
 	Genre      string        `xml:"genre,attr,omitempty"   json:"genre,omitempty"`
 	Year       int           `xml:"year,attr,omitempty"    json:"year,omitempty"`
 	Tracks     []*TrackChild `xml:"song,omitempty"         json:"song,omitempty"`

diff --git a/server/ctrlsubsonic/testdata/db b/server/ctrlsubsonic/testdata/db
diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_alpha_artist b/server/ctrlsubsonic/testdata/test_get_album_list_alpha_artist
@@ -16,7 +16,7 @@
           "name": "",
           "songCount": 10,
           "duration": 2609,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-06-13T12:57:28.850090338+01:00"
         },
         {
           "id": "al-9",
@@ -29,7 +29,7 @@
           "name": "",
           "songCount": 21,
           "duration": 4222,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-06-13T12:57:24.306717554+01:00"
         },
         {
           "id": "al-5",
@@ -42,7 +42,7 @@
           "name": "",
           "songCount": 14,
           "duration": 2738,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-06-05T17:46:37.675917974+01:00"
         },
         {
           "id": "al-6",
@@ -54,7 +54,7 @@
           "name": "",
           "songCount": 9,
           "duration": 2801,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-05-23T15:12:02.921473302+01:00"
         },
         {
           "id": "al-21",
@@ -67,7 +67,7 @@
           "name": "",
           "songCount": 15,
           "duration": 2324,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-06-10T19:26:30.944742894+01:00"
         },
         {
           "id": "al-3",
@@ -80,7 +80,7 @@
           "name": "",
           "songCount": 5,
           "duration": 1871,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-05-16T22:10:52+01:00"
         },
         {
           "id": "al-16",
@@ -93,7 +93,7 @@
           "name": "",
           "songCount": 16,
           "duration": 3040,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-04-30T16:48:48+01:00"
         },
         {
           "id": "al-17",
@@ -106,7 +106,7 @@
           "name": "",
           "songCount": 18,
           "duration": 3266,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-04-30T16:48:48+01:00"
         },
         {
           "id": "al-19",
@@ -119,7 +119,7 @@
           "name": "",
           "songCount": 15,
           "duration": 3812,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-04-30T16:48:30+01:00"
         },
         {
           "id": "al-13",
@@ -132,7 +132,7 @@
           "name": "",
           "songCount": 9,
           "duration": 2169,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-05-23T15:12:02.921473302+01:00"
         }
       ]
     }

diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_alpha_name b/server/ctrlsubsonic/testdata/test_get_album_list_alpha_name
@@ -16,7 +16,7 @@
           "name": "",
           "songCount": 21,
           "duration": 4222,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-06-13T12:57:24.306717554+01:00"
         },
         {
           "id": "al-8",
@@ -29,7 +29,7 @@
           "name": "",
           "songCount": 10,
           "duration": 2609,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-06-13T12:57:28.850090338+01:00"
         },
         {
           "id": "al-19",
@@ -42,7 +42,7 @@
           "name": "",
           "songCount": 15,
           "duration": 3812,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-04-30T16:48:30+01:00"
         },
         {
           "id": "al-21",
@@ -55,7 +55,7 @@
           "name": "",
           "songCount": 15,
           "duration": 2324,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-06-10T19:26:30.944742894+01:00"
         },
         {
           "id": "al-17",
@@ -68,7 +68,7 @@
           "name": "",
           "songCount": 18,
           "duration": 3266,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-04-30T16:48:48+01:00"
         },
         {
           "id": "al-16",
@@ -81,7 +81,7 @@
           "name": "",
           "songCount": 16,
           "duration": 3040,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-04-30T16:48:48+01:00"
         },
         {
           "id": "al-6",
@@ -93,7 +93,7 @@
           "name": "",
           "songCount": 9,
           "duration": 2801,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-05-23T15:12:02.921473302+01:00"
         },
         {
           "id": "al-3",
@@ -106,7 +106,7 @@
           "name": "",
           "songCount": 5,
           "duration": 1871,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-05-16T22:10:52+01:00"
         },
         {
           "id": "al-5",
@@ -119,7 +119,7 @@
           "name": "",
           "songCount": 14,
           "duration": 2738,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-06-05T17:46:37.675917974+01:00"
         },
         {
           "id": "al-13",
@@ -132,7 +132,7 @@
           "name": "",
           "songCount": 9,
           "duration": 2169,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-05-23T15:12:02.921473302+01:00"
         }
       ]
     }

diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_newest b/server/ctrlsubsonic/testdata/test_get_album_list_newest
@@ -16,7 +16,7 @@
           "name": "",
           "songCount": 10,
           "duration": 2609,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-06-13T12:57:28.850090338+01:00"
         },
         {
           "id": "al-9",
@@ -29,7 +29,7 @@
           "name": "",
           "songCount": 21,
           "duration": 4222,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-06-13T12:57:24.306717554+01:00"
         },
         {
           "id": "al-21",
@@ -42,7 +42,7 @@
           "name": "",
           "songCount": 15,
           "duration": 2324,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-06-10T19:26:30.944742894+01:00"
         },
         {
           "id": "al-5",
@@ -55,7 +55,7 @@
           "name": "",
           "songCount": 14,
           "duration": 2738,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-06-05T17:46:37.675917974+01:00"
         },
         {
           "id": "al-6",
@@ -67,7 +67,7 @@
           "name": "",
           "songCount": 9,
           "duration": 2801,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-05-23T15:12:02.921473302+01:00"
         },
         {
           "id": "al-13",
@@ -80,7 +80,7 @@
           "name": "",
           "songCount": 9,
           "duration": 2169,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-05-23T15:12:02.921473302+01:00"
         },
         {
           "id": "al-3",
@@ -93,7 +93,7 @@
           "name": "",
           "songCount": 5,
           "duration": 1871,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-05-16T22:10:52+01:00"
         },
         {
           "id": "al-16",
@@ -106,7 +106,7 @@
           "name": "",
           "songCount": 16,
           "duration": 3040,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-04-30T16:48:48+01:00"
         },
         {
           "id": "al-17",
@@ -119,7 +119,7 @@
           "name": "",
           "songCount": 18,
           "duration": 3266,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-04-30T16:48:48+01:00"
         },
         {
           "id": "al-19",
@@ -132,7 +132,7 @@
           "name": "",
           "songCount": 15,
           "duration": 3812,
-          "created": "0001-01-01T00:00:00Z"
+          "created": "2019-04-30T16:48:30+01:00"
         }
       ]
     }