📈[분석추가] &⚡️[성능 향상] Prometheus & Grafana 모니터링 환경 구축 & 성능 향상

.gitignore

@@ -1 +1,2 @@
 .env
+/.idea

SpringBoot/build.gradle

@@ -82,6 +82,13 @@ dependencies {
 
 	/* Swagger UI */
 	implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0"
+
+	/* Prometheus */
+	implementation 'org.springframework.boot:spring-boot-starter-actuator'
+	implementation 'io.micrometer:micrometer-registry-prometheus'
+
+	/* Redis-Cache */
+	implementation 'org.springframework.boot:spring-boot-starter-cache'
 }
 
 dependencyManagement {

SpringBoot/database/init.sql

@@ -111,4 +111,8 @@ CREATE TABLE hot_topic
 
 CREATE INDEX idx_news_title ON news(title); -- news 테이블 DELETE 시 title 검색 시
 CREATE INDEX idx_news_published_at ON news(published_at);
-CREATE INDEX idx_news_publisher ON news(publisher);
+CREATE INDEX idx_news_publisher ON news(publisher);
+-- SELECT에 사용되는 조건
+CREATE INDEX idx_news_published_sections ON news(published_at, sections);
+-- 중복 삭제에 효율적인 복합 인덱스
+CREATE INDEX idx_news_dup ON news(published_at, title, publisher, id);

SpringBoot/src/main/java/Baemin/News_Deliver/Domain/HotTopic/HotTopic_Description

@@ -2,5 +2,6 @@
 
 ## 도메인 설명 
 
-## 기능 설명 
+## 기능 설명
+
 

SpringBoot/src/main/java/Baemin/News_Deliver/Domain/HotTopic/service/HotTopicService.java

@@ -5,14 +5,17 @@
 import Baemin.News_Deliver.Domain.HotTopic.repository.HotTopicRepository;
 import Baemin.News_Deliver.Global.News.ElasticSearch.dto.NewsEsDocument;
 import Baemin.News_Deliver.Global.News.ElasticSearch.service.NewsEsService;
-import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.elasticsearch._types.aggregations.StringTermsBucket;
+import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
+import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -39,12 +42,23 @@
  */
 @Slf4j
 @Service
-@RequiredArgsConstructor
 public class HotTopicService {
 
-    private final ElasticsearchClient elasticsearchClient;
     private final HotTopicRepository hotTopicRepository;
     private final NewsEsService elasticSearchService;
+    private final RedisTemplate<String, Object> redisTemplate;
+
+    public HotTopicService(
+            HotTopicRepository hotTopicRepository,
+            NewsEsService elasticSearchService,
+            @Qualifier("redisCacheTemplate") RedisTemplate<String, Object> redisTemplate
+    ) {
+        this.hotTopicRepository = hotTopicRepository;
+        this.elasticSearchService = elasticSearchService;
+        this.redisTemplate = redisTemplate;
+    }
+
+    private static final String CACHE_PREFIX = "keyword:";
 
     /**
      * DB에서 "어제" 저장된 핫토픽 상위 10개 조회 후 DTO로 반환
@@ -55,18 +69,40 @@ public class HotTopicService {
      * @return 어제의 핫토픽 리스트 (최대 10개)
      */
     public List<HotTopicResponseDTO> getHotTopicList() {
+        long start = System.nanoTime();
+        String cacheKey = "hottopic:daily";
+
+        List<HotTopicResponseDTO> cached = (List<HotTopicResponseDTO>) redisTemplate.opsForValue().get(cacheKey);
+        if (cached != null) {
+            long end = System.nanoTime();
+            log.info("✅ 핫토픽 캐시에서 가져옴 ({} ms)", (end - start) / 1_000_000);
+            return cached;
+        }
+
         LocalDate yesterday = LocalDate.now().minusDays(1);
-        LocalDateTime startOfYesterday = yesterday.atStartOfDay(); // 어제 00:00:00
-        LocalDateTime endOfYesterday = yesterday.atTime(LocalTime.MAX); // 어제 23:59:59.999999999
+        LocalDateTime startOfYesterday = yesterday.atStartOfDay();
+        LocalDateTime endOfYesterday = yesterday.atTime(LocalTime.MAX);
 
-        return hotTopicRepository.findTop10ByTopicDateBetweenOrderByTopicRankAsc(startOfYesterday, endOfYesterday).stream()
+        List<HotTopicResponseDTO> result = hotTopicRepository.findTop10ByTopicDateBetweenOrderByTopicRankAsc(startOfYesterday, endOfYesterday)
+                .stream()
                 .map(entity -> HotTopicResponseDTO.builder()
                         .topicRank(entity.getTopicRank())
                         .keyword(entity.getKeyword())
                         .keywordCount(entity.getKeywordCount())
                         .topicDate(entity.getTopicDate())
                         .build())
                 .toList();
+
+        long end = System.nanoTime();
+        log.info("📦 핫토픽 DB 조회 & 캐싱 완료 ({} ms)", (end - start) / 1_000_000);
+
+        long ttlSeconds = Duration.between(
+                LocalDateTime.now(),
+                LocalDate.now().plusDays(1).atStartOfDay()
+        ).getSeconds();
+
+        redisTemplate.opsForValue().set(cacheKey, result, Duration.ofSeconds(ttlSeconds));
+        return result;
     }
 
     /**
@@ -116,6 +152,26 @@ public void getAndSaveHotTopic() throws IOException {
      * @throws IOException Elasticsearch 통신 실패 시
      */
     public List<NewsEsDocument> getNewsList(String keyword, int size) throws IOException {
-        return elasticSearchService.searchByKeyword(keyword, size);
+        long start = System.nanoTime();
+        String cacheKey = CACHE_PREFIX + keyword;
+
+        List<NewsEsDocument> cached = (List<NewsEsDocument>) redisTemplate.opsForValue().get(cacheKey);
+        if (cached != null) {
+            long end = System.nanoTime();
+            log.info("✅ 캐시에서 가져옴: {} ({} ms)", keyword, (end - start) / 1_000_000);
+            return cached;
+        }
+
+        List<NewsEsDocument> result = elasticSearchService.searchByKeyword(keyword, size);
+        long end = System.nanoTime();
+        log.info("📦 ES 조회 & 캐싱: {} 완료 ({} ms)", keyword, (end - start) / 1_000_000);
+
+        long ttlSeconds = Duration.between(
+                LocalDateTime.now(),
+                LocalDate.now().plusDays(1).atStartOfDay()
+        ).getSeconds();
+
+        redisTemplate.opsForValue().set(cacheKey, result, Duration.ofSeconds(ttlSeconds));
+        return result;
     }
 }

SpringBoot/src/main/java/Baemin/News_Deliver/Domain/Mypage/Controller/SettingController.java

@@ -91,7 +91,8 @@ public ResponseEntity<Long> saveSetting(@RequestBody SettingDTO settingDTO,
             Long userId = authService.findByKakaoId(kakaoId).getId();
             settingDTO.setUserId(userId);
 
-            return settingService.saveSetting(settingDTO);
+            Long settingId = settingService.saveSetting(settingDTO);
+            return ResponseEntity.ok(settingId);
 
         } catch (Exception e) {
             log.error("설정 저장 실패: kakaoId={}, error={}",
@@ -127,7 +128,8 @@ public ResponseEntity<Void> updateSetting(@RequestBody SettingDTO settingDTO,
             Long userId = authService.findByKakaoId(kakaoId).getId();
             settingDTO.setUserId(userId);
 
-            return settingService.updateSetting(settingDTO);
+            settingService.updateSetting(settingDTO);
+            return ResponseEntity.noContent().build();
 
         } catch (Exception e) {
             log.error("설정 수정 실패: kakaoId={}, error={}",
@@ -154,19 +156,12 @@ public ResponseEntity<Void> updateSetting(@RequestBody SettingDTO settingDTO,
     })
     public ResponseEntity<Void> deleteSetting(@PathVariable("id") Long id,
                                               Authentication authentication) {
-        try {
-            // 인증 객체에서 카카오 ID 추출
-            String kakaoId = authentication.getName();
-
-            // 카카오 ID로 사용자 조회 (인증 실패 예외 처리)
-            Long userId = authService.findByKakaoId(kakaoId).getId();
 
-            return settingService.deleteSetting(id, userId);
+        String kakaoId = authentication.getName();
+        Long userId = authService.findByKakaoId(kakaoId).getId();
 
-        } catch (Exception e) {
-            log.error("설정 삭제 실패: kakaoId={}, error={}",
-                    authentication.getName(), e.getMessage());
-            throw new SettingException(ErrorCode.SETTING_DELETE_FAILED);
-        }
+        settingService.deleteSetting(id, userId);
+        return ResponseEntity.noContent().build();
     }
+
 }