diff --git a/db/db.go b/db/db.go index 6221a0cb6..a4a2926cb 100644 --- a/db/db.go +++ b/db/db.go @@ -2963,9 +2963,9 @@ func GetConsumersForGraph(tenantName string) ([]models.ConsumerForGraph, error) return []models.ConsumerForGraph{}, err } defer conn.Release() - query := `SELECT c.name, c.consumers_group, c.station_id, c.app_id, c.is_active + query := `SELECT c.name, c.consumers_group, c.station_id, c.app_id FROM consumers AS c - WHERE c.tenant_name = $1 + WHERE c.tenant_name = $1 AND c.is_active = true ORDER BY c.name, c.station_id DESC LIMIT 10000;` stmt, err := conn.Conn().Prepare(ctx, "get_consumers_for_graph", query) diff --git a/models/consumers.go b/models/consumers.go index bfa3efa03..45aec52e9 100644 --- a/models/consumers.go +++ b/models/consumers.go @@ -120,5 +120,4 @@ type ConsumerForGraph struct { Name string `json:"name"` StationId int `json:"station_id"` AppId string `json:"app_id"` - IsActive bool `json:"is_active"` } diff --git a/models/producers.go b/models/producers.go index 3bc629f89..e55ed2ebc 100644 --- a/models/producers.go +++ b/models/producers.go @@ -51,7 +51,6 @@ type ProducerForGraph struct { Name string `json:"name"` StationId int `json:"station_id"` AppId string `json:"app_id"` - IsActive bool `json:"is_active"` } type ProducerForGraphWithCount struct {