Skip to content

Commit a40eb01

Browse files
committed
fix dbmem tests
1 parent 69dd9af commit a40eb01

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

coderd/database/dbauthz/dbauthz_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3709,6 +3709,10 @@ func (s *MethodTestSuite) TestSystemFunctions() {
37093709
OrganizationID: org.ID,
37103710
CreatedBy: user.ID,
37113711
})
3712+
_, err := db.InsertPreset(context.Background(), database.InsertPresetParams{
3713+
TemplateVersionID: templateVersion.ID,
3714+
Name: "test",
3715+
})
37123716
workspace := dbgen.Workspace(s.T(), db, database.WorkspaceTable{
37133717
OrganizationID: org.ID,
37143718
OwnerID: user.ID,
@@ -3723,10 +3727,6 @@ func (s *MethodTestSuite) TestSystemFunctions() {
37233727
InitiatorID: user.ID,
37243728
JobID: job.ID,
37253729
})
3726-
_, err := db.InsertPreset(context.Background(), database.InsertPresetParams{
3727-
TemplateVersionID: workspaceBuild.TemplateVersionID,
3728-
Name: "test",
3729-
})
37303730
require.NoError(s.T(), err)
37313731
db.GetPresetByWorkspaceBuildID(context.Background(), workspaceBuild.ID)
37323732
check.Args(workspaceBuild.ID).Asserts(rbac.ResourceTemplate, policy.ActionRead)

coderd/database/dbmem/dbmem.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3669,16 +3669,17 @@ func (q *FakeQuerier) GetPresetByWorkspaceBuildID(_ context.Context, workspaceBu
36693669
defer q.mutex.RUnlock()
36703670

36713671
for _, workspaceBuild := range q.workspaceBuilds {
3672-
if workspaceBuild.ID == workspaceBuildID {
3673-
for _, preset := range q.presets {
3674-
if preset.TemplateVersionID == workspaceBuild.TemplateVersionID {
3675-
return database.GetPresetByWorkspaceBuildIDRow{
3676-
ID: uuid.NullUUID{UUID: preset.ID, Valid: true},
3677-
Name: sql.NullString{String: preset.Name, Valid: true},
3678-
CreatedAt: sql.NullTime{Time: preset.CreatedAt, Valid: true},
3679-
UpdatedAt: preset.UpdatedAt,
3680-
}, nil
3681-
}
3672+
if workspaceBuild.ID != workspaceBuildID {
3673+
continue
3674+
}
3675+
for _, preset := range q.presets {
3676+
if preset.TemplateVersionID == workspaceBuild.TemplateVersionID {
3677+
return database.GetPresetByWorkspaceBuildIDRow{
3678+
ID: uuid.NullUUID{UUID: preset.ID, Valid: true},
3679+
Name: sql.NullString{String: preset.Name, Valid: true},
3680+
CreatedAt: sql.NullTime{Time: preset.CreatedAt, Valid: true},
3681+
UpdatedAt: preset.UpdatedAt,
3682+
}, nil
36823683
}
36833684
}
36843685
}
@@ -7916,11 +7917,10 @@ func (q *FakeQuerier) InsertPreset(_ context.Context, arg database.InsertPresetP
79167917
defer q.mutex.Unlock()
79177918

79187919
preset := database.TemplateVersionPreset{
7919-
// TODO (sasswart): double check how we generate these IDs in postgres.
7920-
// They should not be params here.
7921-
Name: arg.Name,
7922-
CreatedAt: arg.CreatedAt,
7923-
UpdatedAt: arg.UpdatedAt,
7920+
TemplateVersionID: arg.TemplateVersionID,
7921+
Name: arg.Name,
7922+
CreatedAt: arg.CreatedAt,
7923+
UpdatedAt: arg.UpdatedAt,
79247924
}
79257925
q.presets = append(q.presets, preset)
79267926
return preset, nil

0 commit comments

Comments
 (0)