use shortened version

GoogleChrome · Jan 28, 2025 · 93e4170 · 93e4170
1 parent 19bb6fc
commit 93e4170
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 24 deletions.
diff --git a/lib/gcpspanner/spanneradapters/backend.go b/lib/gcpspanner/spanneradapters/backend.go
@@ -607,21 +607,21 @@ func getFeatureSearchSortOrder(
 		return gcpspanner.NewChromiumUsageSort(true)
 	case backend.ChromiumUsageDesc:
 		return gcpspanner.NewChromiumUsageSort(false)
-	case backend.DesktopAvailabilityChromeAsc:
+	case backend.AvailabilityChromeAsc:
 		return gcpspanner.NewBrowserFeatureSupportSort(true, string(backend.Chrome))
-	case backend.DesktopAvailabilityChromeDesc:
+	case backend.AvailabilityChromeDesc:
 		return gcpspanner.NewBrowserFeatureSupportSort(false, string(backend.Chrome))
-	case backend.DesktopAvailabilityEdgeAsc:
+	case backend.AvailabilityEdgeAsc:
 		return gcpspanner.NewBrowserFeatureSupportSort(true, string(backend.Edge))
-	case backend.DesktopAvailabilityEdgeDesc:
+	case backend.AvailabilityEdgeDesc:
 		return gcpspanner.NewBrowserFeatureSupportSort(false, string(backend.Edge))
-	case backend.DesktopAvailabilityFirefoxAsc:
+	case backend.AvailabilityFirefoxAsc:
 		return gcpspanner.NewBrowserFeatureSupportSort(true, string(backend.Firefox))
-	case backend.DesktopAvailabilityFirefoxDesc:
+	case backend.AvailabilityFirefoxDesc:
 		return gcpspanner.NewBrowserFeatureSupportSort(false, string(backend.Firefox))
-	case backend.DesktopAvailabilitySafariAsc:
+	case backend.AvailabilitySafariAsc:
 		return gcpspanner.NewBrowserFeatureSupportSort(true, string(backend.Safari))
-	case backend.DesktopAvailabilitySafariDesc:
+	case backend.AvailabilitySafariDesc:
 		return gcpspanner.NewBrowserFeatureSupportSort(false, string(backend.Safari))
 	}
 

diff --git a/lib/gcpspanner/spanneradapters/backend_test.go b/lib/gcpspanner/spanneradapters/backend_test.go
@@ -1337,35 +1337,35 @@ func TestGetFeatureSearchSortOrder(t *testing.T) {
 			want:  gcpspanner.NewBrowserImplSort(false, "safari", true),
 		},
 		{
-			input: valuePtr(backend.DesktopAvailabilityChromeAsc),
+			input: valuePtr(backend.AvailabilityChromeAsc),
 			want:  gcpspanner.NewBrowserFeatureSupportSort(true, "chrome"),
 		},
 		{
-			input: valuePtr(backend.DesktopAvailabilityChromeDesc),
+			input: valuePtr(backend.AvailabilityChromeDesc),
 			want:  gcpspanner.NewBrowserFeatureSupportSort(false, "chrome"),
 		},
 		{
-			input: valuePtr(backend.DesktopAvailabilityEdgeAsc),
+			input: valuePtr(backend.AvailabilityEdgeAsc),
 			want:  gcpspanner.NewBrowserFeatureSupportSort(true, "edge"),
 		},
 		{
-			input: valuePtr(backend.DesktopAvailabilityEdgeDesc),
+			input: valuePtr(backend.AvailabilityEdgeDesc),
 			want:  gcpspanner.NewBrowserFeatureSupportSort(false, "edge"),
 		},
 		{
-			input: valuePtr(backend.DesktopAvailabilityFirefoxAsc),
+			input: valuePtr(backend.AvailabilityFirefoxAsc),
 			want:  gcpspanner.NewBrowserFeatureSupportSort(true, "firefox"),
 		},
 		{
-			input: valuePtr(backend.DesktopAvailabilityFirefoxDesc),
+			input: valuePtr(backend.AvailabilityFirefoxDesc),
 			want:  gcpspanner.NewBrowserFeatureSupportSort(false, "firefox"),
 		},
 		{
-			input: valuePtr(backend.DesktopAvailabilitySafariAsc),
+			input: valuePtr(backend.AvailabilitySafariAsc),
 			want:  gcpspanner.NewBrowserFeatureSupportSort(true, "safari"),
 		},
 		{
-			input: valuePtr(backend.DesktopAvailabilitySafariDesc),
+			input: valuePtr(backend.AvailabilitySafariDesc),
 			want:  gcpspanner.NewBrowserFeatureSupportSort(false, "safari"),
 		},
 	}

diff --git a/openapi/backend/openapi.yaml b/openapi/backend/openapi.yaml
@@ -76,14 +76,15 @@ paths:
               - experimental_firefox_desc
               - chromium_usage_asc
               - chromium_usage_desc
-              - desktop_availability_chrome_asc
-              - desktop_availability_chrome_desc
-              - desktop_availability_edge_asc
-              - desktop_availability_edge_desc
-              - desktop_availability_firefox_asc
-              - desktop_availability_firefox_desc
-              - desktop_availability_safari_asc
-              - desktop_availability_safari_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