fix: use is-dormant instead of dormant_at (#10191)

coderd/searchquery/search.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/httpapi"
-	"github.com/coder/coder/v2/coderd/util/ptr"
 	"github.com/coder/coder/v2/codersdk"
 )
 
@@ -70,11 +69,7 @@ func Users(query string) (database.GetUsersParams, []codersdk.ValidationError) {
 	return filter, parser.Errors
 }
 
-type PostFilter struct {
-	DeletingBy *time.Time `json:"deleting_by" format:"date-time"`
-}
-
-func Workspaces(query string, page codersdk.Pagination, agentInactiveDisconnectTimeout time.Duration) (database.GetWorkspacesParams, PostFilter, []codersdk.ValidationError) {
+func Workspaces(query string, page codersdk.Pagination, agentInactiveDisconnectTimeout time.Duration) (database.GetWorkspacesParams, []codersdk.ValidationError) {
 	filter := database.GetWorkspacesParams{
 		AgentInactiveDisconnectTimeoutSeconds: int64(agentInactiveDisconnectTimeout.Seconds()),
 
@@ -82,10 +77,8 @@ func Workspaces(query string, page codersdk.Pagination, agentInactiveDisconnectT
 		Limit:  int32(page.Limit),
 	}
 
-	var postFilter PostFilter
-
 	if query == "" {
-		return filter, postFilter, nil
+		return filter, nil
 	}
 
 	// Always lowercase for all searches.
@@ -105,7 +98,7 @@ func Workspaces(query string, page codersdk.Pagination, agentInactiveDisconnectT
 		return nil
 	})
 	if len(errors) > 0 {
-		return filter, postFilter, errors
+		return filter, errors
 	}
 
 	parser := httpapi.NewQueryParamParser()
@@ -114,21 +107,12 @@ func Workspaces(query string, page codersdk.Pagination, agentInactiveDisconnectT
 	filter.Name = parser.String(values, "", "name")
 	filter.Status = string(httpapi.ParseCustom(parser, values, "", "status", httpapi.ParseEnum[database.WorkspaceStatus]))
 	filter.HasAgent = parser.String(values, "", "has-agent")
-	filter.DormantAt = parser.Time(values, time.Time{}, "dormant_at", "2006-01-02")
+	filter.IsDormant = parser.String(values, "", "is-dormant")
 	filter.LastUsedAfter = parser.Time3339Nano(values, time.Time{}, "last_used_after")
 	filter.LastUsedBefore = parser.Time3339Nano(values, time.Time{}, "last_used_before")
 
-	if _, ok := values["deleting_by"]; ok {
-		postFilter.DeletingBy = ptr.Ref(parser.Time(values, time.Time{}, "deleting_by", "2006-01-02"))
-		// We want to make sure to grab dormant workspaces since they
-		// are omitted by default.
-		if filter.DormantAt.IsZero() {
-			filter.DormantAt = time.Date(1970, time.January, 1, 0, 0, 0, 0, time.UTC)
-		}
-	}
-
 	parser.ErrorExcessParams(values)
-	return filter, postFilter, parser.Errors
+	return filter, parser.Errors
 }
 
 func searchTerms(query string, defaultKey func(term string, values url.Values) error) (url.Values, []codersdk.ValidationError) {

coderd/searchquery/search_test.go

@@ -12,7 +12,6 @@ import (
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/rbac"
 	"github.com/coder/coder/v2/coderd/searchquery"
-	"github.com/coder/coder/v2/coderd/util/ptr"
 	"github.com/coder/coder/v2/codersdk"
 )
 
@@ -150,7 +149,7 @@ func TestSearchWorkspace(t *testing.T) {
 		c := c
 		t.Run(c.Name, func(t *testing.T) {
 			t.Parallel()
-			values, postFilter, errs := searchquery.Workspaces(c.Query, codersdk.Pagination{}, 0)
+			values, errs := searchquery.Workspaces(c.Query, codersdk.Pagination{}, 0)
 			if c.ExpectedErrorContains != "" {
 				assert.True(t, len(errs) > 0, "expect some errors")
 				var s strings.Builder
@@ -159,7 +158,6 @@ func TestSearchWorkspace(t *testing.T) {
 				}
 				assert.Contains(t, s.String(), c.ExpectedErrorContains)
 			} else {
-				assert.Empty(t, postFilter)
 				assert.Len(t, errs, 0, "expected no error")
 				assert.Equal(t, c.Expected, values, "expected values")
 			}
@@ -170,51 +168,10 @@ func TestSearchWorkspace(t *testing.T) {
 
 		query := ``
 		timeout := 1337 * time.Second
-		values, _, errs := searchquery.Workspaces(query, codersdk.Pagination{}, timeout)
+		values, errs := searchquery.Workspaces(query, codersdk.Pagination{}, timeout)
 		require.Empty(t, errs)
 		require.Equal(t, int64(timeout.Seconds()), values.AgentInactiveDisconnectTimeoutSeconds)
 	})
-
-	t.Run("TestSearchWorkspacePostFilter", func(t *testing.T) {
-		t.Parallel()
-		testCases := []struct {
-			Name     string
-			Query    string
-			Expected searchquery.PostFilter
-		}{
-			{
-				Name:     "Empty",
-				Query:    "",
-				Expected: searchquery.PostFilter{},
-			},
-			{
-				Name:  "DeletingBy",
-				Query: "deleting_by:2023-06-09",
-				Expected: searchquery.PostFilter{
-					DeletingBy: ptr.Ref(time.Date(
-						2023, 6, 9, 0, 0, 0, 0, time.UTC)),
-				},
-			},
-			{
-				Name:  "MultipleParams",
-				Query: "deleting_by:2023-06-09 name:workspace-name",
-				Expected: searchquery.PostFilter{
-					DeletingBy: ptr.Ref(time.Date(
-						2023, 6, 9, 0, 0, 0, 0, time.UTC)),
-				},
-			},
-		}
-
-		for _, c := range testCases {
-			c := c
-			t.Run(c.Name, func(t *testing.T) {
-				t.Parallel()
-				_, postFilter, errs := searchquery.Workspaces(c.Query, codersdk.Pagination{}, 0)
-				assert.Len(t, errs, 0, "expected no error")
-				assert.Equal(t, c.Expected, postFilter, "expected values")
-			})
-		}
-	})
 }
 
 func TestSearchAudit(t *testing.T) {