diff --git a/api/src/db/schema/shows.ts b/api/src/db/schema/shows.ts index 38b51041..6745eed0 100644 --- a/api/src/db/schema/shows.ts +++ b/api/src/db/schema/shows.ts @@ -12,9 +12,9 @@ import { uuid, varchar, } from "drizzle-orm/pg-core"; -import { image, language, schema } from "./utils"; import { entries } from "./entries"; import { seasons } from "./seasons"; +import { image, language, schema } from "./utils"; export const showKind = schema.enum("show_kind", ["serie", "movie"]); export const showStatus = schema.enum("show_status", [ diff --git a/api/src/db/utils.ts b/api/src/db/utils.ts index d71296e1..f2a4947a 100644 --- a/api/src/db/utils.ts +++ b/api/src/db/utils.ts @@ -71,7 +71,7 @@ export function sqlarr(array: unknown[]) { return `{${array.map((item) => `"${item}"`).join(",")}}`; } -// TODO: upstream this +// See https://github.com/drizzle-team/drizzle-orm/issues/4044 // TODO: type values (everything is a `text` for now) export function values(items: Record[]) { const [firstProp, ...props] = Object.keys(items[0]); diff --git a/api/src/models/entry/index.ts b/api/src/models/entry/index.ts index 73e73e6c..56b9b9f9 100644 --- a/api/src/models/entry/index.ts +++ b/api/src/models/entry/index.ts @@ -1,11 +1,11 @@ import { t } from "elysia"; import { Episode, - SeedEpisode, MovieEntry, + SeedEpisode, SeedMovieEntry, - Special, SeedSpecial, + Special, } from "../entry"; export const Entry = t.Union([Episode, MovieEntry, Special]); diff --git a/api/src/models/entry/special.ts b/api/src/models/entry/special.ts index 56302cd5..188c8b3c 100644 --- a/api/src/models/entry/special.ts +++ b/api/src/models/entry/special.ts @@ -1,7 +1,7 @@ import { t } from "elysia"; import { comment } from "../../utils"; -import { BaseEntry, EntryTranslation } from "./base-entry"; import { EpisodeId, Resource, SeedImage, TranslationRecord } from "../utils"; +import { BaseEntry, EntryTranslation } from "./base-entry"; export const BaseSpecial = t.Intersect( [ diff --git a/api/src/models/season.ts b/api/src/models/season.ts index 4777a30f..d5c032eb 100644 --- a/api/src/models/season.ts +++ b/api/src/models/season.ts @@ -1,9 +1,9 @@ import { t } from "elysia"; +import { bubbleImages, madeInAbyss, registerExamples } from "./examples"; import { SeasonId } from "./utils/external-id"; import { Image, SeedImage } from "./utils/image"; import { TranslationRecord } from "./utils/language"; import { Resource } from "./utils/resource"; -import { bubbleImages, madeInAbyss, registerExamples } from "./examples"; export const BaseSeason = t.Object({ seasonNumber: t.Number({ minimum: 1 }), diff --git a/api/tests/movies/get-all-movies.test.ts b/api/tests/movies/get-all-movies.test.ts index c15a6548..b908c216 100644 --- a/api/tests/movies/get-all-movies.test.ts +++ b/api/tests/movies/get-all-movies.test.ts @@ -8,7 +8,7 @@ import { dune1984 } from "~/models/examples/dune-1984"; import { dune } from "~/models/examples/dune-2021"; import type { Movie } from "~/models/movie"; import { isUuid } from "~/models/utils"; -import { getMovies, app } from "../helpers"; +import { app, getMovies } from "../helpers"; beforeAll(async () => { await db.delete(shows);