fix a test

sreya · sreya · commit 6aec9e45e859 · 2023-07-19T22:39:48.000Z
diff --git a/coderd/database/modelmethods.go b/coderd/database/modelmethods.go
@@ -354,6 +354,8 @@ func ConvertWorkspaceRows(rows []GetWorkspacesRow) []Workspace {
 			AutostartSchedule: r.AutostartSchedule,
 			Ttl:               r.Ttl,
 			LastUsedAt:        r.LastUsedAt,
+			LockedAt:          r.LockedAt,
+			DeletingAt:        r.DeletingAt,
 		}
 	}
 
diff --git a/coderd/database/modelqueries.go b/coderd/database/modelqueries.go
@@ -238,6 +238,7 @@ func (q *sqlQuerier) GetAuthorizedWorkspaces(ctx context.Context, arg GetWorkspa
 			&i.Ttl,
 			&i.LastUsedAt,
 			&i.LockedAt,
+			&i.DeletingAt,
 			&i.TemplateName,
 			&i.TemplateVersionID,
 			&i.TemplateVersionName,
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -185,6 +185,7 @@ func (api *API) workspaces(rw http.ResponseWriter, r *http.Request) {
 			if v.DeletingAt == nil {
 				continue
 			}
+			fmt.Println("WELL WE GOT ONE!")
 			// get the beginning of the day on which deletion is scheduled
 			truncatedDeletionAt := time.Date(v.DeletingAt.Year(), v.DeletingAt.Month(), v.DeletingAt.Day(), 0, 0, 0, 0, v.DeletingAt.Location())
 			if truncatedDeletionAt.After(*postFilter.DeletingBy) {
diff --git a/enterprise/coderd/workspaces_test.go b/enterprise/coderd/workspaces_test.go
@@ -7,7 +7,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"cdr.dev/slog/sloggers/slogtest"
@@ -625,52 +624,53 @@ func TestWorkspaceAutobuild(t *testing.T) {
 func TestWorkspacesFiltering(t *testing.T) {
 	t.Parallel()
 
-	t.Run("FilterQueryHasDeletingByAndLicensed", func(t *testing.T) {
+	t.Run("DeletingBy", func(t *testing.T) {
 		t.Parallel()
 
-		inactivityTTL := 1 * 24 * time.Hour
+		lockedTTL := 24 * time.Hour
 
 		client, user := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				IncludeProvisionerDaemon: true,
 			},
-			LicenseOptions: &coderdenttest.LicenseOptions{
-				Features: license.Features{
-					codersdk.FeatureAdvancedTemplateScheduling: 1,
-				},
-			},
 		})
+		user := coderdtest.CreateFirstUser(t, client)
+		_ = coderdenttest.AddFullLicense(t, client)
 
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
+		_ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
 		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
 
-		coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
-
 		// update template with inactivity ttl
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 		defer cancel()
 
 		template, err := client.UpdateTemplateMeta(ctx, template.ID, codersdk.UpdateTemplateMeta{
-			InactivityTTLMillis: inactivityTTL.Milliseconds(),
+			LockedTTLMillis: lockedTTL.Milliseconds(),
 		})
-
-		assert.NoError(t, err)
-		assert.Equal(t, inactivityTTL.Milliseconds(), template.InactivityTTLMillis)
+		require.NoError(t, err)
+		require.Equal(t, lockedTTL.Milliseconds(), template.LockedTTLMillis)
 
 		workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID)
-		coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
+		_ = coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
 
 		// stop build so workspace is inactive
 		stopBuild := coderdtest.CreateWorkspaceBuild(t, client, workspace, database.WorkspaceTransitionStop)
 		coderdtest.AwaitWorkspaceBuildJob(t, client, stopBuild.ID)
+		err = client.UpdateWorkspaceLock(ctx, workspace.ID, codersdk.UpdateWorkspaceLock{
+			Lock: true,
+		})
+		require.NoError(t, err)
+		workspace = coderdtest.MustWorkspace(t, client, workspace.ID)
+		require.NotNil(t, workspace.DeletingAt)
 
 		res, err := client.Workspaces(ctx, codersdk.WorkspaceFilter{
 			// adding a second to time.Now() to give some buffer in case test runs quickly
-			FilterQuery: fmt.Sprintf("deleting_by:%s", time.Now().Add(time.Second).Add(inactivityTTL).Format("2006-01-02")),
+			FilterQuery: fmt.Sprintf("deleting_by:%s", time.Now().Add(time.Second).Add(lockedTTL).Format("2006-01-02")),
 		})
-		assert.NoError(t, err)
-		assert.Len(t, res.Workspaces, 1)
-		assert.Equal(t, workspace.ID, res.Workspaces[0].ID)
+		require.NoError(t, err)
+		require.Len(t, res.Workspaces, 1)
+		require.Equal(t, workspace.ID, res.Workspaces[0].ID)
 	})
 }
 

Original file line number	Diff line number	Diff line change
`@@ -354,6 +354,8 @@ func ConvertWorkspaceRows(rows []GetWorkspacesRow) []Workspace {`
`354`	`354`	`AutostartSchedule: r.AutostartSchedule,`
`355`	`355`	`Ttl: r.Ttl,`
`356`	`356`	`LastUsedAt: r.LastUsedAt,`
	`357`	`+ LockedAt: r.LockedAt,`
	`358`	`+ DeletingAt: r.DeletingAt,`
`357`	`359`	`}`
`358`	`360`	`}`
`359`	`361`
Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,7 @@ func (api API) workspaces(rw http.ResponseWriter, r http.Request) {`
`185`	`185`	`if v.DeletingAt == nil {`
`186`	`186`	`continue`
`187`	`187`	`}`
	`188`	`+ fmt.Println("WELL WE GOT ONE!")`
`188`	`189`	`// get the beginning of the day on which deletion is scheduled`
`189`	`190`	`truncatedDeletionAt := time.Date(v.DeletingAt.Year(), v.DeletingAt.Month(), v.DeletingAt.Day(), 0, 0, 0, 0, v.DeletingAt.Location())`
`190`	`191`	`if truncatedDeletionAt.After(*postFilter.DeletingBy) {`