Cleanup translation schema for series + example

api/src/models/examples/made-in-abyss.ts

@@ -1,8 +1,9 @@
-import type { SeedSerie } from "../seed";
+import type { SeedSerie } from "~/models/serie";
 
-export const madeInAbyss: SeedSerie = {
+export const madeInAbyss = {
-	id: "04bcf2ac-3c09-42f6-8357-b003798f9562",
 	slug: "made-in-abyss",
+	translations: {
+		en: {
 			name: "Made in Abyss",
 			tagline: "How far would you go… for the ones you love?",
 			aliases: [
@@ -32,6 +33,15 @@ export const madeInAbyss: SeedSerie = {
 				"fantasy",
 				"adventure",
 			],
+			poster:
+				"https://image.tmdb.org/t/p/original/4Bh9qzB1Kau4RDaVQXVFdoJ0HcE.jpg",
+			thumbnail:
+				"https://image.tmdb.org/t/p/original/Df9XrvZFIeQfLKfu8evRmzvRsd.jpg",
+			logo: "https://image.tmdb.org/t/p/original/7hY3Q4GhkiYPBfn4UoVg0AO4Zgk.png",
+			banner: null,
+			trailerUrl: "https://www.youtube.com/watch?v=ePOyy6Wlk4s",
+		},
+	},
 	genres: [
 		"animation",
 		"drama",
@@ -46,26 +56,6 @@ export const madeInAbyss: SeedSerie = {
 	originalLanguage: "ja",
 	startAir: "2017-07-07",
 	endAir: "2022-09-28",
-	poster: {
-		id: "8205a20e-d91f-804c-3a84-4e4dc6202d66",
-		source:
-			"https://image.tmdb.org/t/p/original/4Bh9qzB1Kau4RDaVQXVFdoJ0HcE.jpg",
-		blurhash: "LZGlS3XTD%jE~Wf,SeV@%2o|WERj",
-	},
-	thumbnail: {
-		id: "819d816c-88f6-9f3a-b5e7-ce3daaffbac4",
-		source:
-			"https://image.tmdb.org/t/p/original/Df9XrvZFIeQfLKfu8evRmzvRsd.jpg",
-		blurhash: "LmJtk{kq~q%2bbWCxaV@.8RixuNG",
-	},
-	logo: {
-		id: "23cb7b06-8406-2288-8e40-08bfc16180b5",
-		source:
-			"https://image.tmdb.org/t/p/original/7hY3Q4GhkiYPBfn4UoVg0AO4Zgk.png",
-		blurhash: "LKGaa%M{0zbI#7$%bbofGGw^wcw{",
-	},
-	banner: null,
-	trailerUrl: "https://www.youtube.com/watch?v=ePOyy6Wlk4s",
 	externalId: {
 		themoviedatabase: {
 			dataId: "72636",
@@ -74,26 +64,23 @@ export const madeInAbyss: SeedSerie = {
 		imdb: { dataId: "tt7222086", link: "https://www.imdb.com/title/tt7222086" },
 		tvdb: { dataId: "326109", link: null },
 	},
-	createdAt: "2023-11-29T11:12:11.949503Z",
-	nextRefresh: "2025-01-07T11:42:50.948248Z",
 	seasons: [
 		{
-			id: "490aa312-53b9-43c2-845d-7cbf32642c98",
 			slug: "made-in-abyss-s1",
 			seasonNumber: 1,
+			translations: {
+				en: {
 					name: "Season 1",
 					description:
 						"Within the depths of the Abyss, a girl named Riko stumbles upon a robot who looks like a young boy. Riko and her new friend descend into uncharted territory to unlock its mysteries, but what lies in wait for them in the darkness?",
-			startAir: "2017-07-07",
+					poster:
-			endAir: "2017-09-29",
-			poster: {
-				id: "1c121a2b-d3a2-4ce8-e22a-79b13dde3f7d",
-				source:
 						"https://image.tmdb.org/t/p/original/uVK3H8CgtrVgySFpdImvNXkN7RK.jpg",
-				blurhash: "LYG9BNkrD%V?~WS5S1WA%LbubHV[",
-			},
 					thumbnail: null,
 					banner: null,
+				},
+			},
+			startAir: "2017-07-07",
+			endAir: "2017-09-29",
 			externalId: {
 				themoviedatabase: {
 					serieId: "72636",
@@ -101,26 +88,23 @@ export const madeInAbyss: SeedSerie = {
 					link: "https://www.themoviedb.org/tv/72636/season/1",
 				},
 			},
-			createdAt: "2023-11-29T11:12:13.008151Z",
-			nextRefresh: "2025-01-07T11:37:50.151836Z",
 		},
 		{
-			id: "135af9ae-a8eb-4110-a4e4-05eee49e2d76",
 			slug: "made-in-abyss-s2",
 			seasonNumber: 2,
+			translations: {
+				en: {
 					name: "The Golden City of the Scorching Sun",
 					description:
 						"Set directly after the events of Made in Abyss: Dawn of the Deep Soul, the fifth installment of Made in Abyss covers the adventure of Reg, Riko and Nanachi in the Sixth Layer, The Capital of the Unreturned.",
-			startAir: "2022-07-06",
+					poster:
-			endAir: "2022-09-28",
-			poster: {
-				id: "a03c57d7-4032-7d97-083a-9a6e51d5f1e7",
-				source:
 						"https://image.tmdb.org/t/p/original/clC2erfUqIezhET67Gz9fcKD1L2.jpg",
-				blurhash: "LpNTRGx]s9oz~WbJRPoft7RjV@a|",
-			},
 					thumbnail: null,
 					banner: null,
+				},
+			},
+			startAir: "2022-07-06",
+			endAir: "2022-09-28",
 			externalId: {
 				themoviedatabase: {
 					serieId: "72636",
@@ -128,8 +112,6 @@ export const madeInAbyss: SeedSerie = {
 					link: "https://www.themoviedb.org/tv/72636/season/2",
 				},
 			},
-			createdAt: "2023-11-29T11:12:13.630306Z",
-			nextRefresh: "2025-01-07T11:09:19.552971Z",
 		},
 	],
 	entries: [
@@ -337,4 +319,4 @@ export const madeInAbyss: SeedSerie = {
 			},
 		},
 	],
-};
+} satisfies SeedSerie;

api/src/models/movie.ts

@@ -6,6 +6,7 @@ import {
 	Genre,
 	Image,
 	Language,
+	Resource,
 	SeedImage,
 	TranslationRecord,
 } from "./utils";
@@ -15,8 +16,6 @@ export const MovieStatus = t.UnionEnum(["unknown", "finished", "planned"]);
 export type MovieStatus = typeof MovieStatus.static;
 
 const BaseMovie = t.Object({
-	id: t.String({ format: "uuid" }),
-	slug: t.String({ format: "slug" }),
 	genres: t.Array(Genre),
 	rating: t.Nullable(t.Number({ minimum: 0, maximum: 100 })),
 	status: MovieStatus,
@@ -53,8 +52,9 @@ export const MovieTranslation = t.Object({
 export type MovieTranslation = typeof MovieTranslation.static;
 
 export const Movie = t.Intersect([
-	BaseMovie,
+	Resource,
 	MovieTranslation,
+	BaseMovie,
 	t.Object({ isAvailable: t.Boolean() }),
 ]);
 export type Movie = typeof Movie.static;
@@ -69,8 +69,9 @@ export const FullMovie = t.Intersect([
 export type FullMovie = typeof FullMovie.static;
 
 export const SeedMovie = t.Intersect([
-	t.Omit(BaseMovie, ["id", "createdAt", "nextRefresh"]),
+	t.Omit(BaseMovie, ["createdAt", "nextRefresh"]),
 	t.Object({
+		slug: t.String({ format: "slug", examples: ["bubble"] }),
 		translations: TranslationRecord(
 			t.Intersect([
 				t.Omit(MovieTranslation, ["poster", "thumbnail", "banner", "logo"]),
@@ -92,4 +93,3 @@ registerExamples(Movie, {
 	...bubble.translations.en,
 	...bubbleImages,
 });
-registerExamples(SeedMovie, bubble);

api/src/models/season.ts

@@ -1,7 +1,7 @@
 import { t } from "elysia";
 import { SeasonId } from "./utils/external-id";
-import { Image } from "./utils/image";
+import { Image, SeedImage } from "./utils/image";
-import { Language } from "./utils/language";
+import { TranslationRecord } from "./utils/language";
 import { Resource } from "./utils/resource";
 
 export const BaseSeason = t.Object({
@@ -29,8 +29,18 @@ export const Season = t.Intersect([Resource, BaseSeason, SeasonTranslation]);
 export type Season = typeof Season.static;
 
 export const SeedSeason = t.Intersect([
-	BaseSeason,
+	t.Omit(BaseSeason, ["createdAt", "nextRefresh"]),
 	t.Object({
-		translations: t.Record(Language(), SeasonTranslation, { minPropreties: 1 }),
+		slug: t.String({ format: "slug" }),
+		translations: TranslationRecord(
+			t.Intersect([
+				t.Omit(SeasonTranslation, ["poster", "thumbnail", "banner"]),
+				t.Object({
+					poster: t.Nullable(SeedImage),
+					thumbnail: t.Nullable(SeedImage),
+					banner: t.Nullable(SeedImage),
+				}),
+			]),
+		),
 	}),
 ]);

api/src/models/serie.ts

@@ -1,10 +1,10 @@
 import { t } from "elysia";
-import { madeInAbyss, registerExamples } from "./examples";
+import { bubbleImages, madeInAbyss, registerExamples } from "./examples";
 import { SeedSeason } from "./season";
 import { ExternalId } from "./utils/external-id";
 import { Genre } from "./utils/genres";
-import { Image } from "./utils/image";
+import { Image, SeedImage } from "./utils/image";
-import { Language } from "./utils/language";
+import { Language, TranslationRecord } from "./utils/language";
 import { Resource } from "./utils/resource";
 
 export const SerieStatus = t.UnionEnum([
@@ -55,16 +55,34 @@ export const SerieTranslation = t.Object({
 });
 export type SerieTranslation = typeof SerieTranslation.static;
 
-export const Serie = t.Intersect([Resource, BaseSerie, SerieTranslation]);
+export const Serie = t.Intersect([Resource, SerieTranslation, BaseSerie]);
 export type Serie = typeof Serie.static;
 
 export const SeedSerie = t.Intersect([
-	BaseSerie,
+	t.Omit(BaseSerie, ["createdAt", "nextRefresh"]),
 	t.Object({
-		translations: t.Record(Language(), SerieTranslation, { minProperties: 1 }),
+		slug: t.String({ format: "slug" }),
+		translations: TranslationRecord(
+			t.Intersect([
+				t.Omit(SerieTranslation, ["poster", "thumbnail", "banner", "logo"]),
+				t.Object({
+					poster: t.Nullable(SeedImage),
+					thumbnail: t.Nullable(SeedImage),
+					banner: t.Nullable(SeedImage),
+					logo: t.Nullable(SeedImage),
+				}),
+			]),
+		),
 		seasons: t.Array(SeedSeason),
 		// entries: t.Array(SeedEntry),
 		// extras: t.Optional(t.Array(SeedExtra)),
 	}),
 ]);
 export type SeedSerie = typeof SeedSerie.static;
+
+registerExamples(Serie, {
+	...madeInAbyss,
+	...madeInAbyss.translations.en,
+	...bubbleImages,
+});
+registerExamples(SeedSerie, madeInAbyss);

api/src/models/utils/page.ts

@@ -11,7 +11,7 @@ export const Page = <T extends TSchema>(schema: T, options?: ObjectOptions) =>
 			next: t.Nullable(t.String({ format: "uri" })),
 		},
 		{
-			description: `Paginated list of ${schema.title} that match filters.`,
+			description: "Paginated list that match filters.",
 			...options,
 		},
 	);