add pagination

packages/eventindexer/event.go

@@ -4,7 +4,9 @@ import (
 	"context"
 	"database/sql"
 	"math/big"
+	"net/http"
 
+	"github.com/morkid/paginate"
 	"gorm.io/datatypes"
 )
 
@@ -67,7 +69,8 @@ type EventRepository interface {
 	GetCountByAddressAndEventName(ctx context.Context, address string, event string) (int, error)
 	GetByAddressAndEventName(
 		ctx context.Context,
+		req *http.Request,
 		address string,
 		event string,
-	) ([]*Event, error)
+	) (paginate.Page, error)
 }

packages/eventindexer/http/get_by_address_and_event.go

@@ -5,24 +5,18 @@ import (
 
 	"github.com/cyberhorsey/webutils"
 	"github.com/labstack/echo/v4"
-	"github.com/taikoxyz/taiko-mono/packages/eventindexer"
 )
 
-type GetByAddressAndEventNameResp struct {
-	Events []*eventindexer.Event `json:"events"`
-}
-
 func (srv *Server) GetByAddressAndEventName(c echo.Context) error {
-	events, err := srv.eventRepo.GetByAddressAndEventName(
+	page, err := srv.eventRepo.GetByAddressAndEventName(
 		c.Request().Context(),
+		c.Request(),
 		c.QueryParam("address"),
 		c.QueryParam("event"),
 	)
 	if err != nil {
 		return webutils.LogAndRenderErrors(c, http.StatusUnprocessableEntity, err)
 	}
 
-	return c.JSON(http.StatusOK, &GetByAddressAndEventNameResp{
-		Events: events,
-	})
+	return c.JSON(http.StatusOK, page)
 }

packages/eventindexer/http/get_by_address_and_event_test.go

@@ -39,14 +39,14 @@ func Test_GetByAddressAndEvent(t *testing.T) {
 			"0xhasntProposedAnything",
 			eventindexer.EventNameBlockProposed,
 			http.StatusOK,
-			[]string{`{"events":`},
+			[]string{`{"items":`},
 		},
 		{
 			"success",
 			"0x123",
 			eventindexer.EventNameBlockProposed,
 			http.StatusOK,
-			[]string{`{"events":`},
+			[]string{`{"items":`},
 		},
 	}
 

packages/eventindexer/mock/event_repository.go

@@ -3,7 +3,9 @@ package mock
 import (
 	"context"
 	"math/rand"
+	"net/http"
 
+	"github.com/morkid/paginate"
 	"github.com/taikoxyz/taiko-mono/packages/eventindexer"
 	"gorm.io/datatypes"
 	"gorm.io/gorm"
@@ -61,9 +63,10 @@ func (r *EventRepository) GetCountByAddressAndEventName(
 
 func (r *EventRepository) GetByAddressAndEventName(
 	ctx context.Context,
+	req *http.Request,
 	address string,
 	event string,
-) ([]*eventindexer.Event, error) {
+) (paginate.Page, error) {
 	var events []*eventindexer.Event
 
 	for _, e := range r.events {
@@ -72,7 +75,9 @@ func (r *EventRepository) GetByAddressAndEventName(
 		}
 	}
 
-	return events, nil
+	return paginate.Page{
+		Items: events,
+	}, nil
 }
 
 func (r *EventRepository) FindByEventTypeAndBlockID(

packages/eventindexer/repo/event.go

@@ -2,7 +2,9 @@ package repo
 
 import (
 	"context"
+	"net/http"
 
+	"github.com/morkid/paginate"
 	"github.com/pkg/errors"
 	"github.com/taikoxyz/taiko-mono/packages/eventindexer"
 	"gorm.io/datatypes"
@@ -115,16 +117,20 @@ func (r *EventRepository) GetCountByAddressAndEventName(
 
 func (r *EventRepository) GetByAddressAndEventName(
 	ctx context.Context,
+	req *http.Request,
 	address string,
 	event string,
-) ([]*eventindexer.Event, error) {
-	var events []*eventindexer.Event
+) (paginate.Page, error) {
+	pg := paginate.New(&paginate.Config{
+		DefaultSize: 100,
+	})
 
-	if err := r.db.GormDB().
-		Raw("SELECT * FROM events WHERE event = ? AND address = ?", event, address).
-		Find(&events).Error; err != nil {
-		return nil, errors.Wrap(err, "r.db.Find")
-	}
+	q := r.db.GormDB().
+		Raw("SELECT * FROM events WHERE event = ? AND address = ?", event, address)
+
+	reqCtx := pg.With(q)
+
+	page := reqCtx.Request(req).Response(&[]eventindexer.Event{})
 
-	return events, nil
+	return page, nil
 }

packages/eventindexer/repo/event_test.go

@@ -213,60 +213,6 @@ func TestIntegration_Event_GetCountByAddressAndEventName(t *testing.T) {
 	}
 }
 
-func TestIntegration_Event_GetByAddressAndEventName(t *testing.T) {
-	db, close, err := testMysql(t)
-	assert.Equal(t, nil, err)
-
-	defer close()
-
-	eventRepo, err := NewEventRepository(db)
-	assert.Equal(t, nil, err)
-
-	_, err = eventRepo.Save(context.Background(), dummyProveEventOpts)
-
-	assert.Equal(t, nil, err)
-
-	_, err = eventRepo.Save(context.Background(), dummyProposeEventOpts)
-
-	assert.Equal(t, nil, err)
-
-	tests := []struct {
-		name    string
-		address string
-		event   string
-		wantLen int
-		wantErr error
-	}{
-		{
-			"success",
-			dummyProposeEventOpts.Address,
-			dummyProposeEventOpts.Event,
-			1,
-			nil,
-		},
-		{
-			"none",
-			"0xfake",
-			dummyProposeEventOpts.Event,
-			0,
-			nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			resp, err := eventRepo.GetByAddressAndEventName(
-				context.Background(),
-				tt.address,
-				tt.event,
-			)
-			spew.Dump(resp)
-			assert.Equal(t, tt.wantErr, err)
-			assert.Equal(t, tt.wantLen, len(resp))
-		})
-	}
-}
-
 func TestIntegration_Event_Delete(t *testing.T) {
 	db, close, err := testMysql(t)
 	assert.Equal(t, nil, err)