Refactor/music

build.gradle

@@ -52,6 +52,9 @@ dependencies {
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+    implementation 'org.apache.httpcomponents.core5:httpcore5:5.3.1'
+    implementation 'org.apache.httpcomponents.client5:httpclient5:5.4.1'
 }
 
 tasks.named('test') {

src/main/java/team3/kummit/dto/CommentRequest.java → src/main/java/team3/kummit/api/CommentRequest.java

@@ -1,4 +1,4 @@
-package team3.kummit.dto;
+package team3.kummit.api;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;

src/main/java/team3/kummit/dto/CommentResponse.java → src/main/java/team3/kummit/api/CommentResponse.java

@@ -1,4 +1,4 @@
-package team3.kummit.dto;
+package team3.kummit.api;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/team3/kummit/dto/EmotionBandArchiveResponse.java → src/main/java/team3/kummit/api/EmotionBandArchiveResponse.java

@@ -1,4 +1,4 @@
-package team3.kummit.dto;
+package team3.kummit.api;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/team3/kummit/dto/EmotionBandCreateRequest.java → src/main/java/team3/kummit/api/EmotionBandCreateRequest.java

@@ -1,4 +1,4 @@
-package team3.kummit.dto;
+package team3.kummit.api;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;

src/main/java/team3/kummit/dto/EmotionBandCreateResponse.java → src/main/java/team3/kummit/api/EmotionBandCreateResponse.java

@@ -1,4 +1,4 @@
-package team3.kummit.dto;
+package team3.kummit.api;
 
 public record EmotionBandCreateResponse (Long emotionBandId){
 }

src/main/java/team3/kummit/dto/EmotionBandDetailResponse.java → src/main/java/team3/kummit/api/EmotionBandDetailResponse.java

@@ -1,4 +1,4 @@
-package team3.kummit.dto;
+package team3.kummit.api;
 
 import java.time.LocalDateTime;
 import java.util.List;

src/main/java/team3/kummit/dto/EmotionBandLikeResponse.java → src/main/java/team3/kummit/api/EmotionBandLikeResponse.java

@@ -1,4 +1,4 @@
-package team3.kummit.dto;
+package team3.kummit.api;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/team3/kummit/dto/EmotionBandListResponse.java → src/main/java/team3/kummit/api/EmotionBandListResponse.java

@@ -1,4 +1,4 @@
-package team3.kummit.dto;
+package team3.kummit.api;
 
 import java.util.List;
 

src/main/java/team3/kummit/dto/EmotionBandResponse.java → src/main/java/team3/kummit/api/EmotionBandResponse.java

@@ -1,4 +1,4 @@
-package team3.kummit.dto;
+package team3.kummit.api;
 
 import java.time.LocalDateTime;
 import java.util.List;

src/main/java/team3/kummit/dto/MemberBandResponse.java → src/main/java/team3/kummit/api/MemberBandResponse.java

@@ -1,4 +1,4 @@
-package team3.kummit.dto;
+package team3.kummit.api;
 
 import java.util.List;
 

src/main/java/team3/kummit/dto/MemberBandResponseDto.java → src/main/java/team3/kummit/api/MemberBandResponseDto.java

@@ -1,4 +1,4 @@
-package team3.kummit.dto;
+package team3.kummit.api;
 
 import java.time.LocalDateTime;
 import java.util.List;

src/main/java/team3/kummit/dto/MemberLoginRequest.java → src/main/java/team3/kummit/api/MemberLoginRequest.java

@@ -1,4 +1,4 @@
-package team3.kummit.dto;
+package team3.kummit.api;
 
 public record MemberLoginRequest (String name){
 }

src/main/java/team3/kummit/dto/MemberLoginResponse.java → src/main/java/team3/kummit/api/MemberLoginResponse.java

@@ -1,4 +1,4 @@
-package team3.kummit.dto;
+package team3.kummit.api;
 
 public record MemberLoginResponse (Long memberId){
 }

src/main/java/team3/kummit/dto/MemberProfileResponse.java → src/main/java/team3/kummit/api/MemberProfileResponse.java

@@ -1,4 +1,4 @@
-package team3.kummit.dto;
+package team3.kummit.api;
 
 import java.time.LocalDate;
 

src/main/java/team3/kummit/dto/SongRequest.java → src/main/java/team3/kummit/api/SongRequest.java

@@ -1,4 +1,4 @@
-package team3.kummit.dto;
+package team3.kummit.api;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/team3/kummit/dto/SongResponse.java → src/main/java/team3/kummit/api/SongResponse.java

@@ -1,4 +1,4 @@
-package team3.kummit.dto;
+package team3.kummit.api;
 
 import java.time.LocalDateTime;
 

src/main/java/team3/kummit/dto/MusicSearchResponse.java → src/main/java/team3/kummit/api/music/MusicSearchResponse.java

@@ -1,4 +1,4 @@
-package team3.kummit.dto;
+package team3.kummit.api.music;
 
 import java.util.List;
 

src/main/java/team3/kummit/config/MusicSearchConfig.java

@@ -1,8 +1,13 @@
 package team3.kummit.config;
 
+import org.apache.hc.client5.http.impl.DefaultConnectionKeepAliveStrategy;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
 
 @Configuration
@@ -11,7 +16,20 @@ public class MusicSearchConfig {
     @Bean
     public RestTemplate getResetTemplate() {
 
-        return new RestTemplate(new SimpleClientHttpRequestFactory());
+        // 커넥션 풀 설정
+        PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager();
+        connectionManager.setMaxTotal(50);
+        connectionManager.setDefaultMaxPerRoute(50); // 아이튠즈 API 만 사용하니까 개수 동일하게
+
+        CloseableHttpClient httpClient = HttpClients.custom()
+                .setConnectionManager(connectionManager)
+                .setKeepAliveStrategy(DefaultConnectionKeepAliveStrategy.INSTANCE)
+                .build();
+
+        HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory(httpClient);
+        factory.setConnectTimeout(10_000);
+
+        return new RestTemplate(factory);
     }
 
 }

src/main/java/team3/kummit/controller/CommentController.java

@@ -14,8 +14,8 @@
 
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import team3.kummit.dto.CommentRequest;
-import team3.kummit.dto.CommentResponse;
+import team3.kummit.api.CommentRequest;
+import team3.kummit.api.CommentResponse;
 import team3.kummit.service.CommentService;
 
 @Tag(name = "Comment", description = "댓글 관리")

src/main/java/team3/kummit/controller/EmotionBandArchiveController.java

@@ -11,7 +11,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
-import team3.kummit.dto.EmotionBandArchiveResponse;
+import team3.kummit.api.EmotionBandArchiveResponse;
 import team3.kummit.service.EmotionBandArchiveService;
 
 @Tag(name = "EmotionBand-Archive", description = "감정밴드 보관 관리")

src/main/java/team3/kummit/controller/EmotionBandController.java

@@ -13,10 +13,10 @@
 
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import team3.kummit.dto.EmotionBandCreateRequest;
-import team3.kummit.dto.EmotionBandCreateResponse;
-import team3.kummit.dto.EmotionBandDetailResponse;
-import team3.kummit.dto.EmotionBandListResponse;
+import team3.kummit.api.EmotionBandCreateRequest;
+import team3.kummit.api.EmotionBandCreateResponse;
+import team3.kummit.api.EmotionBandDetailResponse;
+import team3.kummit.api.EmotionBandListResponse;
 import team3.kummit.service.EmotionBandService;
 import team3.kummit.service.MemberService;
 

src/main/java/team3/kummit/controller/EmotionBandLikeController.java

@@ -11,7 +11,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
-import team3.kummit.dto.EmotionBandLikeResponse;
+import team3.kummit.api.EmotionBandLikeResponse;
 import team3.kummit.service.EmotionBandLikeService;
 
 @Tag(name = "EmotionBand-Like", description = "감정밴드 좋아요 관리")

src/main/java/team3/kummit/controller/MemberController.java

@@ -16,9 +16,9 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import team3.kummit.api.*;
 import team3.kummit.domain.EmotionBand;
 import team3.kummit.domain.Member;
-import team3.kummit.dto.*;
 import team3.kummit.service.EmotionBandArchiveService;
 import team3.kummit.service.EmotionBandLikeService;
 import team3.kummit.service.EmotionBandService;

src/main/java/team3/kummit/controller/MusicSearchController.java

@@ -19,7 +19,7 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import team3.kummit.dto.MusicSearchResponse;
+import team3.kummit.api.music.MusicSearchResponse;
 import team3.kummit.service.music.MusicResponse;
 import team3.kummit.service.music.MusicSearchService;
 

src/main/java/team3/kummit/controller/SongController.java

@@ -11,8 +11,8 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
-import team3.kummit.dto.SongRequest;
-import team3.kummit.dto.SongResponse;
+import team3.kummit.api.SongRequest;
+import team3.kummit.api.SongResponse;
 import team3.kummit.service.SongService;
 
 @Tag(name = "Song", description = "음악 관리")

src/main/java/team3/kummit/service/CommentService.java

@@ -8,11 +8,11 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import lombok.RequiredArgsConstructor;
+import team3.kummit.api.CommentRequest;
+import team3.kummit.api.CommentResponse;
 import team3.kummit.domain.Comment;
 import team3.kummit.domain.EmotionBand;
 import team3.kummit.domain.Member;
-import team3.kummit.dto.CommentRequest;
-import team3.kummit.dto.CommentResponse;
 import team3.kummit.exception.ResourceNotFoundException;
 import team3.kummit.repository.CommentRepository;
 import team3.kummit.repository.EmotionBandRepository;

src/main/java/team3/kummit/service/EmotionBandArchiveService.java

@@ -6,10 +6,10 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import lombok.RequiredArgsConstructor;
+import team3.kummit.api.EmotionBandArchiveResponse;
 import team3.kummit.domain.EmotionBand;
 import team3.kummit.domain.EmotionBandArchive;
 import team3.kummit.domain.Member;
-import team3.kummit.dto.EmotionBandArchiveResponse;
 import team3.kummit.exception.ResourceNotFoundException;
 import team3.kummit.repository.EmotionBandArchiveRepository;
 import team3.kummit.repository.EmotionBandRepository;

src/main/java/team3/kummit/service/EmotionBandService.java

@@ -8,10 +8,10 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import lombok.RequiredArgsConstructor;
+import team3.kummit.api.*;
 import team3.kummit.domain.EmotionBand;
 import team3.kummit.domain.Member;
 import team3.kummit.domain.Song;
-import team3.kummit.dto.*;
 import team3.kummit.exception.ResourceNotFoundException;
 import team3.kummit.repository.EmotionBandRepository;
 import team3.kummit.repository.SongRepository;

src/main/java/team3/kummit/service/SongService.java

@@ -6,11 +6,11 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import lombok.RequiredArgsConstructor;
+import team3.kummit.api.SongRequest;
+import team3.kummit.api.SongResponse;
 import team3.kummit.domain.EmotionBand;
 import team3.kummit.domain.Member;
 import team3.kummit.domain.Song;
-import team3.kummit.dto.SongRequest;
-import team3.kummit.dto.SongResponse;
 import team3.kummit.exception.ResourceNotFoundException;
 import team3.kummit.repository.EmotionBandRepository;
 import team3.kummit.repository.MemberRepository;

src/main/java/team3/kummit/service/music/MusicApiResponseParser.java

@@ -1,13 +1,14 @@
 package team3.kummit.service.music;
 
 
-import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
+import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.stereotype.Component;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -19,15 +20,16 @@
 @RequiredArgsConstructor
 class MusicApiResponseParser {
 
-    private final ObjectMapper objectMapper = new ObjectMapper();
+    private final ObjectMapper objectMapper = new ObjectMapper(); // 테스트를 위해 직접 생성
 
     public List<MusicResponse> parseMusicResponse(String response) {
 
         JsonNode root;
         try{
             root = objectMapper.readTree(response);
-        }catch (IOException e){
-            throw new RuntimeException(e);
+        }catch (JsonProcessingException e){
+            log.error("parseMusicResponse error: {}", e.getMessage());
+            throw new HttpMessageNotReadableException(e.getMessage(),e, null);
         }
         return StreamSupport.stream(root.withArray("results").spliterator(), false)
                 .map(node -> objectMapper.convertValue(node, MusicResponse.class))

src/main/resources/application.yml

@@ -0,0 +1 @@
+spring.jpa.open-in-view : false

src/test/java/team3/kummit/repository/EmotionBandRepositoryTest.java

@@ -26,8 +26,5 @@ void findAllByEmotionBandIdList() {
     @Test
     void indAllByEmotionBandIdList() {
         List<EmotionBand> allByEmotionBandIdList = repository.findAllByEmotionBandIdList(List.of(1L, 2L, 3L), LocalDateTime.now());
-        for (EmotionBand emotionBand : allByEmotionBandIdList) {
-            System.out.println(emotionBand.getId());
-        }
     }
 }

src/test/java/team3/kummit/service/EmotionBandArchiveServiceTest.java

@@ -16,10 +16,10 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import team3.kummit.api.EmotionBandArchiveResponse;
 import team3.kummit.domain.EmotionBand;
 import team3.kummit.domain.EmotionBandArchive;
 import team3.kummit.domain.Member;
-import team3.kummit.dto.EmotionBandArchiveResponse;
 import team3.kummit.exception.ResourceNotFoundException;
 import team3.kummit.repository.EmotionBandArchiveRepository;
 import team3.kummit.repository.EmotionBandRepository;

src/test/java/team3/kummit/service/EmotionBandServiceTest.java

@@ -10,8 +10,8 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.transaction.annotation.Transactional;
 
+import team3.kummit.api.EmotionBandCreateRequest;
 import team3.kummit.domain.Member;
-import team3.kummit.dto.EmotionBandCreateRequest;
 import team3.kummit.repository.MemberRepository;
 
 @SpringBootTest

src/test/java/team3/kummit/service/SongServiceTest.java

@@ -16,11 +16,11 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import team3.kummit.api.SongRequest;
+import team3.kummit.api.SongResponse;
 import team3.kummit.domain.EmotionBand;
 import team3.kummit.domain.Member;
 import team3.kummit.domain.Song;
-import team3.kummit.dto.SongRequest;
-import team3.kummit.dto.SongResponse;
 import team3.kummit.exception.ResourceNotFoundException;
 import team3.kummit.repository.EmotionBandRepository;
 import team3.kummit.repository.MemberRepository;

src/test/java/team3/kummit/service/comment/CommentCreateServiceTest.java

@@ -16,11 +16,11 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import team3.kummit.api.CommentRequest;
+import team3.kummit.api.CommentResponse;
 import team3.kummit.domain.Comment;
 import team3.kummit.domain.EmotionBand;
 import team3.kummit.domain.Member;
-import team3.kummit.dto.CommentRequest;
-import team3.kummit.dto.CommentResponse;
 import team3.kummit.exception.ResourceNotFoundException;
 import team3.kummit.repository.CommentRepository;
 import team3.kummit.repository.EmotionBandRepository;

src/test/java/team3/kummit/service/comment/CommentGetServiceTest.java

@@ -15,10 +15,10 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import team3.kummit.api.CommentResponse;
 import team3.kummit.domain.Comment;
 import team3.kummit.domain.EmotionBand;
 import team3.kummit.domain.Member;
-import team3.kummit.dto.CommentResponse;
 import team3.kummit.repository.CommentRepository;
 import team3.kummit.repository.EmotionBandRepository;
 import team3.kummit.repository.MemberRepository;