Test & fix search

api/src/controllers/movies.ts

@@ -317,13 +317,13 @@ export const movies = new Elysia({ prefix: "/movies", tags: ["movies"] })
 				.where(
 					and(
 						filter,
-						query ? sql`${query}::text %> ${showTranslations.name}` : undefined,
+						query ? sql`${transQ.name} %> ${query}::text` : undefined,
 						keysetPaginate({ table: shows, after, sort }),
 					),
 				)
 				.orderBy(
 					...(query
-						? [sql`word_similarity(${query}::text, ${showTranslations.name})`]
+						? [sql`word_similarity(${query}::text, ${transQ.name})`]
 						: sortToSql(sort, shows)),
 					shows.pk,
 				)

api/src/db/index.ts

@@ -1,15 +1,30 @@
+import { sql } from "drizzle-orm";
 import { drizzle } from "drizzle-orm/node-postgres";
+import { migrate as migrateDb } from "drizzle-orm/node-postgres/migrator";
 import * as schema from "./schema";
 
+const dbConfig = {
+	user: process.env.POSTGRES_USER ?? "kyoo",
+	password: process.env.POSTGRES_PASSWORD ?? "password",
+	database: process.env.POSTGRES_DB ?? "kyooDB",
+	host: process.env.POSTGRES_SERVER ?? "postgres",
+	port: Number(process.env.POSTGRES_PORT) || 5432,
+	ssl: false,
+};
 export const db = drizzle({
 	schema,
-	connection: {
+	connection: dbConfig,
-		user: process.env.POSTGRES_USER ?? "kyoo",
-		password: process.env.POSTGRES_PASSWORD ?? "password",
-		database: process.env.POSTGRES_DB ?? "kyooDB",
-		host: process.env.POSTGRES_SERVER ?? "postgres",
-		port: Number(process.env.POSTGRES_PORT) || 5432,
-		ssl: false,
-	},
 	casing: "snake_case",
 });
+
+export const migrate = async () => {
+	await db.execute(
+		sql.raw(
+			`ALTER DATABASE "${dbConfig.database}" SET pg_trgm.word_similarity_threshold = 0.4;`,
+		),
+	);
+	await migrateDb(db, {
+		migrationsSchema: "kyoo",
+		migrationsFolder: "./drizzle",
+	});
+};

api/src/db/schema/utils.ts

@@ -1,4 +1,4 @@
-import { customType, jsonb, pgSchema, varchar } from "drizzle-orm/pg-core";
+import { jsonb, pgSchema, varchar } from "drizzle-orm/pg-core";
 
 export const schema = pgSchema("kyoo");
 
@@ -6,10 +6,3 @@ export const language = () => varchar({ length: 255 });
 
 export const image = () =>
 	jsonb().$type<{ id: string; source: string; blurhash: string }>();
-
-// idk why they didn't implement this one
-export const tsvector = customType<{ data: string }>({
-	dataType() {
-		return "tsvector";
-	},
-});

api/src/index.ts

@@ -1,6 +1,5 @@
 import jwt from "@elysiajs/jwt";
 import { swagger } from "@elysiajs/swagger";
-import { migrate } from "drizzle-orm/node-postgres/migrator";
 import { Elysia } from "elysia";
 import { base } from "./base";
 import { entries } from "./controllers/entries";
@@ -9,11 +8,11 @@ import { seasons } from "./controllers/seasons";
 import { seed } from "./controllers/seed";
 import { series } from "./controllers/series";
 import { videos } from "./controllers/videos";
-import { db } from "./db";
+import { migrate } from "./db";
 import { Image } from "./models/utils";
 import { comment } from "./utils";
 
-await migrate(db, { migrationsSchema: "kyoo", migrationsFolder: "./drizzle" });
+await migrate();
 
 let secret = process.env.JWT_SECRET;
 if (!secret) {

api/tests/movies/get-all-movies.test.ts

@@ -280,7 +280,38 @@ describe("Get all movies", () => {
 		const [resp, body] = await getMovies({
 			limit: 2,
 			filter: "tags eq gravity",
-			preferOriginal: true,
+		});
+
+		expectStatus(resp, body).toBe(200);
+		expect(body.items).toBeArrayOfSize(1);
+		expect(body.items[0].slug).toBe(bubble.slug);
+	});
+});
+
+describe("search", () => {
+	it("Partial match", async () => {
+		const [resp, body] = await getMovies({
+			limit: 2,
+			query: "bub",
+		});
+
+		expectStatus(resp, body).toBe(200);
+		expect(body.items).toBeArrayOfSize(1);
+		expect(body.items[0].slug).toBe(bubble.slug);
+	});
+	it("Invalid search don't match", async () => {
+		const [resp, body] = await getMovies({
+			limit: 2,
+			query: "buboeuoeunhoeu",
+		});
+
+		expectStatus(resp, body).toBe(200);
+		expect(body.items).toBeArrayOfSize(0);
+	});
+	it("Typo match", async () => {
+		const [resp, body] = await getMovies({
+			limit: 2,
+			query: "bobble",
 		});
 
 		expectStatus(resp, body).toBe(200);

api/tests/movies/movies-helper.ts

@@ -33,6 +33,7 @@ export const getMovies = async ({
 	limit?: number;
 	after?: string;
 	sort?: string | string[];
+	query?: string;
 	langs?: string;
 	preferOriginal?: boolean;
 }) => {

api/tests/setup.ts

@@ -1,10 +1,6 @@
 import { beforeAll } from "bun:test";
-import { migrate } from "drizzle-orm/node-postgres/migrator";
+import { migrate } from "~/db";
-import { db } from "~/db";
 
 beforeAll(async () => {
-	await migrate(db, {
+	await migrate();
-		migrationsSchema: "kyoo",
-		migrationsFolder: "./drizzle",
-	});
 });