Feature/37 guest can see released

prisma/schema.prisma

@@ -65,20 +65,25 @@ model Animation {
   rating         Rating
   primaryKeyword String
   status         Status
-  isReleased     Boolean       @default(false)
-  viewCount      Int           @default(0)
-  reviewCount    Int           @default(0)
-  createdAt      DateTime      @default(now())
-  updatedAt      DateTime      @default(now()) @updatedAt
-  deletedAt      DateTime?
+
+  seasonYear    Int     @default(dbgenerated("DATE_PART('year', now())"))
+  seasonQuarter Int     @default(dbgenerated("CEIL(DATE_PART('month', now()) / 4)"))
+  seriesGroup   String? /// 특정시리즈 이름. 가장 대포적인 이름. [사이버포뮬러11, zero, 신....] -> 사이버포뮬러 | [에반게리온 Q, 파, 오리지널...] -> 에반게리온
+
+  isReleased  Boolean   @default(false)
+  viewCount   Int       @default(0)
+  reviewCount Int       @default(0)
+  createdAt   DateTime  @default(now())
+  updatedAt   DateTime  @default(now()) @updatedAt
+  deletedAt   DateTime?
 
   studios         AnimationStudio[]
   genres          AnimationGenre[]
   voiceActors     AnimationVoiceActor[]
   originalWorkers AnimationOriginalWorker[]
   keywords        Keyword[]
-  seasons         Season[]
-  bookmarks       Bookmark[]
+
+  bookmarks Bookmark[]
 }
 
 model AnimationGenre {
@@ -121,9 +126,9 @@ model AnimationOriginalWorker {
 }
 
 model Genre {
-  id        Int       @id @default(autoincrement())
-  type      GenreType @unique
-  createdAt DateTime  @default(now())
+  id        Int      @id @default(autoincrement())
+  name      String   @unique
+  createdAt DateTime @default(now())
 
   animations AnimationGenre[]
 }
@@ -159,15 +164,6 @@ model Keyword {
   animation   Animation @relation(fields: [animationId], references: [id])
 }
 
-model Season {
-  id          Int       @id @default(autoincrement())
-  animationId Int
-  year        Int       @default(0)
-  quarter     Int       @default(0)
-  createdAt   DateTime  @default(now())
-  animation   Animation @relation(fields: [animationId], references: [id], onDelete: Cascade)
-}
-
 model Review {
   id          Int        @id @default(autoincrement())
   memberId    Int
@@ -298,20 +294,6 @@ enum Status {
   UNKNOWN
 }
 
-enum GenreType {
-  FANTASY
-  SF
-  ROMANCE
-  ACTION
-  ADVANTURE
-  ANOTHER_WORLD
-  FAMILY
-  GAG
-  TOUCHING
-  CRIME
-  DRAMA
-}
-
 enum ReviewType {
   SHORT
   LONG

src/app.module.ts

@@ -11,6 +11,7 @@ import { PrismaModule } from './global/database/prisma/prisma.module';
 import { HttpExceptionFilter } from './global/common/filter/http-exception.filter';
 import { PrismaExceptionFilter } from './global/common/filter/prisma-exception.filter';
 import { BookmarkModule } from './domain/bookmark/bookmark.module';
+import { GenreModule } from './domain/genre/genre.module';
 
 @Module({
   imports: [
@@ -32,6 +33,7 @@ import { BookmarkModule } from './domain/bookmark/bookmark.module';
     MemberModule,
     AnimationModule,
     StudioModule,
+    GenreModule,
     ReviewsModule,
     BookmarkModule,
   ],

src/domain/animation/admin.animation.controller.ts

@@ -1,19 +1,21 @@
-import { Controller, UseGuards } from '@nestjs/common';
+import { Controller, HttpCode, UseGuards } from '@nestjs/common';
 import { AnimationService } from './animation.service';
 import { TypedBody, TypedParam, TypedRoute } from '@nestia/core';
 import { Animation, Role } from '@prisma/client';
 import { AnimationReqDto, AnimationUpdateDto } from './dto/animation.req.dto';
 import { AnimationItemResDto } from './dto/animation.res.dto';
 import { Roles } from '../../global/common/decoratror/roles.decorator';
 import { RolesGuard } from '../../global/auth/guard/roles.guard';
+import { ApiNoContentResponse } from '@nestjs/swagger';
 
 @Controller('/animation')
 export class AdminAnimationController {
   constructor(private readonly service: AnimationService) {}
 
   /**
    * @tag admin/animation
-   * @enum season.quarter: [1, 2, 3, 4]
+   * @enum seasonQuarter: [1, 2, 3, 4]
+   * @seriesGroup 시리즈인 경우 대표적인 이름. ex) [에반게리온 서, 파, Q] -> 에반게리온
    */
   @TypedRoute.Post('/')
   // @UseGuards(RolesGuard)
@@ -33,17 +35,18 @@ export class AdminAnimationController {
   async update(
     @TypedParam('id') id: number,
     @TypedBody() body: AnimationReqDto,
-  ): Promise<Animation> {
+  ): Promise<AnimationItemResDto> {
     return this.service.updateById(id, body);
   }
 
   /**
    * @tag admin/animation
    */
   @TypedRoute.Delete('/:id')
+  @HttpCode(204)
   // @UseGuards(RolesGuard)
   // @Roles(Role.ADMIN)
-  async destroy(@TypedParam('id') id: number): Promise<Animation> {
+  async destroy(@TypedParam('id') id: number): Promise<void> {
     return this.service.destroyById(id);
   }
 }

src/domain/animation/animation.controller.ts

@@ -19,8 +19,6 @@ export class AnimationController {
    */
   @TypedRoute.Get('/')
   @ApiOperation({ summary: 'animation list' })
-  @UseGuards(RolesGuard)
-  @Roles(Role.MEMBER, Role.ADMIN)
   async getList(
     @User() user: MemberProfile,
     @TypedQuery() query: AnimationListDto,
@@ -32,8 +30,6 @@ export class AnimationController {
    * @tag animation
    */
   @TypedRoute.Get('/:id')
-  @UseGuards(RolesGuard)
-  @Roles(Role.MEMBER, Role.ADMIN)
   async show(
     @User() user: MemberProfile,
     @TypedParam('id') id: number,

src/domain/animation/animation.repository.ts

@@ -1,4 +1,4 @@
-import { Injectable, UnauthorizedException } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { PrismaService } from '../../global/database/prisma/prisma.service';
 import { AnimationListDto } from './dto/animation.req.dto';
 import { AnimationReqDto } from './dto/animation.req.dto';
@@ -32,7 +32,6 @@ export class AnimationRepository {
         },
       },
       // TODO: keywords
-      seasons: true,
     };
   }
 
@@ -42,7 +41,6 @@ export class AnimationRepository {
       genres,
       voiceActors,
       originalWorkers,
-      seasons,
       ...animationBody
     } = body;
 
@@ -65,8 +63,8 @@ export class AnimationRepository {
         create: genres.map((g) => ({
           genre: {
             connectOrCreate: {
-              where: { type: g },
-              create: { type: g },
+              where: { name: g },
+              create: { name: g },
             },
           },
         })),
@@ -93,13 +91,6 @@ export class AnimationRepository {
           },
         })),
       },
-      seasons: {
-        deleteMany: id ? { animationId: id } : undefined,
-        create: seasons.map((s) => ({
-          year: s.year,
-          quarter: s.quarter,
-        })),
-      },
       // TODO: keywords
     };
   }
@@ -108,6 +99,7 @@ export class AnimationRepository {
     const search = {
       OR: [
         { name: { contains: params.search ?? '' } },
+        { seriesGroup: { contains: params.search ?? '' } },
         { plot: { contains: params.search ?? '' } },
         { primaryKeyword: { contains: params.search ?? '' } },
       ],
@@ -118,6 +110,7 @@ export class AnimationRepository {
     return this.prisma.animation.findMany({
       skip: params.lastId ? 1 : 0,
       take: params.pageSize ?? 20,
+      cursor: params.lastId ? { id: params.lastId } : undefined,
       orderBy: {
         [params.sortBy ?? 'createdAt']: params.sortOrder ?? Sort.DESC,
       },
@@ -127,15 +120,13 @@ export class AnimationRepository {
   }
 
   async getAnimationById(role: Role, id: number) {
-    const animation = await this.prisma.animation.findFirst({
-      where: { id },
+    return this.prisma.animation.findFirstOrThrow({
+      where: {
+        id,
+        isReleased: role === Role.ADMIN ? {} : true,
+      },
       include: this.makeCommonIncludeQuery(),
     });
-
-    if (role !== Role.ADMIN && !animation?.isReleased)
-      throw new UnauthorizedException('NotReleased');
-
-    return animation;
   }
 
   async storeAnimation(body: AnimationReqDto) {
@@ -146,16 +137,14 @@ export class AnimationRepository {
   }
 
   async updateAnimation(id: number, body: AnimationReqDto) {
-    return this.prisma.$transaction(async (tx) => {
-      return tx.animation.update({
-        where: { id },
-        data: this.makeCommonBodyQuery(body, id),
-        include: this.makeCommonIncludeQuery(),
-      });
+    return this.prisma.animation.update({
+      where: { id },
+      data: this.makeCommonBodyQuery(body, id),
+      include: this.makeCommonIncludeQuery(),
     });
   }
 
   async destroyById(id: number) {
-    return this.prisma.animation.delete({ where: { id } });
+    await this.prisma.animation.delete({ where: { id } });
   }
 }

src/domain/animation/animation.service.ts

@@ -1,16 +1,15 @@
-import { Injectable, NotFoundException } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { AnimationRepository } from './animation.repository';
 import {
   Animation,
   Genre,
   MemberProfile,
   OriginalWorker,
-  Season,
   Studio,
   VoiceActor,
 } from '@prisma/client';
 import { AnimationListDto } from './dto/animation.req.dto';
-import { AnimationReqDto, AnimationUpdateDto } from './dto/animation.req.dto';
+import { AnimationReqDto } from './dto/animation.req.dto';
 import { AnimationItemResDto } from './dto/animation.res.dto';
 
 @Injectable()
@@ -22,35 +21,35 @@ export class AnimationService {
     query: AnimationListDto,
   ): Promise<AnimationItemResDto[]> {
     const items = await this.repository.getAnimations(user.role, query);
-    return this.flattenStudios(items);
+    return this.flattenRelations(items);
   }
 
   async getOneById(user: MemberProfile, id: number) {
     const item = await this.repository.getAnimationById(user.role, id);
 
-    if (!item) throw new NotFoundException();
-
-    return this.flattenStudios([item])[0];
+    return this.flattenRelations([item])[0];
   }
 
   async store(body: AnimationReqDto) {
     const item = await this.repository.storeAnimation(body);
-    return this.flattenStudios([item])[0];
+    return this.flattenRelations([item])[0];
   }
 
-  async updateById(id: number, body: AnimationReqDto): Promise<Animation> {
+  async updateById(
+    id: number,
+    body: AnimationReqDto,
+  ): Promise<AnimationItemResDto> {
     const item = await this.repository.updateAnimation(id, body);
-    return this.flattenStudios([item])[0];
+    return this.flattenRelations([item])[0];
   }
 
-  async destroyById(id: number): Promise<Animation> {
+  async destroyById(id: number): Promise<void> {
     return await this.repository.destroyById(Number(id));
   }
 
-  private flattenStudios(
+  private flattenRelations(
     items: (Animation & {
       studios: { studio: Studio }[];
-      seasons: Season[];
       genres: { genre: Genre }[];
       voiceActors: { voiceActor: VoiceActor }[];
       originalWorkers: { originalWorker: OriginalWorker }[];

src/domain/animation/dto/animation.req.dto.ts

@@ -1,4 +1,4 @@
-import { BroadcastType, GenreType, Rating, Status } from '@prisma/client';
+import { BroadcastType, Rating, Status } from '@prisma/client';
 
 export interface AnimationListDto {
   /**
@@ -40,16 +40,10 @@ export interface AnimationRelationDto {
    * */
   studioNames: string[];
 
-  /**
-   * @default 가이낙스
-   * */
-  seasons: { year: number; quarter: number }[];
-
   /**
    * @default FANTASY
-   * @enum GenreType
    * */
-  genres: GenreType[];
+  genres: string[];
 
   /**
    * @default 타네다 리사
@@ -101,6 +95,23 @@ export interface AnimationBaseDto {
    * */
   status: Status;
 
+  /**
+   * @default 2023
+   * */
+  seasonYear: number;
+
+  /**
+   * @default 1
+   * @enum [1, 2, 3, 4]
+   * */
+  seasonQuarter: number;
+
+  /**
+   * @default 에반게리온
+   * @description 시리즈인 경우 대표적인 이름. ex) [에반게리온 서, 파, Q] -> 에반게리온
+   * */
+  seriesGroup: string | null;
+
   /**
    * @default true
    * */