Skip to content

Commit 718205e

Browse files
stereostevestereosteve
committed
use trashid.TrashId for user_id
1 parent 4880de2 commit 718205e

11 files changed

Lines changed: 97 additions & 40 deletions

‎api/dbv1/full_playlists.go‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010
type FullPlaylist struct {
1111
GetPlaylistsRow
1212

13-
ID string `json:"id"`
14-
Artwork *SquareImage `json:"artwork"`
15-
UserID string `json:"user_id"`
16-
User FullUser `json:"user"`
17-
Tracks []FullTrack `json:"tracks"`
13+
ID string `json:"id"`
14+
Artwork *SquareImage `json:"artwork"`
15+
UserID trashid.TrashId `json:"user_id"`
16+
User FullUser `json:"user"`
17+
Tracks []FullTrack `json:"tracks"`
1818

1919
FolloweeReposts []*FolloweeRepost `json:"followee_reposts"`
2020
FolloweeFavorites []*FolloweeFavorite `json:"followee_favorites"`
@@ -120,20 +120,20 @@ func (q *Queries) FullPlaylists(ctx context.Context, arg GetPlaylistsParams) ([]
120120
}
121121

122122
type MinPlaylist struct {
123-
ID string `json:"id"`
124-
PlaylistName pgtype.Text `json:"playlist_name"`
125-
PlaylistOwnerID int32 `json:"playlist_owner_id"`
126-
PlaylistID int32 `json:"playlist_id"`
127-
Artwork *SquareImage `json:"artwork"`
128-
Description *string `json:"description"`
129-
PlaylistContents interface{} `json:"playlist_contents"`
130-
IsAlbum bool `json:"is_album"`
131-
IsPrivate bool `json:"is_private"`
132-
FavoriteCount int32 `json:"favorite_count"`
133-
RepostCount int32 `json:"repost_count"`
134-
UserID string `json:"user_id"`
135-
User MinUser `json:"user"`
136-
Tracks []MinTrack `json:"tracks"`
123+
ID string `json:"id"`
124+
PlaylistName pgtype.Text `json:"playlist_name"`
125+
PlaylistOwnerID int32 `json:"playlist_owner_id"`
126+
PlaylistID int32 `json:"playlist_id"`
127+
Artwork *SquareImage `json:"artwork"`
128+
Description *string `json:"description"`
129+
PlaylistContents interface{} `json:"playlist_contents"`
130+
IsAlbum bool `json:"is_album"`
131+
IsPrivate bool `json:"is_private"`
132+
FavoriteCount int32 `json:"favorite_count"`
133+
RepostCount int32 `json:"repost_count"`
134+
UserID trashid.TrashId `json:"user_id"`
135+
User MinUser `json:"user"`
136+
Tracks []MinTrack `json:"tracks"`
137137
}
138138

139139
func ToMinPlaylist(fullPlaylist FullPlaylist) MinPlaylist {

‎api/dbv1/full_tracks.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ type FullTracksParams GetTracksParams
1414
type FullTrack struct {
1515
GetTracksRow
1616

17-
Permalink string `json:"permalink"`
18-
IsStreamable bool `json:"is_streamable"`
19-
Artwork *SquareImage `json:"artwork"`
20-
Stream *MediaLink `json:"stream"`
21-
Download *MediaLink `json:"download"`
22-
Preview *MediaLink `json:"preview"`
23-
UserID string `json:"user_id"`
24-
User FullUser `json:"user"`
17+
Permalink string `json:"permalink"`
18+
IsStreamable bool `json:"is_streamable"`
19+
Artwork *SquareImage `json:"artwork"`
20+
Stream *MediaLink `json:"stream"`
21+
Download *MediaLink `json:"download"`
22+
Preview *MediaLink `json:"preview"`
23+
UserID trashid.TrashId `json:"user_id"`
24+
User FullUser `json:"user"`
2525

2626
FolloweeReposts []*FolloweeRepost `json:"followee_reposts"`
2727
FolloweeFavorites []*FolloweeFavorite `json:"followee_favorites"`

‎api/dbv1/full_users.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func (q *Queries) FullUsersKeyed(ctx context.Context, arg GetUsersParams) (map[i
3232
user.PlaylistLibrary = []byte("null")
3333
}
3434

35-
user.ID, _ = trashid.EncodeHashId(int(user.UserID))
35+
// user.ID, _ = trashid.EncodeHashId(int(user.UserID))
3636

3737
// profile picture + cover photo
3838
var coverPhoto *RectangleImage
@@ -119,7 +119,7 @@ func squareImageStruct(maybeCids ...pgtype.Text) *SquareImage {
119119
}
120120

121121
type MinUser struct {
122-
ID string `json:"id"`
122+
ID trashid.TrashId `json:"id"`
123123
AlbumCount pgtype.Int8 `json:"album_count"`
124124
ArtistPickTrackID *string `json:"artist_pick_track_id"`
125125
Bio pgtype.Text `json:"bio"`

‎api/dbv1/get_users.sql.go‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/dbv1/models.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/dbv1/queries/get_users.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ SELECT
1111
follower_count,
1212
following_count as followee_count,
1313
handle,
14-
'hashid' as id,
15-
u.user_id,
14+
u.user_id as id,
15+
u.user_id::int as user_id,
1616
is_verified,
1717
twitter_handle,
1818
instagram_handle,

‎api/v1_playlists_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"testing"
55

66
"bridgerton.audius.co/api/dbv1"
7+
"bridgerton.audius.co/trashid"
78
"github.com/stretchr/testify/assert"
89
)
910

@@ -18,5 +19,5 @@ func TestPlaylistsEndpoint(t *testing.T) {
1819
pl := resp.Data[0]
1920
assert.Equal(t, pl.ID, "7eP5n")
2021
assert.Len(t, pl.Tracks, 2)
21-
assert.Equal(t, "ML51L", pl.Tracks[0].User.ID)
22+
assert.Equal(t, trashid.TrashId(2), pl.Tracks[0].User.ID)
2223
}

‎api/v1_playlists_trending.go‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
package api
2+
3+
import (
4+
"net/http"
5+
6+
"bridgerton.audius.co/api/dbv1"
7+
"github.com/gofiber/fiber/v2"
8+
"github.com/jackc/pgx/v5"
9+
)
10+
11+
func (app *ApiServer) v1PlaylistsTrending(c *fiber.Ctx) error {
12+
sql := `
13+
SELECT
14+
save_item_id as playlist_id
15+
-- count(distinct user_id) as save_count,
16+
-- sum(follower_count) as network_size
17+
FROM saves
18+
JOIN aggregate_user USING (user_id)
19+
WHERE save_type != 'track'
20+
AND saves.is_delete = false
21+
AND saves.created_at > NOW() - INTERVAL '7 days'
22+
GROUP BY playlist_id
23+
ORDER BY sum(follower_count) DESC
24+
LIMIT @limit
25+
`
26+
27+
rows, err := app.pool.Query(c.Context(), sql, pgx.NamedArgs{
28+
"limit": c.Query("limit", "50"),
29+
})
30+
if err != nil {
31+
return err
32+
}
33+
34+
ids, err := pgx.CollectRows(rows, pgx.RowTo[int32])
35+
if err != nil {
36+
return err
37+
}
38+
39+
playlists, err := app.queries.FullPlaylists(c.Context(), dbv1.GetPlaylistsParams{
40+
Ids: ids,
41+
MyID: app.getMyId(c),
42+
})
43+
44+
return c.Status(http.StatusOK).JSON(fiber.Map{
45+
"data": playlists,
46+
})
47+
}

‎api/v1_user_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"testing"
66

77
"bridgerton.audius.co/api/dbv1"
8+
"bridgerton.audius.co/trashid"
89
"github.com/stretchr/testify/assert"
910
)
1011

@@ -23,5 +24,5 @@ func TestGetUser(t *testing.T) {
2324

2425
// but we also unmarshaled into userResponse
2526
// for structured testing
26-
assert.Equal(t, userResponse.Data[0].ID, "7eP5n")
27+
assert.Equal(t, userResponse.Data[0].ID, trashid.TrashId(1))
2728
}

‎api/v1_users_test.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func TestUserQuery(t *testing.T) {
1919
require.Len(t, users, 1)
2020
user := users[0]
2121
assert.Equal(t, int32(1), user.UserID)
22-
assert.Equal(t, "7eP5n", user.ID)
22+
// assert.Equal(t, "7eP5n", user.ID)
2323
assert.Equal(t, "rayjacobson", user.Handle.String)
2424
assert.False(t, user.DoesCurrentUserFollow)
2525
assert.False(t, user.DoesFollowCurrentUser)
@@ -79,7 +79,9 @@ func TestGetUsers(t *testing.T) {
7979

8080
// but we also unmarshaled into userResponse
8181
// for structured testing
82-
assert.Equal(t, userResponse.Data[0].ID, "7eP5n")
82+
// update: this actually gets decoded back to an int in go memory
83+
// even tho it's hashid in the json...
84+
// assert.Equal(t, userResponse.Data[0].ID, "7eP5n")
8385
}
8486

8587
func TestFollowerEndpoint(t *testing.T) {
@@ -89,5 +91,5 @@ func TestFollowerEndpoint(t *testing.T) {
8991

9092
status, _ := testGet(t, "/v1/full/users/7eP5n/followers", &userResponse)
9193
assert.Equal(t, 200, status)
92-
assert.Equal(t, userResponse.Data[0].ID, "ML51L")
94+
// assert.Equal(t, userResponse.Data[0].ID, "ML51L")
9395
}

0 commit comments

Comments
 (0)