[refactor] voiceRoomRePo::findId return Optional

KUIT-Space · Nov 5, 2024 · ef3f87a · ef3f87a
1 parent 794090f
commit ef3f87a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/src/main/java/space/space_spring/controller/VoiceRoomController.java b/src/main/java/space/space_spring/controller/VoiceRoomController.java
@@ -207,7 +207,8 @@ private boolean validateVoiceRoomNameExist(String voiceRoomName){
         return true;
     }
     private boolean validateVoiceRoomInSpace(long spaceId,long voiceRoomId){
-        if(! (voiceRoomRepository.findById(voiceRoomId).getSpace().getSpaceId().equals(spaceId))){
+        if(! (voiceRoomRepository.findById(voiceRoomId).orElseThrow(()->new CustomException(VOICEROOM_NOT_EXIST))
+                .getSpace().getSpaceId().equals(spaceId))){
             throw new CustomException(VOICEROOM_NOT_IN_SPACE);
         }
         return true;

diff --git a/src/main/java/space/space_spring/dao/VoiceRoomRepository.java b/src/main/java/space/space_spring/dao/VoiceRoomRepository.java
@@ -8,6 +8,8 @@
 import space.space_spring.entity.VoiceRoom;
 
 import java.util.List;
+import java.util.Optional;
+
 @Repository
 public interface VoiceRoomRepository extends JpaRepository<VoiceRoom,Long> {
 
@@ -24,7 +26,7 @@ public interface VoiceRoomRepository extends JpaRepository<VoiceRoom,Long> {
     @Query("SELECT CASE WHEN COUNT(v) > 0 THEN true ELSE false END FROM VoiceRoom v WHERE v.name = :voiceRoomName AND v.status = 'ACTIVE'")
     boolean existsByName(@Param("voiceRoomName") String voiceRoomName);
     @Query("SELECT v FROM VoiceRoom v WHERE v.voiceRoomId = :id AND v.status = 'ACTIVE'")
-    VoiceRoom findById(@Param("id") long Id);
+    Optional<VoiceRoom> findById(@Param("id") long Id);
 
     @Query("SELECT v FROM VoiceRoom v WHERE v.space.id = :spaceId AND v.status = 'ACTIVE'")
     List<VoiceRoom> findActiveVoiceRoomsBySpaceId(@Param("spaceId") Long spaceId);

diff --git a/src/main/java/space/space_spring/service/VoiceRoomParticipantService.java b/src/main/java/space/space_spring/service/VoiceRoomParticipantService.java
@@ -14,6 +14,7 @@
 import space.space_spring.entity.Space;
 import space.space_spring.entity.User;
 import space.space_spring.entity.UserSpace;
+import space.space_spring.exception.CustomException;
 import space.space_spring.util.LiveKitUtils;
 
 import java.util.Collections;
@@ -22,6 +23,8 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
+import static space.space_spring.response.status.BaseExceptionResponseStatus.VOICEROOM_NOT_EXIST;
+
 @Service
 @RequiredArgsConstructor
 @Slf4j
@@ -35,7 +38,7 @@ public List<GetParticipantList.ParticipantInfo> getParticipantInfoListById(long
         return getParticipantDtoListById(voiceRoomId).convertParticipantDtoList();
     }
     private ParticipantListDto getParticipantDtoListById(long voiceRoomId){
-        Space space = voiceRoomRepository.findById(voiceRoomId).getSpace();
+        Space space = voiceRoomRepository.findById(voiceRoomId).orElseThrow(()->new CustomException(VOICEROOM_NOT_EXIST)).getSpace();
         //Todo 다른 네이밍 고려
         List<ParticipantDto> participantDtos =  liveKitUtils.getParticipantInfo(String.valueOf(voiceRoomId));
         if(participantDtos==null || participantDtos.isEmpty()){

diff --git a/src/main/java/space/space_spring/service/VoiceRoomService.java b/src/main/java/space/space_spring/service/VoiceRoomService.java
@@ -13,6 +13,7 @@
 import space.space_spring.entity.Space;
 import space.space_spring.entity.User;
 import space.space_spring.entity.VoiceRoom;
+import space.space_spring.exception.CustomException;
 import space.space_spring.util.LiveKitUtils;
 import space.space_spring.util.space.SpaceUtils;
 
@@ -25,6 +26,8 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
+import static space.space_spring.response.status.BaseExceptionResponseStatus.VOICEROOM_NOT_EXIST;
+
 @Service
 @RequiredArgsConstructor
 public class VoiceRoomService {
@@ -167,7 +170,7 @@ public boolean updateVoiceRoom(List<PatchVoiceRoom.UpdateRoom> updateRoomList){
 
     public void deleteVoiceRoom(long voiceRoomId){
         //Todo Base Entity에 일괄적으로 soft Delete를 적용하는 방법을 다같이 정하는 것이 좋아보임
-        VoiceRoom voiceRoom = voiceRoomRepository.findById(voiceRoomId);
+        VoiceRoom voiceRoom = voiceRoomRepository.findById(voiceRoomId).orElseThrow(()->new CustomException(VOICEROOM_NOT_EXIST));
         voiceRoom.updateInactive();
         voiceRoomRepository.save(voiceRoom);
     }
@@ -182,7 +185,7 @@ private String findProfileImageByUserId(Long userSpaceId){
 //        return voiceRoomRepository.findBySpace(space);
 //    }
     private List<ParticipantDto> getParticipantDtoListById(long voiceRoomId){
-        Space space = voiceRoomRepository.findById(voiceRoomId).getSpace();
+        Space space = voiceRoomRepository.findById(voiceRoomId).orElseThrow(()->new CustomException(VOICEROOM_NOT_EXIST)).getSpace();
         List<ParticipantDto> participantDtoList =  liveKitUtils.getParticipantInfo(String.valueOf(voiceRoomId));
         if(participantDtoList==null||participantDtoList.isEmpty()){
             return Collections.emptyList();