X-Git-Url: https://git.jacobcasper.com/?p=brackets.git;a=blobdiff_plain;f=routes%2Fartist%2Fartist.go;h=d26f66d5bbbaf7eca8c778f3f5edbb0a9d258aa1;hp=09788ada7a0d8e0e83ba6d57944e5fb1520cf9b3;hb=30baa977ecf2af70a4be2b7ea49cc7ceefa3e4c5;hpb=47d8493fa8fc92295ad04b93ab38bca70b8b6dc2

diff --git a/routes/artist/artist.go b/routes/artist/artist.go
index 09788ad..d26f66d 100644
--- a/routes/artist/artist.go
+++ b/routes/artist/artist.go
@@ -1,6 +1,7 @@
 package artist
 
 import (
+	"database/sql"
 	"encoding/json"
 	"git.jacobcasper.com/brackets/env"
 	"git.jacobcasper.com/brackets/routes"
@@ -22,8 +23,13 @@ func Index(env *env.Env) routes.Handler {
 		artistId := r.FormValue("id")
 		if artistId != "" {
 			artist := types.Artist{}
-			row := env.Db.Db.QueryRow("SELECT ID, NAME FROM ARTIST WHERE ID = ?", artistId)
-			if err := row.Scan(&artist.ID, &artist.Name); err != nil {
+			row := env.Db.Db.QueryRow(`
+SELECT ID, NAME, POPULARITY
+FROM ARTIST
+WHERE ID = ?`,
+				artistId,
+			)
+			if err := row.Scan(&artist.ID, &artist.Name, &artist.Popularity); err != nil {
 				http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 				return
 			}
@@ -37,7 +43,11 @@ func Index(env *env.Env) routes.Handler {
 			return
 		}
 
-		rows, err := env.Db.Db.Query("SELECT ID, NAME FROM ARTIST LIMIT 20")
+		rows, err := env.Db.Db.Query(`
+SELECT ID, NAME, POPULARITY
+FROM ARTIST
+LIMIT 20`,
+		)
 		if err != nil {
 			http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 			return
@@ -47,7 +57,7 @@ func Index(env *env.Env) routes.Handler {
 		artists := make([]types.Artist, 0)
 		for rows.Next() {
 			artist := types.Artist{}
-			if err := rows.Scan(&artist.ID, &artist.Name); err != nil {
+			if err := rows.Scan(&artist.ID, &artist.Name, &artist.Popularity); err != nil {
 				http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 				return
 			}
@@ -92,25 +102,106 @@ func Add(env *env.Env) routes.Handler {
 
 		env.Db.Mu.Lock()
 		defer env.Db.Mu.Unlock()
-		env.Db.Db.Exec("INSERT INTO ARTIST (ID, NAME) VALUES (?, ?)", artist.ID, artist.Name)
+		env.Db.Db.Exec(`
+INSERT INTO ARTIST
+(ID, NAME, POPULARITY)
+VALUES (?, ?, ?)`,
+			artist.ID,
+			artist.Name,
+			artist.Popularity,
+		)
 
 		for _, genre := range artist.Genres {
-			result, err := env.Db.Db.Exec("INSERT OR IGNORE INTO GENRE (NAME) VALUES (?)", genre)
+			var genreId int64
+			row := env.Db.Db.QueryRow(`
+SELECT ID
+FROM GENRE
+WHERE NAME = lower(?)
+`,
+				genre,
+			)
+
+			err := row.Scan(&genreId)
+			if err == sql.ErrNoRows {
+				result, err := env.Db.Db.Exec(`
+INSERT INTO GENRE
+(NAME)
+VALUES (?)`,
+					genre,
+				)
+				if err != nil {
+					log.Printf("Failed to insert genre %s: %s", genre, err.Error())
+					http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+					return
+				}
+
+				genreId, err = result.LastInsertId()
+				if err != nil {
+					log.Print("Failed to retrieve last insert id: ", err.Error())
+					http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+					return
+				}
+			}
+
+			env.Db.Db.Exec(`
+INSERT INTO ARTIST_GENRE_XREF
+(ARTIST_ID, GENRE_ID)
+VALUES (?, ?)`,
+				artist.ID,
+				genreId,
+			)
+		}
+		w.WriteHeader(http.StatusCreated)
+	}
+}
+
+func ByGenre(env *env.Env) routes.Handler {
+	return func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != "GET" {
+			http.Error(w, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed)
+			return
+		}
+
+		w.Header().Set("Content-Type", "application/json")
+		genreName := r.FormValue("genre_name")
+		if genreName != "" {
+			rows, err := env.Db.Db.Query(`
+SELECT a.ID, a.NAME
+FROM ARTIST a
+JOIN ARTIST_GENRE_XREF x ON a.ID = x.ARTIST_ID
+JOIN GENRE g ON g.ID = x.GENRE_ID
+WHERE g.NAME = lower(?)
+`,
+				genreName,
+			)
 			if err != nil {
-				log.Printf("Failed to insert genre %s: %s", genre, err.Error())
+				log.Print(err)
 				http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 				return
 			}
+			defer rows.Close()
 
-			genreId, err := result.LastInsertId()
+			artists := make([]types.Artist, 0)
+			for rows.Next() {
+				artist := types.Artist{}
+				if err := rows.Scan(&artist.ID, &artist.Name, &artist.Popularity); err != nil {
+					http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+					return
+				}
+				artists = append(artists, artist)
+			}
+			if err = rows.Err(); err != nil {
+				log.Print(err)
+				http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+				return
+			}
+			b, err := json.Marshal(artists)
 			if err != nil {
-				log.Print("Failed to retrieve last insert id: ", err.Error())
+				log.Print(err)
 				http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 				return
 			}
-
-			env.Db.Db.Exec("INSERT INTO ARTIST_GENRE_XREF (ARTIST_ID, GENRE_ID) VALUES (?, ?)", artist.ID, genreId)
+			w.Write(b)
 		}
-		w.WriteHeader(http.StatusCreated)
 	}
 }