Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-05-30 19:54:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix after handling

Browse Source
This commit is contained in:
Zoe Roux 2025-01-12 15:55:02 +01:00
parent f490faa796
commit 86d37514dc
No known key found for this signature in database
2 changed files with 18 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
api/src/models/utils/keyset-paginate.ts
View File

@ -29,33 +29,33 @@ export const keysetPaginate = <
sort: Sort<T, Remap>; sort: Sort<T, Remap>;
}) => { }) => {
if (!after) return undefined; if (!after) return undefined;
let cursor: After = JSON.parse( const cursor: After = JSON.parse(
Buffer.from(after, "base64").toString("utf-8"), Buffer.from(after, "base64").toString("utf-8"),
); );
const pkSort = { key: "pk" as const, desc: false }; const pkSort = { key: "pk" as const, desc: false };
if (sort.random) {
return or(
gt(
sql`md5(${sort.random.seed} || ${table[pkSort.key]})`,
sql`md5(${sort.random.seed} || ${cursor[0]})`,
),
and(
eq(
sql`md5(${sort.random.seed} || ${table[pkSort.key]})`,
sql`md5(${sort.random.seed} || ${cursor[0]})`,
),
gt(table[pkSort.key], cursor[0]),
),
);
}
// TODO: Add an outer query >= for perf // TODO: Add an outer query >= for perf
// PERF: See https://use-the-index-luke.com/sql/partial-results/fetch-next-page#sb-equivalent-logic // PERF: See https://use-the-index-luke.com/sql/partial-results/fetch-next-page#sb-equivalent-logic
let where = undefined; let where = undefined;
let previous = undefined; let previous = undefined;
if (sort.random) {
const lastCursor = cursor.slice(-1)[0];
where = or(
where,
and(
previous,
gt(
sql`md5(${sort.random.seed} || ${table[pkSort.key]})`,
sql`md5(${sort.random.seed} || ${lastCursor})`,
),
),
);
previous = and(previous, eq(table[pkSort.key], lastCursor));
cursor = cursor.slice(1);
}
for (const [i, by] of [...sort.sort, pkSort].entries()) { for (const [i, by] of [...sort.sort, pkSort].entries()) {
const cmp = by.desc ? lt : gt; const cmp = by.desc ? lt : gt;
where = or( where = or(
@ -79,7 +79,6 @@ export const keysetPaginate = <
export const generateAfter = (cursor: any, sort: Sort<any, any>) => { export const generateAfter = (cursor: any, sort: Sort<any, any>) => {
const ret = [ const ret = [
...(sort.random ? [`random:${sort.random.seed}`] : []),
...sort.sort.map((by) => cursor[by.remmapedKey ?? by.key]), ...sort.sort.map((by) => cursor[by.remmapedKey ?? by.key]),
cursor.pk, cursor.pk,
]; ];

22
api/tests/movies/get-all-movies.test.ts
View File

@ -7,7 +7,7 @@ import { bubble } from "~/models/examples";
import { dune1984 } from "~/models/examples/dune-1984"; import { dune1984 } from "~/models/examples/dune-1984";
import { dune } from "~/models/examples/dune-2021"; import { dune } from "~/models/examples/dune-2021";
import { getMovies, movieApp } from "./movies-helper"; import { getMovies, movieApp } from "./movies-helper";
import { Movie } from "~/models/movie"; import type { Movie } from "~/models/movie";
beforeAll(async () => { beforeAll(async () => {
await db.delete(shows); await db.delete(shows);
@ -142,26 +142,6 @@ describe("Get all movies", () => {
expect(items1Ids).toEqual(items2Ids); expect(items1Ids).toEqual(items2Ids);
}); });
it("No limit, compare order with different seeds", async () => {
// First query
let [resp1, body1] = await getMovies({
sort: "random:100",
});
expectStatus(resp1, body1).toBe(200);
const items1: Movie[] = body1.items;
const items1Ids = items1.map(({ id }) => id);
// Second query
let [resp2, body2] = await getMovies({
sort: "random:5",
});
expectStatus(resp2, body2).toBe(200);
const items2: Movie[] = body2.items;
const items2Ids = items2.map(({ id }) => id);
expect(items1Ids).not.toEqual(items2Ids);
});
it("Limit 1, pages 1 and 2 ", async () => { it("Limit 1, pages 1 and 2 ", async () => {
// First query fetches all // First query fetches all
// use the result to know what is expected // use the result to know what is expected