diff --git a/internal/dashboard/charts.go b/internal/dashboard/charts.go index d338ffb..4cd4b89 100644 --- a/internal/dashboard/charts.go +++ b/internal/dashboard/charts.go @@ -1,6 +1,7 @@ package dashboard import ( + "cic-dw/pkg/date_range" "context" "net/http" "time" @@ -21,7 +22,7 @@ func handleNewRegistrations(c echo.Context) error { data []lineChartRes ) - from, to := parseDateRange(c.QueryParams()) + from, to := date_range.ParseDateRange(c.QueryParams()) rows, err := api.db.Query(context.Background(), api.q["new-user-registrations"], from, to) if err != nil { @@ -42,7 +43,7 @@ func handleTransactionsCount(c echo.Context) error { data []lineChartRes ) - from, to := parseDateRange(c.QueryParams()) + from, to := date_range.ParseDateRange(c.QueryParams()) rows, err := api.db.Query(context.Background(), api.q["transactions-count"], from, to) if err != nil { @@ -64,7 +65,7 @@ func handleTokenTransactionsCount(c echo.Context) error { data []lineChartRes ) - from, to := parseDateRange(c.QueryParams()) + from, to := date_range.ParseDateRange(c.QueryParams()) rows, err := api.db.Query(context.Background(), api.q["token-transactions-count"], from, to, token) if err != nil { @@ -86,7 +87,7 @@ func handleTokenVolume(c echo.Context) error { data []lineChartRes ) - from, to := parseDateRange(c.QueryParams()) + from, to := date_range.ParseDateRange(c.QueryParams()) rows, err := api.db.Query(context.Background(), api.q["token-volume"], from, to, token) if err != nil { diff --git a/internal/public/api.go b/internal/public/api.go index ce46aeb..783e245 100644 --- a/internal/public/api.go +++ b/internal/public/api.go @@ -37,4 +37,5 @@ func InitPublicApi(e *echo.Echo, db *pgxpool.Pool, batchBalance *batch_balance.B g.GET("/tokens", handleTokenListQuery) g.GET("/token/:address", handleTokenInfo) g.GET("/token-summary/:address", handleTokenSummary) + g.GET("/latest-token-transactions/:address", handleTokenTransactions) } diff --git a/internal/public/transactions.go b/internal/public/transactions.go new file mode 100644 index 0000000..81bb05a --- /dev/null +++ b/internal/public/transactions.go @@ -0,0 +1,56 @@ +package public + +import ( + "cic-dw/pkg/pagination" + "context" + "net/http" + "time" + + "github.com/georgysavva/scany/pgxscan" + "github.com/labstack/echo/v4" + "github.com/rs/zerolog/log" +) + +type tokenTransactionsRes struct { + Id int64 `db:"id" json:"id"` + Block int64 `db:"block_number" json:"block"` + Date time.Time `db:"date_block" json:"time"` + TxHash string `db:"tx_hash" json:"tx_hash"` + Token string `db:"token_symbol" json:"token_symbol"` + From string `db:"sender_address" json:"from"` + To string `db:"recipient_address" json:"to"` + Value int64 `db:"tx_value" json:"tx_value"` + Success bool `db:"success" json:"success"` +} + +func handleTokenTransactions(c echo.Context) error { + var ( + api = c.Get("api").(*api) + token = c.Param("address") + pg = pagination.GetPagination(c.QueryParams()) + + data []tokenTransactionsRes + ) + + if pg.Cursor == -1 { + var max int64 + if err := api.db.QueryRow(context.Background(), "SELECT MAX(id) + 10 from transactions").Scan(&max); err != nil { + return err + } + + pg.Cursor = int(max) + } + + log.Info().Msgf("%d", pg.Cursor) + + rows, err := api.db.Query(context.Background(), api.q["latest-token-transactions"], token, pg.Cursor, pg.PerPage) + if err != nil { + return err + } + + if err := pgxscan.ScanAll(&data, rows); err != nil { + return err + } + + return c.JSON(http.StatusOK, data) +} diff --git a/internal/dashboard/util.go b/pkg/date_range/date_range.go similarity index 86% rename from internal/dashboard/util.go rename to pkg/date_range/date_range.go index 410d157..a6ddff4 100644 --- a/internal/dashboard/util.go +++ b/pkg/date_range/date_range.go @@ -1,11 +1,12 @@ -package dashboard +package date_range import ( - "github.com/golang-module/carbon/v2" "net/url" + + "github.com/golang-module/carbon/v2" ) -func parseDateRange(q url.Values) (string, string) { +func ParseDateRange(q url.Values) (string, string) { var from, to string qFrom := q.Get("from") diff --git a/queries/public.sql b/queries/public.sql index 1144277..b46c5bf 100644 --- a/queries/public.sql +++ b/queries/public.sql @@ -46,3 +46,10 @@ WHERE token_address = $1 AND transactions.sender_address NOT IN (SELECT sys_address FROM exclude) AND transactions.recipient_address NOT IN (SELECT sys_address FROM exclude) AND transactions.success = true; + + +--name: latest-token-transactions +-- Returns latest token transactions, with curosr forward query and limit +SELECT transactions.id, transactions.block_number, transactions.date_block, transactions.tx_hash, tokens.token_symbol, transactions.sender_address, transactions.recipient_address, transactions.tx_value, transactions.success FROM transactions +INNER JOIN tokens ON transactions.token_address = tokens.token_address +WHERE transactions.token_address = $1 AND transactions.id < $2 ORDER BY transactions.id DESC LIMIT $3; \ No newline at end of file