fix sort ordering bug in dmem

johnstcn · johnstcn · commit d53054622bbc · 2024-01-23T11:57:42.000Z
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -7738,9 +7738,12 @@ func (q *FakeQuerier) GetAuthorizedWorkspaces(ctx context.Context, arg database.
 		w2 := workspaces[j]
 
 		// Order by: favorite first
-		if w1.FavoriteOf == arg.OrderByFavorite {
+		if w1.FavoriteOf == arg.OrderByFavorite && w2.FavoriteOf != arg.OrderByFavorite {
 			return true
 		}
+		if w1.FavoriteOf != arg.OrderByFavorite && w2.FavoriteOf == arg.OrderByFavorite {
+			return false
+		}
 
 		// Order by: running
 		w1IsRunning := isRunning(preloadedWorkspaceBuilds[w1.ID], preloadedProvisionerJobs[w1.ID])
@@ -7755,12 +7758,12 @@ func (q *FakeQuerier) GetAuthorizedWorkspaces(ctx context.Context, arg database.
 		}
 
 		// Order by: usernames
-		if w1.ID != w2.ID {
-			return sort.StringsAreSorted([]string{preloadedUsers[w1.ID].Username, preloadedUsers[w2.ID].Username})
+		if strings.Compare(preloadedUsers[w1.ID].Username, preloadedUsers[w2.ID].Username) < 0 {
+			return true
 		}
 
 		// Order by: workspace names
-		return sort.StringsAreSorted([]string{w1.Name, w2.Name})
+		return strings.Compare(w1.Name, w2.Name) < 0
 	})
 
 	beforePageCount := len(workspaces)
diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go
@@ -479,10 +479,6 @@ func TestAdminViewAllWorkspaces(t *testing.T) {
 func TestWorkspacesSortOrder(t *testing.T) {
 	t.Parallel()
 
-	if !dbtestutil.WillUsePostgres() {
-		t.Skip("sort order is only tested on postgres")
-	}
-
 	client, db := coderdtest.NewWithDatabase(t, nil)
 	firstUser := coderdtest.CreateFirstUser(t, client)
 	secondUserClient, secondUser := coderdtest.CreateAnotherUserMutators(t, client, firstUser.OrganizationID, []string{"owner"}, func(r *codersdk.CreateUserRequest) {
@@ -534,7 +530,7 @@ func TestWorkspacesSortOrder(t *testing.T) {
 	// 2. Running workspaces
 	// 3. Sort by usernames
 	// 4. Sort by workspace names
-	require.Equal(t, expectedNames, actualNames)
+	assert.Equal(t, expectedNames, actualNames)
 
 	// Once again but this time as a different user. This time we do not expect to see another
 	// user's favorites first.
@@ -561,7 +557,7 @@ func TestWorkspacesSortOrder(t *testing.T) {
 	// 2. Running workspaces
 	// 3. Sort by usernames
 	// 4. Sort by workspace names
-	require.Equal(t, expectedNames, actualNames)
+	assert.Equal(t, expectedNames, actualNames)
 }
 
 func TestPostWorkspacesByOrganization(t *testing.T) {
