Add trending tests

Author: raymondjacobson

api/fixture_test.go

@@ -105,6 +105,16 @@ var (
 		"updated_at":  time.Now(),
 		"image_url":   nil,
 	}
+
+	trackTrendingScoreBaseRow = map[string]any{
+		"track_id":   nil,
+		"type":       "TRACKS",
+		"genre":      nil,
+		"version":    "pnagD",
+		"time_range": nil,
+		"score":      nil,
+		"created_at": time.Now(),
+	}
 )
 
 func insertFixtures(table string, baseRow map[string]any, csvFile string) {

api/server_test.go

@@ -67,6 +67,7 @@ func TestMain(m *testing.M) {
 	insertFixtures("follows", followBaseRow, "testdata/follow_fixtures.csv")
 	insertFixtures("reposts", repostBaseRow, "testdata/repost_fixtures.csv")
 	insertFixtures("developer_apps", developerAppBaseRow, "testdata/developer_app_fixtures.csv")
+	insertFixtures("track_trending_scores", trackTrendingScoreBaseRow, "testdata/track_trending_scores_fixtures.csv")
 
 	// index to es / os
 

api/testdata/track_fixtures.csv

@@ -1,6 +1,7 @@
-track_id,owner_id,title,is_unlisted,stream_conditions,download_conditions
-200,2,Culca Canyon,f,,
-201,2,Turkey Time DEMO,t,,
-300,3,Follow Gated Download,f,,"{""follow_user_id"": 3}"
-301,3,Pay Gated Download,f,,"{""usdc_purchase"": {""price"": 135, ""splits"": [{""user_id"": 3, ""percentage"": 100.0}]}}"
-302,3,Tip Gated Stream,f," {""tip_user_id"": 859175075}",
+track_id,genre,owner_id,title,is_unlisted,stream_conditions,download_conditions
+200,Electronic,2,Culca Canyon,f,,
+201,Alternative,2,Turkey Time DEMO,t,,
+202,Alternative,2,Turkey Time (live),f,,
+300,Electronic,3,Follow Gated Download,f,,"{""follow_user_id"": 3}"
+301,Electronic,3,Pay Gated Download,f,,"{""usdc_purchase"": {""price"": 135, ""splits"": [{""user_id"": 3, ""percentage"": 100.0}]}}"
+302,Electronic,3,Tip Gated Stream,f," {""tip_user_id"": 859175075}",

api/testdata/track_trending_scores_fixtures.csv

@@ -0,0 +1,7 @@
+track_id,genre,time_range,score
+200,Electronic,week,1.0
+200,Electronic,allTime,5.0
+201,Alternative,week,2.0
+202,Alternative,week,2.0
+300,Electronic,week,3.0
+300,Electronic,allTime,3.0

api/v1_trending.go

@@ -9,6 +9,7 @@ import (
 func (app *ApiServer) v1Trending(c *fiber.Ctx) error {
 	myId := c.Locals("myId")
 
+	// SQL query with conditional genre filter
 	sql := `
 	SELECT track_trending_scores.track_id
 	FROM track_trending_scores
@@ -19,18 +20,20 @@ func (app *ApiServer) v1Trending(c *fiber.Ctx) error {
 		AND tracks.is_available = true
 	WHERE type = 'TRACKS'
 		AND version = 'pnagD'
-		AND time_range = 'week'
+		AND time_range = @timeRange
+		AND (@genre = '' OR track_trending_scores.genre = @genre)
 	ORDER BY
 		score DESC,
 		track_id DESC
 	LIMIT @limit
 	OFFSET @offset
 	`
 
-	args := pgx.NamedArgs{
-		"limit":  100,
-		"offset": 0,
-	}
+	args := pgx.NamedArgs{}
+	args["limit"] = c.Query("limit", "100")
+	args["offset"] = c.Query("offset", "0")
+	args["timeRange"] = c.Query("timeRange", "week")
+	args["genre"] = c.Query("genre", "")
 
 	rows, err := app.pool.Query(c.Context(), sql, args)
 	if err != nil {

api/v1_trending_test.go

@@ -0,0 +1,54 @@
+package api
+
+import (
+	"testing"
+
+	"bridgerton.audius.co/api/dbv1"
+	"bridgerton.audius.co/trashid"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGetTrending(t *testing.T) {
+	var resp struct {
+		Data []dbv1.FullTrack
+	}
+	status, _ := testGet(t, "/v1/tracks/trending", &resp)
+	assert.Equal(t, 200, status)
+
+	assert.Equal(t, trashid.MustEncodeHashID(300), resp.Data[0].ID)
+	assert.Equal(t, "Electronic", resp.Data[0].Genre.String)
+
+	assert.Equal(t, trashid.MustEncodeHashID(202), resp.Data[1].ID)
+	assert.Equal(t, "Alternative", resp.Data[1].Genre.String)
+
+	assert.Equal(t, trashid.MustEncodeHashID(200), resp.Data[2].ID)
+	assert.Equal(t, "Electronic", resp.Data[2].Genre.String)
+}
+
+func TestGetTrendingElectronic(t *testing.T) {
+	var resp struct {
+		Data []dbv1.FullTrack
+	}
+	status, _ := testGet(t, "/v1/tracks/trending?genre=Electronic", &resp)
+	assert.Equal(t, 200, status)
+
+	assert.Equal(t, "eYRWn", resp.Data[0].ID)
+	assert.Equal(t, "Electronic", resp.Data[0].Genre.String)
+
+	assert.Equal(t, "eYJyn", resp.Data[1].ID)
+	assert.Equal(t, "Electronic", resp.Data[1].Genre.String)
+}
+
+func TestGetTrendingAllTime(t *testing.T) {
+	var resp struct {
+		Data []dbv1.FullTrack
+	}
+	status, _ := testGet(t, "/v1/tracks/trending?timeRange=allTime", &resp)
+	assert.Equal(t, 200, status)
+
+	assert.Equal(t, "eYJyn", resp.Data[0].ID)
+	assert.Equal(t, "Electronic", resp.Data[0].Genre.String)
+
+	assert.Equal(t, "eYRWn", resp.Data[1].ID)
+	assert.Equal(t, "Electronic", resp.Data[1].Genre.String)
+}