diff --git a/api/src/models/entry/extra.ts b/api/src/models/entry/extra.ts index 72149a88..1d033753 100644 --- a/api/src/models/entry/extra.ts +++ b/api/src/models/entry/extra.ts @@ -3,7 +3,6 @@ import { type Prettify, comment } from "~/utils"; import { madeInAbyss, registerExamples } from "../examples"; import { DbMetadata, SeedImage } from "../utils"; import { Resource } from "../utils/resource"; -import { EmbeddedVideo } from "../video"; import { BaseEntry } from "./base-entry"; export const ExtraType = t.UnionEnum([ @@ -32,14 +31,7 @@ export const BaseExtra = t.Intersect( }, ); -export const Extra = t.Intersect([ - Resource(), - BaseExtra, - t.Object({ - video: t.Optional(EmbeddedVideo), - }), - DbMetadata, -]); +export const Extra = t.Intersect([Resource(), BaseExtra, DbMetadata]); export type Extra = Prettify; export const SeedExtra = t.Intersect([ @@ -52,4 +44,4 @@ export const SeedExtra = t.Intersect([ ]); export type SeedExtra = Prettify; -registerExamples(Extra, { ...madeInAbyss.extras[0], video: undefined }); +registerExamples(Extra, madeInAbyss.extras[0]); diff --git a/api/src/models/entry/unknown-entry.ts b/api/src/models/entry/unknown-entry.ts index e845a438..efe1d380 100644 --- a/api/src/models/entry/unknown-entry.ts +++ b/api/src/models/entry/unknown-entry.ts @@ -2,7 +2,6 @@ import { t } from "elysia"; import { type Prettify, comment } from "~/utils"; import { bubbleImages, registerExamples, youtubeExample } from "../examples"; import { DbMetadata, Resource } from "../utils"; -import { EmbeddedVideo } from "../video"; import { BaseEntry, EntryTranslation } from "./base-entry"; export const BaseUnknownEntry = t.Intersect( @@ -28,9 +27,6 @@ export const UnknownEntry = t.Intersect([ Resource(), UnknownEntryTranslation, BaseUnknownEntry, - t.Object({ - video: t.Optional(EmbeddedVideo), - }), DbMetadata, ]); export type UnknownEntry = Prettify; diff --git a/api/tests/series/get-entries.test.ts b/api/tests/series/get-entries.test.ts index d8dce9cd..ca5a692e 100644 --- a/api/tests/series/get-entries.test.ts +++ b/api/tests/series/get-entries.test.ts @@ -40,6 +40,13 @@ describe("Get entries", () => { expectStatus(resp, body).toBe(200); expect(body.items[0].videos).toBeArrayOfSize(1); + expect(body.items[0].videos[0]).toMatchObject({ + path: madeInAbyssVideo.path, + slug: madeInAbyssVideo.slug, + version: madeInAbyssVideo.version, + rendering: madeInAbyssVideo.rendering, + part: madeInAbyssVideo.part, + }); }); });