move query logic into queries folder

Author: schottra

api/dbv1/full_account.go

@@ -0,0 +1,58 @@
+package dbv1
+
+import (
+	"context"
+	"encoding/json"
+
+	"github.com/jackc/pgx/v5"
+)
+
+type FullAccount struct {
+	User            FullUser              `json:"user"`
+	Playlists       []FullAccountPlaylist `json:"playlists"`
+	PlaylistLibrary json.RawMessage       `json:"playlist_library"`
+	TrackSaveCount  int64                 `json:"track_save_count"`
+}
+
+func (q *Queries) FullAccount(ctx context.Context, wallet string) (*FullAccount, error) {
+	// resolve wallet to user id
+	userId, err := q.GetUserForWallet(ctx, wallet)
+
+	if err != nil {
+		return nil, err
+	}
+
+	users, err := q.FullUsers(ctx, GetUsersParams{
+		Ids:  []int32{userId},
+		MyID: userId,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	if len(users) == 0 {
+		// todo: better error? Need a 404 for this
+		return nil, pgx.ErrNoRows
+	}
+
+	playlists, err := q.FullAccountPlaylists(ctx, userId)
+	if err != nil {
+		return nil, err
+	}
+
+	// Extract playlist_library from user record
+	playlistLibrary := users[0].PlaylistLibrary
+	trackSaveCount := users[0].TrackSaveCount
+	// Create a copy of the user without playlist_library/track_save_count as
+	// they are deprecated fields and we will return them as siblings
+	userWithoutLibrary := users[0]
+	userWithoutLibrary.PlaylistLibrary = nil
+	userWithoutLibrary.TrackSaveCount = nil
+
+	return &FullAccount{
+		User:            userWithoutLibrary,
+		Playlists:       playlists,
+		PlaylistLibrary: playlistLibrary,
+		TrackSaveCount:  *trackSaveCount,
+	}, nil
+}

api/dbv1/get_account_playlists.sql.go

@@ -31,4 +31,4 @@ WHERE (
         AND p.is_delete = FALSE
         AND p.playlist_id IN (SELECT save_item_id FROM saved_playlists))
 )
-ORDER BY created_at DESC;
+ORDER BY p.created_at DESC;

api/dbv1/get_user_for_wallet.sql.go

@@ -0,0 +1,7 @@
+-- name: GetUserForWallet :one
+SELECT user_id FROM users
+WHERE
+    wallet = lower(@wallet)
+    AND is_current = true
+ORDER BY handle IS NOT NULL, created_at ASC
+LIMIT 1;

api/dbv1/queries/get_account_playlists.sql

@@ -1,68 +1,22 @@
 package api
 
 import (
-	"bridgerton.audius.co/api/dbv1"
 	"github.com/gofiber/fiber/v2"
 )
 
 // todo: in python this route requires auth
 func (app *ApiServer) v1UsersAccount(c *fiber.Ctx) error {
-	// resolve wallet to user id
-	var userId int32
-
-	// todo: this is a duplicate of the authMiddleware, make it common?
-	err := app.pool.QueryRow(
-		c.Context(),
-		`
-		SELECT user_id FROM users
-		WHERE
-			wallet = lower($1)
-			AND is_current = true
-		ORDER BY handle IS NOT NULL, created_at ASC
-		LIMIT 1
-		`,
-		c.Params("wallet"),
-	).Scan(&userId)
-
-	if err != nil {
-		return err
+	wallet := c.Params("wallet")
+	if wallet == "" {
+		return fiber.NewError(fiber.StatusBadRequest, "Missing wallet parameter")
 	}
 
-	users, err := app.queries.FullUsers(c.Context(), dbv1.GetUsersParams{
-		Ids:  []int32{userId},
-		MyID: userId,
-	})
+	account, err := app.queries.FullAccount(c.Context(), wallet)
 	if err != nil {
 		return err
 	}
-	if len(users) == 0 {
-		return sendError(c, 404, "wallet not found")
-	}
-
-	playlists, err := app.queries.FullAccountPlaylists(c.Context(), userId)
-	if err != nil {
-		return err
-	}
-
-	// Extract playlist_library from user record
-	playlistLibrary := users[0].PlaylistLibrary
-	trackSaveCount := users[0].TrackSaveCount
-	// Create a copy of the user without playlist_library/track_save_count as
-	// they are deprecated fields and we will return them as siblings
-	userWithoutLibrary := users[0]
-	userWithoutLibrary.PlaylistLibrary = nil
-	userWithoutLibrary.TrackSaveCount = nil
 
-	// this route does not have a non-full version...
-	// and also nests user under data.user
-	// and there are some additional fields
-	// so we don't use the v1UserResponse helper
 	return c.JSON(fiber.Map{
-		"data": fiber.Map{
-			"track_save_count": trackSaveCount,
-			"playlists":        playlists,
-			"playlist_library": playlistLibrary,
-			"user":             userWithoutLibrary,
-		},
+		"data": account,
 	})
 }