4주차 멘토링 코드리뷰용 PR

.gitignore

@@ -37,4 +37,5 @@ out/
 .vscode/
 
 application.yml
+application-test.yml
 .env

build.gradle

@@ -33,6 +33,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9'
     implementation 'io.awspring.cloud:spring-cloud-starter-aws:2.4.4'
+    implementation 'io.awspring.cloud:spring-cloud-starter-aws-secrets-manager-config:2.4.4'
     implementation 'com.opencsv:opencsv:5.11.2'
     compileOnly 'org.projectlombok:lombok'
     runtimeOnly 'com.mysql:mysql-connector-j'

docker-compose.yml

@@ -61,6 +61,33 @@ services:
     networks:
       - app-tier
 
+  prometheus:
+    user: "root"
+    image: prom/prometheus
+    container_name: prometheus_container
+    volumes:
+      - /home/ubuntu/WEB5_7_3star_BE/prometheus-grafana/prometheus/config:/etc/prometheus
+      - /home/ubuntu/WEB5_7_3star_BE/prometheus-grafana/prometheus/volume:/prometheus/data
+    ports:
+      - 9090:9090
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+    restart: always
+    networks:
+      - app-tier
+
+  grafana:
+    user: "root"
+    image: grafana/grafana
+    container_name: grafana_container
+    ports:
+      - 3000:3000
+    volumes:
+      - ./grafana/volume:/var/lib/grafana
+    restart: always
+    networks:
+      - app-tier
+
 volumes:
   mysqldb-data:
     driver: local

prometheus-grafana/prometheus/config/prometheus.yml

@@ -0,0 +1,26 @@
+global:
+  scrape_interval: 15s
+  scrape_timeout: 15s
+  evaluation_interval: 2m
+  external_labels:
+    monitor: 'monitor'
+  query_log_file: query_log_file.log
+rule_files:
+  - "rule.yml"
+scrape_configs:
+  - job_name: 'prometheus'
+    scrape_interval: 10s
+    scrape_timeout: 10s
+    metrics_path: '/metrics'
+    honor_labels: false
+    honor_timestamps: false
+    scheme: 'http'
+    static_configs:
+      - targets: [ '43.202.206.47:9090' ]
+        #      - targets: [ 'localhost:9090' ]
+        labels:
+          service: 'monitor-1'
+  - job_name: 'node'
+    static_configs:
+      #      - targets: [ 'localhost:9100' ]
+      - targets: [ '43.202.206.47:9100' ]

prometheus-grafana/prometheus/config/rule.yml

@@ -0,0 +1,17 @@
+groups:
+  - name: rule
+    rules:
+      - alert: InstanceDown
+        expr: up == 0
+        for: 5m
+        labels:
+          severity: page
+        annotations:
+          summary: "Instance {{ $labels.instance }} down"
+          description: "{{ $labels.instance }} of job {{ $labels.job }} has been down for more than 5 minutes."
+      - alert: APIHighRequestLatency
+        expr: api_http_request_latencies_second{quantile="0.5"} > 1
+        for: 10m
+        annotations:
+          summary: "High request latency on {{ $labels.instance }}"
+          description: "{{ $labels.instance }} has a median request latency above 1s (current value: {{ $value }}s)"

src/main/java/com/threestar/trainus/TrainUsApplication.java

@@ -1,15 +1,23 @@
 package com.threestar.trainus;
 
+import java.util.TimeZone;
+
+import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.context.annotation.Bean;
 
-@EnableJpaAuditing
 @SpringBootApplication
 public class TrainUsApplication {
 
 	public static void main(String[] args) {
 		SpringApplication.run(TrainUsApplication.class, args);
 	}
 
+	@Bean
+	public CommandLineRunner init() {
+		return args -> {
+			TimeZone.setDefault(TimeZone.getTimeZone("Asia/Seoul"));
+		};
+	}
 }

src/main/java/com/threestar/trainus/domain/comment/controller/CommentController.java

@@ -1,24 +1,24 @@
 package com.threestar.trainus.domain.comment.controller;
 
-import org.springframework.beans.factory.annotation.Value;
+import java.util.List;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.threestar.trainus.domain.comment.dto.CommentCreateRequestDto;
 import com.threestar.trainus.domain.comment.dto.CommentPageResponseDto;
-import com.threestar.trainus.domain.comment.dto.CommentPageWrapperDto;
 import com.threestar.trainus.domain.comment.dto.CommentResponseDto;
-import com.threestar.trainus.domain.comment.mapper.CommentMapper;
 import com.threestar.trainus.domain.comment.service.CommentService;
 import com.threestar.trainus.global.annotation.LoginUser;
+import com.threestar.trainus.global.dto.PageRequestDto;
 import com.threestar.trainus.global.unit.BaseResponse;
 import com.threestar.trainus.global.unit.PagedResponse;
 
@@ -34,8 +34,6 @@
 public class CommentController {
 
 	private final CommentService commentService;
-	@Value("${spring.page.size.limit}")
-	private int pageSizeLimit;
 
 	@PostMapping("/{lessonId}")
 	@Operation(summary = "댓글 작성", description = "레슨 ID에 해당되는 댓글을 작성합니다.")
@@ -47,14 +45,11 @@ public ResponseEntity<BaseResponse<CommentResponseDto>> createComment(@PathVaria
 
 	@GetMapping("/{lessonId}")
 	@Operation(summary = "댓글 조회", description = "레슨 ID에 해당되는 댓글들을 조회합니다.")
-	public ResponseEntity<PagedResponse<CommentPageWrapperDto>> readAll(@PathVariable Long lessonId,
-		@RequestParam("page") int page,
-		@RequestParam("pageSize") int pageSize) {
-		int correctPage = Math.max(page, 1);
-		int correctPageSize = Math.max(1, Math.min(pageSize, pageSizeLimit));
-		CommentPageResponseDto commentsInfo = commentService.readAll(lessonId, correctPage, correctPageSize);
-		CommentPageWrapperDto comments = CommentMapper.toCommentPageWrapperDto(commentsInfo);
-		return PagedResponse.ok("댓글 조회 성공", comments, commentsInfo.getCount(), HttpStatus.OK);
+	public ResponseEntity<PagedResponse<List<CommentResponseDto>>> readAll(@PathVariable Long lessonId,
+		@Valid @ModelAttribute PageRequestDto pageRequestDto) {
+		CommentPageResponseDto commentsInfo = commentService.readAll(lessonId, pageRequestDto.getPage(),
+			pageRequestDto.getLimit());
+		return PagedResponse.ok("댓글 조회 성공", commentsInfo.comments(), commentsInfo.count(), HttpStatus.OK);
 	}
 
 	@DeleteMapping("/{commentId}")

src/main/java/com/threestar/trainus/domain/comment/dto/CommentCreateRequestDto.java

@@ -2,12 +2,11 @@
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
-import lombok.Getter;
 
-@Getter
-public class CommentCreateRequestDto {
+public record CommentCreateRequestDto(
 	@NotBlank(message = "댓글 내용은 필수입니다")
 	@Size(max = 255, message = "댓글은 255자 이내여야 합니다.")
-	private String content;
-	private Long parentCommentId;
+	String content,
+	Long parentCommentId
+) {
 }

src/main/java/com/threestar/trainus/domain/comment/dto/CommentPageResponseDto.java

@@ -3,12 +3,10 @@
 import java.util.List;
 
 import lombok.Builder;
-import lombok.Getter;
 
-@Getter
 @Builder
-public class CommentPageResponseDto {
-
-	private List<CommentResponseDto> comments;
-	private Integer count;
+public record CommentPageResponseDto(
+	List<CommentResponseDto> comments,
+	Integer count
+) {
 }

src/main/java/com/threestar/trainus/domain/comment/dto/CommentResponseDto.java

@@ -3,15 +3,15 @@
 import java.time.LocalDateTime;
 
 import lombok.Builder;
-import lombok.Getter;
 
-@Getter
 @Builder
-public class CommentResponseDto {
-	private Long commentId;
-	private Long userId;
-	private String content;
-	private Long parentCommentId;
-	private Boolean deleted;
-	private LocalDateTime createdAt;
+public record CommentResponseDto(
+	Long commentId,
+	Long userId,
+	String nickname,
+	String content,
+	Long parentCommentId,
+	Boolean deleted,
+	LocalDateTime createdAt
+) {
 }

src/main/java/com/threestar/trainus/domain/comment/dto/CommentWithUserProjection.java

@@ -0,0 +1,19 @@
+package com.threestar.trainus.domain.comment.dto;
+
+import java.time.LocalDateTime;
+
+public interface CommentWithUserProjection {
+	Long getCommentId();
+
+	String getContent();
+
+	Long getParentCommentId();
+
+	Boolean getDeleted();
+
+	LocalDateTime getCreatedAt();
+
+	Long getUserId();
+
+	String getNickname();
+}

src/main/java/com/threestar/trainus/domain/comment/mapper/CommentMapper.java

@@ -3,8 +3,8 @@
 import java.util.List;
 
 import com.threestar.trainus.domain.comment.dto.CommentPageResponseDto;
-import com.threestar.trainus.domain.comment.dto.CommentPageWrapperDto;
 import com.threestar.trainus.domain.comment.dto.CommentResponseDto;
+import com.threestar.trainus.domain.comment.dto.CommentWithUserProjection;
 import com.threestar.trainus.domain.comment.entity.Comment;
 
 public class CommentMapper {
@@ -20,6 +20,19 @@ public static CommentResponseDto toCommentResponseDto(Comment comment) {
 			.parentCommentId(comment.getParentCommentId())
 			.deleted(comment.getDeleted())
 			.createdAt(comment.getCreatedAt())
+			.nickname(comment.getUser().getNickname())
+			.build();
+	}
+
+	public static CommentResponseDto toCommentResponseDtoWithProjection(CommentWithUserProjection comment) {
+		return CommentResponseDto.builder()
+			.commentId(comment.getCommentId())
+			.userId(comment.getUserId())
+			.content(comment.getContent())
+			.parentCommentId(comment.getParentCommentId())
+			.deleted(comment.getDeleted())
+			.createdAt(comment.getCreatedAt())
+			.nickname(comment.getNickname())
 			.build();
 	}
 
@@ -29,10 +42,4 @@ public static CommentPageResponseDto toCommentPageResponseDto(List<CommentRespon
 			.count(count)
 			.build();
 	}
-
-	public static CommentPageWrapperDto toCommentPageWrapperDto(CommentPageResponseDto commentPageResponseDto) {
-		return CommentPageWrapperDto.builder()
-			.comments(commentPageResponseDto.getComments())
-			.build();
-	}
 }

src/main/java/com/threestar/trainus/domain/comment/repository/CommentRepository.java

@@ -7,26 +7,54 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import com.threestar.trainus.domain.comment.dto.CommentWithUserProjection;
 import com.threestar.trainus.domain.comment.entity.Comment;
 
 public interface CommentRepository extends JpaRepository<Comment, Long> {
 
 	//create index idx_lesson_id_parent_comment_id_comment_id on comments(lesson_id, parent_comment_id asc, comment_id asc); 인덱스 통해 조회 성능 최적화
 	@Query(value = """
-		select comments.comment_id, comments.lesson_id, comments.user_id, comments.content, 
-		comments.parent_comment_id, comments.deleted, comments.created_at, comments.updated_at  
-		from ( select comment_id from comments where lesson_id = :lessonId order by parent_comment_id asc, comment_id asc limit :limit offset :offset 
-		) t left join comments on t.comment_id = comments.comment_id
+			SELECT 
+				c.comment_id AS commentId,
+				c.content AS content,
+				c.parent_comment_id AS parentCommentId,
+				c.deleted AS deleted,
+				c.created_at AS createdAt,
+				u.id AS userId,
+				u.nickname AS nickname
+			FROM (
+				SELECT comment_id
+				FROM comments c
+				JOIN user u ON c.user_id = u.id AND u.deleted_at IS NULL
+				WHERE lesson_id = :lessonId
+		  	    	ORDER BY parent_comment_id ASC, comment_id ASC
+		  	    	LIMIT :limit OFFSET :offset
+			) t
+			JOIN comments c ON t.comment_id = c.comment_id
+			JOIN user u ON c.user_id = u.id
 		""", nativeQuery = true)
-	List<Comment> findAll(@Param("lessonId") Long lessonId, @Param("offset") int offset, @Param("limit") int limit);
+	List<CommentWithUserProjection> findAll(@Param("lessonId") Long lessonId, @Param("offset") int offset,
+		@Param("limit") int limit);
 
 	@Query(value = """
-		select count(*) from ( select comment_id from comments where lesson_id = :lessonId limit :limit) t
+		SELECT count(*) FROM ( 
+		    SELECT comment_id 
+		    FROM comments c
+		    JOIN user u ON c.user_id = u.id AND u.deleted_at IS NULL
+		    WHERE lesson_id = :lessonId 
+		    LIMIT :limit
+		) t
 		""", nativeQuery = true)
 	Integer count(@Param("lessonId") Long lessonId, @Param("limit") int limit);
 
 	@Query(value = """
-		select count(*) from (select comment_id from comments where lesson_id = :lessonId and parent_comment_id = :parentCommentId limit :limit) t
+		SELECT count(*) FROM (
+		    SELECT comment_id 
+		    FROM comments c
+		    JOIN user u ON c.user_id = u.id AND u.deleted_at IS NULL
+		    WHERE lesson_id = :lessonId AND parent_comment_id = :parentCommentId 
+		    LIMIT :limit
+		) t
 		""", nativeQuery = true)
 	Long countBy(@Param("lessonId") Long lessonId, @Param("parentCommentId") Long parentCommentId,
 		@Param("limit") int limit);