From d5664860adbf196d2bc37fbdec7fec85f974ec61 Mon Sep 17 00:00:00 2001 From: Natty Date: Thu, 28 Dec 2023 04:59:39 +0100 Subject: [PATCH] But not like that aaa --- .../src/server/api/endpoints/users/notes.ts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts index fcd61319b8..2475d0865f 100644 --- a/packages/backend/src/server/api/endpoints/users/notes.ts +++ b/packages/backend/src/server/api/endpoints/users/notes.ts @@ -67,13 +67,8 @@ export default define(meta, paramDef, async (ps, me) => { throw e; }); - const cte = makePaginationQuery( - Notes.createQueryBuilder("n"), - ps.sinceId, - ps.untilId, - ps.sinceDate, - ps.untilDate, - ) + const cte = + Notes.createQueryBuilder("n") .select(`"n"."id"`, "id") .andWhere("n.userId = :userId", { userId: user.id }); @@ -97,7 +92,13 @@ export default define(meta, paramDef, async (ps, me) => { ); } - const query = Notes.createQueryBuilder("note") + const query = makePaginationQuery( + Notes.createQueryBuilder("note"), + ps.sinceId, + ps.untilId, + ps.sinceDate, + ps.untilDate, + ) .addCommonTableExpression(cte, "noteCte"); query.andWhere(`"note"."id" IN` + query.subQuery()