Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion lib/gcpspanner/spanneradapters/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -555,12 +555,13 @@ func (s *Backend) FeaturesSearch(
}

// TODO: Pass in context to be used by slog.ErrorContext.
// nolint: gocyclo // WONTFIX. Keep all the cases here so that the exhaustive
// linter can catch a missing case.
func getFeatureSearchSortOrder(
sortOrder *backend.ListFeaturesParamsSort) gcpspanner.Sortable {
if sortOrder == nil {
return gcpspanner.NewBaselineStatusSort(false)
}
// nolint: exhaustive // Remove once we support all the cases.
switch *sortOrder {
case backend.NameAsc:
return gcpspanner.NewFeatureNameSort(true)
Expand Down Expand Up @@ -606,6 +607,22 @@ func getFeatureSearchSortOrder(
return gcpspanner.NewChromiumUsageSort(true)
case backend.ChromiumUsageDesc:
return gcpspanner.NewChromiumUsageSort(false)
case backend.AvailabilityChromeAsc:
return gcpspanner.NewBrowserFeatureSupportSort(true, string(backend.Chrome))
case backend.AvailabilityChromeDesc:
return gcpspanner.NewBrowserFeatureSupportSort(false, string(backend.Chrome))
case backend.AvailabilityEdgeAsc:
return gcpspanner.NewBrowserFeatureSupportSort(true, string(backend.Edge))
case backend.AvailabilityEdgeDesc:
return gcpspanner.NewBrowserFeatureSupportSort(false, string(backend.Edge))
case backend.AvailabilityFirefoxAsc:
return gcpspanner.NewBrowserFeatureSupportSort(true, string(backend.Firefox))
case backend.AvailabilityFirefoxDesc:
return gcpspanner.NewBrowserFeatureSupportSort(false, string(backend.Firefox))
case backend.AvailabilitySafariAsc:
return gcpspanner.NewBrowserFeatureSupportSort(true, string(backend.Safari))
case backend.AvailabilitySafariDesc:
return gcpspanner.NewBrowserFeatureSupportSort(false, string(backend.Safari))
}

// Unknown sort order
Expand Down
32 changes: 32 additions & 0 deletions lib/gcpspanner/spanneradapters/backend_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1336,6 +1336,38 @@ func TestGetFeatureSearchSortOrder(t *testing.T) {
input: valuePtr(backend.StableSafariDesc),
want: gcpspanner.NewBrowserImplSort(false, "safari", true),
},
{
input: valuePtr(backend.AvailabilityChromeAsc),
want: gcpspanner.NewBrowserFeatureSupportSort(true, "chrome"),
},
{
input: valuePtr(backend.AvailabilityChromeDesc),
want: gcpspanner.NewBrowserFeatureSupportSort(false, "chrome"),
},
{
input: valuePtr(backend.AvailabilityEdgeAsc),
want: gcpspanner.NewBrowserFeatureSupportSort(true, "edge"),
},
{
input: valuePtr(backend.AvailabilityEdgeDesc),
want: gcpspanner.NewBrowserFeatureSupportSort(false, "edge"),
},
{
input: valuePtr(backend.AvailabilityFirefoxAsc),
want: gcpspanner.NewBrowserFeatureSupportSort(true, "firefox"),
},
{
input: valuePtr(backend.AvailabilityFirefoxDesc),
want: gcpspanner.NewBrowserFeatureSupportSort(false, "firefox"),
},
{
input: valuePtr(backend.AvailabilitySafariAsc),
want: gcpspanner.NewBrowserFeatureSupportSort(true, "safari"),
},
{
input: valuePtr(backend.AvailabilitySafariDesc),
want: gcpspanner.NewBrowserFeatureSupportSort(false, "safari"),
},
}

for _, tt := range sortOrderTests {
Expand Down
9 changes: 9 additions & 0 deletions openapi/backend/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,15 @@ paths:
- experimental_firefox_desc
- chromium_usage_asc
- chromium_usage_desc
# availability_{browser}_{direction}
- availability_chrome_asc
- availability_chrome_desc
- availability_edge_asc
- availability_edge_desc
- availability_firefox_asc
- availability_firefox_desc
- availability_safari_asc
- availability_safari_desc
responses:
'200':
description: OK
Expand Down