More getMusicDirectory

api/get_music_directory.go

@@ -30,15 +30,30 @@ func (c *GetMusicDirectoryController) Get() {
 		c.SendError(responses.ERROR_GENERIC, "Internal Error")
 	}
 
+	dir := &responses.Directory{}
 	if found {
-		_, err := c.artistRepo.Get(id)
-		if err != nil {
-			beego.Error("Error reading Artist from DB", err)
-			c.SendError(responses.ERROR_GENERIC, "Internal Error")
-		}
+		a, _:= c.retrieveArtist(id)
+
+		dir.Id = a.Id
+		dir.Name = a.Name
+	} else {
+		beego.Info("Artist", id, "not found")
+		c.SendError(responses.ERROR_DATA_NOT_FOUND, "Directory not found")
 	}
 
 	response := c.NewEmpty()
-	response.Directory = &responses.Directory{}
+	response.Directory = dir
 	c.SendResponse(response)
 }
+
+func (c *GetMusicDirectoryController) retrieveArtist(id string) (a *domain.Artist, as[]domain.Album) {
+	var err error
+
+	if a, err = c.artistRepo.Get(id); err != nil {
+		beego.Error("Error reading Artist from DB", err)
+		c.SendError(responses.ERROR_GENERIC, "Internal Error")
+	}
+
+	as = make([]domain.Album, 0)
+	return
+}

api/get_music_directory_test.go

@@ -14,13 +14,13 @@ import (
 func TestGetMusicDirectory(t *testing.T) {
 	Init(t, false)
 
-	mockRepo := mocks.CreateMockArtistRepo()
+	mockArtistRepo := mocks.CreateMockArtistRepo()
 	utils.DefineSingleton(new(domain.ArtistRepository), func() domain.ArtistRepository {
-		return mockRepo
+		return mockArtistRepo
 	})
 
-	mockRepo.SetData("[]")
-	mockRepo.SetError(false)
+	mockArtistRepo.SetData("[]", 0)
+	mockArtistRepo.SetError(false)
 
 	Convey("Subject: GetMusicDirectory Endpoint", t, func() {
 		Convey("Should fail if missing Id parameter", func() {
@@ -30,11 +30,27 @@ func TestGetMusicDirectory(t *testing.T) {
 		})
 		Convey("Id is for an artist", func() {
 			Convey("Return fail on Artist Table error", func() {
-				mockRepo.SetError(true)
+				mockArtistRepo.SetError(true)
 				_, w := Get(AddParams("/rest/getMusicDirectory.view", "id=1"), "TestGetMusicDirectory")
 
 				So(w.Body, ShouldReceiveError, responses.ERROR_GENERIC)
 			})
 		})
+		Convey("When id is not found", func() {
+			mockArtistRepo.SetData(`[{"Id":"1","Name":"The Charlatans"}]`, 1)
+			_, w := Get(AddParams("/rest/getMusicDirectory.view", "id=NOT_FOUND"), "TestGetMusicDirectory")
+
+			So(w.Body, ShouldReceiveError, responses.ERROR_DATA_NOT_FOUND)
+		})
+		Convey("When id matches an artist without albums", func() {
+			mockArtistRepo.SetData(`[{"Id":"1","Name":"The KLF"}]`, 1)
+			_, w := Get(AddParams("/rest/getMusicDirectory.view", "id=1"), "TestGetMusicDirectory")
+
+			So(w.Body, ShouldContainJSON, `"id":"1","name":"The KLF"`)
+		})
+		Reset(func() {
+			mockArtistRepo.SetData("[]", 0)
+			mockArtistRepo.SetError(false)
+		})
 	})
 }