Przeglądaj źródła

fix postgreSQL count fail (#1184)

AlteredCoder 3 lat temu
rodzic
commit
b1a7ffb92f
1 zmienionych plików z 8 dodań i 5 usunięć
  1. 8 5
      pkg/database/alerts.go

+ 8 - 5
pkg/database/alerts.go

@@ -753,17 +753,20 @@ func (c *Client) QueryAlertWithFilter(filter map[string][]string) ([]*ent.Alert,
 			WithEvents().
 			WithEvents().
 			WithMetas().
 			WithMetas().
 			WithOwner()
 			WithOwner()
-		if sort == "ASC" {
-			alerts = alerts.Order(ent.Asc(alert.FieldCreatedAt))
-		} else {
-			alerts = alerts.Order(ent.Desc(alert.FieldCreatedAt))
-		}
+
 		if limit == 0 {
 		if limit == 0 {
 			limit, err = alerts.Count(c.CTX)
 			limit, err = alerts.Count(c.CTX)
 			if err != nil {
 			if err != nil {
 				return []*ent.Alert{}, fmt.Errorf("unable to count nb alerts: %s", err)
 				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)
 		result, err := alerts.Limit(paginationSize).Offset(offset).All(c.CTX)
 		if err != nil {
 		if err != nil {
 			return []*ent.Alert{}, errors.Wrapf(QueryFail, "pagination size: %d, offset: %d: %s", paginationSize, offset, err)
 			return []*ent.Alert{}, errors.Wrapf(QueryFail, "pagination size: %d, offset: %d: %s", paginationSize, offset, err)