Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions apps/api/src/app.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type { TaskRepository } from "./tasks/task.types.js";
function createRepository(overrides:Partial<TaskRepository>={}):TaskRepository {
return {
list:async()=>[],
count:async()=>0,
findById:async()=>null,
listActivities:async()=>[],
create:async()=>{throw new Error("secret task content should not be logged");},
Expand Down
2 changes: 1 addition & 1 deletion apps/api/src/auth/authentication.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { TaskRepository } from "../tasks/task.types.js";

const owner = "11111111-1111-4111-8111-111111111111";
const repository = {
list: vi.fn(async () => []), findById: async () => null, listActivities: async () => [],
list: vi.fn(async () => []), count: vi.fn(async () => 0), findById: async () => null, listActivities: async () => [],
create: async () => { throw new Error(); }, update: async () => null, delete: async () => false,
} satisfies TaskRepository;
const env = {SUPABASE_URL:"https://auth.example.test", SUPABASE_PUBLISHABLE_KEY:"sb_publishable_test"};
Expand Down
6 changes: 6 additions & 0 deletions apps/api/src/tasks/prisma-task.repository.integration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@ describe.skipIf(!process.env.TEST_DATABASE_URL)("Prisma task persistence", () =>
expect(list.body.data.map((task: {id:string})=>task.id)).toEqual(token==="alice"?[id]:[]);
expect((await request(app).get(`/api/v1/tasks/${legacy.id}`).set("Authorization",`Bearer ${token}`)).status).toBe(404);
}
const alicePage=await request(app).get("/api/v1/tasks?page=1&limit=1").set("Authorization","Bearer alice");
const bobPage=await request(app).get("/api/v1/tasks?page=1&limit=1").set("Authorization","Bearer bob");
expect(alicePage.body.pagination).toEqual({page:1,limit:1,total:1,totalPages:1});
expect(alicePage.body.data.map((task: {id:string})=>task.id)).toEqual([id]);
expect(bobPage.body.pagination).toEqual({page:1,limit:1,total:0,totalPages:0});
expect(bobPage.body.data).toEqual([]);
for(const suffix of ["", "/activities"]){
expect((await request(app).get(`/api/v1/tasks/${id}${suffix}`).set("Authorization","Bearer bob")).status).toBe(404);
}
Expand Down
8 changes: 7 additions & 1 deletion apps/api/src/tasks/prisma-task.repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,13 @@ export class PrismaTaskRepository implements TaskRepository {
return this.prisma.task.findMany({
where: { status: filters.status, priority: filters.priority, ownerId: this.ownerId },
...(filters.page !== undefined || filters.limit !== undefined ? { skip: ((filters.page ?? 1) - 1) * (filters.limit ?? 50), take: filters.limit ?? 50 } : {}),
orderBy: [{ dueAt: "asc" }, { createdAt: "desc" }],
orderBy: [{ dueAt: "asc" }, { createdAt: "desc" }, { id: "asc" }],
});
}

async count(filters: ListTaskFilters): Promise<number> {
return this.prisma.task.count({
where: { ownerId: this.ownerId, status: filters.status, priority: filters.priority },
});
}

Expand Down
1 change: 1 addition & 0 deletions apps/api/src/tasks/task.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export interface UpdateTaskInput { title?:string; description?:string|null; stat
export interface ListTaskFilters { status?:TaskStatus; priority?:TaskPriority; page?:number; limit?:number; }
export interface TaskRepository {
list(filters:ListTaskFilters):Promise<TaskRecord[]>;
count(filters:ListTaskFilters):Promise<number>;
findById(id:string):Promise<TaskRecord|null>;
listActivities(taskId:string):Promise<TaskActivityRecord[]>;
/** Atomically persist the task and its creation activity. */
Expand Down
2 changes: 2 additions & 0 deletions apps/api/src/tasks/tasks.routes.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class InMemoryTaskRepository implements TaskRepository {
async list(filters:ListTaskFilters):Promise<TaskRecord[]> {
return this.tasks.filter(task=>(!filters.status||task.status===filters.status)&&(!filters.priority||task.priority===filters.priority));
}
async count(filters:ListTaskFilters):Promise<number>{return (await this.list(filters)).length;}
async listActivities(taskId:string):Promise<TaskActivityRecord[]>{return this.activities.filter(activity=>activity.taskId===taskId);}
async addActivity(taskId:string,type:string,message:string):Promise<TaskActivityRecord>{const activity={id:`activity-${this.activities.length+1}`,taskId,type,message,createdAt:new Date()};this.activities.push(activity);return activity;}
async findById(id:string):Promise<TaskRecord|null>{return this.tasks.find(task=>task.id===id)??null;}
Expand All @@ -36,6 +37,7 @@ describe("task endpoints",()=>{
it("lists tasks and supports filters",async()=>{const response=await request(app).get("/api/v1/tasks?status=NEW");expect(response.status).toBe(200);expect(response.body.data).toHaveLength(1);});
it("validates pagination bounds without changing existing list responses",async()=>{
const valid=await request(app).get("/api/v1/tasks?page=1&limit=20&status=NEW");
expect(valid.body.pagination).toEqual({page:1,limit:20,total:1,totalPages:1});
expect(valid.status).toBe(200);
expect(valid.body.data).toEqual(expect.any(Array));
for(const query of ["page=0","page=-1","page=1.5","limit=0","limit=101","page=abc"]){
Expand Down
10 changes: 10 additions & 0 deletions apps/api/src/tasks/tasks.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,16 @@ export function createTasksRouter(repository: TaskRepository): Router {
return;
}

if (filters.data.page !== undefined || filters.data.limit !== undefined) {
const page = filters.data.page ?? 1;
const limit = filters.data.limit ?? 50;
const [data, total] = await Promise.all([
repository.list({ ...filters.data, page, limit }),
repository.count(filters.data),
]);
response.status(200).json({ data, pagination: { page, limit, total, totalPages: Math.ceil(total / limit) } });
return;
}
response.status(200).json({ data: await repository.list(filters.data) });
});

Expand Down
Loading