Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4c1b0b2

Browse files
committed
feat(coderd/database): add ListTasks query
1 parent9c6be5b commit4c1b0b2

File tree

8 files changed

+235
-0
lines changed

8 files changed

+235
-0
lines changed

‎coderd/database/dbauthz/dbauthz.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4485,6 +4485,11 @@ func (q *querier) ListProvisionerKeysByOrganizationExcludeReserved(ctx context.C
44854485
returnfetchWithPostFilter(q.auth,policy.ActionRead,q.db.ListProvisionerKeysByOrganizationExcludeReserved)(ctx,organizationID)
44864486
}
44874487

4488+
func (q*querier)ListTasks(ctx context.Context,arg database.ListTasksParams) ([]database.Task,error) {
4489+
// TODO(Cian): replace this with a sql filter for improved performance.
4490+
returnfetchWithPostFilter(q.auth,policy.ActionRead,q.db.ListTasks)(ctx,arg)
4491+
}
4492+
44884493
func (q*querier)ListUserSecrets(ctx context.Context,userID uuid.UUID) ([]database.UserSecret,error) {
44894494
obj:=rbac.ResourceUserSecret.WithOwner(userID.String())
44904495
iferr:=q.authorizeContext(ctx,policy.ActionRead,obj);err!=nil {

‎coderd/database/dbauthz/dbauthz_test.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2392,6 +2392,18 @@ func (s *MethodTestSuite) TestTasks() {
23922392
dbm.EXPECT().GetTaskByWorkspaceID(gomock.Any(),task.WorkspaceID.UUID).Return(task,nil).AnyTimes()
23932393
check.Args(task.WorkspaceID.UUID).Asserts(task,policy.ActionRead).Returns(task)
23942394
}))
2395+
s.Run("ListTasks",s.Mocked(func(dbm*dbmock.MockStore,faker*gofakeit.Faker,check*expects) {
2396+
u1:=testutil.Fake(s.T(),faker, database.User{})
2397+
u2:=testutil.Fake(s.T(),faker, database.User{})
2398+
org1:=testutil.Fake(s.T(),faker, database.Organization{})
2399+
org2:=testutil.Fake(s.T(),faker, database.Organization{})
2400+
_=testutil.Fake(s.T(),faker, database.OrganizationMember{UserID:u1.ID,OrganizationID:org1.ID})
2401+
_=testutil.Fake(s.T(),faker, database.OrganizationMember{UserID:u2.ID,OrganizationID:org2.ID})
2402+
t1:=testutil.Fake(s.T(),faker, database.Task{OwnerID:u1.ID})
2403+
t2:=testutil.Fake(s.T(),faker, database.Task{OwnerID:u2.ID})
2404+
dbm.EXPECT().ListTasks(gomock.Any(),gomock.Any()).Return([]database.Task{t1,t2},nil).AnyTimes()
2405+
check.Args(database.ListTasksParams{}).Asserts(t1,policy.ActionRead,t2,policy.ActionRead).Returns([]database.Task{t1,t2})
2406+
}))
23952407
}
23962408

23972409
func (s*MethodTestSuite)TestProvisionerKeys() {

‎coderd/database/dbmetrics/querymetrics.go‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/dbmock/dbmock.go‎

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/querier.go‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/querier_test.go‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7314,3 +7314,143 @@ func TestUsageEventsTrigger(t *testing.T) {
73147314
require.Len(t,rows,0)
73157315
})
73167316
}
7317+
7318+
funcTestListTasks(t*testing.T) {
7319+
t.Parallel()
7320+
7321+
db,ps:=dbtestutil.NewDB(t)
7322+
7323+
// Given: two organizations and two users, one of which is a member of both
7324+
org1:=dbgen.Organization(t,db, database.Organization{})
7325+
org2:=dbgen.Organization(t,db, database.Organization{})
7326+
user1:=dbgen.User(t,db, database.User{})
7327+
user2:=dbgen.User(t,db, database.User{})
7328+
_=dbgen.OrganizationMember(t,db, database.OrganizationMember{
7329+
OrganizationID:org1.ID,
7330+
UserID:user1.ID,
7331+
})
7332+
_=dbgen.OrganizationMember(t,db, database.OrganizationMember{
7333+
OrganizationID:org2.ID,
7334+
UserID:user2.ID,
7335+
})
7336+
7337+
// Given: a template with an active version
7338+
tv:=dbgen.TemplateVersion(t,db, database.TemplateVersion{
7339+
CreatedBy:user1.ID,
7340+
OrganizationID:org1.ID,
7341+
})
7342+
tpl:=dbgen.Template(t,db, database.Template{
7343+
CreatedBy:user1.ID,
7344+
OrganizationID:org1.ID,
7345+
ActiveVersionID:tv.ID,
7346+
})
7347+
7348+
// Helper function to create a task
7349+
createTask:=func(orgID,ownerID uuid.UUID) database.TaskTable {
7350+
ws:=dbgen.Workspace(t,db, database.WorkspaceTable{
7351+
OrganizationID:orgID,
7352+
OwnerID:ownerID,
7353+
TemplateID:tpl.ID,
7354+
})
7355+
pj:=dbgen.ProvisionerJob(t,db,ps, database.ProvisionerJob{})
7356+
sidebarAppID:=uuid.New()
7357+
_=dbgen.WorkspaceBuild(t,db, database.WorkspaceBuild{
7358+
JobID:pj.ID,
7359+
TemplateVersionID:tv.ID,
7360+
WorkspaceID:ws.ID,
7361+
})
7362+
wr:=dbgen.WorkspaceResource(t,db, database.WorkspaceResource{
7363+
JobID:pj.ID,
7364+
})
7365+
agt:=dbgen.WorkspaceAgent(t,db, database.WorkspaceAgent{
7366+
ResourceID:wr.ID,
7367+
})
7368+
wa:=dbgen.WorkspaceApp(t,db, database.WorkspaceApp{
7369+
ID:sidebarAppID,
7370+
AgentID:agt.ID,
7371+
})
7372+
tsk:=dbgen.Task(t,db, database.TaskTable{
7373+
OrganizationID:orgID,
7374+
OwnerID:ownerID,
7375+
Prompt:testutil.GetRandomName(t),
7376+
TemplateVersionID:tv.ID,
7377+
WorkspaceID: uuid.NullUUID{UUID:ws.ID,Valid:true},
7378+
})
7379+
_=dbgen.TaskWorkspaceApp(t,db, database.TaskWorkspaceApp{
7380+
TaskID:tsk.ID,
7381+
WorkspaceAgentID: uuid.NullUUID{Valid:true,UUID:agt.ID},
7382+
WorkspaceAppID: uuid.NullUUID{Valid:true,UUID:wa.ID},
7383+
})
7384+
returntsk
7385+
}
7386+
7387+
// Given: user1 has one task, user2 has one task, user3 has two tasks (one in each org)
7388+
_=createTask(org1.ID,user1.ID)
7389+
_=createTask(org1.ID,user2.ID)
7390+
_=createTask(org2.ID,user2.ID)
7391+
7392+
// Then: run various filters and assert expected results
7393+
for_,tc:=range []struct {
7394+
namestring
7395+
filter database.ListTasksParams
7396+
expectLenint
7397+
}{
7398+
{
7399+
name:"no filter",
7400+
filter: database.ListTasksParams{
7401+
OwnerID:uuid.Nil,
7402+
OrganizationID:uuid.Nil,
7403+
},
7404+
expectLen:3,
7405+
},
7406+
{
7407+
name:"filter by user ID",
7408+
filter: database.ListTasksParams{
7409+
OwnerID:user1.ID,
7410+
OrganizationID:uuid.Nil,
7411+
},
7412+
expectLen:1,
7413+
},
7414+
{
7415+
name:"filter by organization ID",
7416+
filter: database.ListTasksParams{
7417+
OwnerID:uuid.Nil,
7418+
OrganizationID:org1.ID,
7419+
},
7420+
expectLen:2,
7421+
},
7422+
{
7423+
name:"filter by user and organization ID",
7424+
filter: database.ListTasksParams{
7425+
OwnerID:user2.ID,
7426+
OrganizationID:org2.ID,
7427+
},
7428+
expectLen:1,
7429+
},
7430+
{
7431+
name:"no results",
7432+
filter: database.ListTasksParams{
7433+
OwnerID:user1.ID,
7434+
OrganizationID:org2.ID,
7435+
},
7436+
expectLen:0,
7437+
},
7438+
} {
7439+
t.Run(tc.name,func(t*testing.T) {
7440+
t.Parallel()
7441+
ctx:=testutil.Context(t,testutil.WaitShort)
7442+
tasks,err:=db.ListTasks(ctx,tc.filter)
7443+
ifassert.NoError(t,err) {
7444+
assert.Len(t,tasks,tc.expectLen)
7445+
}
7446+
for_,task:=rangetasks {
7447+
iftc.filter.OrganizationID!=uuid.Nil {
7448+
assert.Equal(t,tc.filter.OrganizationID,task.OrganizationID)
7449+
}
7450+
iftc.filter.OwnerID!=uuid.Nil {
7451+
assert.Equal(t,tc.filter.OwnerID,task.OwnerID)
7452+
}
7453+
}
7454+
})
7455+
}
7456+
}

‎coderd/database/queries.sql.go‎

Lines changed: 48 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/queries/tasks.sql‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,10 @@ SELECT * FROM tasks_with_status WHERE id = @id::uuid;
2121

2222
-- name: GetTaskByWorkspaceID :one
2323
SELECT*FROM tasks_with_statusWHERE workspace_id= @workspace_id::uuid;
24+
25+
-- name: ListTasks :many
26+
SELECT*FROM tasks_with_status tws
27+
WHEREtws.deleted_at ISNULL
28+
AND CASE WHEN @owner_id::UUID!='00000000-0000-0000-0000-000000000000' THENtws.owner_id= @owner_id::UUID ELSE TRUE END
29+
AND CASE WHEN @organization_id::UUID!='00000000-0000-0000-0000-000000000000' THENtws.organization_id= @organization_id::UUID ELSE TRUE END
30+
ORDER BYtws.created_atDESC;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp