synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-13 21:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: order workspaces by running first (#7656)

Browse Source 
* wip

* use updated sql

* wip

* Implement sorting in databasefake.go

* More fixes

* sql fmt

---------

Co-authored-by: Marcin Tojek <marcin@coder.com>
This commit is contained in:
Rodrigo Maia
2023-05-25 13:35:47 -03:00
committed by GitHub
parent 96a2e63809
commit d9299caa12
6 changed files with 134 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
coderd/workspaces_internal_test.go
View File

@ -4,7 +4,6 @@ import (
"testing"
"time"
"github.com/google/uuid"
"github.com/stretchr/testify/require"
"github.com/coder/coder/coderd/database"
@ -81,96 +80,3 @@ func Test_calculateDeletingAt(t *testing.T) {
})
}
}
func TestSortWorkspaces(t *testing.T) {
// the correct sorting order is:
// 1. first show workspaces that are currently running,
// 2. then sort by user_name,
// 3. then sort by last_used_at (descending),
t.Parallel()
workspaceFactory := func(t *testing.T, name string, ownerID uuid.UUID, ownerName string, status codersdk.WorkspaceStatus, lastUsedAt time.Time) codersdk.Workspace {
t.Helper()
return codersdk.Workspace{
ID: uuid.New(),
OwnerID: ownerID,
OwnerName: ownerName,
LatestBuild: codersdk.WorkspaceBuild{
Status: status,
},
Name: name,
LastUsedAt: lastUsedAt,
}
}
userAuuid := uuid.New()
workspaceRunningUserA := workspaceFactory(t, "running-userA", userAuuid, "userA", codersdk.WorkspaceStatusRunning, time.Now())
workspaceRunningUserB := workspaceFactory(t, "running-userB", uuid.New(), "userB", codersdk.WorkspaceStatusRunning, time.Now())
workspacePendingUserC := workspaceFactory(t, "pending-userC", uuid.New(), "userC", codersdk.WorkspaceStatusPending, time.Now())
workspaceRunningUserA2 := workspaceFactory(t, "running-userA2", userAuuid, "userA", codersdk.WorkspaceStatusRunning, time.Now().Add(time.Minute))
workspaceRunningUserZ := workspaceFactory(t, "running-userZ", uuid.New(), "userZ", codersdk.WorkspaceStatusRunning, time.Now())
workspaceRunningUserA3 := workspaceFactory(t, "running-userA3", userAuuid, "userA", codersdk.WorkspaceStatusRunning, time.Now().Add(time.Hour))
testCases := []struct {
name string
input []codersdk.Workspace
expectedOrder []string
}{
{
name: "Running workspaces should be first",
input: []codersdk.Workspace{
workspaceRunningUserB,
workspacePendingUserC,
workspaceRunningUserA,
},
expectedOrder: []string{
"running-userA",
"running-userB",
"pending-userC",
},
},
{
name: "then sort by owner name",
input: []codersdk.Workspace{
workspaceRunningUserZ,
workspaceRunningUserA,
workspaceRunningUserB,
},
expectedOrder: []string{
"running-userA",
"running-userB",
"running-userZ",
},
},
{
name: "then sort by last used at (recent first)",
input: []codersdk.Workspace{
workspaceRunningUserA,
workspaceRunningUserA2,
workspaceRunningUserA3,
},
expectedOrder: []string{
"running-userA3",
"running-userA2",
"running-userA",
},
},
}
for _, tc := range testCases {
tc := tc
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
workspaces := tc.input
sortWorkspaces(workspaces)
var resultNames []string
for _, workspace := range workspaces {
resultNames = append(resultNames, workspace.Name)
}
require.Equal(t, tc.expectedOrder, resultNames, tc.name)
})
}
}