Merge pull request #403 from Quickchive/fix/remove-category-content-duplication-check

stae1102 · web-flow · commit eff044dc8450 · 2025-07-27T16:12:04.000+09:00
fix: 카테고리 중복검사 로직 수정
diff --git a/src/categories/category.repository.ts b/src/categories/category.repository.ts
@@ -146,4 +146,23 @@ export class CategoryRepository extends Repository<Category> {
       },
     });
   }
+
+  async findByParentId(
+    parentId: number,
+    entityManager?: EntityManager,
+  ): Promise<Category[]> {
+    if (entityManager) {
+      return entityManager.find(Category, {
+        where: {
+          parentId,
+        },
+      });
+    }
+
+    return await this.find({
+      where: {
+        parentId,
+      },
+    });
+  }
 }
diff --git a/src/contents/contents.controller.ts b/src/contents/contents.controller.ts
@@ -2,14 +2,13 @@ import {
   Body,
   Controller,
   Delete,
-  Post,
+  Get,
   Param,
-  UseGuards,
   ParseIntPipe,
   Patch,
-  Get,
-  UseInterceptors,
+  Post,
   Query,
+  UseGuards,
 } from '@nestjs/common';
 import {
   ApiBadRequestResponse,
@@ -24,10 +23,7 @@ import {
 } from '@nestjs/swagger';
 import { AuthUser } from '../auth/auth-user.decorator';
 import { JwtAuthGuard } from '../auth/jwt/jwt.guard';
-import { TransactionInterceptor } from '../common/interceptors/transaction.interceptor';
-import { TransactionManager } from '../common/transaction.decorator';
 import { User } from '../users/entities/user.entity';
-import { EntityManager } from 'typeorm';
 import { ContentsService } from './contents.service';
 import {
   AddContentBodyDto,
@@ -38,6 +34,7 @@ import {
   toggleFavoriteOutput,
   UpdateContentBodyDto,
   UpdateContentOutput,
+  UpdateContentRequest,
 } from './dtos/content.dto';
 import { ErrorOutput } from '../common/dtos/output.dto';
 import {
@@ -118,6 +115,34 @@ export class ContentsController {
     return this.contentsService.updateContent(user, content);
   }
 
+  @ApiOperation({
+    summary: '콘텐츠 정보 수정',
+    description: '콘텐츠을 수정하는 메서드',
+  })
+  @ApiCreatedResponse({
+    description: '콘텐츠 수정 성공 여부를 반환한다.',
+    type: UpdateContentOutput,
+  })
+  @ApiConflictResponse({
+    description: '동일한 링크의 콘텐츠가 같은 카테고리 내에 존재할 경우',
+    type: ErrorOutput,
+  })
+  @ApiNotFoundResponse({
+    description: '존재하지 않는 콘텐츠 또는 유저인 경우',
+    type: ErrorOutput,
+  })
+  @Patch(':contentId')
+  async updateContentV2(
+    @AuthUser() user: User,
+    @Body() content: UpdateContentRequest,
+    @Param('contentId') contentId: number,
+  ): Promise<UpdateContentOutput> {
+    return this.contentsService.updateContent(user, {
+      ...content,
+      id: contentId,
+    });
+  }
+
   @ApiOperation({
     summary: '즐겨찾기 등록 및 해제',
     description: '즐겨찾기에 등록 및 해제하는 메서드',
diff --git a/src/contents/contents.service.ts b/src/contents/contents.service.ts
@@ -1,10 +1,11 @@
 import {
   BadRequestException,
+  ConflictException,
   ForbiddenException,
   Injectable,
   NotFoundException,
 } from '@nestjs/common';
-import { DataSource, EntityManager } from 'typeorm';
+import { DataSource, EntityManager, In, Not } from 'typeorm';
 
 import {
   AddContentBodyDto,
@@ -184,8 +185,6 @@ export class ContentsService {
       reminder,
       favorite,
       categoryId,
-      categoryName,
-      parentId,
     }: UpdateContentBodyDto,
     entityManager?: EntityManager,
   ): Promise<AddContentOutput> {
@@ -197,32 +196,41 @@ export class ContentsService {
       reminder,
       favorite,
     };
-    const userInDb = await this.userRepository.findOneWithContentsAndCategories(
-      user.id,
-    );
-    if (!userInDb) {
-      throw new NotFoundException('User not found');
-    }
 
-    const content = userInDb?.contents?.filter(
-      (content) => content.id === contentId,
-    )[0];
+    const content = await this.contentRepository.findOne({
+      where: {
+        id: contentId,
+      },
+      relations: ['category'],
+    });
+
     if (!content) {
-      throw new NotFoundException('Content not found.');
+      throw new NotFoundException('컨텐츠가 존재하지 않습니다.');
     }
 
-    if (categoryId !== undefined) {
-      const category =
-        categoryId !== null
-          ? await this.categoryRepository.findById(categoryId, entityManager)
-          : null;
+    // 카테고리 변경이 발생하는 경우
+    if (categoryId && !content.isSameCategory(categoryId)) {
+      const [category, subCategories] = await Promise.all([
+        (async () => {
+          const category = await this.categoryRepository.findById(categoryId);
 
-      if (category) {
-        await checkContentDuplicateAndAddCategorySaveLog(
-          link,
-          category,
-          userInDb,
-        );
+          if (!category) {
+            throw new NotFoundException('카테고리가 존재하지 않습니다.');
+          }
+
+          return category;
+        })(),
+        this.categoryRepository.findByParentId(categoryId),
+      ]);
+
+      const isDuplicated = await this.isDuplicatedContents(
+        content.id,
+        [category, ...subCategories],
+        content.link,
+      );
+
+      if (isDuplicated) {
+        throw new ConflictException('이미 저장된 컨텐츠입니다.');
       }
 
       await this.contentRepository.updateOne(
@@ -471,4 +479,22 @@ export class ContentsService {
       throw e;
     }
   }
+
+  private async isDuplicatedContents(
+    id: number,
+    categories: Category[],
+    link: string,
+  ) {
+    const existingContents = await this.contentRepository.find({
+      where: {
+        id: Not(id),
+        category: {
+          id: In(categories.map((category) => category.id)),
+        },
+        link,
+      },
+    });
+
+    return existingContents.length > 0;
+  }
 }
diff --git a/src/contents/dtos/content.dto.ts b/src/contents/dtos/content.dto.ts
@@ -1,7 +1,6 @@
 import {
   ApiProperty,
   ApiPropertyOptional,
-  IntersectionType,
   PartialType,
   PickType,
 } from '@nestjs/swagger';
@@ -121,15 +120,133 @@ export class AddMultipleContentsBodyDto {
 }
 
 class ContentBody extends PartialType(AddContentBodyDto) {}
+
 class ContentIdAndDescription extends PickType(Content, [
   'id',
   'description',
 ]) {}
 
-export class UpdateContentBodyDto extends IntersectionType(
-  ContentIdAndDescription,
-  ContentBody,
-) {}
+export class UpdateContentBodyDto {
+  @ApiProperty({
+    description: '컨텐츠 id',
+  })
+  @IsInt()
+  @IsPositive()
+  id: number;
+
+  @ApiPropertyOptional({
+    description: '컨텐츠 설명',
+  })
+  @IsString()
+  @IsNotEmpty()
+  @IsOptional()
+  readonly description?: string;
+
+  @ApiPropertyOptional({
+    description: '컨텐츠 링크',
+  })
+  @IsUrl()
+  @IsNotEmpty()
+  @IsOptional()
+  readonly link?: string;
+
+  @ApiPropertyOptional({
+    description: '컨텐츠 제목',
+  })
+  @IsString()
+  @IsNotEmpty()
+  @IsOptional()
+  readonly title?: string;
+
+  @ApiPropertyOptional({
+    description: '컨텐츠 메모',
+  })
+  @IsString()
+  @IsNotEmpty()
+  @IsOptional()
+  readonly comment?: string;
+
+  @ApiPropertyOptional({
+    description: '리마인더 시간',
+  })
+  @Type(() => Date)
+  @IsDate()
+  @IsOptional()
+  readonly reminder?: Date;
+
+  @ApiPropertyOptional({
+    description: '즐겨찾기 여부',
+  })
+  @IsBoolean()
+  @IsOptional()
+  readonly favorite?: boolean;
+
+  @ApiPropertyOptional({
+    description: '카테고리 id',
+  })
+  @IsInt()
+  @IsPositive()
+  @IsOptional()
+  readonly categoryId?: number;
+}
+
+export class UpdateContentRequest {
+  @ApiPropertyOptional({
+    description: '컨텐츠 설명',
+  })
+  @IsString()
+  @IsNotEmpty()
+  @IsOptional()
+  readonly description?: string;
+
+  @ApiPropertyOptional({
+    description: '컨텐츠 링크',
+  })
+  @IsUrl()
+  @IsNotEmpty()
+  @IsOptional()
+  readonly link?: string;
+
+  @ApiPropertyOptional({
+    description: '컨텐츠 제목',
+  })
+  @IsString()
+  @IsNotEmpty()
+  @IsOptional()
+  readonly title?: string;
+
+  @ApiPropertyOptional({
+    description: '컨텐츠 메모',
+  })
+  @IsString()
+  @IsNotEmpty()
+  @IsOptional()
+  readonly comment?: string;
+
+  @ApiPropertyOptional({
+    description: '리마인더 시간',
+  })
+  @Type(() => Date)
+  @IsDate()
+  @IsOptional()
+  readonly reminder?: Date;
+
+  @ApiPropertyOptional({
+    description: '즐겨찾기 여부',
+  })
+  @IsBoolean()
+  @IsOptional()
+  readonly favorite?: boolean;
+
+  @ApiPropertyOptional({
+    description: '카테고리 id',
+  })
+  @IsInt()
+  @IsPositive()
+  @IsOptional()
+  readonly categoryId?: number;
+}
+
 export class UpdateContentOutput extends CoreOutput {}
 
 export class DeleteContentOutput extends CoreOutput {}
diff --git a/src/contents/entities/content.entity.ts b/src/contents/entities/content.entity.ts
@@ -86,4 +86,8 @@ export class Content extends CoreEntity {
   @ApiProperty({ description: 'Owner ID' })
   @RelationId((content: Content) => content.user)
   userId: number;
+
+  isSameCategory(categoryId: number): boolean {
+    return this.category?.id === categoryId;
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -86,4 +86,8 @@ export class Content extends CoreEntity {`
`86`	`86`	`@ApiProperty({ description: 'Owner ID' })`
`87`	`87`	`@RelationId((content: Content) => content.user)`
`88`	`88`	`userId: number;`
	`89`	`+`
	`90`	`+ isSameCategory(categoryId: number): boolean {`
	`91`	`+ return this.category?.id === categoryId;`
	`92`	`+ }`
`89`	`93`	`}`