Add GetGenre endpoint

engine/browser.go

@@ -3,7 +3,9 @@ package engine
 import (
 	"context"
 	"fmt"
+	"sort"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/cloudsonic/sonic-server/log"
@@ -18,11 +20,12 @@ type Browser interface {
 	Artist(ctx context.Context, id string) (*DirectoryInfo, error)
 	Album(ctx context.Context, id string) (*DirectoryInfo, error)
 	GetSong(id string) (*Entry, error)
+	GetGenres() (model.Genres, error)
 }
 
 func NewBrowser(pr model.PropertyRepository, fr model.MediaFolderRepository, ir model.ArtistIndexRepository,
-	ar model.ArtistRepository, alr model.AlbumRepository, mr model.MediaFileRepository) Browser {
-	return &browser{pr, fr, ir, ar, alr, mr}
+	ar model.ArtistRepository, alr model.AlbumRepository, mr model.MediaFileRepository, gr model.GenreRepository) Browser {
+	return &browser{pr, fr, ir, ar, alr, mr, gr}
 }
 
 type browser struct {
@@ -32,6 +35,7 @@ type browser struct {
 	artistRepo model.ArtistRepository
 	albumRepo  model.AlbumRepository
 	mfileRepo  model.MediaFileRepository
+	genreRepo  model.GenreRepository
 }
 
 func (b *browser) MediaFolders() (model.MediaFolders, error) {
@@ -114,6 +118,19 @@ func (b *browser) GetSong(id string) (*Entry, error) {
 	return &entry, nil
 }
 
+func (b *browser) GetGenres() (model.Genres, error) {
+	genres, err := b.genreRepo.GetAll()
+	for i, g := range genres {
+		if strings.TrimSpace(g.Name) == "" {
+			genres[i].Name = "<Empty>"
+		}
+	}
+	sort.Slice(genres, func(i, j int) bool {
+		return genres[i].Name < genres[j].Name
+	})
+	return genres, err
+}
+
 func (b *browser) buildArtistDir(a *model.Artist, albums model.Albums) *DirectoryInfo {
 	dir := &DirectoryInfo{
 		Id:         a.ID,

engine/browser_test.go

@@ -0,0 +1,49 @@
+package engine
+
+import (
+	"errors"
+
+	"github.com/cloudsonic/sonic-server/model"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Browser", func() {
+	var repo *mockGenreRepository
+	var b Browser
+
+	BeforeSuite(func() {
+		repo = &mockGenreRepository{data: model.Genres{
+			{Name: "Rock", SongCount: 1000, AlbumCount: 100},
+			{Name: "", SongCount: 13, AlbumCount: 13},
+			{Name: "Electronic", SongCount: 4000, AlbumCount: 40},
+		}}
+		b = &browser{genreRepo: repo}
+	})
+
+	It("returns sorted data", func() {
+		Expect(b.GetGenres()).To(Equal(model.Genres{
+			{Name: "<Empty>", SongCount: 13, AlbumCount: 13},
+			{Name: "Electronic", SongCount: 4000, AlbumCount: 40},
+			{Name: "Rock", SongCount: 1000, AlbumCount: 100},
+		}))
+	})
+
+	It("bubbles up errors", func() {
+		repo.err = errors.New("generic error")
+		_, err := b.GetGenres()
+		Expect(err).ToNot(BeNil())
+	})
+})
+
+type mockGenreRepository struct {
+	data model.Genres
+	err  error
+}
+
+func (r *mockGenreRepository) GetAll() (model.Genres, error) {
+	if r.err != nil {
+		return nil, r.err
+	}
+	return r.data, nil
+}

engine/engine_suite_test.go

@@ -0,0 +1,15 @@
+package engine
+
+import (
+	"testing"
+
+	"github.com/cloudsonic/sonic-server/log"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+func TestPersistence(t *testing.T) {
+	log.SetLevel(log.LevelCritical)
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Persistence Suite")
+}