Skip to content

fix: Order database queries for templates #3249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 27, 2022
Merged

fix: Order database queries for templates #3249

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a64acd
fix: Order database queries for templates
mafredri Jul 27, 2022
c0498a9
fix: Add sorting to databasefake as well
mafredri Jul 27, 2022
f8df8ef
fix: Re-fix databasefake
mafredri Jul 27, 2022
97e0667
fix: Re-fix databasefake^2
mafredri Jul 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: Add sorting to databasefake as well
  • Loading branch information
@mafredri
mafredri committed Jul 27, 2022
commit c0498a9c1586b3d1b030ac2675fbca994b1dfd15
13 changes: 11 additions & 2 deletions coderd/database/databasefake/databasefake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,8 @@ func (q *fakeQuerier) GetLatestWorkspaceBuildsByWorkspaceIDs(_ context.Context,
}

func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceID(_ context.Context,
params database.GetWorkspaceBuildByWorkspaceIDParams) ([]database.WorkspaceBuild, error) {
params database.GetWorkspaceBuildByWorkspaceIDParams,
) ([]database.WorkspaceBuild, error) {
q.mutex.RLock()
defer q.mutex.RUnlock()

Expand Down Expand Up @@ -893,6 +894,9 @@ func (q *fakeQuerier) GetTemplatesWithFilter(_ context.Context, arg database.Get
templates = append(templates, template)
}
if len(templates) > 0 {
slices.SortFunc(templates, func(i, j database.Template) bool {
return i.CreatedAt.Before(j.CreatedAt) && i.ID.String() < j.ID.String()
})
return templates, nil
}

Expand Down Expand Up @@ -1069,7 +1073,12 @@ func (q *fakeQuerier) GetTemplates(_ context.Context) ([]database.Template, erro
q.mutex.RLock()
defer q.mutex.RUnlock()

return q.templates[:], nil
templates := slices.Clone(q.templates)
slices.SortFunc(templates, func(i, j database.Template) bool {
return i.CreatedAt.Before(j.CreatedAt) && i.ID.String() < j.ID.String()
})

return templates, nil
}

func (q *fakeQuerier) GetOrganizationMemberByUserID(_ context.Context, arg database.GetOrganizationMemberByUserIDParams) (database.OrganizationMember, error) {
Expand Down