diff --git a/api/src/models/collections.ts b/api/src/models/collections.ts index 452a7868..62a5c489 100644 --- a/api/src/models/collections.ts +++ b/api/src/models/collections.ts @@ -13,7 +13,6 @@ import { } from "./utils"; const BaseCollection = t.Object({ - kind: t.Literal("collection"), genres: t.Array(Genre), rating: t.Nullable(t.Integer({ minimum: 0, maximum: 100 })), startAir: t.Nullable( diff --git a/api/src/models/movie.ts b/api/src/models/movie.ts index 706a87ce..c64bcdef 100644 --- a/api/src/models/movie.ts +++ b/api/src/models/movie.ts @@ -1,5 +1,5 @@ import { t } from "elysia"; -import { type Prettify, comment } from "~/utils"; +import type { Prettify } from "~/utils"; import { SeedCollection } from "./collections"; import { bubble, bubbleImages, registerExamples } from "./examples"; import { SeedStudio, Studio } from "./studio"; @@ -20,7 +20,6 @@ export const MovieStatus = t.UnionEnum(["unknown", "finished", "planned"]); export type MovieStatus = typeof MovieStatus.static; const BaseMovie = t.Object({ - kind: t.Literal("movie"), genres: t.Array(Genre), rating: t.Nullable(t.Integer({ minimum: 0, maximum: 100 })), status: MovieStatus, diff --git a/api/src/models/serie.ts b/api/src/models/serie.ts index d02de2d7..252e090e 100644 --- a/api/src/models/serie.ts +++ b/api/src/models/serie.ts @@ -26,7 +26,6 @@ export const SerieStatus = t.UnionEnum([ export type SerieStatus = typeof SerieStatus.static; const BaseSerie = t.Object({ - kind: t.Literal("serie"), genres: t.Array(Genre), rating: t.Nullable(t.Integer({ minimum: 0, maximum: 100 })), status: SerieStatus, diff --git a/api/src/models/show.ts b/api/src/models/show.ts index ccaaf35a..915ce7b4 100644 --- a/api/src/models/show.ts +++ b/api/src/models/show.ts @@ -3,4 +3,8 @@ import { Collection } from "./collections"; import { Movie } from "./movie"; import { Serie } from "./serie"; -export const Show = t.Union([Movie, Serie, Collection]); +export const Show = t.Union([ + t.Intersect([Movie, t.Object({ kind: t.Literal("movie") })]), + t.Intersect([Serie, t.Object({ kind: t.Literal("serie") })]), + t.Intersect([Collection, t.Object({ kind: t.Literal("collection") })]), +]);