Track artist popularity

[brackets.git] / routes / artist / artist.go

diff --git a/routes/artist/artist.go b/routes/artist/artist.go
index e6eb320..d26f66d 100644 (file)
--- 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,24 +102,54 @@ 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)
-                       if err != nil {
-                               log.Printf("Failed to insert genre %s: %s", genre, err.Error())
-                               http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-                               return
-                       }
+                       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
+                               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)
+                       env.Db.Db.Exec(`
+INSERT INTO ARTIST_GENRE_XREF
+(ARTIST_ID, GENRE_ID)
+VALUES (?, ?)`,
+                               artist.ID,
+                               genreId,
+                       )
                }
                w.WriteHeader(http.StatusCreated)
        }
@@ -125,7 +165,15 @@ func ByGenre(env *env.Env) routes.Handler {
                w.Header().Set("Content-Type", "application/json")
                genreName := r.FormValue("genre_name")
                if genreName != "" {
-                       rows, err := env.Db.Db.Query("SELECT ID, NAME FROM ARTIST WHERE ID IN (SELECT ARTIST_ID FROM ARTIST_GENRE_XREF WHERE GENRE_ID IN (SELECT ID FROM GENRE WHERE NAME = lower(?))) LIMIT 20", 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.Print(err)
                                http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
@@ -136,7 +184,7 @@ func ByGenre(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
                                }