[API-69] Implement managed users endpoint

api/dbv1/managers.go

@@ -0,0 +1,92 @@
+package dbv1
+
+import (
+	"context"
+)
+
+type FullManagerGrant struct {
+	GetGrantsForUserIdRow
+	GranteeUserID *struct{} `json:"grantee_user_id,omitempty"`
+}
+
+type FullManagedUserGrant struct {
+	GetGrantsForGranteeUserIdRow
+	GranteeUserID *struct{} `json:"grantee_user_id,omitempty"`
+}
+
+type FullManager struct {
+	Manager FullUser         `json:"manager"`
+	Grant   FullManagerGrant `json:"grant"`
+}
+
+type FullManagedUser struct {
+	User  FullUser             `json:"user"`
+	Grant FullManagedUserGrant `json:"grant"`
+}
+
+func (q *Queries) FullManagers(ctx context.Context, params GetGrantsForUserIdParams) ([]FullManager, error) {
+
+	grants, err := q.GetGrantsForUserId(ctx, params)
+	if err != nil {
+		return nil, err
+	}
+
+	user_ids := make([]int32, len(grants))
+	for i, grant := range grants {
+		user_ids[i] = int32(grant.GranteeUserID)
+	}
+
+	users, err := q.FullUsersKeyed(ctx, GetUsersParams{
+		Ids:  user_ids,
+		MyID: params.UserID,
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	managers := make([]FullManager, len(grants))
+	for i, grant := range grants {
+		managers[i] = FullManager{
+			Manager: users[int32(grant.GranteeUserID)],
+			Grant:   FullManagerGrant{GetGrantsForUserIdRow: grant},
+		}
+	}
+
+	return managers, nil
+}
+
+func (q *Queries) FullManagedUsers(ctx context.Context, params GetGrantsForGranteeUserIdParams) ([]FullManagedUser, error) {
+	grants, err := q.GetGrantsForGranteeUserId(ctx, GetGrantsForGranteeUserIdParams{
+		IsRevoked:  params.IsRevoked,
+		IsApproved: params.IsApproved,
+		UserID:     params.UserID,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	user_ids := make([]int32, len(grants))
+	for i, grant := range grants {
+		user_ids[i] = int32(grant.UserID)
+	}
+
+	users, err := q.FullUsersKeyed(ctx, GetUsersParams{
+		Ids:  user_ids,
+		MyID: params.UserID,
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	managedUsers := make([]FullManagedUser, len(grants))
+	for i, grant := range grants {
+		managedUsers[i] = FullManagedUser{
+			User:  users[int32(grant.UserID)],
+			Grant: FullManagedUserGrant{GetGrantsForGranteeUserIdRow: grant},
+		}
+	}
+
+	return managedUsers, nil
+}

api/dbv1/queries/get_grants.sql

@@ -12,10 +12,9 @@ JOIN users u ON u.wallet = g.grantee_address
 WHERE g.user_id = @user_id::int
   AND g.is_revoked = @is_revoked
   AND g.is_current = true
-  AND sqlc.narg('is_approved')::boolean IS NULL OR g.is_approved = sqlc.narg('is_approved')
-ORDER BY g.created_at DESC;
+  AND (g.is_approved = sqlc.narg('is_approved') OR sqlc.narg('is_approved') IS NULL);
 
--- name: GetGrantsForGranteeAddress :many
+-- name: GetGrantsForGranteeUserId :many
 SELECT
   g.user_id,
   g.grantee_address,
@@ -24,10 +23,9 @@ SELECT
   g.created_at,
   g.updated_at,
   u.user_id as grantee_user_id
-FROM grants g
-JOIN users u ON u.wallet = g.grantee_address
-WHERE g.grantee_address = @grantee_address
+FROM users u
+JOIN grants g ON g.grantee_address = u.wallet
+WHERE u.user_id = @user_id::int
   AND g.is_current = true
   AND g.is_revoked = @is_revoked
-  AND sqlc.narg('is_approved')::boolean IS NULL OR g.is_approved = sqlc.narg('is_approved')
-ORDER BY g.created_at DESC;
+  AND (g.is_approved = sqlc.narg('is_approved') OR sqlc.narg('is_approved') IS NULL);

api/server.go

@@ -226,6 +226,7 @@ func NewApiServer(config config.Config) *ApiServer {
 		g.Get("/users/:userId/library/tracks", app.v1UsersLibraryTracks)
 		g.Get("/users/:userId/library/:playlistType", app.v1UsersLibraryPlaylists)
 		g.Get("/users/:userId/managers", app.v1UsersManagers)
+		g.Get("/users/:userId/managed_users", app.v1UsersManagedUsers)
 		g.Get("/users/:userId/mutuals", app.v1UsersMutuals)
 		g.Get("/users/:userId/reposts", app.v1UsersReposts)
 		g.Get("/users/:userId/related", app.v1UsersRelated)

api/server_test.go

@@ -119,6 +119,7 @@ func Test200UnAuthed(t *testing.T) {
 		"/v1/full/users/7eP5n/library/albums?type=purchase&sort_method=saves",
 
 		"/v1/full/users/7eP5n/managers",
+		"/v1/full/users/7eP5n/managed_users",
 		"/v1/full/users/7eP5n/mutuals",
 		"/v1/full/users/7eP5n/reposts",
 		"/v1/full/users/7eP5n/related",

api/testdata/grants_fixtures.csv

@@ -3,3 +3,6 @@ user_id,grantee_address,is_approved,is_revoked
 1,0xc451c1f8943b575158310552b41230c61844a1c1,false,true
 1,0x1234567890abcdef,true,true
 1,0x681c616ae836ceca1effe00bd07f2fdbf9a082bc,false,false
+2,0x681c616ae836ceca1effe00bd07f2fdbf9a082bc,true,false
+3,0x681c616ae836ceca1effe00bd07f2fdbf9a082bc,true,true
+4,0x681c616ae836ceca1effe00bd07f2fdbf9a082bc,false,true

api/v1_users_managed_users.go

@@ -0,0 +1,41 @@
+package api
+
+import (
+	"strconv"
+
+	"bridgerton.audius.co/api/dbv1"
+	"github.com/gofiber/fiber/v2"
+	"github.com/jackc/pgx/v5/pgtype"
+)
+
+func (app *ApiServer) v1UsersManagedUsers(c *fiber.Ctx) error {
+	// Behavior of this field is a little odd. We only want to filter by it
+	// if it is passed, but otherwise not use a default value for either.
+	var isApproved *bool
+	if approvedStr := c.Query("is_approved"); approvedStr != "" {
+		parsed, err := strconv.ParseBool(approvedStr)
+		if err != nil {
+			return fiber.NewError(fiber.StatusBadRequest, "Invalid value for is_approved")
+		}
+		isApproved = &parsed
+	}
+
+	isRevoked, err := strconv.ParseBool(c.Query("is_revoked", "false"))
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid value for is_revoked")
+	}
+	params := dbv1.GetGrantsForGranteeUserIdParams{
+		UserID:     int32(c.Locals("userId").(int)),
+		IsApproved: pgtype.Bool{Bool: isApproved != nil && *isApproved, Valid: isApproved != nil},
+		IsRevoked:  isRevoked,
+	}
+
+	managedUsers, err := app.queries.FullManagedUsers(c.Context(), params)
+	if err != nil {
+		return err
+	}
+
+	return c.JSON(fiber.Map{
+		"data": managedUsers,
+	})
+}

api/v1_users_managed_users_test.go

@@ -0,0 +1,61 @@
+package api
+
+import (
+	"testing"
+
+	"bridgerton.audius.co/api/dbv1"
+	"github.com/stretchr/testify/assert"
+)
+
+// Defaults to all approval status and no revoked managers
+func TestGetManagedUsersNoParams(t *testing.T) {
+	var managedUsersResponse struct {
+		Data []dbv1.FullManagedUser
+	}
+	status, _ := testGet(t, "/v1/users/eYZmn/managed_users", &managedUsersResponse)
+	assert.Equal(t, 200, status)
+	assert.Equal(t, 2, len(managedUsersResponse.Data))
+
+	assert.Equal(t, 1, int(managedUsersResponse.Data[0].User.ID))
+	assert.Equal(t, false, managedUsersResponse.Data[0].Grant.IsApproved.Bool)
+	assert.Equal(t, 2, int(managedUsersResponse.Data[1].User.ID))
+	assert.Equal(t, true, managedUsersResponse.Data[1].Grant.IsApproved.Bool)
+}
+
+// Should return only approved managers and default to not showing revoked managers
+func TestGetManagedUsersApproved(t *testing.T) {
+	var managedUsersResponse struct {
+		Data []dbv1.FullManagedUser
+	}
+	status, _ := testGet(t, "/v1/users/eYZmn/managed_users?is_approved=true", &managedUsersResponse)
+	assert.Equal(t, 200, status)
+	assert.Equal(t, 1, len(managedUsersResponse.Data))
+	assert.Equal(t, 2, int(managedUsersResponse.Data[0].User.ID))
+	assert.Equal(t, true, managedUsersResponse.Data[0].Grant.IsApproved.Bool)
+}
+
+func TestGetManagedUsersRevoked(t *testing.T) {
+	var managedUsersResponse struct {
+		Data []dbv1.FullManagedUser
+	}
+	status, _ := testGet(t, "/v1/users/eYZmn/managed_users?is_revoked=true", &managedUsersResponse)
+	assert.Equal(t, 200, status)
+	assert.Equal(t, 2, len(managedUsersResponse.Data))
+	assert.Equal(t, 3, int(managedUsersResponse.Data[0].User.ID))
+	assert.Equal(t, true, managedUsersResponse.Data[0].Grant.IsApproved.Bool)
+	assert.Equal(t, true, managedUsersResponse.Data[0].Grant.IsRevoked)
+	assert.Equal(t, 4, int(managedUsersResponse.Data[1].User.ID))
+	assert.Equal(t, false, managedUsersResponse.Data[1].Grant.IsApproved.Bool)
+	assert.Equal(t, true, managedUsersResponse.Data[1].Grant.IsRevoked)
+}
+
+func TestGetManagedUsersInvalidParams(t *testing.T) {
+	var managedUsersResponse struct {
+		Data []dbv1.FullManagedUser
+	}
+	status, _ := testGet(t, "/v1/users/eYZmn/managed_users?is_approved=invalid", &managedUsersResponse)
+	assert.Equal(t, 400, status)
+
+	status, _ = testGet(t, "/v1/users/eYZmn/managed_users?is_revoked=invalid", &managedUsersResponse)
+	assert.Equal(t, 400, status)
+}

api/v1_users_managers_test.go

@@ -29,7 +29,7 @@ func TestGetUsersManagersApproved(t *testing.T) {
 	}
 	status, _ := testGet(t, "/v1/users/7eP5n/managers?is_approved=true", &managersResponse)
 	assert.Equal(t, 200, status)
-	assert.Equal(t, 2, len(managersResponse.Data))
+	assert.Equal(t, 1, len(managersResponse.Data))
 	assert.Equal(t, "0x5f1a372b28956c8363f8bc3a231a6e9e1186ead8", managersResponse.Data[0].Manager.Wallet.String)
 	assert.Equal(t, true, managersResponse.Data[0].Grant.IsApproved.Bool)
 }
@@ -49,7 +49,7 @@ func TestGetUsersManagersRevoked(t *testing.T) {
 	assert.Equal(t, true, managersResponse.Data[1].Grant.IsRevoked)
 }
 
-func TestInvalidParams(t *testing.T) {
+func TestGetUsersManagersInvalidParams(t *testing.T) {
 	var managersResponse struct {
 		Data []dbv1.FullManager
 	}