Merge pull request #85 from Nexters/dev

Author: Jeongminyooa

src/main/java/donmani/donmani_server/reward/repository/UserEquippedItemRepository.java

@@ -12,11 +12,13 @@ public interface UserEquippedItemRepository extends JpaRepository<UserEquippedIt
     @Query("SELECT e FROM UserEquippedItem e " +
             "WHERE e.user = :user " +
             "AND FUNCTION('YEAR', e.savedAt) = :year " +
-            "AND FUNCTION('MONTH', e.savedAt) = :month")
-    Optional<UserEquippedItem> findByUserAndSavedAtInCurrentMonth(
+            "AND FUNCTION('MONTH', e.savedAt) = :month " +
+            "ORDER BY e.savedAt DESC")
+    Optional<UserEquippedItem> findTopByUserAndSavedAtInCurrentMonth(
             @Param("user") User user,
             @Param("year") int year,
             @Param("month") int month
     );
 
+
 }

src/main/java/donmani/donmani_server/reward/service/RewardService.java

@@ -230,7 +230,7 @@ public void saveItem(RewardItemSaveRequestDTO request) {
             throw new IllegalArgumentException("유효하지 않은 요청입니다.");
         }
 
-        Optional<UserEquippedItem> equippedItem = userEquippedItemRepository.findByUserAndSavedAtInCurrentMonth(user, year, month);
+        Optional<UserEquippedItem> equippedItem = userEquippedItemRepository.findTopByUserAndSavedAtInCurrentMonth(user, year, month);
 
         RewardItem updateBackground = rewardItemRepository.findById(request.getBackgroundId()).orElseThrow();
         RewardItem updateEffect = rewardItemRepository.findById(request.getEffectId()).orElseThrow();
@@ -270,7 +270,7 @@ public List<RewardItemResponseDTO> getSavedItem(String userKey, int year, int mo
 
         User user = userRepository.findByUserKey(userKey).orElseThrow(() -> new RuntimeException("USER NOT FOUND"));
 
-        Optional<UserEquippedItem> savedItem = userEquippedItemRepository.findByUserAndSavedAtInCurrentMonth(user, year, month);
+        Optional<UserEquippedItem> savedItem = userEquippedItemRepository.findTopByUserAndSavedAtInCurrentMonth(user, year, month);
 
         if(savedItem.isPresent()) {
             UserEquippedItem presentSavedItem = savedItem.get();