Add more tie-breakers, more to come...

Author: christeredvartsen

internal/persistence/bigquery/sortfilter.go

@@ -4,20 +4,32 @@ import (
 	"context"
 	"strings"
 
+	"github.com/nais/api/internal/graph/model"
 	"github.com/nais/api/internal/graph/sortfilter"
+	"k8s.io/utils/ptr"
 )
 
 var (
 	SortFilter       = sortfilter.New[*BigQueryDataset, BigQueryDatasetOrderField, struct{}]()
 	SortFilterAccess = sortfilter.New[*BigQueryDatasetAccess, BigQueryDatasetAccessOrderField, struct{}]()
 )
 
+type (
+	SortFilterTieBreaker = sortfilter.TieBreaker[BigQueryDatasetOrderField]
+)
+
 func init() {
 	SortFilter.RegisterSort("NAME", func(ctx context.Context, a, b *BigQueryDataset) int {
 		return strings.Compare(a.GetName(), b.GetName())
+	}, SortFilterTieBreaker{
+		Field:     "ENVIRONMENT",
+		Direction: ptr.To(model.OrderDirectionAsc),
 	})
 	SortFilter.RegisterSort("ENVIRONMENT", func(ctx context.Context, a, b *BigQueryDataset) int {
 		return strings.Compare(a.EnvironmentName, b.EnvironmentName)
+	}, SortFilterTieBreaker{
+		Field:     "NAME",
+		Direction: ptr.To(model.OrderDirectionAsc),
 	})
 
 	SortFilterAccess.RegisterSort("EMAIL", func(ctx context.Context, a, b *BigQueryDatasetAccess) int {

internal/vulnerability/sortfilter.go

@@ -12,18 +12,35 @@ import (
 
 var SortFilterImageVulnerabilities = sortfilter.New[*ImageVulnerability, ImageVulnerabilityOrderField, struct{}]()
 
+type (
+	SortFilterImageVulnerabilitiesTieBreaker = sortfilter.TieBreaker[ImageVulnerabilityOrderField]
+)
+
 func init() {
 	workloadInit()
 
+	identifierTieBreaker := SortFilterImageVulnerabilitiesTieBreaker{
+		Field:     "IDENTIFIER",
+		Direction: ptr.To(model.OrderDirectionAsc),
+	}
+	packageTieBreaker := SortFilterImageVulnerabilitiesTieBreaker{
+		Field:     "PACKAGE",
+		Direction: ptr.To(model.OrderDirectionAsc),
+	}
+	severityTieBreaker := SortFilterImageVulnerabilitiesTieBreaker{
+		Field:     "SEVERITY",
+		Direction: ptr.To(model.OrderDirectionDesc),
+	}
+
 	SortFilterImageVulnerabilities.RegisterSort("IDENTIFIER", func(ctx context.Context, a, b *ImageVulnerability) int {
 		return strings.Compare(a.Identifier, b.Identifier)
-	})
+	}, severityTieBreaker, packageTieBreaker)
 	SortFilterImageVulnerabilities.RegisterSort("PACKAGE", func(ctx context.Context, a, b *ImageVulnerability) int {
 		return strings.Compare(a.Package, b.Package)
-	})
+	}, severityTieBreaker, identifierTieBreaker)
 	SortFilterImageVulnerabilities.RegisterSort("STATE", func(ctx context.Context, a, b *ImageVulnerability) int {
 		return strings.Compare(a.State.String(), b.State.String())
-	})
+	}, severityTieBreaker, identifierTieBreaker, packageTieBreaker)
 	SortFilterImageVulnerabilities.RegisterConcurrentSort("SUPPRESSED", func(ctx context.Context, a *ImageVulnerability) int {
 		vuln, err := GetImageAnalysisTrail(ctx, a)
 		if err != nil {
@@ -35,7 +52,7 @@ func init() {
 		}
 
 		return 0
-	})
+	}, severityTieBreaker, identifierTieBreaker, packageTieBreaker)
 	SortFilterImageVulnerabilities.RegisterSort("SEVERITY", func(ctx context.Context, a, b *ImageVulnerability) int {
 		severityToScore := map[ImageVulnerabilitySeverity]int{
 			ImageVulnerabilitySeverityCritical:   5,
@@ -46,7 +63,7 @@ func init() {
 		}
 
 		return severityToScore[a.Severity] - severityToScore[b.Severity]
-	})
+	}, identifierTieBreaker, packageTieBreaker)
 }
 
 func workloadInit() {