Merge pull request #369 from Quickchive/develop

Develop to master

Author: stae1102

src/categories/category.controller.ts

@@ -41,6 +41,7 @@ import {
 } from './dtos/load-personal-categories.dto';
 import { User } from '../users/entities/user.entity';
 import { CategoryService } from './category.service';
+import { AutoCategorizeRequest } from './dtos/auto-categorize.dto';
 
 @Controller('categories')
 @ApiTags('Category')
@@ -167,7 +168,7 @@ export class CategoryController {
   @Get('auto-categorize')
   async autoCategorize(
     @AuthUser() user: User,
-    @Query('link') link: string,
+    @Query() { link }: AutoCategorizeRequest,
   ): Promise<AutoCategorizeOutput> {
     return this.categoryService.autoCategorize(user, link);
   }

src/categories/category.service.ts

@@ -477,11 +477,24 @@ export class CategoryService {
 
   async autoCategorizeWithId(user: User, link: string) {
     try {
-      const categories = await this.categoryRepository.findByUserId(user.id);
-      if (categories.length === 0) {
+      const _categories = await this.categoryRepository.findByUserId(user.id);
+      if (_categories.length === 0) {
         throw new NotFoundException('Categories not found');
       }
 
+      const categories = _categories.map((category) => ({
+        ...category,
+        depth: 0,
+      }));
+
+      categories.map((category, index) => {
+        categories.slice(index + 1).map((subCategory) => {
+          if (subCategory.parentId && subCategory.parentId === category.id) {
+            subCategory.depth = category.depth + 1;
+          }
+        });
+      });
+
       const { title, siteName, description } = await getLinkInfo(link);
 
       const content = await getLinkContent(link);
@@ -497,18 +510,22 @@ You can only answer a single category name. Here is the article's information:
         description && `description: "${description.trim()}"`
       }</description>
 <siteName>${siteName && `site name: "${siteName.trim()}"`}</siteName>
-Please provide the most suitable category among the following. Here is Category options: [${[
-        ...categories,
-        'None',
-      ].join(', ')}]
 
 Given the following categories, please provide the most suitable category for the article.
+- The deeper the category depth, the more specific the category is.
+- If the 1, 2, and 3 depth categories are equally worthy of saving links, then the deeper categories should be recommended more.
 <categories>${categories
         .map((category) =>
-          JSON.stringify({ id: category.id, name: category.name }),
+          JSON.stringify({
+            id: category.id,
+            name: category.name,
+            depth: category.depth,
+          }),
         )
         .join('\n')}</categories>
 
+If there's no suitable category, must provide reply with "None".
+
 Present your reply options in JSON format below.
 \`\`\`json
 {

src/categories/dtos/auto-categorize.dto.ts

@@ -0,0 +1,12 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString, IsUrl } from 'class-validator';
+
+export class AutoCategorizeRequest {
+  @ApiProperty({
+    description: '링크',
+    type: String,
+  })
+  @IsString()
+  @IsUrl({}, { message: '링크가 올바르지 않습니다.' })
+  link: string;
+}

src/categories/v2/category.v2.controller.ts

@@ -10,6 +10,7 @@ import { CategoryService } from '../category.service';
 import { AuthUser } from '../../auth/auth-user.decorator';
 import { User } from '../../users/entities/user.entity';
 import { RecommendedCategoryResponseDto } from './dto/recommended-category-response.dto';
+import { AutoCategorizeRequest } from '../dtos/auto-categorize.dto';
 
 @Controller('v2/categories')
 @ApiTags('Category v2')
@@ -29,7 +30,10 @@ export class CategoryV2Controller {
     type: RecommendedCategoryResponseDto,
   })
   @Get('auto-categorize')
-  async autoCategorize(@AuthUser() user: User, @Query('link') link: string) {
+  async autoCategorize(
+    @AuthUser() user: User,
+    @Query() { link }: AutoCategorizeRequest,
+  ) {
     const { category } = await this.categoryService.autoCategorizeWithId(
       user,
       link,

src/contents/dtos/content.dto.ts

@@ -14,6 +14,7 @@ import {
   IsOptional,
   IsPositive,
   IsString,
+  IsUrl,
 } from 'class-validator';
 import { CoreOutput } from '../../common/dtos/output.dto';
 import { Content } from '../entities/content.entity';
@@ -22,6 +23,7 @@ import { Type } from 'class-transformer';
 export class AddContentBodyDto {
   @ApiProperty({ example: 'ex.com', description: '아티클 주소' })
   @IsString()
+  @IsUrl({}, { message: '아티클 주소가 올바르지 않습니다.' })
   link: string;
 
   @ApiPropertyOptional({

src/contents/util/content.util.ts

@@ -1,9 +1,10 @@
 import {
   BadRequestException,
+  ForbiddenException,
   InternalServerErrorException,
 } from '@nestjs/common';
 import * as cheerio from 'cheerio';
-import axios, { AxiosResponse } from 'axios';
+import axios, { AxiosError, AxiosResponse } from 'axios';
 
 interface OGCrawlerOptions {
   timeout?: number;
@@ -32,13 +33,13 @@ class OGCrawler {
   }
 
   public async fetch(url: string): Promise<any> {
-    try {
-      // YouTube 비디오 ID 추출
-      const videoId = this.extractVideoId(url);
-      if (videoId) {
-        return await this.fetchYouTubeData(videoId);
-      }
+    // YouTube 비디오 ID 추출
+    const videoId = this.extractVideoId(url);
+    if (videoId) {
+      return await this.fetchYouTubeData(videoId);
+    }
 
+    try {
       const response: AxiosResponse = await axios({
         method: 'get',
         url,
@@ -71,11 +72,10 @@ class OGCrawler {
 
       return this.parse(response.data);
     } catch (error) {
-      if (error instanceof Error) {
-        throw new InternalServerErrorException(
-          `Failed to fetch URL: ${error.message}`,
-        );
+      if (error instanceof AxiosError && error.response?.status === 403) {
+        throw new ForbiddenException('og 데이터를 가져올 수 없는 링크입니다.');
       }
+
       throw new InternalServerErrorException('An unknown error occurred');
     }
   }