Fix genre_xrefs not being created if genre already existed

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

diff --git a/routes/artist/artist.go b/routes/artist/artist.go
index cc09563..a62a282 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"
@@ -95,22 +96,76 @@ func Add(env *env.Env) routes.Handler {
                env.Db.Db.Exec("INSERT INTO ARTIST (ID, NAME) VALUES (?, ?)", artist.ID, artist.Name)
 
                for _, genre := range artist.Genres {
-                       result, err := env.Db.Db.Exec("REPLACE 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 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)
                        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); 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)
        }
 }