From eb57f3fb833f14a5414bc6c5670182fa0cbed734 Mon Sep 17 00:00:00 2001
From: froge <froge@git.repo.cafe>
Date: Wed, 12 Feb 2025 13:00:12 +1000
Subject: [PATCH] Added better route test cases and some minor cleanup

---
 auth_test.go   | 19 +++++++++++++++++++
 database.go    |  4 +++-
 main.go        |  2 +-
 routes_test.go |  4 ++--
 4 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 auth_test.go

diff --git a/auth_test.go b/auth_test.go
new file mode 100644
index 0000000..d3c9bd6
--- /dev/null
+++ b/auth_test.go
@@ -0,0 +1,19 @@
+package main
+
+import (
+	"testing"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestgetSpotifyAuthURL(t *testing.T) {
+	// The result of this call is a serialized SpotifyToken struct
+	// The data is dynamic so we can't easily check it but we validate types/fields
+	res, err := getSpotifyToken(spotifyClientID, spotifyClientSecret)
+	if err != nil {
+		assert.Fail(t, err.Error())
+	}
+	testRes := &SpotifyToken{AccessToken: "example", TokenType: "Bearer", ExpiresIn: 100}
+	assert.IsType(t, testRes, res)
+	// This should always be "Bearer" according to spotify docs
+	assert.Equal(t, "Bearer", res.TokenType)
+}
diff --git a/database.go b/database.go
index 7184cee..1c398b0 100644
--- a/database.go
+++ b/database.go
@@ -4,6 +4,7 @@ import (
     "gorm.io/driver/sqlite"
     "gorm.io/gorm"
 	"log/slog"
+	"fmt"
 ) 
 
 type ArtistProfile struct {
@@ -22,7 +23,8 @@ type Genre struct {
 func setupTestDatabase(name string) *gorm.DB  {
 	slog.Info("[GOMUSIC] Setting up new test database in memory")
 	// Open a named DB instance so each test has a clean environment
-	db, err := gorm.Open(sqlite.Open("file:test1?mode=memory&cache=shared"), &gorm.Config{})
+	dbName := fmt.Sprintf("file:%s?mode=memory&cache=shared", name)
+	db, err := gorm.Open(sqlite.Open(dbName), &gorm.Config{})
 	if err != nil {
 		panic("Failed to open database")
 	}
diff --git a/main.go b/main.go
index 6745fd6..c4d0f0f 100644
--- a/main.go
+++ b/main.go
@@ -34,7 +34,7 @@ func main() {
         slog.Warn("[GOMUSIC] No Spotify secret configured in 'SPOTIFY_SECRET' environment variable")
     }
 
-	var db = setupDatabase()
+	db := setupDatabase()
 	env := &Env{db: db}
     
 	// Router/middleware and server setup
diff --git a/routes_test.go b/routes_test.go
index 0908e29..7865917 100644
--- a/routes_test.go
+++ b/routes_test.go
@@ -45,9 +45,9 @@ func TestGetArtistByIDRoute(t *testing.T) {
 	assert.Equal(t, "Pitbull", spotifyResp.Name)
 
 	var artist ArtistProfile
-	dbResult := env.db.First(&artist)
+	dbResult := env.db.Take(&artist)
 	if dbResult.Error != nil {
-		assert.Fail(t, fmt.Sprintf("Failed to retrieve new info from test database: %s", err.Error()))
+		assert.Fail(t, "Failed to retrieve new info from test database")
 	}
 	
 	assert.Equal(t, "Pitbull", artist.Name)