From b1a7ffb92f7db8e47b0fe904c0b12f77322dab6d Mon Sep 17 00:00:00 2001 From: AlteredCoder <64792091+AlteredCoder@users.noreply.github.com> Date: Wed, 19 Jan 2022 14:50:53 +0100 Subject: [PATCH] fix postgreSQL count fail (#1184) --- pkg/database/alerts.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkg/database/alerts.go b/pkg/database/alerts.go index cc6d4bbe7..5f784e04e 100644 --- a/pkg/database/alerts.go +++ b/pkg/database/alerts.go @@ -753,17 +753,20 @@ func (c *Client) QueryAlertWithFilter(filter map[string][]string) ([]*ent.Alert, WithEvents(). WithMetas(). WithOwner() - if sort == "ASC" { - alerts = alerts.Order(ent.Asc(alert.FieldCreatedAt)) - } else { - alerts = alerts.Order(ent.Desc(alert.FieldCreatedAt)) - } + if limit == 0 { limit, err = alerts.Count(c.CTX) if err != nil { return []*ent.Alert{}, fmt.Errorf("unable to count nb alerts: %s", err) } } + + if sort == "ASC" { + alerts = alerts.Order(ent.Asc(alert.FieldCreatedAt)) + } else { + alerts = alerts.Order(ent.Desc(alert.FieldCreatedAt)) + } + result, err := alerts.Limit(paginationSize).Offset(offset).All(c.CTX) if err != nil { return []*ent.Alert{}, errors.Wrapf(QueryFail, "pagination size: %d, offset: %d: %s", paginationSize, offset, err)