Perf/after optimization

.github/workflows/pipeline-monorepo.yaml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - dev
+      - perf/after-optimization
     paths-ignore:
       - 'tests/**'       # k6 스크립트
       - 'docs/**'        # 문서 폴더

apigateway-service/pom.xml

@@ -76,6 +76,15 @@
             <version>2.5.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.example</groupId>
             <artifactId>common-module</artifactId>

apigateway-service/src/main/resources/application.yml

@@ -74,6 +74,9 @@ spring:
               uri: http://community-service:80
               predicates:
                 - Path=/community-service/**
+          httpclient:
+            connect-timeout: 10000
+            response-timeout: 30s
 
 app:
   gateway:
@@ -146,4 +149,19 @@ springdoc:
   # 게이트웨이의 공인 주소(ngrok)를 명시하여 Mixed Content 문제 해결
   servers:
     - url: https://impressionless-connaturally-jonie.ngrok-free.dev
-      description: NGrok Development Server
+      description: NGrok Development Server
+
+# --- Monitoring Configuration (Added) ---
+management:
+  endpoints:
+    web:
+      exposure:
+        include: prometheus, health, info  # 프로메테우스 지표 노출 허용
+  endpoint:
+    health:
+      show-details: always
+    prometheus:
+      enabled: true
+  metrics:
+    tags:
+      application: ${spring.application.name} # Grafana에서 서비스별로 구분하기 위해 태그 추가

auth-service/pom.xml

@@ -98,10 +98,6 @@
             <scope>runtime</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-kubernetes-client-loadbalancer</artifactId>

auth-service/src/main/java/com/example/authservice/AuthServiceApplication.java

@@ -2,7 +2,6 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -11,7 +10,6 @@
 @SpringBootApplication(scanBasePackages = "com.example")
 @EnableJpaAuditing
 @EnableAsync
-@EnableFeignClients
 public class AuthServiceApplication {
 
     public static void main(String[] args) {

auth-service/src/main/java/com/example/authservice/config/SecurityConfig.java

@@ -40,7 +40,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http, Authentication
                 .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
                 .authorizeHttpRequests(authorize -> authorize
                         .requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
-                        .requestMatchers("/swagger-ui/**", "/v3/api-docs/**", "/swagger-resources/**").permitAll()
+                        .requestMatchers("/swagger-ui/**", "/v3/api-docs/**", "/swagger-resources/**", "/actuator/**").permitAll()
                         // 모든 /auth/** 경로는 인증 없이 허용
                         .requestMatchers("/auth/**").permitAll()
                         .requestMatchers("/oauth2/**", "/login/oauth2/**").permitAll()

auth-service/src/main/resources/application.yml

@@ -106,10 +106,23 @@ jwt:
 
 # Feign (User Service ???)
 app:
-  feign:
-    user-service-url: http://user-service:80 # k8s ?? ??? ?? (?? 80)
   frontend:
     redirect-url: ${APP_FRONTEND_REDIRECT_URL} # ex) http://127.0.0.1:5173/auth/callback
 
 springdoc:
-  override-with-generic-response: false
+  override-with-generic-response: false
+
+# --- Monitoring Configuration (Added) ---
+management:
+  endpoints:
+    web:
+      exposure:
+        include: prometheus, health, info  # 프로메테우스 지표 노출 허용
+  endpoint:
+    health:
+      show-details: always
+    prometheus:
+      enabled: true
+  metrics:
+    tags:
+      application: ${spring.application.name} # Grafana에서 서비스별로 구분하기 위해 태그 추가

chat-service/pom.xml

@@ -124,6 +124,16 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
+
     </dependencies>
 
     <dependencyManagement>

chat-service/src/main/resources/application.yml

@@ -37,4 +37,19 @@ spring:
 logging:
   level:
     org.springframework.web.socket: DEBUG
-    com.example.chatservice: DEBUG
+    com.example.chatservice: DEBUG
+
+# --- Monitoring Configuration (Added) ---
+management:
+  endpoints:
+    web:
+      exposure:
+        include: prometheus, health, info  # 프로메테우스 지표 노출 허용
+  endpoint:
+    health:
+      show-details: always
+    prometheus:
+      enabled: true
+  metrics:
+    tags:
+      application: ${spring.application.name} # Grafana에서 서비스별로 구분하기 위해 태그 추가

common-module/src/main/java/com/example/commonmodule/dto/event/UserProfileCreationFailureEvent.java

@@ -9,5 +9,5 @@
 @AllArgsConstructor
 public class UserProfileCreationFailureEvent {
     private Long userId;
-    private String reason; // 실패 사유
+    private String reason;
 }

community-service/src/main/java/com/example/communityservice/controller/PostController.java

@@ -6,8 +6,7 @@
 import com.example.communityservice.dto.request.PostCreateRequest;
 import com.example.communityservice.dto.request.PostUpdateRequest;
 import com.example.communityservice.dto.request.RecruitmentStatusRequest;
-import com.example.communityservice.dto.response.PostDetailResponse;
-import com.example.communityservice.dto.response.PostResponse;
+import com.example.communityservice.dto.response.*;
 import com.example.communityservice.entity.enumerate.PostCategory;
 import com.example.communityservice.service.PostService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -79,12 +78,13 @@ public ResponseEntity<Void> deletePost(@AuthenticationPrincipal AuthUser authUse
 
     @Operation(summary = "게시글 목록 조회 (검색/필터)", description = "카테고리, 키워드, 해결 여부 등을 조건으로 게시글 목록을 조회합니다. (인증 불필요)")
     @GetMapping("/posts")
-    public ResponseEntity<Page<PostResponse>> getPosts(
+    public ResponseEntity<CustomPageResponse<PostResponse>> getPosts(
             @Parameter(description = "카테고리 (QNA, INFO, RECRUIT)") @RequestParam(required = false) PostCategory category,
             @Parameter(description = "검색 키워드 (제목 + 내용)") @RequestParam(required = false) String keyword,
             @Parameter(description = "해결 여부 (QnA 전용)") @RequestParam(required = false) Boolean isSolved,
             @Parameter(description = "페이징 설정 (기본: 최신순 10개)") @PageableDefault(size = 10, sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable) {
-        return ResponseEntity.ok(postService.getPosts(category, keyword, isSolved, pageable));
+        Page<PostResponse> page = postService.getPosts(category, keyword, isSolved, pageable);
+        return ResponseEntity.ok(new CustomPageResponse<>(page));
     }
 
     @Operation(summary = "게시글 상세 조회", description = "게시글의 상세 내용과 계층형 댓글 목록을 조회합니다. 로그인 시 북마크 여부가 포함됩니다.")
@@ -202,27 +202,26 @@ public ResponseEntity<Void> updateRecruitmentStatus(@AuthenticationPrincipal Aut
         return ResponseEntity.ok().build();
     }
 
-    @Operation(summary = "내가 쓴 게시글 조회", description = "로그인한 사용자가 작성한 게시글 목록을 조회합니다.")
+    @Operation(summary = "내가 쓴 게시글 조회", description = "로그인한 사용자가 작성한 게시글 목록을 조회합니다. (카테고리 필터링 가능)")
     @SecurityRequirement(name = "BearerAuthentication")
     @GetMapping("/posts/me")
-    public ResponseEntity<Page<PostResponse>> getMyPosts(@AuthenticationPrincipal AuthUser authUser,
-                                                         @PageableDefault(sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable) {
-        return ResponseEntity.ok(postService.getMyPosts(authUser.getUserId(), pageable));
+    public ResponseEntity<CustomPageResponse<MyPostResponse>> getMyPosts(
+            @AuthenticationPrincipal AuthUser authUser,
+            @Parameter(description = "카테고리 (QNA, INFO, RECRUIT), 미입력 시 전체") @RequestParam(required = false) PostCategory category,
+            @PageableDefault(sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable) {
+        Page<MyPostResponse> page = postService.getMyPosts(authUser.getUserId(), category, pageable);
+        return ResponseEntity.ok(new CustomPageResponse<>(page));
     }
 
-    @Operation(summary = "내가 북마크한 글 조회", description = "로그인한 사용자가 북마크한 게시글 목록을 조회합니다.")
+    @Operation(summary = "내가 북마크한 글 조회", description = "로그인한 사용자가 북마크한 게시글 목록을 조회합니다. (카테고리 필터링 가능)")
     @SecurityRequirement(name = "BearerAuthentication")
     @GetMapping("/posts/me/bookmarks")
-    public ResponseEntity<Page<PostResponse>> getMyBookmarkedPosts(@AuthenticationPrincipal AuthUser authUser,
-                                                                   @PageableDefault(sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable) {
-        return ResponseEntity.ok(postService.getMyBookmarkedPosts(authUser.getUserId(), pageable));
+    public ResponseEntity<CustomPageResponse<MyBookmarkPostResponse>> getMyBookmarkedPosts(
+            @AuthenticationPrincipal AuthUser authUser,
+            @Parameter(description = "카테고리 (QNA, INFO, RECRUIT), 미입력 시 전체") @RequestParam(required = false) PostCategory category,
+            @PageableDefault(sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable) {
+        Page<MyBookmarkPostResponse> page = postService.getMyBookmarkedPosts(authUser.getUserId(), category, pageable);
+        return ResponseEntity.ok(new CustomPageResponse<>(page));
     }
 
-    @Operation(summary = "내가 댓글 단 글 조회", description = "로그인한 사용자가 댓글을 작성한 게시글 목록을 조회합니다.")
-    @SecurityRequirement(name = "BearerAuthentication")
-    @GetMapping("/posts/me/commented")
-    public ResponseEntity<Page<PostResponse>> getMyCommentedPosts(@AuthenticationPrincipal AuthUser authUser,
-                                                                  @PageableDefault(sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable) {
-        return ResponseEntity.ok(postService.getMyCommentedPosts(authUser.getUserId(), pageable));
-    }
 }

community-service/src/main/java/com/example/communityservice/controller/TestSetupController.java

@@ -40,12 +40,18 @@ public ResponseEntity<Void> setupPosts(@RequestBody Map<String, Object> request)
 
         // 2. 데이터 생성
         List<PostEntity> posts = new ArrayList<>();
+
+        PostCategory[] categories = PostCategory.values();
+
         for (int i = 0; i < count; i++) {
+
+            PostCategory category = categories[i % categories.length];
+
             posts.add(PostEntity.builder()
                     .userId(userId)
                     .title("성능 테스트용 게시글 " + i)
                     .content("이 게시글은 성능 테스트를 위해 생성된 더미 데이터입니다. ".repeat(5)) // 내용 불리기
-                    .category(PostCategory.INFO)
+                    .category(category)
                     .build());
         }
 

community-service/src/main/java/com/example/communityservice/dto/response/CommentResponse.java

@@ -1,38 +1,48 @@
 package com.example.communityservice.dto.response;
 
-import com.example.communityservice.entity.PostCommentEntity;
-import lombok.Builder;
-import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.*;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
-@Data
+@Getter
+@Setter
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class CommentResponse {
     private Long id;
-    private Long userId;
-
-    // 작성자 정보 (로컬 캐시에서 매핑)
+    private Long postId;
+    private Long userId; // 작성자 ID
     private String writerName;
     private String writerEmail;
-
     private String content;
-    private boolean isAccepted; // QnA 채택 여부
+    private boolean isAccepted; // 채택 여부
+
+    @JsonIgnore // 계층 구조 생성용 (클라이언트 응답에는 제외 가능)
+    private Long parentId;
+
     private LocalDateTime createdAt;
+    private LocalDateTime lastModifiedAt;
 
-    // 대댓글 리스트 (계층형 구조)
-    private List<CommentResponse> children;
+    @Builder.Default
+    private List<CommentResponse> children = new ArrayList<>();
 
-    public static CommentResponse from(PostCommentEntity entity) {
-        return CommentResponse.builder()
-                .id(entity.getId())
-                .userId(entity.getUserId())
-                .content(entity.getContent())
-                .isAccepted(entity.isAccepted())
-                .createdAt(entity.getCreatedAt())
-                .children(new ArrayList<>()) // 초기화
-                .build();
+    // QueryDSL Projections.constructor 사용을 위한 생성자 (children 제외)
+    public CommentResponse(Long id, Long postId, Long userId, String writerName, String writerEmail,
+                           String content, boolean isAccepted, Long parentId,
+                           LocalDateTime createdAt, LocalDateTime lastModifiedAt) {
+        this.id = id;
+        this.postId = postId;
+        this.userId = userId;
+        this.writerName = writerName;
+        this.writerEmail = writerEmail;
+        this.content = content;
+        this.isAccepted = isAccepted;
+        this.parentId = parentId;
+        this.createdAt = createdAt;
+        this.lastModifiedAt = lastModifiedAt;
     }
 }

community-service/src/main/java/com/example/communityservice/dto/response/CustomPageResponse.java

@@ -0,0 +1,27 @@
+package com.example.communityservice.dto.response;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+
+@Getter
+@NoArgsConstructor
+public class CustomPageResponse<T> {
+    private List<T> content;
+    private int pageNumber;
+    private int pageSize;
+    private long totalElements;
+    private int totalPages;
+    private boolean last;
+
+    public CustomPageResponse(Page<T> page) {
+        this.content = page.getContent();
+        this.pageNumber = page.getNumber();
+        this.pageSize = page.getSize();
+        this.totalElements = page.getTotalElements();
+        this.totalPages = page.getTotalPages();
+        this.last = page.isLast();
+    }
+}