From 383c84cf575e0c77c92c597b3c1acb7d77a0bcbc Mon Sep 17 00:00:00 2001 From: lcqff Date: Mon, 27 Jan 2025 19:39:50 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EC=9E=90=EC=8B=9D=20=EA=B0=9D?= =?UTF-8?q?=EC=B2=B4=EA=B0=80=20=EB=B6=80=EB=AA=A8=20=EA=B0=9D=EC=B2=B4?= =?UTF-8?q?=EC=9D=98=20Service=EC=97=90=20=EC=9D=98=EC=A1=B4=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #46 --- .../domain/album/service/AlbumService.java | 6 +++--- .../domain/track/service/TrackService.java | 13 +++---------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/main/java/MusicPlatform/domain/album/service/AlbumService.java b/src/main/java/MusicPlatform/domain/album/service/AlbumService.java index f55dd3d..e31894d 100644 --- a/src/main/java/MusicPlatform/domain/album/service/AlbumService.java +++ b/src/main/java/MusicPlatform/domain/album/service/AlbumService.java @@ -12,8 +12,8 @@ import MusicPlatform.domain.artist.service.ArtistService; import MusicPlatform.domain.artist.service.dto.response.ArtistResponseDto; import MusicPlatform.domain.track.entity.Track; +import MusicPlatform.domain.track.repository.TrackRepository; import MusicPlatform.domain.track.service.dto.response.TrackBasicResponseDto; -import MusicPlatform.domain.track.service.TrackService; import MusicPlatform.global.error.BusinessException; import java.time.LocalDate; import java.util.List; @@ -30,7 +30,7 @@ @RequiredArgsConstructor public class AlbumService { private final AlbumRepository albumRepository; - private final TrackService trackService; + private final TrackRepository trackRepository; private final ArtistService artistService; @Transactional(readOnly = true) @@ -91,7 +91,7 @@ public void deleteByUuid(String uuid) { } private AlbumFullResponseDto convertToDto(Album album, Pageable trackPageable) { - Page tracks = trackService.getAllByAlbum(album, trackPageable); + Page tracks = trackRepository.findAllByAlbum(album, trackPageable); return AlbumFullResponseDto.builder() .albumResponseDto(AlbumBasicResponseDto.from(album)) .trackResponseDtos(tracks.stream() diff --git a/src/main/java/MusicPlatform/domain/track/service/TrackService.java b/src/main/java/MusicPlatform/domain/track/service/TrackService.java index c0c5bdb..9947d01 100644 --- a/src/main/java/MusicPlatform/domain/track/service/TrackService.java +++ b/src/main/java/MusicPlatform/domain/track/service/TrackService.java @@ -1,10 +1,9 @@ package MusicPlatform.domain.track.service; -import static MusicPlatform.global.error.BusinessError.NOT_FOUND_ALBUM; import static MusicPlatform.global.error.BusinessError.NOT_FOUND_TRACK; import MusicPlatform.domain.album.entity.Album; -import MusicPlatform.domain.album.repository.AlbumRepository; +import MusicPlatform.domain.album.service.AlbumService; import MusicPlatform.domain.artist.entity.Artist; import MusicPlatform.domain.artist.service.ArtistService; import MusicPlatform.domain.track.entity.Track; @@ -27,7 +26,7 @@ @RequiredArgsConstructor public class TrackService { private final TrackRepository trackRepository; - private final AlbumRepository albumRepository; + private final AlbumService albumService; private final ArtistService artistService; @Transactional(readOnly = true) @@ -36,14 +35,8 @@ public Track findByUuid(String uuid) { new BusinessException(NOT_FOUND_TRACK)); } - @Transactional(readOnly = true) - public Page getAllByAlbum(Album album, Pageable pageable) { - return trackRepository.findAllByAlbum(album, pageable); - } - public void save(TrackRequestDto requestDto, String albumUuid) { - Album album = albumRepository.findByUuid(albumUuid) - .orElseThrow(() -> new BusinessException(NOT_FOUND_ALBUM)); + Album album = albumService.getByUuid(albumUuid); Track track = Track.builder() .title(requestDto.title()) .lyric(requestDto.lyric())