Skip to content

Commit 8f246c5

Browse files
joobisbjoobisb
committed
rename the created fields
1 parent e29a208 commit 8f246c5

File tree

8 files changed

+44
-44
lines changed

8 files changed

+44
-44
lines changed

‎coderd/database/dbmem/dbmem.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5648,20 +5648,20 @@ func (q *FakeQuerier) GetUsers(_ context.Context, params database.GetUsersParams
56485648
users = usersFilteredByRole
56495649
}
56505650

5651-
if !params.CreatedAtBefore.IsZero() {
5651+
if !params.CreatedBefore.IsZero() {
56525652
usersFilteredByCreatedAt := make([]database.User, 0, len(users))
56535653
for i, user := range users {
5654-
if user.CreatedAt.Before(params.CreatedAtBefore) {
5654+
if user.CreatedAt.Before(params.CreatedBefore) {
56555655
usersFilteredByCreatedAt = append(usersFilteredByCreatedAt, users[i])
56565656
}
56575657
}
56585658
users = usersFilteredByCreatedAt
56595659
}
56605660

5661-
if !params.CreatedAtAfter.IsZero() {
5661+
if !params.CreatedAfter.IsZero() {
56625662
usersFilteredByCreatedAt := make([]database.User, 0, len(users))
56635663
for i, user := range users {
5664-
if user.CreatedAt.After(params.CreatedAtAfter) {
5664+
if user.CreatedAt.After(params.CreatedAfter) {
56655665
usersFilteredByCreatedAt = append(usersFilteredByCreatedAt, users[i])
56665666
}
56675667
}

‎coderd/database/modelqueries.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,8 @@ func (q *sqlQuerier) GetAuthorizedUsers(ctx context.Context, arg GetUsersParams,
390390
pq.Array(arg.RbacRole),
391391
arg.LastSeenBefore,
392392
arg.LastSeenAfter,
393-
arg.CreatedAtBefore,
394-
arg.CreatedAtAfter,
393+
arg.CreatedBefore,
394+
arg.CreatedAfter,
395395
arg.OffsetOpt,
396396
arg.LimitOpt,
397397
)

‎coderd/database/queries.sql.go

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/users.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,13 +201,13 @@ WHERE
201201
END
202202
-- Filter by created_at
203203
AND CASE
204-
WHEN @created_at_before :: timestamp with time zone != '0001-01-01 00:00:00Z' THEN
205-
created_at <= @created_at_before
204+
WHEN @created_before :: timestamp with time zone != '0001-01-01 00:00:00Z' THEN
205+
created_at <= @created_before
206206
ELSE true
207207
END
208208
AND CASE
209-
WHEN @created_at_after :: timestamp with time zone != '0001-01-01 00:00:00Z' THEN
210-
created_at >= @created_at_after
209+
WHEN @created_after :: timestamp with time zone != '0001-01-01 00:00:00Z' THEN
210+
created_at >= @created_after
211211
ELSE true
212212
END
213213
-- End of filters

‎coderd/searchquery/search.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ func Users(query string) (database.GetUsersParams, []codersdk.ValidationError) {
6565

6666
parser := httpapi.NewQueryParamParser()
6767
filter := database.GetUsersParams{
68-
Search: parser.String(values, "", "search"),
69-
Status: httpapi.ParseCustomList(parser, values, []database.UserStatus{}, "status", httpapi.ParseEnum[database.UserStatus]),
70-
RbacRole: parser.Strings(values, []string{}, "role"),
71-
LastSeenAfter: parser.Time3339Nano(values, time.Time{}, "last_seen_after"),
72-
LastSeenBefore: parser.Time3339Nano(values, time.Time{}, "last_seen_before"),
73-
CreatedAtAfter: parser.Time3339Nano(values, time.Time{}, "created_at_after"),
74-
CreatedAtBefore: parser.Time3339Nano(values, time.Time{}, "created_at_before"),
68+
Search: parser.String(values, "", "search"),
69+
Status: httpapi.ParseCustomList(parser, values, []database.UserStatus{}, "status", httpapi.ParseEnum[database.UserStatus]),
70+
RbacRole: parser.Strings(values, []string{}, "role"),
71+
LastSeenAfter: parser.Time3339Nano(values, time.Time{}, "last_seen_after"),
72+
LastSeenBefore: parser.Time3339Nano(values, time.Time{}, "last_seen_before"),
73+
CreatedAfter: parser.Time3339Nano(values, time.Time{}, "created_after"),
74+
CreatedBefore: parser.Time3339Nano(values, time.Time{}, "created_before"),
7575
}
7676
parser.ErrorExcessParams(values)
7777
return filter, parser.Errors

‎coderd/users.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -311,16 +311,16 @@ func (api *API) GetUsers(rw http.ResponseWriter, r *http.Request) ([]database.Us
311311
}
312312

313313
userRows, err := api.Database.GetUsers(ctx, database.GetUsersParams{
314-
AfterID: paginationParams.AfterID,
315-
Search: params.Search,
316-
Status: params.Status,
317-
RbacRole: params.RbacRole,
318-
LastSeenBefore: params.LastSeenBefore,
319-
LastSeenAfter: params.LastSeenAfter,
320-
CreatedAtAfter: params.CreatedAtAfter,
321-
CreatedAtBefore: params.CreatedAtBefore,
322-
OffsetOpt: int32(paginationParams.Offset),
323-
LimitOpt: int32(paginationParams.Limit),
314+
AfterID: paginationParams.AfterID,
315+
Search: params.Search,
316+
Status: params.Status,
317+
RbacRole: params.RbacRole,
318+
LastSeenBefore: params.LastSeenBefore,
319+
LastSeenAfter: params.LastSeenAfter,
320+
CreatedAfter: params.CreatedAfter,
321+
CreatedBefore: params.CreatedBefore,
322+
OffsetOpt: int32(paginationParams.Offset),
323+
LimitOpt: int32(paginationParams.Limit),
324324
})
325325
if err != nil {
326326
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{

‎coderd/users_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1658,7 +1658,7 @@ func TestUsersFilter(t *testing.T) {
16581658
{
16591659
Name: "CreatedAtBefore",
16601660
Filter: codersdk.UsersRequest{
1661-
SearchQuery: `created_at_before:"2023-01-31T23:59:59Z"`,
1661+
SearchQuery: `created_before:"2023-01-31T23:59:59Z"`,
16621662
},
16631663
FilterF: func(_ codersdk.UsersRequest, u codersdk.User) bool {
16641664
end := time.Date(2023, 1, 31, 23, 59, 59, 0, time.UTC)
@@ -1668,7 +1668,7 @@ func TestUsersFilter(t *testing.T) {
16681668
{
16691669
Name: "CreatedAtAfter",
16701670
Filter: codersdk.UsersRequest{
1671-
SearchQuery: `created_at_after:"2023-01-01T00:00:00Z"`,
1671+
SearchQuery: `created_after:"2023-01-01T00:00:00Z"`,
16721672
},
16731673
FilterF: func(_ codersdk.UsersRequest, u codersdk.User) bool {
16741674
start := time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC)
@@ -1678,7 +1678,7 @@ func TestUsersFilter(t *testing.T) {
16781678
{
16791679
Name: "CreatedAtRange",
16801680
Filter: codersdk.UsersRequest{
1681-
SearchQuery: `created_at_after:"2023-01-01T00:00:00Z" created_at_before:"2023-01-31T23:59:59Z"`,
1681+
SearchQuery: `created_after:"2023-01-01T00:00:00Z" created_before:"2023-01-31T23:59:59Z"`,
16821682
},
16831683
FilterF: func(_ codersdk.UsersRequest, u codersdk.User) bool {
16841684
start := time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC)

‎docs/admin/users/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ to use the Coder's filter query:
188188
- To find users who have not been active since July 2023:
189189
`status:active last_seen_before:"2023-07-01T00:00:00Z"`
190190
- To find users who were created between January 1 and January 18, 2023:
191-
`created_at_before:"2023-01-18T00:00:00Z" created_at_after:"2023-01-01T23:59:59Z"`
191+
`created_before:"2023-01-18T00:00:00Z" created_after:"2023-01-01T23:59:59Z"`
192192

193193
The following filters are supported:
194194

@@ -200,5 +200,5 @@ The following filters are supported:
200200
- `last_seen_before` and `last_seen_after` - The last time a user has used the
201201
platform (e.g. logging in, any API requests, connecting to workspaces). Uses
202202
the RFC3339Nano format.
203-
- `created_at_before` and `created_at_after` - The time a user was created. Uses
203+
- `created_before` and `created_after` - The time a user was created. Uses
204204
the RFC3339Nano format.

0 commit comments

Comments
 (0)