fix: 소확행 수정 API 오류 수정

9uttery · Sep 15, 2024 · 1b8f90c · 1b8f90c
1 parent a788569
commit 1b8f90c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/main/java/com/guttery/madii/domain/albums/application/service/AlbumService.java b/src/main/java/com/guttery/madii/domain/albums/application/service/AlbumService.java
@@ -99,8 +99,7 @@ public void addJoyToAlbum(Long joyId, AlbumSaveJoyRequest albumSaveJoyRequest, U
                     .orElseThrow(() -> CustomException.of(ErrorDetails.ALBUM_NOT_FOUND));
 
             // 앨범 내에서 가장 높은 order 값을 조회하여 1을 더해줌
-            Integer maxOrder = savingJoyRepository.findMaxOrderByAlbum(album);
-            Integer joyOrder = (maxOrder == null) ? 1 : maxOrder + 1;
+            final Integer joyOrder = savingJoyRepository.findTopByAlbumOrderByJoyOrderDesc(album).map(SavingJoy::getJoyOrder).orElse(0) + 1;
             final SavingJoy savingJoy = SavingJoy.createSavingJoy(joy, album, joyOrder);
             savingJoyRepository.save(savingJoy);
         }

diff --git a/src/main/java/com/guttery/madii/domain/albums/domain/repository/SavingJoyRepository.java b/src/main/java/com/guttery/madii/domain/albums/domain/repository/SavingJoyRepository.java
@@ -14,7 +14,7 @@ public interface SavingJoyRepository extends JpaRepository<SavingJoy, Long> {
 
     void deleteByAlbumAlbumId(Long albumId);
 
-    Integer findMaxOrderByAlbum(Album album);
+    Optional<SavingJoy> findTopByAlbumOrderByJoyOrderDesc(Album album);
 
     void deleteAllByJoyJoyIdIn(List<Long> deletedJoyIds);
 

diff --git a/src/main/java/com/guttery/madii/domain/joy/application/service/JoyService.java b/src/main/java/com/guttery/madii/domain/joy/application/service/JoyService.java
@@ -79,13 +79,12 @@ public void addToSavingJoy(Long joyId, List<Long> afterAlbumIds) {
                     .orElseThrow(() -> CustomException.of(ErrorDetails.ALBUM_NOT_FOUND));
 
             // 앨범 내에서 가장 높은 order 값을 조회하여 1을 더해줌
-            Integer maxOrder = savingJoyRepository.findMaxOrderByAlbum(album);
-            Integer joyOrder = (maxOrder == null) ? 1 : maxOrder + 1;
-            final SavingJoy savingJoy = SavingJoy.createSavingJoy(joy, album, joyOrder);
-            savingJoyRepository.save(savingJoy);
+          final Integer joyOrder = savingJoyRepository.findTopByAlbumOrderByJoyOrderDesc(album).map(SavingJoy::getJoyOrder).orElse(0) + 1;
+          final SavingJoy savingJoy = SavingJoy.createSavingJoy(joy, album, joyOrder);
+          savingJoyRepository.save(savingJoy);
 
             // 앨범은 공개, 소확행은 비공개일 때 -> 소확행 공개로 변경
-            if (album.getAlbumStatus().getIsOfficial() && joy.getJoyType().equals(JoyType.PERSONAL)) {
+            if (Boolean.TRUE.equals(album.getAlbumStatus().getIsOfficial()) && joy.getJoyType().equals(JoyType.PERSONAL)) {
                 joy.makeOfficial();
             }
         }