diff --git a/build.gradle b/build.gradle index ee41ea4..7bea60c 100644 --- a/build.gradle +++ b/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') { diff --git a/src/main/java/team3/kummit/dto/CommentRequest.java b/src/main/java/team3/kummit/api/CommentRequest.java similarity index 92% rename from src/main/java/team3/kummit/dto/CommentRequest.java rename to src/main/java/team3/kummit/api/CommentRequest.java index 1ac96b8..1fc1162 100644 --- a/src/main/java/team3/kummit/dto/CommentRequest.java +++ b/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; diff --git a/src/main/java/team3/kummit/dto/CommentResponse.java b/src/main/java/team3/kummit/api/CommentResponse.java similarity index 95% rename from src/main/java/team3/kummit/dto/CommentResponse.java rename to src/main/java/team3/kummit/api/CommentResponse.java index ea43d92..96cb7f7 100644 --- a/src/main/java/team3/kummit/dto/CommentResponse.java +++ b/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; diff --git a/src/main/java/team3/kummit/dto/EmotionBandArchiveResponse.java b/src/main/java/team3/kummit/api/EmotionBandArchiveResponse.java similarity index 93% rename from src/main/java/team3/kummit/dto/EmotionBandArchiveResponse.java rename to src/main/java/team3/kummit/api/EmotionBandArchiveResponse.java index 2276a44..7596593 100644 --- a/src/main/java/team3/kummit/dto/EmotionBandArchiveResponse.java +++ b/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; diff --git a/src/main/java/team3/kummit/dto/EmotionBandCreateRequest.java b/src/main/java/team3/kummit/api/EmotionBandCreateRequest.java similarity index 97% rename from src/main/java/team3/kummit/dto/EmotionBandCreateRequest.java rename to src/main/java/team3/kummit/api/EmotionBandCreateRequest.java index c4442d8..fac4f86 100644 --- a/src/main/java/team3/kummit/dto/EmotionBandCreateRequest.java +++ b/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; diff --git a/src/main/java/team3/kummit/dto/EmotionBandCreateResponse.java b/src/main/java/team3/kummit/api/EmotionBandCreateResponse.java similarity index 71% rename from src/main/java/team3/kummit/dto/EmotionBandCreateResponse.java rename to src/main/java/team3/kummit/api/EmotionBandCreateResponse.java index f943bbd..6cbcae3 100644 --- a/src/main/java/team3/kummit/dto/EmotionBandCreateResponse.java +++ b/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){ } diff --git a/src/main/java/team3/kummit/dto/EmotionBandDetailResponse.java b/src/main/java/team3/kummit/api/EmotionBandDetailResponse.java similarity index 98% rename from src/main/java/team3/kummit/dto/EmotionBandDetailResponse.java rename to src/main/java/team3/kummit/api/EmotionBandDetailResponse.java index 7e064f7..53a95cd 100644 --- a/src/main/java/team3/kummit/dto/EmotionBandDetailResponse.java +++ b/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; diff --git a/src/main/java/team3/kummit/dto/EmotionBandLikeResponse.java b/src/main/java/team3/kummit/api/EmotionBandLikeResponse.java similarity index 94% rename from src/main/java/team3/kummit/dto/EmotionBandLikeResponse.java rename to src/main/java/team3/kummit/api/EmotionBandLikeResponse.java index a58d450..db14d15 100644 --- a/src/main/java/team3/kummit/dto/EmotionBandLikeResponse.java +++ b/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; diff --git a/src/main/java/team3/kummit/dto/EmotionBandListResponse.java b/src/main/java/team3/kummit/api/EmotionBandListResponse.java similarity index 94% rename from src/main/java/team3/kummit/dto/EmotionBandListResponse.java rename to src/main/java/team3/kummit/api/EmotionBandListResponse.java index 121ae79..c312dd3 100644 --- a/src/main/java/team3/kummit/dto/EmotionBandListResponse.java +++ b/src/main/java/team3/kummit/api/EmotionBandListResponse.java @@ -1,4 +1,4 @@ -package team3.kummit.dto; +package team3.kummit.api; import java.util.List; diff --git a/src/main/java/team3/kummit/dto/EmotionBandResponse.java b/src/main/java/team3/kummit/api/EmotionBandResponse.java similarity index 98% rename from src/main/java/team3/kummit/dto/EmotionBandResponse.java rename to src/main/java/team3/kummit/api/EmotionBandResponse.java index 4392680..87ba7b0 100644 --- a/src/main/java/team3/kummit/dto/EmotionBandResponse.java +++ b/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; diff --git a/src/main/java/team3/kummit/dto/MemberBandResponse.java b/src/main/java/team3/kummit/api/MemberBandResponse.java similarity index 81% rename from src/main/java/team3/kummit/dto/MemberBandResponse.java rename to src/main/java/team3/kummit/api/MemberBandResponse.java index 4cba54f..f0ae368 100644 --- a/src/main/java/team3/kummit/dto/MemberBandResponse.java +++ b/src/main/java/team3/kummit/api/MemberBandResponse.java @@ -1,4 +1,4 @@ -package team3.kummit.dto; +package team3.kummit.api; import java.util.List; diff --git a/src/main/java/team3/kummit/dto/MemberBandResponseDto.java b/src/main/java/team3/kummit/api/MemberBandResponseDto.java similarity index 96% rename from src/main/java/team3/kummit/dto/MemberBandResponseDto.java rename to src/main/java/team3/kummit/api/MemberBandResponseDto.java index 6dce39e..b2662b7 100644 --- a/src/main/java/team3/kummit/dto/MemberBandResponseDto.java +++ b/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; diff --git a/src/main/java/team3/kummit/dto/MemberLoginRequest.java b/src/main/java/team3/kummit/api/MemberLoginRequest.java similarity index 66% rename from src/main/java/team3/kummit/dto/MemberLoginRequest.java rename to src/main/java/team3/kummit/api/MemberLoginRequest.java index d1c4609..d7bdb7d 100644 --- a/src/main/java/team3/kummit/dto/MemberLoginRequest.java +++ b/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){ } diff --git a/src/main/java/team3/kummit/dto/MemberLoginResponse.java b/src/main/java/team3/kummit/api/MemberLoginResponse.java similarity index 67% rename from src/main/java/team3/kummit/dto/MemberLoginResponse.java rename to src/main/java/team3/kummit/api/MemberLoginResponse.java index fc54e97..99f6eda 100644 --- a/src/main/java/team3/kummit/dto/MemberLoginResponse.java +++ b/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){ } diff --git a/src/main/java/team3/kummit/dto/MemberProfileResponse.java b/src/main/java/team3/kummit/api/MemberProfileResponse.java similarity index 89% rename from src/main/java/team3/kummit/dto/MemberProfileResponse.java rename to src/main/java/team3/kummit/api/MemberProfileResponse.java index 19789a5..04aca78 100644 --- a/src/main/java/team3/kummit/dto/MemberProfileResponse.java +++ b/src/main/java/team3/kummit/api/MemberProfileResponse.java @@ -1,4 +1,4 @@ -package team3.kummit.dto; +package team3.kummit.api; import java.time.LocalDate; diff --git a/src/main/java/team3/kummit/dto/SongRequest.java b/src/main/java/team3/kummit/api/SongRequest.java similarity index 91% rename from src/main/java/team3/kummit/dto/SongRequest.java rename to src/main/java/team3/kummit/api/SongRequest.java index ec70f7f..b0028be 100644 --- a/src/main/java/team3/kummit/dto/SongRequest.java +++ b/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; diff --git a/src/main/java/team3/kummit/dto/SongResponse.java b/src/main/java/team3/kummit/api/SongResponse.java similarity index 97% rename from src/main/java/team3/kummit/dto/SongResponse.java rename to src/main/java/team3/kummit/api/SongResponse.java index c603077..e84c85a 100644 --- a/src/main/java/team3/kummit/dto/SongResponse.java +++ b/src/main/java/team3/kummit/api/SongResponse.java @@ -1,4 +1,4 @@ -package team3.kummit.dto; +package team3.kummit.api; import java.time.LocalDateTime; diff --git a/src/main/java/team3/kummit/dto/MusicSearchResponse.java b/src/main/java/team3/kummit/api/music/MusicSearchResponse.java similarity index 83% rename from src/main/java/team3/kummit/dto/MusicSearchResponse.java rename to src/main/java/team3/kummit/api/music/MusicSearchResponse.java index 4dda2b5..4973173 100644 --- a/src/main/java/team3/kummit/dto/MusicSearchResponse.java +++ b/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; diff --git a/src/main/java/team3/kummit/config/MusicSearchConfig.java b/src/main/java/team3/kummit/config/MusicSearchConfig.java index ac02e06..25675f7 100644 --- a/src/main/java/team3/kummit/config/MusicSearchConfig.java +++ b/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); } } diff --git a/src/main/java/team3/kummit/controller/CommentController.java b/src/main/java/team3/kummit/controller/CommentController.java index 25b1b49..5536890 100644 --- a/src/main/java/team3/kummit/controller/CommentController.java +++ b/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 = "댓글 관리") diff --git a/src/main/java/team3/kummit/controller/EmotionBandArchiveController.java b/src/main/java/team3/kummit/controller/EmotionBandArchiveController.java index ab8059d..dd8fdf3 100644 --- a/src/main/java/team3/kummit/controller/EmotionBandArchiveController.java +++ b/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 = "감정밴드 보관 관리") diff --git a/src/main/java/team3/kummit/controller/EmotionBandController.java b/src/main/java/team3/kummit/controller/EmotionBandController.java index ed89683..709067e 100644 --- a/src/main/java/team3/kummit/controller/EmotionBandController.java +++ b/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; diff --git a/src/main/java/team3/kummit/controller/EmotionBandLikeController.java b/src/main/java/team3/kummit/controller/EmotionBandLikeController.java index d2018e8..bb1c95a 100644 --- a/src/main/java/team3/kummit/controller/EmotionBandLikeController.java +++ b/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 = "감정밴드 좋아요 관리") diff --git a/src/main/java/team3/kummit/controller/MemberController.java b/src/main/java/team3/kummit/controller/MemberController.java index c622c11..c7a6c3d 100644 --- a/src/main/java/team3/kummit/controller/MemberController.java +++ b/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; diff --git a/src/main/java/team3/kummit/controller/MusicSearchController.java b/src/main/java/team3/kummit/controller/MusicSearchController.java index 58492a9..8545b6d 100644 --- a/src/main/java/team3/kummit/controller/MusicSearchController.java +++ b/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; diff --git a/src/main/java/team3/kummit/controller/SongController.java b/src/main/java/team3/kummit/controller/SongController.java index f2dbbbc..6c9aa16 100644 --- a/src/main/java/team3/kummit/controller/SongController.java +++ b/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 = "음악 관리") diff --git a/src/main/java/team3/kummit/service/CommentService.java b/src/main/java/team3/kummit/service/CommentService.java index e7c26e6..4a00e48 100644 --- a/src/main/java/team3/kummit/service/CommentService.java +++ b/src/main/java/team3/kummit/service/CommentService.java @@ -7,11 +7,13 @@ 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.api.CommentRequest; +import team3.kummit.api.CommentResponse; import team3.kummit.repository.CommentRepository; import team3.kummit.repository.EmotionBandRepository; import team3.kummit.repository.MemberRepository; diff --git a/src/main/java/team3/kummit/service/EmotionBandArchiveService.java b/src/main/java/team3/kummit/service/EmotionBandArchiveService.java index 56f3871..d0c944a 100644 --- a/src/main/java/team3/kummit/service/EmotionBandArchiveService.java +++ b/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; diff --git a/src/main/java/team3/kummit/service/EmotionBandService.java b/src/main/java/team3/kummit/service/EmotionBandService.java index 0eca991..9b3cf98 100644 --- a/src/main/java/team3/kummit/service/EmotionBandService.java +++ b/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; diff --git a/src/main/java/team3/kummit/service/SongService.java b/src/main/java/team3/kummit/service/SongService.java index 0d108ae..9a7ce0d 100644 --- a/src/main/java/team3/kummit/service/SongService.java +++ b/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; diff --git a/src/main/java/team3/kummit/service/music/MusicApiResponseParser.java b/src/main/java/team3/kummit/service/music/MusicApiResponseParser.java index 4c0414f..d252b55 100644 --- a/src/main/java/team3/kummit/service/music/MusicApiResponseParser.java +++ b/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 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)) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..625e65c --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1 @@ +spring.jpa.open-in-view : false diff --git a/src/test/java/team3/kummit/repository/EmotionBandRepositoryTest.java b/src/test/java/team3/kummit/repository/EmotionBandRepositoryTest.java index 36687a5..f6137ae 100644 --- a/src/test/java/team3/kummit/repository/EmotionBandRepositoryTest.java +++ b/src/test/java/team3/kummit/repository/EmotionBandRepositoryTest.java @@ -26,8 +26,5 @@ void findAllByEmotionBandIdList() { @Test void indAllByEmotionBandIdList() { List allByEmotionBandIdList = repository.findAllByEmotionBandIdList(List.of(1L, 2L, 3L), LocalDateTime.now()); - for (EmotionBand emotionBand : allByEmotionBandIdList) { - System.out.println(emotionBand.getId()); - } } } diff --git a/src/test/java/team3/kummit/service/EmotionBandArchiveServiceTest.java b/src/test/java/team3/kummit/service/EmotionBandArchiveServiceTest.java index 5824ff5..795c5a3 100644 --- a/src/test/java/team3/kummit/service/EmotionBandArchiveServiceTest.java +++ b/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; diff --git a/src/test/java/team3/kummit/service/EmotionBandServiceTest.java b/src/test/java/team3/kummit/service/EmotionBandServiceTest.java index 2119113..43a3eb5 100644 --- a/src/test/java/team3/kummit/service/EmotionBandServiceTest.java +++ b/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 diff --git a/src/test/java/team3/kummit/service/SongServiceTest.java b/src/test/java/team3/kummit/service/SongServiceTest.java index fbc2e3e..cb6182d 100644 --- a/src/test/java/team3/kummit/service/SongServiceTest.java +++ b/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; diff --git a/src/test/java/team3/kummit/service/comment/CommentCreateServiceTest.java b/src/test/java/team3/kummit/service/comment/CommentCreateServiceTest.java index 7d97589..0d50c64 100644 --- a/src/test/java/team3/kummit/service/comment/CommentCreateServiceTest.java +++ b/src/test/java/team3/kummit/service/comment/CommentCreateServiceTest.java @@ -14,11 +14,15 @@ 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.api.CommentRequest; +import team3.kummit.api.CommentResponse; + import team3.kummit.repository.CommentRepository; import team3.kummit.repository.EmotionBandRepository; import team3.kummit.repository.MemberRepository; diff --git a/src/test/java/team3/kummit/service/comment/CommentGetServiceTest.java b/src/test/java/team3/kummit/service/comment/CommentGetServiceTest.java index e0d4f6a..0596199 100644 --- a/src/test/java/team3/kummit/service/comment/CommentGetServiceTest.java +++ b/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;