Merge branch 'feat/file-upload' of https://github.com/boostcampwm-2024/web05-Denamu into feat/file-upload

Author: asn6878

docker-compose/docker-compose.prod.infra.yml

@@ -35,6 +35,21 @@ services:
       timeout: 5s
       retries: 3
 
+  # MySQL Metrics
+  mysql_metrics:
+    image: prom/mysqld-exporter
+    ports:
+      - "9104:9104"
+    networks:
+      - Denamu
+    command:
+      - "--mysqld.username=$MYSQL_USER:$MYSQL_PASSWORD"
+      - "--mysqld.address=mysql-db:3306"
+    environment:
+      TZ: "Asia/Seoul"
+    depends_on:
+      - mysql-db
+
   # Redis 서비스
   redis:
     image: "redis:6.0.16-alpine"
@@ -58,6 +73,21 @@ services:
     environment:
       TZ: "Asia/Seoul"
 
+  # Redis Metrics
+  redis_metrics:
+    image: oliver006/redis_exporter
+    ports:
+      - "9121:9121"
+    networks:
+      - Denamu
+    environment:
+      REDIS_ADDR: "redis://redis:6379"
+      REDIS_USER: "${REDIS_USER}"
+      REDIS_PASSWORD: "${REDIS_PASSWORD}"
+      TZ: "Asia/Seoul"
+    depends_on:
+      - redis
+
   # Prometheus
   prometheus:
     image: "prom/prometheus"

docker-compose/docker-compose.prod.yml

@@ -20,6 +20,7 @@ services:
         condition: service_healthy
     volumes:
       - ../server/logs:/var/web05-Denamu/server/logs
+      - /var/web05-Denamu/objects:/var/web05-Denamu/objects
     environment:
       NODE_ENV: "PROD"
       TZ: "Asia/Seoul"

docker-compose/init.sql

@@ -130,14 +130,14 @@ CREATE TABLE `comment` (
 
 CREATE TABLE `likes` (
   `id` int NOT NULL AUTO_INCREMENT,
+  `like_date` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
   `feed_id` int NOT NULL,
   `user_id` int NOT NULL,
-  `like_date` datetime NOT NULL,
   PRIMARY KEY (`id`),
-  UNIQUE KEY `UQ_likes_user_feed` (`user_id`,`feed_id`),
-  KEY `FK_like_feed` (`feed_id`),
-  CONSTRAINT `FK_like_feed` FOREIGN KEY (`feed_id`) REFERENCES `feed` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `FK_like_user` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+  UNIQUE KEY `IDX_0be1d6ca115f56ed76c65e6bda` (`user_id`,`feed_id`),
+  KEY `FK_85b0dbd1e7836d0f8cdc38fe830` (`feed_id`),
+  CONSTRAINT `FK_3f519ed95f775c781a254089171` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `FK_85b0dbd1e7836d0f8cdc38fe830` FOREIGN KEY (`feed_id`) REFERENCES `feed` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 );
 
 -- denamu.provider definition
@@ -155,6 +155,18 @@ CREATE TABLE `provider` (
   CONSTRAINT `FK_d3d18186b602240b93c9f1621ea` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 );
 
+-- denamu.rss_remove definition
+
+CREATE TABLE `rss_remove` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `request_date` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
+  `reason` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `blog_id` int NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `REL_69e45fd3ff04dac43a89e1951e` (`blog_id`),
+  CONSTRAINT `FK_69e45fd3ff04dac43a89e1951e4` FOREIGN KEY (`blog_id`) REFERENCES `rss_accept` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+);
+
 -- denamu.admin insert data
 
 INSERT INTO admin (login_id, password) VALUES
@@ -371,11 +383,16 @@ INSERT INTO comment(comment, date, feed_id, user_id) VALUES
 
 -- denamu.activity insert data
 
--- INSERT INTO activity (activity_date, view_count, user_id) VALUES
--- 	();
+INSERT INTO activity (activity_date, view_count, user_id) VALUES
+	('2025-07-01 11:48:00', 1, 1);
 
 -- denamu.like insert data
 
 INSERT INTO likes(feed_id, user_id, like_date) VALUES
 	(94,1,'2025-06-13 17:47:05'),
-	(95,1,'2025-06-13 17:47:07');
+	(95,1,'2025-06-13 17:47:07');
+
+-- denamu.rss_remove insert data
+
+INSERT INTO rss_remove(request_date, reason, blog_id) VALUES
+	('2025-07-01 11:48:00', 'example reason', 1);

docker-compose/prometheus.yml

@@ -11,3 +11,11 @@ scrape_configs:
     metrics_path: "/api/metrics"
     static_configs:
       - targets: ["app:8080"]
+
+  - job_name: "mysql_exporter"
+    static_configs:
+      - targets: ["mysql_metrics:9104"]
+
+  - job_name: "redis_exporter"
+    static_configs:
+      - targets: ["redis_metrics:9121"]

nginx/nginx.conf

@@ -87,6 +87,12 @@ http {
 			try_files $uri $uri/ =404;
 		}
 
+		# 업로드된 파일 서빙
+		location /objects {
+			alias /var/web05-Denamu/objects/;
+			try_files $uri $uri/ =404;
+		}
+
 		# API 요청을 NestJS로 프록시
 		location /api {
 			proxy_pass http://app:8080;

server/src/admin/entity/admin.entity.ts

@@ -1,6 +1,9 @@
 import { BaseEntity, Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
 
-abstract class UserInformation extends BaseEntity {
+@Entity({
+  name: 'admin',
+})
+export class Admin extends BaseEntity {
   @PrimaryGeneratedColumn()
   id: number;
 
@@ -17,8 +20,3 @@ abstract class UserInformation extends BaseEntity {
   })
   password: string;
 }
-
-@Entity({
-  name: 'admin',
-})
-export class Admin extends UserInformation {}

server/src/comment/api-docs/getComment.api-docs.ts

@@ -0,0 +1,71 @@
+import { applyDecorators } from '@nestjs/common';
+import {
+  ApiBadRequestResponse,
+  ApiNotFoundResponse,
+  ApiOkResponse,
+  ApiOperation,
+} from '@nestjs/swagger';
+
+export function ApiGetComment() {
+  return applyDecorators(
+    ApiOperation({
+      summary: '댓글 조회 API',
+    }),
+    ApiOkResponse({
+      description: 'Ok',
+      schema: {
+        properties: {
+          message: {
+            type: 'string',
+          },
+          data: {
+            type: 'array',
+            items: {
+              type: 'object',
+              properties: {
+                id: { type: 'number' },
+                comment: { type: 'string' },
+                date: { type: 'string', format: 'date-time' },
+                user: {
+                  type: 'object',
+                  properties: {
+                    id: { type: 'number' },
+                    userName: { type: 'string' },
+                    profileImage: { type: 'string' },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+      example: {
+        message: '댓글 조회를 성공했습니다.',
+        data: [
+          {
+            id: 1,
+            comment: 'example',
+            date: '2025-01-01T00:00:00.000Z',
+            user: {
+              id: 1,
+              userName: 'example',
+              profileImage: 'https://example.com',
+            },
+          },
+        ],
+      },
+    }),
+    ApiBadRequestResponse({
+      description: 'Bad Request',
+      example: {
+        message: '오류 메세지',
+      },
+    }),
+    ApiNotFoundResponse({
+      description: 'Not Found',
+      example: {
+        message: '게시글을 찾을 수 없습니다.',
+      },
+    }),
+  );
+}

server/src/comment/controller/comment.controller.ts

@@ -2,8 +2,10 @@ import {
   Body,
   Controller,
   Delete,
+  Get,
   HttpCode,
   HttpStatus,
+  Param,
   Patch,
   Post,
   Req,
@@ -19,15 +21,27 @@ import { ApiResponse } from '../../common/response/common.response';
 import { CreateCommentRequestDto } from '../dto/request/create-comment.dto';
 import { DeleteCommentRequestDto } from '../dto/request/delete-comment.dto';
 import { UpdateCommentRequestDto } from '../dto/request/update-comment.dto';
+import { GetCommentRequestDto } from '../dto/request/get-comment.dto';
+import { ApiGetComment } from '../api-docs/getComment.api-docs';
 
 @ApiTags('Comment')
 @Controller('comment')
-@UseGuards(JwtGuard)
 export class CommentController {
   constructor(private readonly commentService: CommentService) {}
 
+  @ApiGetComment()
+  @Get('/:feedId')
+  @HttpCode(HttpStatus.OK)
+  async getComment(@Param() getCommentRequestDto: GetCommentRequestDto) {
+    return ApiResponse.responseWithData(
+      '댓글 조회를 성공했습니다.',
+      await this.commentService.get(getCommentRequestDto),
+    );
+  }
+
   @ApiCreateComment()
   @Post()
+  @UseGuards(JwtGuard)
   @HttpCode(HttpStatus.CREATED)
   async createComment(@Req() req, @Body() commentDto: CreateCommentRequestDto) {
     await this.commentService.create(req.user, commentDto);
@@ -36,6 +50,7 @@ export class CommentController {
 
   @ApiDeleteComment()
   @Delete()
+  @UseGuards(JwtGuard)
   @HttpCode(HttpStatus.OK)
   async deleteComment(@Req() req, @Body() commentDto: DeleteCommentRequestDto) {
     await this.commentService.delete(req.user, commentDto);
@@ -44,6 +59,7 @@ export class CommentController {
 
   @ApiUpdateComment()
   @Patch()
+  @UseGuards(JwtGuard)
   @HttpCode(HttpStatus.OK)
   async updateComment(@Req() req, @Body() commentDto: UpdateCommentRequestDto) {
     await this.commentService.update(req.user, commentDto);

server/src/comment/dto/request/get-comment.dto.ts

@@ -0,0 +1,19 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { Type } from 'class-transformer';
+import { IsInt } from 'class-validator';
+
+export class GetCommentRequestDto {
+  @ApiProperty({
+    example: '게시글 ID',
+    description: '게시글 ID를 입력해주세요',
+  })
+  @IsInt({
+    message: '숫자로 입력해주세요.',
+  })
+  @Type(() => Number)
+  feedId: number;
+
+  constructor(partial: Partial<GetCommentRequestDto>) {
+    Object.assign(this, partial);
+  }
+}

server/src/comment/repository/comment.repository.ts

@@ -9,21 +9,11 @@ export class CommentRepository extends Repository<Comment> {
   }
 
   async getCommentInformation(feedId: number) {
-    const results = await this.createQueryBuilder('comment')
-      .innerJoin('comment.user', 'user') // ✅ 관계명은 'user'로
+    return await this.createQueryBuilder('comment')
+      .innerJoin('comment.user', 'user')
       .where('comment.feed_id = :feedId', { feedId })
       .select(['comment', 'comment.date', 'user'])
       .orderBy('comment.date', 'ASC')
       .getMany();
-    return results.map((row) => ({
-      id: row.id,
-      comment: row.comment,
-      date: row.date,
-      user: {
-        id: row.user.id,
-        userName: row.user.userName,
-        profileImage: row.user.profileImage,
-      },
-    }));
   }
 }