feat(filter): add ordering for filter values (#305)

cloudoperators · Oct 18, 2024 · deb0512 · deb0512
1 parent a11cd04
commit deb0512
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 4 deletions.
diff --git a/internal/api/graphql/graph/model/models.go b/internal/api/graphql/graph/model/models.go
@@ -16,6 +16,27 @@ import (
 
 // add custom models here
 
+var AllSeverityValuesOrdered = []SeverityValues{
+	SeverityValuesCritical,
+	SeverityValuesHigh,
+	SeverityValuesMedium,
+	SeverityValuesLow,
+	SeverityValuesNone,
+}
+
+var AllIssueTypesOrdered = []IssueTypes{
+	IssueTypesPolicyViolation,
+	IssueTypesSecurityEvent,
+	IssueTypesVulnerability,
+}
+
+var AllIssueMatchStatusValuesOrdered = []IssueMatchStatusValues{
+	IssueMatchStatusValuesNew,
+	IssueMatchStatusValuesRiskAccepted,
+	IssueMatchStatusValuesFalsePositive,
+	IssueMatchStatusValuesMitigated,
+}
+
 func NewPageInfo(p *entity.PageInfo) *PageInfo {
 	if p == nil {
 		return nil

diff --git a/internal/api/graphql/graph/resolver/query.go b/internal/api/graphql/graph/resolver/query.go
diff --git a/internal/database/mariadb/component.go b/internal/database/mariadb/component.go
@@ -278,6 +278,7 @@ func (s *SqlDatabase) GetComponentNames(filter *entity.ComponentFilter) ([]strin
     SELECT C.component_name FROM Component C
     %s
     %s
+    ORDER BY C.component_name
     `
 
 	// Ensure the filter is initialized

diff --git a/internal/database/mariadb/component_instance.go b/internal/database/mariadb/component_instance.go
@@ -285,6 +285,7 @@ func (s *SqlDatabase) GetCcrn(filter *entity.ComponentInstanceFilter) ([]string,
     SELECT CI.componentinstance_ccrn FROM ComponentInstance CI 
     %s
     %s
+    ORDER BY CI.componentinstance_ccrn
     `
 
 	// Ensure the filter is initialized

diff --git a/internal/database/mariadb/issue.go b/internal/database/mariadb/issue.go
@@ -5,9 +5,10 @@ package mariadb
 
 import (
 	"fmt"
-	"github.com/cloudoperators/heureka/internal/database"
 	"strings"
 
+	"github.com/cloudoperators/heureka/internal/database"
+
 	"github.com/cloudoperators/heureka/internal/entity"
 	"github.com/jmoiron/sqlx"
 	"github.com/sirupsen/logrus"
@@ -494,6 +495,7 @@ func (s *SqlDatabase) GetIssueNames(filter *entity.IssueFilter) ([]string, error
     SELECT I.issue_primary_name FROM Issue I
     %s
     %s
+    ORDER BY I.issue_primary_name
     `
 
 	// Ensure the filter is initialized

diff --git a/internal/database/mariadb/service.go b/internal/database/mariadb/service.go
@@ -546,6 +546,7 @@ func (s *SqlDatabase) GetServiceNames(filter *entity.ServiceFilter) ([]string, e
     SELECT service_name FROM Service S
     %s
     %s
+    ORDER BY S.service_name
     `
 
 	// Ensure the filter is initialized

diff --git a/internal/database/mariadb/support_group.go b/internal/database/mariadb/support_group.go
@@ -381,6 +381,7 @@ func (s *SqlDatabase) GetSupportGroupNames(filter *entity.SupportGroupFilter) ([
     SELECT SG.supportgroup_name FROM SupportGroup SG
     %s
     %s
+    ORDER BY SG.supportgroup_name
     `
 
 	// Ensure the filter is initialized

diff --git a/internal/database/mariadb/user.go b/internal/database/mariadb/user.go
@@ -296,6 +296,7 @@ func (s *SqlDatabase) GetUserNames(filter *entity.UserFilter) ([]string, error)
     SELECT U.user_name FROM User U
     %s
     %s
+    ORDER BY U.user_name
     `
 
 	// Ensure the filter is initialized
@@ -344,6 +345,7 @@ func (s *SqlDatabase) GetUniqueUserIDs(filter *entity.UserFilter) ([]string, err
     SELECT U.user_unique_user_id FROM User U
     %s
     %s
+    ORDER BY U.user_unique_user_id
     `
 
 	// Ensure the filter is initialized