Add includes for /tracks

api/resources/track.yml

@@ -20,6 +20,10 @@ get:
             properties:
               data:
                 $ref: '../schemas/Track.yml'
+              included:
+                type: array
+                items:
+                  $ref: '../schemas/IncludedResource.yml'
     '403':
       $ref: '../responses/NotAuthorized.yml'
     '404':

api/resources/tracks.yml

@@ -31,6 +31,10 @@ get:
                 $ref: '../schemas/PaginationLinks.yml'
               meta:
                 $ref: '../schemas/PaginationMeta.yml'
+              included:
+                type: array
+                items:
+                  $ref: '../schemas/IncludedResource.yml'
     '400':
       $ref: '../responses/BadRequest.yml'
     '403':

api/schemas/ArtistAttributes.yml

@@ -6,3 +6,5 @@ properties:
   bio:
     type: string
     description: A short biography of the artist
+required:
+  - name

api/schemas/IncludedResource.yml

@@ -1,5 +1,6 @@
 oneOf:
   - $ref: './Track.yml'
+  - $ref: './Album.yml'
   - $ref: './Artist.yml'
 discriminator:
   propertyName: type

model/mediafile.go

@@ -183,6 +183,22 @@ func (mfs MediaFiles) ToAlbum() Album {
 	return a
 }
 
+func (mfs MediaFiles) ArtistIDs() []string {
+	var ids []string
+	for _, mf := range mfs {
+		ids = append(ids, mf.ArtistID, mf.AlbumArtistID)
+	}
+	return ids
+}
+
+func (mfs MediaFiles) AlbumIDs() []string {
+	var ids []string
+	for _, mf := range mfs {
+		ids = append(ids, mf.AlbumID)
+	}
+	return ids
+}
+
 func allOrNothing(items []string) (string, int) {
 	items = slices.Compact(items)
 	if len(items) == 1 {

server/api/api.go

@@ -73,10 +73,20 @@ func (a *Router) GetTracks(ctx context.Context, request GetTracksRequestObject)
 	}
 	baseUrl := baseResourceUrl(ctx, "tracks")
 	links, meta := buildPaginationLinksAndMeta(int32(cnt), request.Params, baseUrl)
+	resources := includedResources{ctx: ctx, ds: a.ds, includes: request.Params.Include}
+	err = resources.AddArtists(mfs.ArtistIDs()...)
+	if err != nil {
+		return nil, err
+	}
+	err = resources.AddAlbums(mfs.AlbumIDs()...)
+	if err != nil {
+		return nil, err
+	}
 	return GetTracks200JSONResponse{
-		Data:  toAPITracks(mfs),
+		Data:     toAPITracks(mfs),
-		Links: links,
+		Links:    links,
-		Meta:  &meta,
+		Meta:     &meta,
+		Included: resources.Build(),
 	}, nil
 }
 
@@ -85,7 +95,19 @@ func (a *Router) GetTrack(ctx context.Context, request GetTrackRequestObject) (G
 	if err != nil {
 		return nil, err
 	}
-	return GetTrack200JSONResponse{Data: toAPITrack(*mf)}, nil
+	resources := includedResources{ctx: ctx, ds: a.ds, includes: request.Params.Include}
+	err = resources.AddArtists(mf.ArtistID, mf.AlbumArtistID)
+	if err != nil {
+		return nil, err
+	}
+	err = resources.AddAlbums(mf.AlbumID)
+	if err != nil {
+		return nil, err
+	}
+	return GetTrack200JSONResponse{
+		Data:     toAPITrack(*mf),
+		Included: resources.Build(),
+	}, nil
 }
 
 func (a *Router) GetAlbums(ctx context.Context, request GetAlbumsRequestObject) (GetAlbumsResponseObject, error) {

server/api/helpers.go

@@ -122,6 +122,25 @@ func toAPIAlbums(mas model.Albums) []Album {
 	return albums
 }
 
+func toAPIArtist(ma model.Artist) Artist {
+	return Artist{
+		Type: ResourceTypeArtist,
+		Id:   ma.ID,
+		Attributes: &ArtistAttributes{
+			Name: ma.Name,
+			Bio:  P(ma.Biography),
+		},
+	}
+}
+
+func toAPIArtists(mas model.Artists) []Artist {
+	artists := make([]Artist, len(mas))
+	for i := range mas {
+		artists[i] = toAPIArtist(mas[i])
+	}
+	return artists
+}
+
 type GetParams interface {
 	GetParams() GetTracksParams
 }

server/api/includes.go

@@ -0,0 +1,60 @@
+package api
+
+import (
+	"context"
+	"sort"
+
+	"github.com/Masterminds/squirrel"
+	"github.com/navidrome/navidrome/model"
+	"golang.org/x/exp/slices"
+)
+
+type includedResources struct {
+	ctx       context.Context
+	ds        model.DataStore
+	includes  *includeSlice
+	resources []IncludedResource
+}
+
+func (i *includedResources) AddAlbums(albumIds ...string) error {
+	if i.includes == nil || !slices.Contains(*i.includes, "album") {
+		return nil
+	}
+	sort.Strings(albumIds)
+	slices.Compact(albumIds)
+	albums, err := i.ds.Album(i.ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{"id": albumIds}})
+	if err != nil {
+		return err
+	}
+	for _, al := range albums {
+		inc := &IncludedResource{}
+		_ = inc.FromAlbum(toAPIAlbum(al))
+		i.resources = append(i.resources, *inc)
+	}
+	return nil
+}
+
+func (i *includedResources) AddArtists(artistIds ...string) error {
+	if i.includes == nil || !slices.Contains(*i.includes, "artist") {
+		return nil
+	}
+	sort.Strings(artistIds)
+	slices.Compact(artistIds)
+	artists, err := i.ds.Artist(i.ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{"artist.id": artistIds}})
+	if err != nil {
+		return err
+	}
+	for _, ar := range artists {
+		inc := &IncludedResource{}
+		_ = inc.FromArtist(toAPIArtist(ar))
+		i.resources = append(i.resources, *inc)
+	}
+	return nil
+}
+
+func (i *includedResources) Build() *[]IncludedResource {
+	if len(i.resources) == 0 {
+		return nil
+	}
+	return &i.resources
+}

server/api/openapi_api.gen.go

@@ -933,9 +933,10 @@ type GetTracksResponseObject interface {
 }
 
 type GetTracks200JSONResponse struct {
-	Data  []Track         `json:"data"`
+	Data     []Track             `json:"data"`
-	Links PaginationLinks `json:"links"`
+	Included *[]IncludedResource `json:"included,omitempty"`
-	Meta  *PaginationMeta `json:"meta,omitempty"`
+	Links    PaginationLinks     `json:"links"`
+	Meta     *PaginationMeta     `json:"meta,omitempty"`
 }
 
 func (response GetTracks200JSONResponse) VisitGetTracksResponse(w http.ResponseWriter) error {
@@ -984,7 +985,8 @@ type GetTrackResponseObject interface {
 }
 
 type GetTrack200JSONResponse struct {
-	Data Track `json:"data"`
+	Data     Track               `json:"data"`
+	Included *[]IncludedResource `json:"included,omitempty"`
 }
 
 func (response GetTrack200JSONResponse) VisitGetTrackResponse(w http.ResponseWriter) error {
@@ -1263,55 +1265,57 @@ func (sh *strictHandler) GetTrack(w http.ResponseWriter, r *http.Request, trackI
 // Base64 encoded, gzipped, json marshaled Swagger object
 var swaggerSpec = []string{
 
-	"H4sIAAAAAAAC/+xb224bOdJ+FYL/D8wMpiN5k9m9MLAXzmwSeJCDYXs2FxkvwO4uqTlhkx2SLVsTCNjX",
+	"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",
-	"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",
+	"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",
-	"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",
+	"Jng0i57jOklWhPIVqaSoQOoVSS0A4wui4U5PyK+KLmBGLLq3blnd/N1DzJa0qCGKI2awvq9BrqI44rSE",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"AcaMdgHRCTrMBH3CezPBUSvf6b9D58PXvKW6F22vLNP2iChukG44jpuW72Ha9ug+cqTjMhN1DttqXoJg",
+	"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",
-	"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",
+	"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",
-	"wsB4vK3ZQdYlPX1DrWbZW5pQpi03lt7ss3xC7x7M1YPwLYi4EjyDDe2vHeM/u/bMLdHH075ic3jOS263",
+	"UDCe30btwOsymr2NtKTpuyiOqNRM6ehmn+bj6O7RQjxy3xyJq4KlsCX9tUH8Z5eemiP6dNJXdAEvWcl0",
-	"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",
+	"X+zrHIyHSUASMSfICKlAEgMyYG9m6W1h0G1enQzmtC50NPvLSRzNhSypRmb0k8dRHJWMs9JId9LwzriG",
-	"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",
+	"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",
-	"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",
+	"7hDFZmL33aPvUFpDD3hm8nUhM5CTAaGRv10uYB1H3n7R1p7S7BLe16BQLJPBA8cfaVUVLEUFT5c8m9CK",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"yse5/Sa8dDM3jYfkw1a7VENR1BE6jZhsMg6XhPlg6I4CTRxsj3eN1qxL0NFD3pCnf2SX+xRWPNBRu7J0",
+	"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",
-	"Cx+4ofFFF3LqdN4ZIQLrQUBDjpeDZVxETl0J5Xn0s7HM1iY61KbrEXvioj0LP+cyFlhnXHsbtufdWvPY",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"RWia4iuJwM8KkU+wQ0vLynhSLWto2EiEKIByw8ccqK5lyHpOSeFqSYGfaEH85g4RouqqElIr7NMF+7qq",
-	"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",
+	"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",
-	"skPAdqFObgtFKtAuzUDeSYlxTrnVg/2LMNhyr3OuyIwLzNdvuVApt/4iwkCmZE6+f5tW5odJNH2m1YDx",
+	"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",
-	"U2CBS8llbYF8//jixQ+NUEQe55gVTEoQZl+7w+NuZjcZeRdjVZbNc56NSC2XhOU5D1G6meiOD1JZMISl",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"HDdv/o0Bdi5Mx5G0/tCd92CguRzbIv2krzfxwS9OQ5F97MNQsLOiIK0l06srQ8T19oBKkKe1HcKxvz33",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"jBiLlXOawoQYazcrlRRLloEiwLNKMBM45t7WVexeOGIXxVVMqoKuTGWgkAObzseEmlTBjS0hN2QjK5yQ",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"/uRtGYPR2nzae1qEJI/2k6w/tlkl9K9jBMUeD2EZUZfuaIzP+kKWYlvKrJImaE3f4//n+Wpv+Do4em27",
+	"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",
-	"ZzKul7pxKY9vvly07Z58BdC0v8y+RTj8Cux+98aILTHyTnbbGWVobXTl8nGO9dPJT6Oowrune/BESbjM",
+	"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",
-	"+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",
+	"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",
-	"G2mxxBngfimZM+yID0md4Y7gK8udnWGm3T3jkP/1bms/21L2MBy9nNe9v0T577//Y4ijJG9hSUpW+cZD",
+	"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",
-	"e68dVpzkHBsNTC+JhkqDcdtFzteuQT93tHkGNmD5zpC5UCkT2Fvy69u9HBxa3/CXPd9Ko2+l0b20F4J/",
+	"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",
-	"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",
+	"GEjyDlakpJVtPDTv2u7EScaw0UDlikioJChzXfhi4xn0S3ubF6AdL98psihEQgvsLdnzbYcwh87X/ZHU",
-	"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",
+	"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",
+	"///+0r9yf0YAAA==",
 }
 
 // GetSwagger returns the content of the embedded swagger specification file

server/api/openapi_types.gen.go

@@ -3,6 +3,13 @@
 // Code generated by github.com/deepmap/oapi-codegen version v1.12.5-0.20230513000919-14548c7e7bbe DO NOT EDIT.
 package api
 
+import (
+	"encoding/json"
+	"errors"
+
+	"github.com/deepmap/oapi-codegen/pkg/runtime"
+)
+
 const (
 	BearerAuthScopes = "bearerAuth.Scopes"
 )
@@ -105,7 +112,7 @@ type ArtistAttributes struct {
 	Bio *string `json:"bio,omitempty"`
 
 	// Name The name of the artist
-	Name *string `json:"name,omitempty"`
+	Name string `json:"name"`
 }
 
 // ArtistMetaObject defines model for ArtistMetaObject.
@@ -139,6 +146,11 @@ type ErrorObject struct {
 	Title  *string `json:"title,omitempty"`
 }
 
+// IncludedResource defines model for IncludedResource.
+type IncludedResource struct {
+	union json.RawMessage
+}
+
 // PaginationLinks defines model for PaginationLinks.
 type PaginationLinks struct {
 	First *string `json:"first,omitempty"`
@@ -443,3 +455,122 @@ type GetTrackParams struct {
 	// Include Related resources to include in the response, separated by commas
 	Include *IncludeForTracks `form:"include,omitempty" json:"include,omitempty"`
 }
+
+// AsTrack returns the union data inside the IncludedResource as a Track
+func (t IncludedResource) AsTrack() (Track, error) {
+	var body Track
+	err := json.Unmarshal(t.union, &body)
+	return body, err
+}
+
+// FromTrack overwrites any union data inside the IncludedResource as the provided Track
+func (t *IncludedResource) FromTrack(v Track) error {
+	v.Type = "track"
+	b, err := json.Marshal(v)
+	t.union = b
+	return err
+}
+
+// MergeTrack performs a merge with any union data inside the IncludedResource, using the provided Track
+func (t *IncludedResource) MergeTrack(v Track) error {
+	v.Type = "track"
+	b, err := json.Marshal(v)
+	if err != nil {
+		return err
+	}
+
+	merged, err := runtime.JsonMerge(t.union, b)
+	t.union = merged
+	return err
+}
+
+// AsAlbum returns the union data inside the IncludedResource as a Album
+func (t IncludedResource) AsAlbum() (Album, error) {
+	var body Album
+	err := json.Unmarshal(t.union, &body)
+	return body, err
+}
+
+// FromAlbum overwrites any union data inside the IncludedResource as the provided Album
+func (t *IncludedResource) FromAlbum(v Album) error {
+	v.Type = "album"
+	b, err := json.Marshal(v)
+	t.union = b
+	return err
+}
+
+// MergeAlbum performs a merge with any union data inside the IncludedResource, using the provided Album
+func (t *IncludedResource) MergeAlbum(v Album) error {
+	v.Type = "album"
+	b, err := json.Marshal(v)
+	if err != nil {
+		return err
+	}
+
+	merged, err := runtime.JsonMerge(t.union, b)
+	t.union = merged
+	return err
+}
+
+// AsArtist returns the union data inside the IncludedResource as a Artist
+func (t IncludedResource) AsArtist() (Artist, error) {
+	var body Artist
+	err := json.Unmarshal(t.union, &body)
+	return body, err
+}
+
+// FromArtist overwrites any union data inside the IncludedResource as the provided Artist
+func (t *IncludedResource) FromArtist(v Artist) error {
+	v.Type = "artist"
+	b, err := json.Marshal(v)
+	t.union = b
+	return err
+}
+
+// MergeArtist performs a merge with any union data inside the IncludedResource, using the provided Artist
+func (t *IncludedResource) MergeArtist(v Artist) error {
+	v.Type = "artist"
+	b, err := json.Marshal(v)
+	if err != nil {
+		return err
+	}
+
+	merged, err := runtime.JsonMerge(t.union, b)
+	t.union = merged
+	return err
+}
+
+func (t IncludedResource) Discriminator() (string, error) {
+	var discriminator struct {
+		Discriminator string `json:"type"`
+	}
+	err := json.Unmarshal(t.union, &discriminator)
+	return discriminator.Discriminator, err
+}
+
+func (t IncludedResource) ValueByDiscriminator() (interface{}, error) {
+	discriminator, err := t.Discriminator()
+	if err != nil {
+		return nil, err
+	}
+	switch discriminator {
+	case "album":
+		return t.AsAlbum()
+	case "artist":
+		return t.AsArtist()
+	case "track":
+		return t.AsTrack()
+	default:
+		return nil, errors.New("unknown discriminator value: " + discriminator)
+	}
+}
+
+func (t IncludedResource) MarshalJSON() ([]byte, error) {
+	b, err := t.union.MarshalJSON()
+	return b, err
+}
+
+func (t *IncludedResource) UnmarshalJSON(b []byte) error {
+	err := t.union.UnmarshalJSON(b)
+	return err
+}