From 706aaf827cdafd926c1dd119355d5d6cc05afd20 Mon Sep 17 00:00:00 2001 From: mehm8128 Date: Sun, 24 Mar 2024 15:09:14 +0900 Subject: [PATCH] =?UTF-8?q?=E3=81=84=E3=82=89=E3=81=AA=E3=81=84=E3=83=87?= =?UTF-8?q?=E3=83=BC=E3=82=BF=E3=82=92=E9=80=81=E3=82=89=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/authors/GetAuthorListResponse.ts | 29 +------ .../src/api/authors/GetAuthorResponse.ts | 10 +-- .../src/api/authors/PatchAuthorResponse.ts | 10 +-- .../src/api/authors/PostAuthorResponse.ts | 10 +-- .../src/api/books/GetBookListResponse.ts | 7 +- .../schema/src/api/books/GetBookResponse.ts | 7 +- .../schema/src/api/books/PatchBookResponse.ts | 7 +- .../schema/src/api/books/PostBookResponse.ts | 7 +- .../api/episodes/GetEpisodeListResponse.ts | 39 +--------- .../src/api/episodes/GetEpisodeResponse.ts | 27 +------ .../src/api/episodes/PatchEpisodeResponse.ts | 39 +--------- .../src/api/episodes/PostEpisodeResponse.ts | 39 +--------- .../api/features/GetFeatureListResponse.ts | 10 +-- .../api/rankings/GetRankingListResponse.ts | 10 +-- .../src/api/releases/GetReleaseResponse.ts | 11 +-- workspaces/server/src/repositories/author.ts | 39 ---------- workspaces/server/src/repositories/book.ts | 10 --- workspaces/server/src/repositories/episode.ts | 76 ------------------- workspaces/server/src/repositories/feature.ts | 8 -- workspaces/server/src/repositories/ranking.ts | 8 -- workspaces/server/src/repositories/release.ts | 8 -- 21 files changed, 16 insertions(+), 395 deletions(-) diff --git a/workspaces/schema/src/api/authors/GetAuthorListResponse.ts b/workspaces/schema/src/api/authors/GetAuthorListResponse.ts index dfcc04d59..309ca5b24 100644 --- a/workspaces/schema/src/api/authors/GetAuthorListResponse.ts +++ b/workspaces/schema/src/api/authors/GetAuthorListResponse.ts @@ -1,7 +1,7 @@ import { createSelectSchema } from 'drizzle-zod'; import type { z } from 'zod'; -import { author, book, episode, image } from '../../models'; +import { author } from '../../models'; export const GetAuthorListResponseSchema = createSelectSchema(author) .pick({ @@ -9,33 +9,6 @@ export const GetAuthorListResponseSchema = createSelectSchema(author) id: true, name: true, }) - .extend({ - books: createSelectSchema(book) - .pick({ - description: true, - id: true, - name: true, - }) - .extend({ - episodes: createSelectSchema(episode) - .pick({ - chapter: true, - description: true, - id: true, - name: true, - }) - .array(), - image: createSelectSchema(image).pick({ - alt: true, - id: true, - }), - }) - .array(), - image: createSelectSchema(image).pick({ - alt: true, - id: true, - }), - }) .array(); export type GetAuthorListResponse = z.infer; diff --git a/workspaces/schema/src/api/authors/GetAuthorResponse.ts b/workspaces/schema/src/api/authors/GetAuthorResponse.ts index 49a6d762e..b5d5208a2 100644 --- a/workspaces/schema/src/api/authors/GetAuthorResponse.ts +++ b/workspaces/schema/src/api/authors/GetAuthorResponse.ts @@ -1,7 +1,7 @@ import { createSelectSchema } from 'drizzle-zod'; import type { z } from 'zod'; -import { author, book, episode, image } from '../../models'; +import { author, book, image } from '../../models'; export const GetAuthorResponseSchema = createSelectSchema(author) .pick({ @@ -17,14 +17,6 @@ export const GetAuthorResponseSchema = createSelectSchema(author) name: true, }) .extend({ - episodes: createSelectSchema(episode) - .pick({ - chapter: true, - description: true, - id: true, - name: true, - }) - .array(), image: createSelectSchema(image).pick({ alt: true, id: true, diff --git a/workspaces/schema/src/api/authors/PatchAuthorResponse.ts b/workspaces/schema/src/api/authors/PatchAuthorResponse.ts index 1b8e00fa4..33a0a467b 100644 --- a/workspaces/schema/src/api/authors/PatchAuthorResponse.ts +++ b/workspaces/schema/src/api/authors/PatchAuthorResponse.ts @@ -1,7 +1,7 @@ import { createSelectSchema } from 'drizzle-zod'; import type { z } from 'zod'; -import { author, book, episode, image } from '../../models'; +import { author, book, image } from '../../models'; export const PatchAuthorResponseSchema = createSelectSchema(author) .pick({ @@ -17,14 +17,6 @@ export const PatchAuthorResponseSchema = createSelectSchema(author) name: true, }) .extend({ - episodes: createSelectSchema(episode) - .pick({ - chapter: true, - description: true, - id: true, - name: true, - }) - .array(), image: createSelectSchema(image).pick({ alt: true, id: true, diff --git a/workspaces/schema/src/api/authors/PostAuthorResponse.ts b/workspaces/schema/src/api/authors/PostAuthorResponse.ts index 4a8c72ced..088ffe788 100644 --- a/workspaces/schema/src/api/authors/PostAuthorResponse.ts +++ b/workspaces/schema/src/api/authors/PostAuthorResponse.ts @@ -1,7 +1,7 @@ import { createSelectSchema } from 'drizzle-zod'; import type { z } from 'zod'; -import { author, book, episode, image } from '../../models'; +import { author, book, image } from '../../models'; export const PostAuthorResponseSchema = createSelectSchema(author) .pick({ @@ -17,14 +17,6 @@ export const PostAuthorResponseSchema = createSelectSchema(author) name: true, }) .extend({ - episodes: createSelectSchema(episode) - .pick({ - chapter: true, - description: true, - id: true, - name: true, - }) - .array(), image: createSelectSchema(image).pick({ alt: true, id: true, diff --git a/workspaces/schema/src/api/books/GetBookListResponse.ts b/workspaces/schema/src/api/books/GetBookListResponse.ts index 4b52bfb21..416708c45 100644 --- a/workspaces/schema/src/api/books/GetBookListResponse.ts +++ b/workspaces/schema/src/api/books/GetBookListResponse.ts @@ -1,7 +1,7 @@ import { createSelectSchema } from 'drizzle-zod'; import type { z } from 'zod'; -import { author, book, episode, image } from '../../models'; +import { author, book, image } from '../../models'; export const GetBookListResponseSchema = createSelectSchema(book) .pick({ @@ -23,11 +23,6 @@ export const GetBookListResponseSchema = createSelectSchema(book) id: true, }), }), - episodes: createSelectSchema(episode) - .pick({ - id: true, - }) - .array(), image: createSelectSchema(image).pick({ alt: true, id: true, diff --git a/workspaces/schema/src/api/books/GetBookResponse.ts b/workspaces/schema/src/api/books/GetBookResponse.ts index 143bbcec7..2a1e7e273 100644 --- a/workspaces/schema/src/api/books/GetBookResponse.ts +++ b/workspaces/schema/src/api/books/GetBookResponse.ts @@ -1,7 +1,7 @@ import { createSelectSchema } from 'drizzle-zod'; import type { z } from 'zod'; -import { author, book, episode, image } from '../../models'; +import { author, book, image } from '../../models'; export const GetBookResponseSchema = createSelectSchema(book) .pick({ @@ -23,11 +23,6 @@ export const GetBookResponseSchema = createSelectSchema(book) id: true, }), }), - episodes: createSelectSchema(episode) - .pick({ - id: true, - }) - .array(), image: createSelectSchema(image).pick({ alt: true, id: true, diff --git a/workspaces/schema/src/api/books/PatchBookResponse.ts b/workspaces/schema/src/api/books/PatchBookResponse.ts index 5e064ff95..4399bde2f 100644 --- a/workspaces/schema/src/api/books/PatchBookResponse.ts +++ b/workspaces/schema/src/api/books/PatchBookResponse.ts @@ -1,7 +1,7 @@ import { createSelectSchema } from 'drizzle-zod'; import type { z } from 'zod'; -import { author, book, episode, image } from '../../models'; +import { author, book, image } from '../../models'; export const PatchBookResponseSchema = createSelectSchema(book) .pick({ @@ -23,11 +23,6 @@ export const PatchBookResponseSchema = createSelectSchema(book) id: true, }), }), - episodes: createSelectSchema(episode) - .pick({ - id: true, - }) - .array(), image: createSelectSchema(image).pick({ alt: true, id: true, diff --git a/workspaces/schema/src/api/books/PostBookResponse.ts b/workspaces/schema/src/api/books/PostBookResponse.ts index 1381b479f..8184725a6 100644 --- a/workspaces/schema/src/api/books/PostBookResponse.ts +++ b/workspaces/schema/src/api/books/PostBookResponse.ts @@ -1,7 +1,7 @@ import { createSelectSchema } from 'drizzle-zod'; import type { z } from 'zod'; -import { author, book, episode, image } from '../../models'; +import { author, book, image } from '../../models'; export const PostBookResponseSchema = createSelectSchema(book) .pick({ @@ -23,11 +23,6 @@ export const PostBookResponseSchema = createSelectSchema(book) id: true, }), }), - episodes: createSelectSchema(episode) - .pick({ - id: true, - }) - .array(), image: createSelectSchema(image).pick({ alt: true, id: true, diff --git a/workspaces/schema/src/api/episodes/GetEpisodeListResponse.ts b/workspaces/schema/src/api/episodes/GetEpisodeListResponse.ts index b3d28ecd9..04fcf88e5 100644 --- a/workspaces/schema/src/api/episodes/GetEpisodeListResponse.ts +++ b/workspaces/schema/src/api/episodes/GetEpisodeListResponse.ts @@ -1,7 +1,7 @@ import { createSelectSchema } from 'drizzle-zod'; import type { z } from 'zod'; -import { author, book, episode, episodePage, image } from '../../models'; +import { episode, image } from '../../models'; export const GetEpisodeListResponseSchema = createSelectSchema(episode) .pick({ @@ -12,47 +12,10 @@ export const GetEpisodeListResponseSchema = createSelectSchema(episode) nameRuby: true, }) .extend({ - book: createSelectSchema(book) - .pick({ - description: true, - id: true, - name: true, - nameRuby: true, - }) - .extend({ - author: createSelectSchema(author) - .pick({ - description: true, - id: true, - name: true, - }) - .extend({ - image: createSelectSchema(image).pick({ - alt: true, - id: true, - }), - }), - image: createSelectSchema(image).pick({ - alt: true, - id: true, - }), - }), image: createSelectSchema(image).pick({ alt: true, id: true, }), - pages: createSelectSchema(episodePage) - .pick({ - id: true, - page: true, - }) - .extend({ - image: createSelectSchema(image).pick({ - alt: true, - id: true, - }), - }) - .array(), }) .array(); diff --git a/workspaces/schema/src/api/episodes/GetEpisodeResponse.ts b/workspaces/schema/src/api/episodes/GetEpisodeResponse.ts index d0daf9b14..aa73a192c 100644 --- a/workspaces/schema/src/api/episodes/GetEpisodeResponse.ts +++ b/workspaces/schema/src/api/episodes/GetEpisodeResponse.ts @@ -1,7 +1,7 @@ import { createSelectSchema } from 'drizzle-zod'; import type { z } from 'zod'; -import { author, book, episode, episodePage, image } from '../../models'; +import { episode, episodePage, image } from '../../models'; export const GetEpisodeResponseSchema = createSelectSchema(episode) .pick({ @@ -12,31 +12,6 @@ export const GetEpisodeResponseSchema = createSelectSchema(episode) nameRuby: true, }) .extend({ - book: createSelectSchema(book) - .pick({ - description: true, - id: true, - name: true, - nameRuby: true, - }) - .extend({ - author: createSelectSchema(author) - .pick({ - description: true, - id: true, - name: true, - }) - .extend({ - image: createSelectSchema(image).pick({ - alt: true, - id: true, - }), - }), - image: createSelectSchema(image).pick({ - alt: true, - id: true, - }), - }), image: createSelectSchema(image).pick({ alt: true, id: true, diff --git a/workspaces/schema/src/api/episodes/PatchEpisodeResponse.ts b/workspaces/schema/src/api/episodes/PatchEpisodeResponse.ts index ce2328eb3..117d72c92 100644 --- a/workspaces/schema/src/api/episodes/PatchEpisodeResponse.ts +++ b/workspaces/schema/src/api/episodes/PatchEpisodeResponse.ts @@ -1,7 +1,7 @@ import { createSelectSchema } from 'drizzle-zod'; import type { z } from 'zod'; -import { author, book, episode, episodePage, image } from '../../models'; +import { episode, image } from '../../models'; export const PatchEpisodeResponseSchema = createSelectSchema(episode) .pick({ @@ -12,47 +12,10 @@ export const PatchEpisodeResponseSchema = createSelectSchema(episode) nameRuby: true, }) .extend({ - book: createSelectSchema(book) - .pick({ - description: true, - id: true, - name: true, - nameRuby: true, - }) - .extend({ - author: createSelectSchema(author) - .pick({ - description: true, - id: true, - name: true, - }) - .extend({ - image: createSelectSchema(image).pick({ - alt: true, - id: true, - }), - }), - image: createSelectSchema(image).pick({ - alt: true, - id: true, - }), - }), image: createSelectSchema(image).pick({ alt: true, id: true, }), - pages: createSelectSchema(episodePage) - .pick({ - id: true, - page: true, - }) - .extend({ - image: createSelectSchema(image).pick({ - alt: true, - id: true, - }), - }) - .array(), }); export type PatchEpisodeResponse = z.infer; diff --git a/workspaces/schema/src/api/episodes/PostEpisodeResponse.ts b/workspaces/schema/src/api/episodes/PostEpisodeResponse.ts index 72728f669..f725b5e87 100644 --- a/workspaces/schema/src/api/episodes/PostEpisodeResponse.ts +++ b/workspaces/schema/src/api/episodes/PostEpisodeResponse.ts @@ -1,7 +1,7 @@ import { createSelectSchema } from 'drizzle-zod'; import type { z } from 'zod'; -import { author, book, episode, episodePage, image } from '../../models'; +import { episode, image } from '../../models'; export const PostEpisodeResponseSchema = createSelectSchema(episode) .pick({ @@ -12,47 +12,10 @@ export const PostEpisodeResponseSchema = createSelectSchema(episode) nameRuby: true, }) .extend({ - book: createSelectSchema(book) - .pick({ - description: true, - id: true, - name: true, - nameRuby: true, - }) - .extend({ - author: createSelectSchema(author) - .pick({ - description: true, - id: true, - name: true, - }) - .extend({ - image: createSelectSchema(image).pick({ - alt: true, - id: true, - }), - }), - image: createSelectSchema(image).pick({ - alt: true, - id: true, - }), - }), image: createSelectSchema(image).pick({ alt: true, id: true, }), - pages: createSelectSchema(episodePage) - .pick({ - id: true, - page: true, - }) - .extend({ - image: createSelectSchema(image).pick({ - alt: true, - id: true, - }), - }) - .array(), }); export type PostEpisodeResponse = z.infer; diff --git a/workspaces/schema/src/api/features/GetFeatureListResponse.ts b/workspaces/schema/src/api/features/GetFeatureListResponse.ts index c9c82f658..473101c83 100644 --- a/workspaces/schema/src/api/features/GetFeatureListResponse.ts +++ b/workspaces/schema/src/api/features/GetFeatureListResponse.ts @@ -1,7 +1,7 @@ import { createSelectSchema } from 'drizzle-zod'; import type { z } from 'zod'; -import { author, book, episode, feature, image } from '../../models'; +import { author, book, feature, image } from '../../models'; export const GetFeatureListResponseSchema = createSelectSchema(feature) .pick({ @@ -27,14 +27,6 @@ export const GetFeatureListResponseSchema = createSelectSchema(feature) id: true, }), }), - episodes: createSelectSchema(episode) - .pick({ - chapter: true, - description: true, - id: true, - name: true, - }) - .array(), image: createSelectSchema(image).pick({ alt: true, id: true, diff --git a/workspaces/schema/src/api/rankings/GetRankingListResponse.ts b/workspaces/schema/src/api/rankings/GetRankingListResponse.ts index 0382bb153..c82021d65 100644 --- a/workspaces/schema/src/api/rankings/GetRankingListResponse.ts +++ b/workspaces/schema/src/api/rankings/GetRankingListResponse.ts @@ -1,7 +1,7 @@ import { createSelectSchema } from 'drizzle-zod'; import type { z } from 'zod'; -import { author, book, episode, image, ranking } from '../../models'; +import { author, book, image, ranking } from '../../models'; export const GetRankingListResponseSchema = createSelectSchema(ranking) .pick({ @@ -28,14 +28,6 @@ export const GetRankingListResponseSchema = createSelectSchema(ranking) id: true, }), }), - episodes: createSelectSchema(episode) - .pick({ - chapter: true, - description: true, - id: true, - name: true, - }) - .array(), image: createSelectSchema(image).pick({ alt: true, id: true, diff --git a/workspaces/schema/src/api/releases/GetReleaseResponse.ts b/workspaces/schema/src/api/releases/GetReleaseResponse.ts index 2d02004da..72a69e8c9 100644 --- a/workspaces/schema/src/api/releases/GetReleaseResponse.ts +++ b/workspaces/schema/src/api/releases/GetReleaseResponse.ts @@ -1,7 +1,7 @@ import { createSelectSchema } from 'drizzle-zod'; import type { z } from 'zod'; -import { author, book, episode, image, release } from '../../models'; +import { author, book, image, release } from '../../models'; export const GetReleaseResponseSchema = createSelectSchema(release) .pick({ @@ -28,14 +28,7 @@ export const GetReleaseResponseSchema = createSelectSchema(release) id: true, }), }), - episodes: createSelectSchema(episode) - .pick({ - chapter: true, - description: true, - id: true, - name: true, - }) - .array(), + image: createSelectSchema(image).pick({ alt: true, id: true, diff --git a/workspaces/server/src/repositories/author.ts b/workspaces/server/src/repositories/author.ts index 5c5ecbcd1..332434212 100644 --- a/workspaces/server/src/repositories/author.ts +++ b/workspaces/server/src/repositories/author.ts @@ -52,14 +52,6 @@ class AuthorRepository implements AuthorRepositoryInterface { name: true, }, with: { - episodes: { - columns: { - chapter: true, - description: true, - id: true, - name: true, - }, - }, image: { columns: { alt: true, @@ -105,37 +97,6 @@ class AuthorRepository implements AuthorRepositoryInterface { } return; }, - with: { - books: { - columns: { - description: true, - id: true, - name: true, - }, - with: { - episodes: { - columns: { - chapter: true, - description: true, - id: true, - name: true, - }, - }, - image: { - columns: { - alt: true, - id: true, - }, - }, - }, - }, - image: { - columns: { - alt: true, - id: true, - }, - }, - }, }); return ok(data); diff --git a/workspaces/server/src/repositories/book.ts b/workspaces/server/src/repositories/book.ts index 1e17689f1..f8458b236 100644 --- a/workspaces/server/src/repositories/book.ts +++ b/workspaces/server/src/repositories/book.ts @@ -58,11 +58,6 @@ class BookRepository implements BookRepositoryInterface { }, }, }, - episodes: { - columns: { - id: true, - }, - }, image: { columns: { alt: true, @@ -126,11 +121,6 @@ class BookRepository implements BookRepositoryInterface { }, }, }, - episodes: { - columns: { - id: true, - }, - }, image: { columns: { alt: true, diff --git a/workspaces/server/src/repositories/episode.ts b/workspaces/server/src/repositories/episode.ts index f7586ce9f..e1151fff2 100644 --- a/workspaces/server/src/repositories/episode.ts +++ b/workspaces/server/src/repositories/episode.ts @@ -44,37 +44,6 @@ class EpisodeRepository implements EpisodeRepositoryInterface { return eq(episode.id, options.params.episodeId); }, with: { - book: { - columns: { - description: true, - id: true, - name: true, - nameRuby: true, - }, - with: { - author: { - columns: { - description: true, - id: true, - name: true, - }, - with: { - image: { - columns: { - alt: true, - id: true, - }, - }, - }, - }, - image: { - columns: { - alt: true, - id: true, - }, - }, - }, - }, image: { columns: { alt: true, @@ -131,57 +100,12 @@ class EpisodeRepository implements EpisodeRepositoryInterface { return eq(episode.bookId, options.query.bookId); }, with: { - book: { - columns: { - description: true, - id: true, - name: true, - nameRuby: true, - }, - with: { - author: { - columns: { - description: true, - id: true, - name: true, - }, - with: { - image: { - columns: { - alt: true, - id: true, - }, - }, - }, - }, - image: { - columns: { - alt: true, - id: true, - }, - }, - }, - }, image: { columns: { alt: true, id: true, }, }, - pages: { - columns: { - id: true, - page: true, - }, - with: { - image: { - columns: { - alt: true, - id: true, - }, - }, - }, - }, }, }); diff --git a/workspaces/server/src/repositories/feature.ts b/workspaces/server/src/repositories/feature.ts index b4bbdd308..7e56bf189 100644 --- a/workspaces/server/src/repositories/feature.ts +++ b/workspaces/server/src/repositories/feature.ts @@ -48,14 +48,6 @@ class FeatureRepository implements FeatureRepositoryInterface { }, }, }, - episodes: { - columns: { - chapter: true, - description: true, - id: true, - name: true, - }, - }, image: { columns: { alt: true, diff --git a/workspaces/server/src/repositories/ranking.ts b/workspaces/server/src/repositories/ranking.ts index 42f5aa1e8..051e335fc 100644 --- a/workspaces/server/src/repositories/ranking.ts +++ b/workspaces/server/src/repositories/ranking.ts @@ -49,14 +49,6 @@ class RankingRepository implements RankingRepositoryInterface { }, }, }, - episodes: { - columns: { - chapter: true, - description: true, - id: true, - name: true, - }, - }, image: { columns: { alt: true, diff --git a/workspaces/server/src/repositories/release.ts b/workspaces/server/src/repositories/release.ts index 8950c9a14..e2be3793f 100644 --- a/workspaces/server/src/repositories/release.ts +++ b/workspaces/server/src/repositories/release.ts @@ -65,14 +65,6 @@ class ReleaseRepository implements ReleaseRepositoryInterface { }, }, }, - episodes: { - columns: { - chapter: true, - description: true, - id: true, - name: true, - }, - }, image: { columns: { alt: true,