Filters for TVS;

celenium-io · Jan 21, 2025 · 0ef8ee8 · 0ef8ee8
1 parent 4721bcf
commit 0ef8ee8
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/cmd/api/handler/stats.go b/cmd/api/handler/stats.go
@@ -570,6 +570,8 @@ func (sh StatsHandler) Tvs(c echo.Context) error {
 //	@Tags			stats
 //	@ID				stats-tvs-series
 //	@Param			timeframe	path	string	true	"Timeframe"						Enums(day, month)
+//	@Param			from		query	integer	false	"Time from in unix timestamp"	mininum(1)
+//	@Param			to			query	integer	false	"Time to in unix timestamp"		mininum(1)
 //	@Produce		json
 //	@Success		200	{array}		responses.SeriesItem
 //	@Failure		400	{object}	Error
@@ -581,7 +583,11 @@ func (sh StatsHandler) TvsSeries(c echo.Context) error {
 		return badRequestError(c, err)
 	}
 
-	tvs, err := sh.repo.TvsSeries(c.Request().Context(), storage.Timeframe(req.Timeframe))
+	tvs, err := sh.repo.TvsSeries(
+		c.Request().Context(),
+		storage.Timeframe(req.Timeframe),
+		storage.NewSeriesRequest(req.From, req.To))
+
 	if err != nil {
 		return handleError(c, err, sh.nsRepo)
 	}
@@ -597,5 +603,7 @@ func (sh StatsHandler) TvsSeries(c echo.Context) error {
 }
 
 type tvsSeriesRequest struct {
-	Timeframe string `example:"hour" param:"timeframe" swaggertype:"string" validate:"required,oneof=day month"`
+	Timeframe string `example:"hour"       param:"timeframe" swaggertype:"string"  validate:"required,oneof=day month"`
+	From      int64  `example:"1692892095" query:"from"      swaggertype:"integer" validate:"omitempty,min=1"`
+	To        int64  `example:"1692892095" query:"to"        swaggertype:"integer" validate:"omitempty,min=1"`
 }
diff --git a/cmd/api/handler/stats_test.go b/cmd/api/handler/stats_test.go
@@ -616,7 +616,7 @@ func (s *StatsTestSuite) TestTvsSeries() {
 		c.SetParamValues(string(tf))
 
 		s.stats.EXPECT().
-			TvsSeries(gomock.Any(), tf).
+			TvsSeries(gomock.Any(), tf, gomock.Any()).
 			Return([]storage.SeriesItem{
 				{
 					Time:  testTime,

diff --git a/internal/storage/mock/stats.go b/internal/storage/mock/stats.go
diff --git a/internal/storage/postgres/stats.go b/internal/storage/postgres/stats.go
@@ -438,7 +438,7 @@ func (s Stats) Tvs(ctx context.Context) (tvs decimal.Decimal, err error) {
 	return
 }
 
-func (s Stats) TvsSeries(ctx context.Context, timeframe storage.Timeframe) (response []storage.SeriesItem, err error) {
+func (s Stats) TvsSeries(ctx context.Context, timeframe storage.Timeframe, req storage.SeriesRequest) (response []storage.SeriesItem, err error) {
 	query := s.db.DB().NewSelect()
 
 	switch timeframe {
@@ -452,6 +452,13 @@ func (s Stats) TvsSeries(ctx context.Context, timeframe storage.Timeframe) (resp
 		return nil, errors.Errorf("unexpected timeframe %s", timeframe)
 	}
 
+	if !req.From.IsZero() {
+		query = query.Where("time >= ?", req.From)
+	}
+	if !req.To.IsZero() {
+		query = query.Where("time < ?", req.To)
+	}
+
 	err = query.Order("time desc").
 		Limit(100).
 		Scan(ctx, &response)

diff --git a/internal/storage/stats.go b/internal/storage/stats.go
@@ -182,5 +182,5 @@ type IStats interface {
 	Change24hBlockStats(ctx context.Context) (response Change24hBlockStats, err error)
 	MessagesCount24h(ctx context.Context) ([]CountItem, error)
 	Tvs(ctx context.Context) (decimal.Decimal, error)
-	TvsSeries(ctx context.Context, timeframe Timeframe) ([]SeriesItem, error)
+	TvsSeries(ctx context.Context, timeframe Timeframe, req SeriesRequest) ([]SeriesItem, error)
 }