Skip to content

Commit 9697120

Browse files
Kira-PilotKira-Pilot
committed
PR feedback
1 parent a4b81ce commit 9697120

File tree

6 files changed

+23
-25
lines changed

6 files changed

+23
-25
lines changed

‎coderd/apidoc/docs.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/searchquery/search.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@ func Workspaces(query string, page codersdk.Pagination, agentInactiveDisconnectT
7979
Limit: int32(page.Limit),
8080
}
8181

82-
postFilter := PostFilter{
83-
DeletingBy: nil,
84-
}
82+
var postFilter PostFilter
8583

8684
if query == "" {
8785
return filter, postFilter, nil
@@ -115,8 +113,7 @@ func Workspaces(query string, page codersdk.Pagination, agentInactiveDisconnectT
115113
filter.HasAgent = parser.String(values, "", "has-agent")
116114

117115
if _, ok := values["deleting_by"]; ok {
118-
db := parser.Time(values, time.Time{}, "deleting_by", "2006-01-02")
119-
postFilter.DeletingBy = ptr.Ref(db)
116+
postFilter.DeletingBy = ptr.Ref(parser.Time(values, time.Time{}, "deleting_by", "2006-01-02"))
120117
}
121118

122119
parser.ErrorExcessParams(values)

‎coderd/workspaces.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ func (api *API) workspace(rw http.ResponseWriter, r *http.Request) {
106106
// @Param name query string false "Filter with partial-match by workspace name"
107107
// @Param status query string false "Filter by workspace status" Enums(pending,running,stopping,stopped,failed,canceling,canceled,deleted,deleting)
108108
// @Param has_agent query string false "Filter by agent status" Enums(connected,connecting,disconnected,timeout)
109-
// @Param deleting_by query string false "Filter by DeletingAt time"
109+
// @Param deleting_by query string false "Filter workspaces scheduled to be deleted by this time"
110110
// @Success 200 {object} codersdk.WorkspacesResponse
111111
// @Router /workspaces [get]
112112
func (api *API) workspaces(rw http.ResponseWriter, r *http.Request) {
@@ -189,10 +189,11 @@ func (api *API) workspaces(rw http.ResponseWriter, r *http.Request) {
189189
continue
190190
}
191191
// get the beginning of the day on which deletion is scheduled
192-
truncatedDeletionAt := v.DeletingAt.Truncate(24 * time.Hour)
193-
if v.DeletingAt != nil && (truncatedDeletionAt.Before(*postFilter.DeletingBy) || truncatedDeletionAt.Equal(*postFilter.DeletingBy)) {
194-
filteredWorkspaces = append(filteredWorkspaces, v)
192+
truncatedDeletionAt := time.Date(v.DeletingAt.Year(), v.DeletingAt.Month(), v.DeletingAt.Day(), 0, 0, 0, 0, v.DeletingAt.Location())
193+
if truncatedDeletionAt.After(*postFilter.DeletingBy) {
194+
continue
195195
}
196+
filteredWorkspaces = append(filteredWorkspaces, v)
196197
}
197198
}
198199

‎coderd/workspaces_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ func TestWorkspaceFilterManual(t *testing.T) {
10191019
TemplateScheduleStore: schedule.MockTemplateScheduleStore{
10201020
SetFn: func(ctx context.Context, db database.Store, template database.Template, options schedule.TemplateScheduleOptions) (database.Template, error) {
10211021
if atomic.AddInt64(&setCalled, 1) == 2 {
1022-
require.Equal(t, inactivityTTL, options.InactivityTTL)
1022+
assert.Equal(t, inactivityTTL, options.InactivityTTL)
10231023
}
10241024
template.InactivityTTL = int64(options.InactivityTTL)
10251025
return template, nil
@@ -1044,8 +1044,8 @@ func TestWorkspaceFilterManual(t *testing.T) {
10441044
InactivityTTLMillis: inactivityTTL.Milliseconds(),
10451045
})
10461046

1047-
require.NoError(t, err)
1048-
require.Equal(t, inactivityTTL.Milliseconds(), template.InactivityTTLMillis)
1047+
assert.NoError(t, err)
1048+
assert.Equal(t, inactivityTTL.Milliseconds(), template.InactivityTTLMillis)
10491049

10501050
workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID)
10511051
coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
@@ -1058,9 +1058,9 @@ func TestWorkspaceFilterManual(t *testing.T) {
10581058
FilterQuery: fmt.Sprintf("deleting_by:%s", time.Now().Add(inactivityTTL).Format("2006-01-02")),
10591059
})
10601060

1061-
require.NoError(t, err)
1062-
require.Len(t, res.Workspaces, 1)
1063-
require.Equal(t, workspace.ID, res.Workspaces[0].ID)
1061+
assert.NoError(t, err)
1062+
assert.Len(t, res.Workspaces, 1)
1063+
assert.Equal(t, workspace.ID, res.Workspaces[0].ID)
10641064
})
10651065
}
10661066

‎docs/api/workspaces.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -381,14 +381,14 @@ curl -X GET http://coder-server:8080/api/v2/workspaces \
381381

382382
### Parameters
383383

384-
| Name | In | Type | Required | Description |
385-
| ------------- | ----- | ------ | -------- | ------------------------------------------- |
386-
| `owner` | query | string | false | Filter by owner username |
387-
| `template` | query | string | false | Filter by template name |
388-
| `name` | query | string | false | Filter with partial-match by workspace name |
389-
| `status` | query | string | false | Filter by workspace status |
390-
| `has_agent` | query | string | false | Filter by agent status |
391-
| `deleting_by` | query | string | false | Filter by DeletingAt time |
384+
| Name | In | Type | Required | Description |
385+
| ------------- | ----- | ------ | -------- | ------------------------------------------------------ |
386+
| `owner` | query | string | false | Filter by owner username |
387+
| `template` | query | string | false | Filter by template name |
388+
| `name` | query | string | false | Filter with partial-match by workspace name |
389+
| `status` | query | string | false | Filter by workspace status |
390+
| `has_agent` | query | string | false | Filter by agent status |
391+
| `deleting_by` | query | string | false | Filter workspaces scheduled to be deleted by this time |
392392

393393
#### Enumerated Values
394394

0 commit comments

Comments
 (0)