mirror of
https://github.com/zoriya/Kyoo.git
synced 2025-07-09 03:04:20 -04:00
Add staff & role APIs (#835)
This commit is contained in:
commit
8687cf8de0
@ -129,30 +129,19 @@ erDiagram
|
||||
guid staff_id PK, FK
|
||||
uint order
|
||||
type type "actor|director|writer|producer|music|other"
|
||||
string character_name
|
||||
string character_latin_name
|
||||
jsonb character_image
|
||||
}
|
||||
|
||||
role_translations {
|
||||
string language PK
|
||||
string character_name
|
||||
}
|
||||
roles||--o{ role_translations : has
|
||||
shows ||--|{ roles : has
|
||||
|
||||
staff {
|
||||
guid id PK
|
||||
string(256) slug UK
|
||||
string name "NN"
|
||||
string latin_name
|
||||
jsonb image
|
||||
datetime next_refresh
|
||||
jsonb external_id
|
||||
}
|
||||
|
||||
staff_translations {
|
||||
guid id PK,FK
|
||||
string language PK
|
||||
string name "NN"
|
||||
}
|
||||
staff ||--|{ staff_translations : has
|
||||
staff ||--|{ roles : has
|
||||
|
||||
studios {
|
||||
|
28
api/drizzle/0014_staff.sql
Normal file
28
api/drizzle/0014_staff.sql
Normal file
@ -0,0 +1,28 @@
|
||||
CREATE TYPE "kyoo"."role_kind" AS ENUM('actor', 'director', 'writter', 'producer', 'music', 'other');--> statement-breakpoint
|
||||
CREATE TABLE "kyoo"."roles" (
|
||||
"pk" integer PRIMARY KEY GENERATED ALWAYS AS IDENTITY (sequence name "kyoo"."roles_pk_seq" INCREMENT BY 1 MINVALUE 1 MAXVALUE 2147483647 START WITH 1 CACHE 1),
|
||||
"show_pk" integer NOT NULL,
|
||||
"staff_pk" integer NOT NULL,
|
||||
"kind" "kyoo"."role_kind" NOT NULL,
|
||||
"order" integer NOT NULL,
|
||||
"character" jsonb
|
||||
);
|
||||
--> statement-breakpoint
|
||||
CREATE TABLE "kyoo"."staff" (
|
||||
"pk" integer PRIMARY KEY GENERATED ALWAYS AS IDENTITY (sequence name "kyoo"."staff_pk_seq" INCREMENT BY 1 MINVALUE 1 MAXVALUE 2147483647 START WITH 1 CACHE 1),
|
||||
"id" uuid DEFAULT gen_random_uuid() NOT NULL,
|
||||
"slug" varchar(255) NOT NULL,
|
||||
"name" text NOT NULL,
|
||||
"latin_name" text,
|
||||
"image" jsonb,
|
||||
"external_id" jsonb DEFAULT '{}'::jsonb NOT NULL,
|
||||
"created_at" timestamp with time zone DEFAULT now() NOT NULL,
|
||||
"updated_at" timestamp with time zone NOT NULL,
|
||||
CONSTRAINT "staff_id_unique" UNIQUE("id"),
|
||||
CONSTRAINT "staff_slug_unique" UNIQUE("slug")
|
||||
);
|
||||
--> statement-breakpoint
|
||||
ALTER TABLE "kyoo"."roles" ADD CONSTRAINT "roles_show_pk_shows_pk_fk" FOREIGN KEY ("show_pk") REFERENCES "kyoo"."shows"("pk") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
|
||||
ALTER TABLE "kyoo"."roles" ADD CONSTRAINT "roles_staff_pk_staff_pk_fk" FOREIGN KEY ("staff_pk") REFERENCES "kyoo"."staff"("pk") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
|
||||
CREATE INDEX "role_kind" ON "kyoo"."roles" USING hash ("kind");--> statement-breakpoint
|
||||
CREATE INDEX "role_order" ON "kyoo"."roles" USING btree ("order");
|
1487
api/drizzle/meta/0014_snapshot.json
Normal file
1487
api/drizzle/meta/0014_snapshot.json
Normal file
File diff suppressed because it is too large
Load Diff
@ -99,6 +99,13 @@
|
||||
"when": 1741444868735,
|
||||
"tag": "0013_original",
|
||||
"breakpoints": true
|
||||
},
|
||||
{
|
||||
"idx": 14,
|
||||
"version": "7",
|
||||
"when": 1741601145901,
|
||||
"tag": "0014_staff",
|
||||
"breakpoints": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
@ -1,4 +1,3 @@
|
||||
import type { StaticDecode } from "@sinclair/typebox";
|
||||
import { type SQL, and, eq, ne, sql } from "drizzle-orm";
|
||||
import { Elysia, t } from "elysia";
|
||||
import { db } from "~/db";
|
||||
@ -67,25 +66,32 @@ const unknownFilters: FilterDef = {
|
||||
};
|
||||
|
||||
const entrySort = Sort(
|
||||
[
|
||||
"order",
|
||||
"seasonNumber",
|
||||
"episodeNumber",
|
||||
"number",
|
||||
"airDate",
|
||||
"nextRefresh",
|
||||
],
|
||||
{
|
||||
order: entries.order,
|
||||
seasonNumber: entries.seasonNumber,
|
||||
episodeNumber: entries.episodeNumber,
|
||||
number: entries.episodeNumber,
|
||||
airDate: entries.airDate,
|
||||
nextRefresh: entries.nextRefresh,
|
||||
},
|
||||
{
|
||||
default: ["order"],
|
||||
remap: {
|
||||
number: "episodeNumber",
|
||||
},
|
||||
tablePk: entries.pk,
|
||||
},
|
||||
);
|
||||
|
||||
const extraSort = Sort(["slug", "name", "runtime", "createdAt"], {
|
||||
const extraSort = Sort(
|
||||
{
|
||||
slug: entries.slug,
|
||||
name: entryTranslations.name,
|
||||
runtime: entries.runtime,
|
||||
createdAt: entries.createdAt,
|
||||
},
|
||||
{
|
||||
default: ["slug"],
|
||||
});
|
||||
tablePk: entries.pk,
|
||||
},
|
||||
);
|
||||
|
||||
async function getEntries({
|
||||
after,
|
||||
@ -98,7 +104,7 @@ async function getEntries({
|
||||
after: string | undefined;
|
||||
limit: number;
|
||||
query: string | undefined;
|
||||
sort: StaticDecode<typeof entrySort>;
|
||||
sort: Sort;
|
||||
filter: SQL | undefined;
|
||||
languages: string[];
|
||||
}): Promise<(Entry | Extra | UnknownEntry)[]> {
|
||||
@ -166,13 +172,13 @@ async function getEntries({
|
||||
and(
|
||||
filter,
|
||||
query ? sql`${transQ.name} %> ${query}::text` : undefined,
|
||||
keysetPaginate({ table: entries, after, sort }),
|
||||
keysetPaginate({ after, sort }),
|
||||
),
|
||||
)
|
||||
.orderBy(
|
||||
...(query
|
||||
? [sql`word_similarity(${query}::text, ${transQ.name})`]
|
||||
: sortToSql(sort, entries)),
|
||||
: sortToSql(sort)),
|
||||
entries.pk,
|
||||
)
|
||||
.limit(limit);
|
||||
|
@ -26,6 +26,19 @@ const seasonFilters: FilterDef = {
|
||||
endAir: { column: seasons.endAir, type: "date" },
|
||||
};
|
||||
|
||||
const seasonSort = Sort(
|
||||
{
|
||||
seasonNumber: seasons.seasonNumber,
|
||||
startAir: seasons.startAir,
|
||||
endAir: seasons.endAir,
|
||||
nextRefresh: seasons.nextRefresh,
|
||||
},
|
||||
{
|
||||
default: ["seasonNumber"],
|
||||
tablePk: seasons.pk,
|
||||
},
|
||||
);
|
||||
|
||||
export const seasonsH = new Elysia({ tags: ["series"] })
|
||||
.model({
|
||||
season: Season,
|
||||
@ -82,13 +95,13 @@ export const seasonsH = new Elysia({ tags: ["series"] })
|
||||
eq(seasons.showPk, serie.pk),
|
||||
filter,
|
||||
query ? sql`${transQ.name} %> ${query}::text` : undefined,
|
||||
keysetPaginate({ table: seasons, after, sort }),
|
||||
keysetPaginate({ after, sort }),
|
||||
),
|
||||
)
|
||||
.orderBy(
|
||||
...(query
|
||||
? [sql`word_similarity(${query}::text, ${transQ.name})`]
|
||||
: sortToSql(sort, seasons)),
|
||||
: sortToSql(sort)),
|
||||
seasons.pk,
|
||||
)
|
||||
.limit(limit);
|
||||
@ -104,9 +117,7 @@ export const seasonsH = new Elysia({ tags: ["series"] })
|
||||
}),
|
||||
}),
|
||||
query: t.Object({
|
||||
sort: Sort(["seasonNumber", "startAir", "endAir", "nextRefresh"], {
|
||||
default: ["seasonNumber"],
|
||||
}),
|
||||
sort: seasonSort,
|
||||
filter: t.Optional(Filter({ def: seasonFilters })),
|
||||
query: t.Optional(t.String({ description: desc.query })),
|
||||
limit: t.Integer({
|
||||
|
47
api/src/controllers/seed/insert/staff.ts
Normal file
47
api/src/controllers/seed/insert/staff.ts
Normal file
@ -0,0 +1,47 @@
|
||||
import { eq } from "drizzle-orm";
|
||||
import { db } from "~/db";
|
||||
import { roles, staff } from "~/db/schema";
|
||||
import { conflictUpdateAllExcept } from "~/db/utils";
|
||||
import type { SeedStaff } from "~/models/staff";
|
||||
import { processOptImage } from "../images";
|
||||
|
||||
export const insertStaff = async (
|
||||
seed: SeedStaff[] | undefined,
|
||||
showPk: number,
|
||||
) => {
|
||||
if (!seed?.length) return [];
|
||||
|
||||
return await db.transaction(async (tx) => {
|
||||
const people = seed.map((x) => ({
|
||||
...x.staff,
|
||||
image: processOptImage(x.staff.image),
|
||||
}));
|
||||
const ret = await tx
|
||||
.insert(staff)
|
||||
.values(people)
|
||||
.onConflictDoUpdate({
|
||||
target: staff.slug,
|
||||
set: conflictUpdateAllExcept(staff, ["pk", "id", "slug", "createdAt"]),
|
||||
})
|
||||
.returning({ pk: staff.pk, id: staff.id, slug: staff.slug });
|
||||
|
||||
const rval = seed.map((x, i) => ({
|
||||
showPk,
|
||||
staffPk: ret[i].pk,
|
||||
kind: x.kind,
|
||||
order: i,
|
||||
character: {
|
||||
...x.character,
|
||||
image: processOptImage(x.character.image),
|
||||
},
|
||||
}));
|
||||
|
||||
// always replace all roles. this is because:
|
||||
// - we want `order` to stay in sync (& without duplicates)
|
||||
// - we don't have ways to identify a role so we can't onConflict
|
||||
await tx.delete(roles).where(eq(roles.showPk, showPk));
|
||||
await tx.insert(roles).values(rval);
|
||||
|
||||
return ret;
|
||||
});
|
||||
};
|
@ -5,6 +5,7 @@ import { processOptImage } from "./images";
|
||||
import { insertCollection } from "./insert/collection";
|
||||
import { insertEntries } from "./insert/entries";
|
||||
import { insertShow, updateAvailableCount } from "./insert/shows";
|
||||
import { insertStaff } from "./insert/staff";
|
||||
import { insertStudios } from "./insert/studios";
|
||||
import { guessNextRefresh } from "./refresh";
|
||||
|
||||
@ -26,6 +27,12 @@ export const SeedMovieResponse = t.Object({
|
||||
slug: t.String({ format: "slug", examples: ["disney"] }),
|
||||
}),
|
||||
),
|
||||
staff: t.Array(
|
||||
t.Object({
|
||||
id: t.String({ format: "uuid" }),
|
||||
slug: t.String({ format: "slug", examples: ["hiroyuki-sawano"] }),
|
||||
}),
|
||||
),
|
||||
});
|
||||
export type SeedMovieResponse = typeof SeedMovieResponse.static;
|
||||
|
||||
@ -46,7 +53,7 @@ export const seedMovie = async (
|
||||
seed.slug = `random-${getYear(seed.airDate)}`;
|
||||
}
|
||||
|
||||
const { translations, videos, collection, studios, ...movie } = seed;
|
||||
const { translations, videos, collection, studios, staff, ...movie } = seed;
|
||||
const nextRefresh = guessNextRefresh(movie.airDate ?? new Date());
|
||||
const original = translations[movie.originalLanguage];
|
||||
if (!original) {
|
||||
@ -101,6 +108,7 @@ export const seedMovie = async (
|
||||
await updateAvailableCount([show.pk], false);
|
||||
|
||||
const retStudios = await insertStudios(studios, show.pk);
|
||||
const retStaff = await insertStaff(staff, show.pk);
|
||||
|
||||
return {
|
||||
updated: show.updated,
|
||||
@ -109,5 +117,6 @@ export const seedMovie = async (
|
||||
videos: entry.videos,
|
||||
collection: col,
|
||||
studios: retStudios,
|
||||
staff: retStaff,
|
||||
};
|
||||
};
|
||||
|
@ -6,6 +6,7 @@ import { insertCollection } from "./insert/collection";
|
||||
import { insertEntries } from "./insert/entries";
|
||||
import { insertSeasons } from "./insert/seasons";
|
||||
import { insertShow, updateAvailableCount } from "./insert/shows";
|
||||
import { insertStaff } from "./insert/staff";
|
||||
import { insertStudios } from "./insert/studios";
|
||||
import { guessNextRefresh } from "./refresh";
|
||||
|
||||
@ -53,6 +54,12 @@ export const SeedSerieResponse = t.Object({
|
||||
slug: t.String({ format: "slug", examples: ["mappa"] }),
|
||||
}),
|
||||
),
|
||||
staff: t.Array(
|
||||
t.Object({
|
||||
id: t.String({ format: "uuid" }),
|
||||
slug: t.String({ format: "slug", examples: ["hiroyuki-sawano"] }),
|
||||
}),
|
||||
),
|
||||
});
|
||||
export type SeedSerieResponse = typeof SeedSerieResponse.static;
|
||||
|
||||
@ -80,6 +87,7 @@ export const seedSerie = async (
|
||||
extras,
|
||||
collection,
|
||||
studios,
|
||||
staff,
|
||||
...serie
|
||||
} = seed;
|
||||
const nextRefresh = guessNextRefresh(serie.startAir ?? new Date());
|
||||
@ -127,6 +135,7 @@ export const seedSerie = async (
|
||||
await updateAvailableCount([show.pk]);
|
||||
|
||||
const retStudios = await insertStudios(studios, show.pk);
|
||||
const retStaff = await insertStaff(staff, show.pk);
|
||||
|
||||
return {
|
||||
updated: show.updated,
|
||||
@ -137,5 +146,6 @@ export const seedSerie = async (
|
||||
extras: retExtras,
|
||||
collection: col,
|
||||
studios: retStudios,
|
||||
staff: retStaff,
|
||||
};
|
||||
};
|
||||
|
@ -1,4 +1,3 @@
|
||||
import type { StaticDecode } from "@sinclair/typebox";
|
||||
import { type SQL, and, eq, exists, sql } from "drizzle-orm";
|
||||
import { db } from "~/db";
|
||||
import {
|
||||
@ -57,18 +56,18 @@ export const showFilters: FilterDef = {
|
||||
},
|
||||
};
|
||||
export const showSort = Sort(
|
||||
[
|
||||
"slug",
|
||||
"rating",
|
||||
"airDate",
|
||||
"startAir",
|
||||
"endAir",
|
||||
"createdAt",
|
||||
"nextRefresh",
|
||||
],
|
||||
{
|
||||
remap: { airDate: "startAir" },
|
||||
slug: shows.slug,
|
||||
rating: shows.rating,
|
||||
airDate: shows.startAir,
|
||||
startAir: shows.startAir,
|
||||
endAir: shows.endAir,
|
||||
createdAt: shows.createdAt,
|
||||
nextRefresh: shows.nextRefresh,
|
||||
},
|
||||
{
|
||||
default: ["slug"],
|
||||
tablePk: shows.pk,
|
||||
},
|
||||
);
|
||||
|
||||
@ -159,7 +158,7 @@ export async function getShows({
|
||||
after?: string;
|
||||
limit: number;
|
||||
query?: string;
|
||||
sort?: StaticDecode<typeof showSort>;
|
||||
sort?: Sort;
|
||||
filter?: SQL;
|
||||
languages: string[];
|
||||
fallbackLanguage?: boolean;
|
||||
@ -209,13 +208,13 @@ export async function getShows({
|
||||
and(
|
||||
filter,
|
||||
query ? sql`${transQ.name} %> ${query}::text` : undefined,
|
||||
keysetPaginate({ table: shows, after, sort }),
|
||||
keysetPaginate({ after, sort }),
|
||||
),
|
||||
)
|
||||
.orderBy(
|
||||
...(query
|
||||
? [sql`word_similarity(${query}::text, ${transQ.name})`]
|
||||
: sortToSql(sort, shows)),
|
||||
: sortToSql(sort)),
|
||||
shows.pk,
|
||||
)
|
||||
.limit(limit);
|
||||
|
465
api/src/controllers/staff.ts
Normal file
465
api/src/controllers/staff.ts
Normal file
@ -0,0 +1,465 @@
|
||||
import { type SQL, and, eq, sql } from "drizzle-orm";
|
||||
import Elysia, { t } from "elysia";
|
||||
import { db } from "~/db";
|
||||
import { showTranslations, shows } from "~/db/schema";
|
||||
import { roles, staff } from "~/db/schema/staff";
|
||||
import { getColumns, sqlarr } from "~/db/utils";
|
||||
import { KError } from "~/models/error";
|
||||
import type { MovieStatus } from "~/models/movie";
|
||||
import { Role, Staff } from "~/models/staff";
|
||||
import { RoleWShow, RoleWStaff } from "~/models/staff-roles";
|
||||
import {
|
||||
Filter,
|
||||
type FilterDef,
|
||||
type Image,
|
||||
Page,
|
||||
Sort,
|
||||
createPage,
|
||||
isUuid,
|
||||
keysetPaginate,
|
||||
processLanguages,
|
||||
sortToSql,
|
||||
} from "~/models/utils";
|
||||
import { desc } from "~/models/utils/descriptions";
|
||||
import { showFilters, showSort } from "./shows/logic";
|
||||
|
||||
const staffSort = Sort(
|
||||
{
|
||||
slug: staff.slug,
|
||||
name: staff.name,
|
||||
latinName: staff.latinName,
|
||||
},
|
||||
{
|
||||
default: ["slug"],
|
||||
tablePk: staff.pk,
|
||||
},
|
||||
);
|
||||
|
||||
const staffRoleSort = Sort(
|
||||
{
|
||||
order: roles.order,
|
||||
slug: { sql: staff.slug, accessor: (x) => x.staff.slug },
|
||||
name: { sql: staff.name, accessor: (x) => x.staff.name },
|
||||
latinName: { sql: staff.latinName, accessor: (x) => x.staff.latinName },
|
||||
characterName: {
|
||||
sql: sql`${roles.character}->>'name'`,
|
||||
isNullable: true,
|
||||
accessor: (x) => x.character.name,
|
||||
},
|
||||
characterLatinName: {
|
||||
sql: sql`${roles.character}->>'latinName'`,
|
||||
isNullable: true,
|
||||
accessor: (x) => x.character.latinName,
|
||||
},
|
||||
},
|
||||
{
|
||||
default: ["order"],
|
||||
tablePk: staff.pk,
|
||||
},
|
||||
);
|
||||
|
||||
const staffRoleFilter: FilterDef = {
|
||||
kind: {
|
||||
column: roles.kind,
|
||||
type: "enum",
|
||||
values: Role.properties.kind.enum,
|
||||
},
|
||||
};
|
||||
|
||||
const roleShowFilters: FilterDef = {
|
||||
...staffRoleFilter,
|
||||
...showFilters,
|
||||
};
|
||||
|
||||
async function getStaffRoles({
|
||||
after,
|
||||
limit,
|
||||
query,
|
||||
sort,
|
||||
filter,
|
||||
}: {
|
||||
after?: string;
|
||||
limit: number;
|
||||
query?: string;
|
||||
sort?: Sort;
|
||||
filter?: SQL;
|
||||
}) {
|
||||
return await db
|
||||
.select({
|
||||
...getColumns(roles),
|
||||
staff: getColumns(staff),
|
||||
})
|
||||
.from(roles)
|
||||
.innerJoin(staff, eq(roles.staffPk, staff.pk))
|
||||
.where(
|
||||
and(
|
||||
filter,
|
||||
query ? sql`${staff.name} %> ${query}::text` : undefined,
|
||||
keysetPaginate({ sort, after }),
|
||||
),
|
||||
)
|
||||
.orderBy(
|
||||
...(query
|
||||
? [sql`word_similarity(${query}::text, ${staff.name})`]
|
||||
: sortToSql(sort)),
|
||||
staff.pk,
|
||||
)
|
||||
.limit(limit);
|
||||
}
|
||||
|
||||
export const staffH = new Elysia({ tags: ["staff"] })
|
||||
.model({
|
||||
staff: Staff,
|
||||
role: Role,
|
||||
})
|
||||
.get(
|
||||
"/staff/:id",
|
||||
async ({ params: { id }, error }) => {
|
||||
const [ret] = await db
|
||||
.select()
|
||||
.from(staff)
|
||||
.where(isUuid(id) ? eq(staff.id, id) : eq(staff.slug, id))
|
||||
.limit(1);
|
||||
if (!ret) {
|
||||
return error(404, {
|
||||
status: 404,
|
||||
message: `No staff found with the id or slug: '${id}'`,
|
||||
});
|
||||
}
|
||||
return ret;
|
||||
},
|
||||
{
|
||||
detail: {
|
||||
description: "Get a staff member by id or slug.",
|
||||
},
|
||||
params: t.Object({
|
||||
id: t.String({
|
||||
description: "The id or slug of the staff to retrieve.",
|
||||
example: "hiroyuki-sawano",
|
||||
}),
|
||||
}),
|
||||
response: {
|
||||
200: "staff",
|
||||
404: {
|
||||
...KError,
|
||||
description: "No staff found with the given id or slug.",
|
||||
},
|
||||
},
|
||||
},
|
||||
)
|
||||
.get(
|
||||
"/staff/random",
|
||||
async ({ error, redirect }) => {
|
||||
const [member] = await db
|
||||
.select({ slug: staff.slug })
|
||||
.from(staff)
|
||||
.orderBy(sql`random()`)
|
||||
.limit(1);
|
||||
if (!member)
|
||||
return error(404, {
|
||||
status: 404,
|
||||
message: "No staff in the database.",
|
||||
});
|
||||
return redirect(`/staff/${member.slug}`);
|
||||
},
|
||||
{
|
||||
detail: {
|
||||
description: "Get a random staff member.",
|
||||
},
|
||||
response: {
|
||||
302: t.Void({
|
||||
description:
|
||||
"Redirected to the [/staff/{id}](#tag/staff/GET/staff/{id}) route.",
|
||||
}),
|
||||
404: {
|
||||
...KError,
|
||||
description: "No staff in the database.",
|
||||
},
|
||||
},
|
||||
},
|
||||
)
|
||||
.get(
|
||||
"/staff/:id/roles",
|
||||
async ({
|
||||
params: { id },
|
||||
query: { limit, after, query, sort, filter, preferOriginal },
|
||||
headers: { "accept-language": languages },
|
||||
request: { url },
|
||||
error,
|
||||
}) => {
|
||||
const [member] = await db
|
||||
.select({ pk: staff.pk })
|
||||
.from(staff)
|
||||
.where(isUuid(id) ? eq(staff.id, id) : eq(staff.slug, id))
|
||||
.limit(1);
|
||||
|
||||
if (!member) {
|
||||
return error(404, {
|
||||
status: 404,
|
||||
message: `No staff member with the id or slug: '${id}'.`,
|
||||
});
|
||||
}
|
||||
|
||||
const langs = processLanguages(languages);
|
||||
const transQ = db
|
||||
.selectDistinctOn([showTranslations.pk])
|
||||
.from(showTranslations)
|
||||
.orderBy(
|
||||
showTranslations.pk,
|
||||
sql`array_position(${sqlarr(langs)}, ${showTranslations.language})`,
|
||||
)
|
||||
.as("t");
|
||||
const items = await db
|
||||
.select({
|
||||
...getColumns(roles),
|
||||
show: {
|
||||
...getColumns(shows),
|
||||
...getColumns(transQ),
|
||||
|
||||
// movie columns (status is only a typescript hint)
|
||||
status: sql<MovieStatus>`${shows.status}`,
|
||||
airDate: shows.startAir,
|
||||
kind: sql<any>`${shows.kind}`,
|
||||
isAvailable: sql<boolean>`${shows.availableCount} != 0`,
|
||||
|
||||
...(preferOriginal && {
|
||||
poster: sql<Image>`coalesce(nullif(${shows.original}->'poster', 'null'::jsonb), ${transQ.poster})`,
|
||||
thumbnail: sql<Image>`coalesce(nullif(${shows.original}->'thumbnail', 'null'::jsonb), ${transQ.thumbnail})`,
|
||||
banner: sql<Image>`coalesce(nullif(${shows.original}->'banner', 'null'::jsonb), ${transQ.banner})`,
|
||||
logo: sql<Image>`coalesce(nullif(${shows.original}->'logo', 'null'::jsonb), ${transQ.logo})`,
|
||||
}),
|
||||
},
|
||||
})
|
||||
.from(roles)
|
||||
.innerJoin(shows, eq(roles.showPk, shows.pk))
|
||||
.innerJoin(transQ, eq(shows.pk, transQ.pk))
|
||||
.where(
|
||||
and(
|
||||
eq(roles.staffPk, member.pk),
|
||||
filter,
|
||||
query ? sql`${transQ.name} %> ${query}::text` : undefined,
|
||||
keysetPaginate({ after, sort }),
|
||||
),
|
||||
)
|
||||
.orderBy(
|
||||
...(query
|
||||
? [sql`word_similarity(${query}::text, ${transQ.name})`]
|
||||
: sortToSql(sort)),
|
||||
roles.showPk,
|
||||
)
|
||||
.limit(limit);
|
||||
return createPage(items, { url, sort, limit });
|
||||
},
|
||||
{
|
||||
detail: {
|
||||
description: "Get all roles this staff member worked as/on.",
|
||||
},
|
||||
params: t.Object({
|
||||
id: t.String({
|
||||
description: "The id or slug of the staff to retrieve.",
|
||||
example: "hiroyuki-sawano",
|
||||
}),
|
||||
}),
|
||||
query: t.Object({
|
||||
sort: showSort,
|
||||
filter: t.Optional(Filter({ def: roleShowFilters })),
|
||||
query: t.Optional(t.String({ description: desc.query })),
|
||||
limit: t.Integer({
|
||||
minimum: 1,
|
||||
maximum: 250,
|
||||
default: 50,
|
||||
description: "Max page size.",
|
||||
}),
|
||||
after: t.Optional(t.String({ description: desc.after })),
|
||||
preferOriginal: t.Optional(
|
||||
t.Boolean({
|
||||
description: desc.preferOriginal,
|
||||
}),
|
||||
),
|
||||
}),
|
||||
response: {
|
||||
200: Page(RoleWShow),
|
||||
404: {
|
||||
...KError,
|
||||
description: "No staff found with the given id or slug.",
|
||||
},
|
||||
422: KError,
|
||||
},
|
||||
},
|
||||
)
|
||||
.get(
|
||||
"/staff",
|
||||
async ({ query: { limit, after, sort, query }, request: { url } }) => {
|
||||
const items = await db
|
||||
.select()
|
||||
.from(staff)
|
||||
.where(
|
||||
and(
|
||||
query ? sql`${staff.name} %> ${query}::text` : undefined,
|
||||
keysetPaginate({ after, sort }),
|
||||
),
|
||||
)
|
||||
.orderBy(
|
||||
...(query
|
||||
? [sql`word_similarity(${query}::text, ${staff.name})`]
|
||||
: sortToSql(sort)),
|
||||
staff.pk,
|
||||
)
|
||||
.limit(limit);
|
||||
return createPage(items, { url, sort, limit });
|
||||
},
|
||||
{
|
||||
detail: {
|
||||
description: "Get all staff members known by kyoo.",
|
||||
},
|
||||
query: t.Object({
|
||||
sort: staffSort,
|
||||
query: t.Optional(t.String({ description: desc.query })),
|
||||
limit: t.Integer({
|
||||
minimum: 1,
|
||||
maximum: 250,
|
||||
default: 50,
|
||||
description: "Max page size.",
|
||||
}),
|
||||
after: t.Optional(t.String({ description: desc.after })),
|
||||
}),
|
||||
response: {
|
||||
200: Page(Staff),
|
||||
422: KError,
|
||||
},
|
||||
},
|
||||
)
|
||||
.get(
|
||||
"/movies/:id/staff",
|
||||
async ({
|
||||
params: { id },
|
||||
query: { limit, after, query, sort, filter },
|
||||
request: { url },
|
||||
error,
|
||||
}) => {
|
||||
const [movie] = await db
|
||||
.select({ pk: shows.pk })
|
||||
.from(shows)
|
||||
.where(
|
||||
and(
|
||||
eq(shows.kind, "movie"),
|
||||
isUuid(id) ? eq(shows.id, id) : eq(shows.slug, id),
|
||||
),
|
||||
)
|
||||
.limit(1);
|
||||
|
||||
if (!movie) {
|
||||
return error(404, {
|
||||
status: 404,
|
||||
message: `No movie with the id or slug: '${id}'.`,
|
||||
});
|
||||
}
|
||||
|
||||
const items = await getStaffRoles({
|
||||
limit,
|
||||
after,
|
||||
query,
|
||||
sort,
|
||||
filter: and(eq(roles.showPk, movie.pk), filter),
|
||||
});
|
||||
return createPage(items, { url, sort, limit });
|
||||
},
|
||||
{
|
||||
detail: {
|
||||
description: "Get all staff member who worked on this movie",
|
||||
},
|
||||
params: t.Object({
|
||||
id: t.String({
|
||||
description: "The id or slug of the movie.",
|
||||
example: "bubble",
|
||||
}),
|
||||
}),
|
||||
query: t.Object({
|
||||
sort: staffRoleSort,
|
||||
filter: t.Optional(Filter({ def: staffRoleFilter })),
|
||||
query: t.Optional(t.String({ description: desc.query })),
|
||||
limit: t.Integer({
|
||||
minimum: 1,
|
||||
maximum: 250,
|
||||
default: 50,
|
||||
description: "Max page size.",
|
||||
}),
|
||||
after: t.Optional(t.String({ description: desc.after })),
|
||||
}),
|
||||
response: {
|
||||
200: Page(RoleWStaff),
|
||||
404: {
|
||||
...KError,
|
||||
description: "No movie found with the given id or slug.",
|
||||
},
|
||||
422: KError,
|
||||
},
|
||||
},
|
||||
)
|
||||
.get(
|
||||
"/series/:id/staff",
|
||||
async ({
|
||||
params: { id },
|
||||
query: { limit, after, query, sort, filter },
|
||||
request: { url },
|
||||
error,
|
||||
}) => {
|
||||
const [serie] = await db
|
||||
.select({ pk: shows.pk })
|
||||
.from(shows)
|
||||
.where(
|
||||
and(
|
||||
eq(shows.kind, "serie"),
|
||||
isUuid(id) ? eq(shows.id, id) : eq(shows.slug, id),
|
||||
),
|
||||
)
|
||||
.limit(1);
|
||||
|
||||
if (!serie) {
|
||||
return error(404, {
|
||||
status: 404,
|
||||
message: `No serie with the id or slug: '${id}'.`,
|
||||
});
|
||||
}
|
||||
|
||||
const items = await getStaffRoles({
|
||||
limit,
|
||||
after,
|
||||
query,
|
||||
sort,
|
||||
filter: and(eq(roles.showPk, serie.pk), filter),
|
||||
});
|
||||
return createPage(items, { url, sort, limit });
|
||||
},
|
||||
{
|
||||
detail: {
|
||||
description: "Get all staff member who worked on this serie",
|
||||
},
|
||||
params: t.Object({
|
||||
id: t.String({
|
||||
description: "The id or slug of the serie.",
|
||||
example: "made-in-abyss",
|
||||
}),
|
||||
}),
|
||||
query: t.Object({
|
||||
sort: staffRoleSort,
|
||||
filter: t.Optional(Filter({ def: staffRoleFilter })),
|
||||
query: t.Optional(t.String({ description: desc.query })),
|
||||
limit: t.Integer({
|
||||
minimum: 1,
|
||||
maximum: 250,
|
||||
default: 50,
|
||||
description: "Max page size.",
|
||||
}),
|
||||
after: t.Optional(t.String({ description: desc.after })),
|
||||
}),
|
||||
response: {
|
||||
200: Page(RoleWStaff),
|
||||
404: {
|
||||
...KError,
|
||||
description: "No serie found with the given id or slug.",
|
||||
},
|
||||
422: KError,
|
||||
},
|
||||
},
|
||||
);
|
@ -1,4 +1,3 @@
|
||||
import type { StaticDecode } from "@sinclair/typebox";
|
||||
import { type SQL, and, eq, exists, sql } from "drizzle-orm";
|
||||
import Elysia, { t } from "elysia";
|
||||
import { db } from "~/db";
|
||||
@ -34,7 +33,16 @@ import {
|
||||
import { desc } from "~/models/utils/descriptions";
|
||||
import { getShows, showFilters, showSort } from "./shows/logic";
|
||||
|
||||
const studioSort = Sort(["slug", "createdAt"], { default: ["slug"] });
|
||||
const studioSort = Sort(
|
||||
{
|
||||
slug: studios.slug,
|
||||
createdAt: studios.createdAt,
|
||||
},
|
||||
{
|
||||
default: ["slug"],
|
||||
tablePk: studios.pk,
|
||||
},
|
||||
);
|
||||
|
||||
const studioRelations = {
|
||||
translations: () => {
|
||||
@ -65,7 +73,7 @@ export async function getStudios({
|
||||
after?: string;
|
||||
limit: number;
|
||||
query?: string;
|
||||
sort?: StaticDecode<typeof studioSort>;
|
||||
sort?: Sort;
|
||||
filter?: SQL;
|
||||
languages: string[];
|
||||
fallbackLanguage?: boolean;
|
||||
@ -101,13 +109,13 @@ export async function getStudios({
|
||||
and(
|
||||
filter,
|
||||
query ? sql`${transQ.name} %> ${query}::text` : undefined,
|
||||
keysetPaginate({ table: studios, after, sort }),
|
||||
keysetPaginate({ after, sort }),
|
||||
),
|
||||
)
|
||||
.orderBy(
|
||||
...(query
|
||||
? [sql`word_similarity(${query}::text, ${transQ.name})`]
|
||||
: sortToSql(sort, studios)),
|
||||
: sortToSql(sort)),
|
||||
studios.pk,
|
||||
)
|
||||
.limit(limit);
|
||||
@ -138,7 +146,7 @@ export const studiosH = new Elysia({ prefix: "/studios", tags: ["studios"] })
|
||||
if (!ret) {
|
||||
return error(404, {
|
||||
status: 404,
|
||||
message: `No studio with the id or slug: '${id}'`,
|
||||
message: `No studio found with the id or slug: '${id}'`,
|
||||
});
|
||||
}
|
||||
if (!ret.language) {
|
||||
@ -156,7 +164,7 @@ export const studiosH = new Elysia({ prefix: "/studios", tags: ["studios"] })
|
||||
},
|
||||
params: t.Object({
|
||||
id: t.String({
|
||||
description: "The id or slug of the collection to retrieve.",
|
||||
description: "The id or slug of the studio to retrieve.",
|
||||
example: "mappa",
|
||||
}),
|
||||
}),
|
||||
@ -173,7 +181,7 @@ export const studiosH = new Elysia({ prefix: "/studios", tags: ["studios"] })
|
||||
200: "studio",
|
||||
404: {
|
||||
...KError,
|
||||
description: "No collection found with the given id or slug.",
|
||||
description: "No studio found with the given id or slug.",
|
||||
},
|
||||
422: KError,
|
||||
},
|
||||
|
@ -2,4 +2,5 @@ export * from "./entries";
|
||||
export * from "./seasons";
|
||||
export * from "./shows";
|
||||
export * from "./studios";
|
||||
export * from "./staff";
|
||||
export * from "./videos";
|
||||
|
@ -16,6 +16,7 @@ import {
|
||||
import type { Image, Original } from "~/models/utils";
|
||||
import { entries } from "./entries";
|
||||
import { seasons } from "./seasons";
|
||||
import { roles } from "./staff";
|
||||
import { showStudioJoin } from "./studios";
|
||||
import { externalid, image, language, schema } from "./utils";
|
||||
|
||||
@ -134,6 +135,7 @@ export const showsRelations = relations(shows, ({ many }) => ({
|
||||
entries: many(entries, { relationName: "show_entries" }),
|
||||
seasons: many(seasons, { relationName: "show_seasons" }),
|
||||
studios: many(showStudioJoin, { relationName: "ssj_show" }),
|
||||
staff: many(roles, { relationName: "show_roles" }),
|
||||
}));
|
||||
export const showsTrRelations = relations(showTranslations, ({ one }) => ({
|
||||
show: one(shows, {
|
||||
|
76
api/src/db/schema/staff.ts
Normal file
76
api/src/db/schema/staff.ts
Normal file
@ -0,0 +1,76 @@
|
||||
import { relations, sql } from "drizzle-orm";
|
||||
import {
|
||||
index,
|
||||
integer,
|
||||
jsonb,
|
||||
primaryKey,
|
||||
text,
|
||||
timestamp,
|
||||
uuid,
|
||||
varchar,
|
||||
} from "drizzle-orm/pg-core";
|
||||
import type { Character } from "~/models/staff";
|
||||
import { shows } from "./shows";
|
||||
import { externalid, image, schema } from "./utils";
|
||||
|
||||
export const roleKind = schema.enum("role_kind", [
|
||||
"actor",
|
||||
"director",
|
||||
"writter",
|
||||
"producer",
|
||||
"music",
|
||||
"other",
|
||||
]);
|
||||
|
||||
export const staff = schema.table("staff", {
|
||||
pk: integer().primaryKey().generatedAlwaysAsIdentity(),
|
||||
id: uuid().notNull().unique().defaultRandom(),
|
||||
slug: varchar({ length: 255 }).notNull().unique(),
|
||||
name: text().notNull(),
|
||||
latinName: text(),
|
||||
image: image(),
|
||||
externalId: externalid(),
|
||||
|
||||
createdAt: timestamp({ withTimezone: true, mode: "string" })
|
||||
.notNull()
|
||||
.defaultNow(),
|
||||
updatedAt: timestamp({ withTimezone: true, mode: "string" })
|
||||
.notNull()
|
||||
.$onUpdate(() => sql`now()`),
|
||||
});
|
||||
|
||||
export const roles = schema.table(
|
||||
"roles",
|
||||
{
|
||||
pk: integer().primaryKey().generatedAlwaysAsIdentity(),
|
||||
showPk: integer()
|
||||
.notNull()
|
||||
.references(() => shows.pk, { onDelete: "cascade" }),
|
||||
staffPk: integer()
|
||||
.notNull()
|
||||
.references(() => staff.pk, { onDelete: "cascade" }),
|
||||
kind: roleKind().notNull(),
|
||||
order: integer().notNull(),
|
||||
character: jsonb().$type<Character>(),
|
||||
},
|
||||
(t) => [
|
||||
index("role_kind").using("hash", t.kind),
|
||||
index("role_order").on(t.order),
|
||||
],
|
||||
);
|
||||
|
||||
export const staffRelations = relations(staff, ({ many }) => ({
|
||||
roles: many(roles, { relationName: "staff_roles" }),
|
||||
}));
|
||||
export const rolesRelations = relations(roles, ({ one }) => ({
|
||||
staff: one(staff, {
|
||||
relationName: "staff_roles",
|
||||
fields: [roles.staffPk],
|
||||
references: [staff.pk],
|
||||
}),
|
||||
show: one(shows, {
|
||||
relationName: "show_roles",
|
||||
fields: [roles.showPk],
|
||||
references: [shows.pk],
|
||||
}),
|
||||
}));
|
@ -6,6 +6,7 @@ import { collections } from "./controllers/shows/collections";
|
||||
import { movies } from "./controllers/shows/movies";
|
||||
import { series } from "./controllers/shows/series";
|
||||
import { showsH } from "./controllers/shows/shows";
|
||||
import { staffH } from "./controllers/staff";
|
||||
import { studiosH } from "./controllers/studios";
|
||||
import { videosH } from "./controllers/videos";
|
||||
import type { KError } from "./models/error";
|
||||
@ -54,4 +55,5 @@ export const app = new Elysia()
|
||||
.use(seasonsH)
|
||||
.use(videosH)
|
||||
.use(studiosH)
|
||||
.use(staffH)
|
||||
.use(seed);
|
||||
|
@ -64,6 +64,7 @@ app
|
||||
`,
|
||||
},
|
||||
{ name: "studios", description: "Routes about studios" },
|
||||
{ name: "staff", description: "Routes about staff & roles" },
|
||||
],
|
||||
},
|
||||
}),
|
||||
|
@ -5,7 +5,7 @@ export const duneCollection: SeedCollection = {
|
||||
translations: {
|
||||
en: {
|
||||
name: " Dune Collection",
|
||||
tagline: "A mythic and emotionally charged hero's journey.",
|
||||
tagline: "A mythic and emotionally charged hero journey.",
|
||||
description:
|
||||
"The saga of Paul Atreides and his rise to power on the deadly planet Arrakis.",
|
||||
aliases: [],
|
||||
|
@ -295,4 +295,26 @@ export const madeInAbyss = {
|
||||
},
|
||||
},
|
||||
],
|
||||
staff: [
|
||||
{
|
||||
kind: "actor",
|
||||
character: {
|
||||
name: "レグ",
|
||||
latinName: "Reg",
|
||||
image: "https://cdn.myanimelist.net/images/characters/4/326001.jpg",
|
||||
},
|
||||
staff: {
|
||||
slug: "mariya-ise",
|
||||
name: "伊瀬茉莉也",
|
||||
latinName: "Mariya Ise",
|
||||
image: "https://cdn.myanimelist.net/images/voiceactors/2/65504.jpg",
|
||||
externalId: {
|
||||
themoviedatabase: {
|
||||
dataId: "1250465",
|
||||
link: "https://www.themoviedb.org/person/1250465",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
} satisfies SeedSerie;
|
||||
|
@ -2,6 +2,7 @@ import { t } from "elysia";
|
||||
import type { Prettify } from "~/utils";
|
||||
import { SeedCollection } from "./collections";
|
||||
import { bubble, bubbleImages, registerExamples } from "./examples";
|
||||
import { SeedStaff } from "./staff";
|
||||
import { SeedStudio, Studio } from "./studio";
|
||||
import {
|
||||
DbMetadata,
|
||||
@ -90,6 +91,7 @@ export const SeedMovie = t.Intersect([
|
||||
videos: t.Optional(t.Array(t.String({ format: "uuid" }), { default: [] })),
|
||||
collection: t.Optional(SeedCollection),
|
||||
studios: t.Optional(t.Array(SeedStudio, { default: [] })),
|
||||
staff: t.Optional(t.Array(SeedStaff, { default: [] })),
|
||||
}),
|
||||
]);
|
||||
export type SeedMovie = Prettify<typeof SeedMovie.static>;
|
||||
|
@ -4,6 +4,7 @@ import { SeedCollection } from "./collections";
|
||||
import { SeedEntry, SeedExtra } from "./entry";
|
||||
import { bubbleImages, madeInAbyss, registerExamples } from "./examples";
|
||||
import { SeedSeason } from "./season";
|
||||
import { SeedStaff } from "./staff";
|
||||
import { SeedStudio, Studio } from "./studio";
|
||||
import {
|
||||
DbMetadata,
|
||||
@ -106,6 +107,7 @@ export const SeedSerie = t.Intersect([
|
||||
extras: t.Optional(t.Array(SeedExtra, { default: [] })),
|
||||
collection: t.Optional(SeedCollection),
|
||||
studios: t.Optional(t.Array(SeedStudio, { default: [] })),
|
||||
staff: t.Optional(t.Array(SeedStaff, { default: [] })),
|
||||
}),
|
||||
]);
|
||||
export type SeedSerie = typeof SeedSerie.static;
|
||||
|
19
api/src/models/staff-roles.ts
Normal file
19
api/src/models/staff-roles.ts
Normal file
@ -0,0 +1,19 @@
|
||||
import { t } from "elysia";
|
||||
import { Show } from "./show";
|
||||
import { Role, Staff } from "./staff";
|
||||
|
||||
export const RoleWShow = t.Intersect([
|
||||
Role,
|
||||
t.Object({
|
||||
show: Show,
|
||||
}),
|
||||
]);
|
||||
export type RoleWShow = typeof RoleWShow.static;
|
||||
|
||||
export const RoleWStaff = t.Intersect([
|
||||
Role,
|
||||
t.Object({
|
||||
staff: Staff,
|
||||
}),
|
||||
]);
|
||||
export type RoleWStaff = typeof RoleWStaff.static;
|
74
api/src/models/staff.ts
Normal file
74
api/src/models/staff.ts
Normal file
@ -0,0 +1,74 @@
|
||||
import { t } from "elysia";
|
||||
import { bubbleImages, madeInAbyss, registerExamples } from "./examples";
|
||||
import { DbMetadata, ExternalId, Image, Resource, SeedImage } from "./utils";
|
||||
|
||||
export const Character = t.Object({
|
||||
name: t.String(),
|
||||
latinName: t.Nullable(t.String()),
|
||||
image: t.Nullable(Image),
|
||||
});
|
||||
export type Character = typeof Character.static;
|
||||
|
||||
export const Role = t.Object({
|
||||
kind: t.UnionEnum([
|
||||
"actor",
|
||||
"director",
|
||||
"writter",
|
||||
"producer",
|
||||
"music",
|
||||
"other",
|
||||
]),
|
||||
character: t.Nullable(Character),
|
||||
});
|
||||
export type Role = typeof Role.static;
|
||||
|
||||
const StaffData = t.Object({
|
||||
name: t.String(),
|
||||
latinName: t.Nullable(t.String()),
|
||||
image: t.Nullable(Image),
|
||||
externalId: ExternalId(),
|
||||
});
|
||||
export const Staff = t.Intersect([Resource(), StaffData, DbMetadata]);
|
||||
export type Staff = typeof Staff.static;
|
||||
|
||||
export const SeedStaff = t.Intersect([
|
||||
t.Omit(Role, ["character"]),
|
||||
t.Object({
|
||||
character: t.Intersect([
|
||||
t.Omit(Character, ["image"]),
|
||||
t.Object({
|
||||
image: t.Nullable(SeedImage),
|
||||
}),
|
||||
]),
|
||||
staff: t.Intersect([
|
||||
t.Object({
|
||||
slug: t.String({ format: "slug" }),
|
||||
image: t.Nullable(SeedImage),
|
||||
}),
|
||||
t.Omit(StaffData, ["image"]),
|
||||
]),
|
||||
}),
|
||||
]);
|
||||
export type SeedStaff = typeof SeedStaff.static;
|
||||
|
||||
const role = madeInAbyss.staff[0];
|
||||
registerExamples(SeedStaff, role);
|
||||
registerExamples(Staff, {
|
||||
...role.staff,
|
||||
image: {
|
||||
id: bubbleImages.poster.id,
|
||||
source: role.staff.image,
|
||||
blurhash: bubbleImages.poster.blurhash,
|
||||
},
|
||||
});
|
||||
registerExamples(Role, {
|
||||
...role,
|
||||
character: {
|
||||
...role.character,
|
||||
image: {
|
||||
id: bubbleImages.poster.id,
|
||||
source: role.character.image,
|
||||
blurhash: bubbleImages.poster.blurhash,
|
||||
},
|
||||
},
|
||||
});
|
@ -1,7 +1,5 @@
|
||||
import { type Column, and, eq, gt, isNull, lt, or, sql } from "drizzle-orm";
|
||||
import type { NonEmptyArray, Sort } from "./sort";
|
||||
|
||||
type Table<Name extends string> = Record<Name, Column>;
|
||||
import { and, eq, gt, isNull, lt, or, sql } from "drizzle-orm";
|
||||
import type { Sort } from "./sort";
|
||||
|
||||
type After = (string | number | boolean | undefined)[];
|
||||
|
||||
@ -16,37 +14,37 @@ type After = (string | number | boolean | undefined)[];
|
||||
// (x > a) OR
|
||||
// (x = a AND y < b) OR
|
||||
// (x = a AND y = b AND z > c) OR...
|
||||
export const keysetPaginate = <
|
||||
const T extends NonEmptyArray<string>,
|
||||
const Remap extends Partial<Record<T[number], string>>,
|
||||
>({
|
||||
table,
|
||||
export const keysetPaginate = ({
|
||||
sort,
|
||||
after,
|
||||
}: {
|
||||
table: Table<"pk" | Sort<T, Remap>["sort"][number]["key"]>;
|
||||
sort: Sort | undefined;
|
||||
after: string | undefined;
|
||||
sort: Sort<T, Remap> | undefined;
|
||||
}) => {
|
||||
if (!after || !sort) return undefined;
|
||||
const cursor: After = JSON.parse(
|
||||
Buffer.from(after, "base64").toString("utf-8"),
|
||||
);
|
||||
|
||||
const pkSort = { key: "pk" as const, desc: false };
|
||||
const pkSort = {
|
||||
sql: sort.tablePk,
|
||||
isNullable: false,
|
||||
accessor: (x: any) => x.pk,
|
||||
desc: false,
|
||||
};
|
||||
|
||||
if (sort.random) {
|
||||
return or(
|
||||
gt(
|
||||
sql`md5(${sort.random.seed} || ${table[pkSort.key]})`,
|
||||
sql`md5(${sort.random.seed} || ${sort.tablePk})`,
|
||||
sql`md5(${sort.random.seed} || ${cursor[0]})`,
|
||||
),
|
||||
and(
|
||||
eq(
|
||||
sql`md5(${sort.random.seed} || ${table[pkSort.key]})`,
|
||||
sql`md5(${sort.random.seed} || ${sort.tablePk})`,
|
||||
sql`md5(${sort.random.seed} || ${cursor[0]})`,
|
||||
),
|
||||
gt(table[pkSort.key], cursor[0]),
|
||||
gt(sort.tablePk, cursor[0]),
|
||||
),
|
||||
);
|
||||
}
|
||||
@ -62,31 +60,19 @@ export const keysetPaginate = <
|
||||
where,
|
||||
and(
|
||||
previous,
|
||||
or(
|
||||
cmp(table[by.key], cursor[i]),
|
||||
!table[by.key].notNull ? isNull(table[by.key]) : undefined,
|
||||
),
|
||||
or(cmp(by.sql, cursor[i]), by.isNullable ? isNull(by.sql) : undefined),
|
||||
),
|
||||
);
|
||||
previous = and(
|
||||
previous,
|
||||
cursor[i] === null ? isNull(table[by.key]) : eq(table[by.key], cursor[i]),
|
||||
cursor[i] === null ? isNull(by.sql) : eq(by.sql, cursor[i]),
|
||||
);
|
||||
}
|
||||
|
||||
return where;
|
||||
};
|
||||
|
||||
export const generateAfter = <
|
||||
const ST extends NonEmptyArray<string>,
|
||||
const Remap extends Partial<Record<ST[number], string>> = never,
|
||||
>(
|
||||
cursor: any,
|
||||
sort: Sort<ST, Remap>,
|
||||
) => {
|
||||
const ret = [
|
||||
...sort.sort.map((by) => cursor[by.remmapedKey ?? by.key]),
|
||||
cursor.pk,
|
||||
];
|
||||
export const generateAfter = (cursor: any, sort: Sort) => {
|
||||
const ret = [...sort.sort.map((by) => by.accessor(cursor)), cursor.pk];
|
||||
return Buffer.from(JSON.stringify(ret), "utf-8").toString("base64url");
|
||||
};
|
||||
|
@ -1,7 +1,7 @@
|
||||
import type { ObjectOptions } from "@sinclair/typebox";
|
||||
import { type TSchema, t } from "elysia";
|
||||
import { generateAfter } from "./keyset-paginate";
|
||||
import type { NonEmptyArray, Sort } from "./sort";
|
||||
import type { Sort } from "./sort";
|
||||
|
||||
export const Page = <T extends TSchema>(schema: T, options?: ObjectOptions) =>
|
||||
t.Object(
|
||||
@ -16,13 +16,9 @@ export const Page = <T extends TSchema>(schema: T, options?: ObjectOptions) =>
|
||||
},
|
||||
);
|
||||
|
||||
export const createPage = <
|
||||
T,
|
||||
const ST extends NonEmptyArray<string>,
|
||||
const Remap extends Partial<Record<ST[number], string>> = never,
|
||||
>(
|
||||
export const createPage = <T>(
|
||||
items: T[],
|
||||
{ url, sort, limit }: { url: string; sort: Sort<ST, Remap>; limit: number },
|
||||
{ url, sort, limit }: { url: string; sort: Sort; limit: number },
|
||||
) => {
|
||||
let next: string | null = null;
|
||||
const uri = new URL(url);
|
||||
|
@ -1,34 +1,40 @@
|
||||
import { sql } from "drizzle-orm";
|
||||
import { type SQL, type SQLWrapper, sql } from "drizzle-orm";
|
||||
import type { PgColumn } from "drizzle-orm/pg-core";
|
||||
import { t } from "elysia";
|
||||
|
||||
export type Sort<
|
||||
T extends string[],
|
||||
Remap extends Partial<Record<T[number], string>>,
|
||||
> = {
|
||||
export type Sort = {
|
||||
tablePk: SQLWrapper;
|
||||
sort: {
|
||||
key: Exclude<T[number], keyof Remap> | NonNullable<Remap[keyof Remap]>;
|
||||
remmapedKey?: keyof Remap;
|
||||
sql: SQLWrapper;
|
||||
isNullable: boolean;
|
||||
accessor: (cursor: any) => unknown;
|
||||
desc: boolean;
|
||||
}[];
|
||||
random?: { seed: number };
|
||||
};
|
||||
|
||||
export type NonEmptyArray<T> = [T, ...T[]];
|
||||
|
||||
export const Sort = <
|
||||
const T extends NonEmptyArray<string>,
|
||||
const Remap extends Partial<Record<T[number], string>> = never,
|
||||
>(
|
||||
values: T,
|
||||
export const Sort = (
|
||||
values: Record<
|
||||
string,
|
||||
| PgColumn
|
||||
| {
|
||||
sql: PgColumn;
|
||||
accessor: (cursor: any) => unknown;
|
||||
}
|
||||
| {
|
||||
sql: SQLWrapper;
|
||||
isNullable: boolean;
|
||||
accessor: (cursor: any) => unknown;
|
||||
}
|
||||
>,
|
||||
{
|
||||
description = "How to sort the query",
|
||||
default: def,
|
||||
remap,
|
||||
tablePk,
|
||||
}: {
|
||||
default?: T[number][];
|
||||
default?: (keyof typeof values)[];
|
||||
tablePk: SQLWrapper;
|
||||
description?: string;
|
||||
remap?: Remap;
|
||||
},
|
||||
) =>
|
||||
t
|
||||
@ -36,35 +42,48 @@ export const Sort = <
|
||||
t.Array(
|
||||
t.Union([
|
||||
t.UnionEnum([
|
||||
...values,
|
||||
...values.map((x: T[number]) => `-${x}` as const),
|
||||
...Object.keys(values),
|
||||
...Object.keys(values).map((x) => `-${x}`),
|
||||
"random",
|
||||
]),
|
||||
] as any),
|
||||
t.TemplateLiteral("random:${number}"),
|
||||
]),
|
||||
{
|
||||
// TODO: support explode: true (allow sort=slug,-createdAt). needs a pr to elysia
|
||||
explode: false,
|
||||
default: def,
|
||||
description: description,
|
||||
},
|
||||
),
|
||||
)
|
||||
.Decode((sort): Sort<T, Remap> => {
|
||||
.Decode((sort: string[]): Sort => {
|
||||
const random = sort.find((x) => x.startsWith("random"));
|
||||
if (random) {
|
||||
const seed = random.includes(":")
|
||||
? Number.parseInt(random.substring("random:".length))
|
||||
: Math.floor(Math.random() * Number.MAX_SAFE_INTEGER);
|
||||
return { random: { seed }, sort: [] };
|
||||
return { tablePk, random: { seed }, sort: [] };
|
||||
}
|
||||
return {
|
||||
tablePk,
|
||||
sort: sort.map((x) => {
|
||||
const desc = x[0] === "-";
|
||||
const key = (desc ? x.substring(1) : x) as T[number];
|
||||
if (remap && key in remap)
|
||||
return { key: remap[key]!, remmapedKey: key, desc };
|
||||
return { key: key as Exclude<typeof key, keyof Remap>, desc };
|
||||
const key = desc ? x.substring(1) : x;
|
||||
if ("getSQL" in values[key]) {
|
||||
return {
|
||||
sql: values[key],
|
||||
isNullable: !values[key].notNull,
|
||||
accessor: (x) => x[key],
|
||||
desc,
|
||||
};
|
||||
}
|
||||
return {
|
||||
sql: values[key].sql,
|
||||
isNullable:
|
||||
"isNullable" in values[key]
|
||||
? values[key].isNullable
|
||||
: !values[key].sql.notNull,
|
||||
accessor: values[key].accessor,
|
||||
desc,
|
||||
};
|
||||
}),
|
||||
};
|
||||
})
|
||||
@ -72,20 +91,12 @@ export const Sort = <
|
||||
throw new Error("Encode not supported for sort");
|
||||
});
|
||||
|
||||
type Table<Name extends string> = Record<Name, PgColumn>;
|
||||
|
||||
export const sortToSql = <
|
||||
T extends string[],
|
||||
Remap extends Partial<Record<T[number], string>>,
|
||||
>(
|
||||
sort: Sort<T, Remap> | undefined,
|
||||
table: Table<Sort<T, Remap>["sort"][number]["key"] | "pk">,
|
||||
) => {
|
||||
export const sortToSql = (sort: Sort | undefined) => {
|
||||
if (!sort) return [];
|
||||
if (sort.random) {
|
||||
return [sql`md5(${sort.random.seed} || ${table.pk})`];
|
||||
return [sql`md5(${sort.random.seed} || ${sort.tablePk})`];
|
||||
}
|
||||
return sort.sort.map((x) =>
|
||||
x.desc ? sql`${table[x.key]} desc nulls last` : table[x.key],
|
||||
x.desc ? sql`${x.sql} desc nulls last` : (x.sql as SQL),
|
||||
);
|
||||
};
|
||||
|
@ -1,6 +1,7 @@
|
||||
export * from "./movies-helper";
|
||||
export * from "./series-helper";
|
||||
export * from "./studio-helper";
|
||||
export * from "./staff-helper";
|
||||
export * from "./videos-helper";
|
||||
|
||||
export * from "~/elysia";
|
||||
|
77
api/tests/helpers/staff-helper.ts
Normal file
77
api/tests/helpers/staff-helper.ts
Normal file
@ -0,0 +1,77 @@
|
||||
import { buildUrl } from "tests/utils";
|
||||
import { app } from "~/elysia";
|
||||
|
||||
export const getStaff = async (id: string, query: {}) => {
|
||||
const resp = await app.handle(
|
||||
new Request(buildUrl(`staff/${id}`, query), {
|
||||
method: "GET",
|
||||
}),
|
||||
);
|
||||
const body = await resp.json();
|
||||
return [resp, body] as const;
|
||||
};
|
||||
|
||||
export const getStaffRoles = async (
|
||||
staff: string,
|
||||
{
|
||||
langs,
|
||||
...opts
|
||||
}: {
|
||||
filter?: string;
|
||||
limit?: number;
|
||||
after?: string;
|
||||
sort?: string | string[];
|
||||
query?: string;
|
||||
langs?: string;
|
||||
preferOriginal?: boolean;
|
||||
},
|
||||
) => {
|
||||
const resp = await app.handle(
|
||||
new Request(buildUrl(`staff/${staff}/roles`, opts), {
|
||||
method: "GET",
|
||||
headers: langs
|
||||
? {
|
||||
"Accept-Language": langs,
|
||||
}
|
||||
: {},
|
||||
}),
|
||||
);
|
||||
const body = await resp.json();
|
||||
return [resp, body] as const;
|
||||
};
|
||||
|
||||
export const getSerieStaff = async (
|
||||
serie: string,
|
||||
opts: {
|
||||
filter?: string;
|
||||
limit?: number;
|
||||
after?: string;
|
||||
sort?: string | string[];
|
||||
},
|
||||
) => {
|
||||
const resp = await app.handle(
|
||||
new Request(buildUrl(`series/${serie}/staff`, opts), {
|
||||
method: "GET",
|
||||
}),
|
||||
);
|
||||
const body = await resp.json();
|
||||
return [resp, body] as const;
|
||||
};
|
||||
|
||||
export const getMovieStaff = async (
|
||||
movie: string,
|
||||
opts: {
|
||||
filter?: string;
|
||||
limit?: number;
|
||||
after?: string;
|
||||
sort?: string | string[];
|
||||
},
|
||||
) => {
|
||||
const resp = await app.handle(
|
||||
new Request(buildUrl(`movies/${movie}/staff`, opts), {
|
||||
method: "GET",
|
||||
}),
|
||||
);
|
||||
const body = await resp.json();
|
||||
return [resp, body] as const;
|
||||
};
|
54
api/tests/series/get-staff.test.ts
Normal file
54
api/tests/series/get-staff.test.ts
Normal file
@ -0,0 +1,54 @@
|
||||
import { beforeAll, describe, expect, it } from "bun:test";
|
||||
import {
|
||||
createSerie,
|
||||
getSerieStaff,
|
||||
getStaff,
|
||||
getStaffRoles,
|
||||
} from "tests/helpers";
|
||||
import { expectStatus } from "tests/utils";
|
||||
import { madeInAbyss } from "~/models/examples";
|
||||
|
||||
beforeAll(async () => {
|
||||
await createSerie(madeInAbyss);
|
||||
});
|
||||
|
||||
describe("Get a staff member", () => {
|
||||
it("Invalid slug", async () => {
|
||||
const [resp, body] = await getStaff("sotneuhn", {});
|
||||
|
||||
expectStatus(resp, body).toBe(404);
|
||||
expect(body).toMatchObject({
|
||||
status: 404,
|
||||
message: expect.any(String),
|
||||
});
|
||||
});
|
||||
it("Get staff by id", async () => {
|
||||
const member = madeInAbyss.staff[0].staff;
|
||||
const [resp, body] = await getStaff(member.slug, {});
|
||||
|
||||
expectStatus(resp, body).toBe(200);
|
||||
expect(body.slug).toBe(member.slug);
|
||||
expect(body.latinName).toBe(member.latinName);
|
||||
});
|
||||
it("Get staff's roles", async () => {
|
||||
const role = madeInAbyss.staff[0];
|
||||
const [resp, body] = await getStaffRoles(role.staff.slug, {});
|
||||
|
||||
expectStatus(resp, body).toBe(200);
|
||||
expect(body.items).toBeArrayOfSize(1);
|
||||
expect(body.items[0].kind).toBe(role.kind);
|
||||
expect(body.items[0].character.name).toBe(role.character.name);
|
||||
expect(body.items[0].show.slug).toBe(madeInAbyss.slug);
|
||||
});
|
||||
it("Get series's staff", async () => {
|
||||
const role = madeInAbyss.staff[0];
|
||||
const [resp, body] = await getSerieStaff(madeInAbyss.slug, {});
|
||||
|
||||
expectStatus(resp, body).toBe(200);
|
||||
expect(body.items).toBeArrayOfSize(1);
|
||||
expect(body.items[0].kind).toBe(role.kind);
|
||||
expect(body.items[0].character.name).toBe(role.character.name);
|
||||
expect(body.items[0].staff.slug).toBe(role.staff.slug);
|
||||
expect(body.items[0].staff.name).toBe(role.staff.name);
|
||||
});
|
||||
});
|
Loading…
x
Reference in New Issue
Block a user