Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions api/dbv1/full_events.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package dbv1

import (
"context"

"bridgerton.audius.co/trashid"
)

type FullEvent struct {
GetEventsRow

EventId trashid.HashId `json:"event_id"`
UserId trashid.HashId `json:"user_id"`
EntityId trashid.HashId `json:"entity_id"`
}

func (q *Queries) FullEventsKeyed(ctx context.Context, arg GetEventsParams) (map[int32]FullEvent, error) {
events, err := q.GetEvents(ctx, arg)
if err != nil {
return nil, err
}
eventMap := map[int32]FullEvent{}
for _, event := range events {
eventMap[int32(event.EventID)] = FullEvent{
GetEventsRow: event,
EventId: trashid.HashId(event.EventID),
UserId: trashid.HashId(event.UserID),
EntityId: trashid.HashId(event.EntityID.Int32),
}
}

return eventMap, nil
}

func (q *Queries) ToFullEvent(event GetEventsRow) FullEvent {
return FullEvent{
GetEventsRow: event,
EventId: trashid.HashId(event.EventID),
UserId: trashid.HashId(event.UserID),
EntityId: trashid.HashId(event.EntityID.Int32),
}
}
96 changes: 96 additions & 0 deletions api/dbv1/get_events.sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions api/dbv1/jsonb_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,8 @@ type FullRemixOfTrack struct {
type FullRemixOf struct {
Tracks []FullRemixOfTrack `json:"tracks"`
}

type EventData struct {
PrizeInfo string `json:"prize_info"`
Description string `json:"description"`
}
2 changes: 1 addition & 1 deletion api/dbv1/models.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions api/dbv1/queries/get_events.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
-- name: GetEvents :many
SELECT
event_id,
entity_type::event_entity_type,
user_id,
entity_id,
event_type::event_type,
end_date,
is_deleted,
created_at,
updated_at,
event_data
FROM events
WHERE
(@entity_ids::int[] = '{}' OR entity_id = ANY(@entity_ids::int[]))
AND (@entity_type::text = '' OR entity_type = @entity_type::event_entity_type)
AND (@event_type::text = '' OR event_type = @event_type::event_type)
AND (@filter_deleted::boolean IS NULL OR is_deleted = @filter_deleted)
ORDER BY created_at DESC, event_id ASC
LIMIT @limit_val
OFFSET @offset_val;
16 changes: 16 additions & 0 deletions api/fixture_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,22 @@ var (
"txhash": "0x1",
"blockhash": "0x2",
}

eventBaseRow = map[string]any{
"txhash": "0x1",
"blockhash": "0x2",
"blocknumber": 101,
"event_id": nil,
"entity_type": nil,
"user_id": nil,
"entity_id": nil,
"event_type": nil,
"end_date": time.Now().Add(time.Hour * 24 * 30),
"is_deleted": false,
"created_at": time.Now(),
"updated_at": time.Now(),
"event_data": nil,
}
)

func insertFixtures(table string, baseRow map[string]any, csvFile string) {
Expand Down
6 changes: 6 additions & 0 deletions api/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,12 @@ func NewApiServer(config config.Config) *ApiServer {

// Comments
g.Get("/comments/unclaimed_id", app.v1CommentsUnclaimedId)

// Events
g.Get("/events/unclaimed_id", app.v1EventsUnclaimedId)
g.Get("/events", app.v1Events)
g.Get("/events/all", app.v1Events)
g.Get("/events/entity", app.v1Events)
}

app.Static("/", "./static")
Expand Down
1 change: 1 addition & 0 deletions api/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ func TestMain(m *testing.M) {
insertFixtures("grants", grantBaseRow, "testdata/grants_fixtures.csv")
insertFixtures("comments", commentBaseRow, "testdata/comment_fixtures.csv")
insertFixtures("comment_threads", map[string]any{}, "testdata/comment_thread_fixtures.csv")
insertFixtures("events", eventBaseRow, "testdata/event_fixtures.csv")

// index to es / os

Expand Down
7 changes: 7 additions & 0 deletions api/testdata/event_fixtures.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
event_id,entity_type,user_id,entity_id,event_type,is_deleted
1,track,200,100,remix_contest,f
2,track,200,100,live_event,f
3,track,200,100,remix_contest,t
4,track,200,101,remix_contest,f
5,track,200,101,live_event,f
6,track,201,102,remix_contest,f
2 changes: 2 additions & 0 deletions api/testdata/user_fixtures.csv
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ user_id,handle,handle_lc,is_deactivated,wallet,playlist_library
100,authtest1,authtest1,f,0x681c616ae836ceca1effe00bd07f2fdbf9a082bc,
101,authtest2,authtest2,f,0xc451c1f8943b575158310552b41230c61844a1c1,
102,authtest3,authtest3,f,0x5f1a372b28956c8363f8bc3a231a6e9e1186ead8,
200,eventsuser,eventsuser,f,0xffffffffff,
201,eventsuser2,eventsuser2,f,0xffffffffff,
44 changes: 44 additions & 0 deletions api/v1_events.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package api

import (
"bridgerton.audius.co/api/dbv1"
"bridgerton.audius.co/trashid"
"github.com/gofiber/fiber/v2"
)

func (app *ApiServer) v1Events(c *fiber.Ctx) error {
limit := c.QueryInt("limit", 25)
offset := c.QueryInt("offset", 0)
eventType := c.Query("event_type", "")
entityType := c.Query("entity_type", "")
filterDeleted := c.QueryBool("filter_deleted", true)
entityIDs := queryMutli(c, "entity_id")

entityIds := []int32{}
for _, id := range entityIDs {
if id, err := trashid.DecodeHashId(id); err == nil {
entityIds = append(entityIds, int32(id))
}
}

recentEvents, err := app.queries.GetEvents(c.Context(), dbv1.GetEventsParams{
EntityIds: entityIds,
EventType: eventType,
EntityType: entityType,
LimitVal: int32(limit),
OffsetVal: int32(offset),
FilterDeleted: !filterDeleted,
})
if err != nil {
return err
}

data := []dbv1.FullEvent{}
for _, event := range recentEvents {
data = append(data, app.queries.ToFullEvent(event))
}

return c.JSON(fiber.Map{
"data": data,
})
}
53 changes: 53 additions & 0 deletions api/v1_events_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
package api

import (
"testing"

"bridgerton.audius.co/api/dbv1"
"bridgerton.audius.co/trashid"
"github.com/stretchr/testify/assert"
)

func TestGetEvents(t *testing.T) {
var eventsResponse struct {
Data []dbv1.FullEvent
}

status, body := testGet(t, "/v1/events", &eventsResponse)
assert.Equal(t, 200, status)

jsonAssert(t, body, map[string]string{
"data.0.event_id": trashid.MustEncodeHashID(1),
"data.0.entity_id": trashid.MustEncodeHashID(100),

"data.1.event_id": trashid.MustEncodeHashID(2),
"data.1.entity_id": trashid.MustEncodeHashID(100),

"data.2.event_id": trashid.MustEncodeHashID(4),
"data.2.entity_id": trashid.MustEncodeHashID(101),

"data.3.event_id": trashid.MustEncodeHashID(5),
"data.3.entity_id": trashid.MustEncodeHashID(101),

"data.4.event_id": trashid.MustEncodeHashID(6),
"data.4.entity_id": trashid.MustEncodeHashID(102),
})
}

func TestGetEventsEntity(t *testing.T) {
var eventsResponse struct {
Data []dbv1.FullEvent
}

status, body := testGet(
t,
"/v1/events/entity?entity_id="+trashid.MustEncodeHashID(102),
&eventsResponse,
)
assert.Equal(t, 200, status)

jsonAssert(t, body, map[string]string{
"data.0.event_id": trashid.MustEncodeHashID(6),
"data.0.entity_id": trashid.MustEncodeHashID(102),
})
}
4 changes: 4 additions & 0 deletions api/v1_unclaimed_id.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,7 @@ func (app *ApiServer) v1PlaylistsUnclaimedId(c *fiber.Ctx) error {
func (app *ApiServer) v1CommentsUnclaimedId(c *fiber.Ctx) error {
return app.v1UnclaimedId(c, "comments", "comment_id", 4_000_000, math.MaxInt32)
}

func (app *ApiServer) v1EventsUnclaimedId(c *fiber.Ctx) error {
return app.v1UnclaimedId(c, "events", "event_id", 1, math.MaxInt32)
}
Loading
Loading