Merge pull request #138 from KUIT-Space/feat/#135/voiceroom-delete-api

Feat/#135/voiceroom delete api
KUIT-Space · Aug 19, 2024 · 1162563 · 1162563
2 parents d3b43fd + 9b2472d
commit 1162563
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 12 deletions.
diff --git a/src/main/java/space/space_spring/controller/VoiceRoomController.java b/src/main/java/space/space_spring/controller/VoiceRoomController.java
@@ -161,8 +161,11 @@ public BaseResponse<String> updateVoiceRoom(
         }
         //해당 유저가 현재 space에 대해 관리자 권한을 갖고 있는지 확인
         validateManagerPermission(userSpaceAuth);
-        //해당 voiceRoom이 해당 space에 속한것이 맞는지 확인
+
         for(PatchVoiceRoom.UpdateRoom updateRoom : patchVoiceRoom.getUpdateRoomList()) {
+            //해당 voiceRoomId가 존재하는지 확인
+            validateVoiceRoom(updateRoom.getRoomId());
+            //해당 voiceRoom이 해당 space에 속한것이 맞는지 확인
             validateVoiceRoomInSpace(spaceId, updateRoom.getRoomId());
         }
 
@@ -181,6 +184,8 @@ public BaseResponse<String> deleteVoiceRoom(
 
         //해당 유저가 현재 space에 대해 관리자 권한을 갖고 있는지 확인
         validateManagerPermission(userSpaceAuth);
+        //해당 보이스룸이 존재하는지 확인
+        validateVoiceRoom(voiceRoomId);
         //해당 voiceRoom이 해당 space에 속한것이 맞는지 확인
         validateVoiceRoomInSpace(spaceId, voiceRoomId);
 

diff --git a/src/main/java/space/space_spring/dao/VoiceRoomRepository.java b/src/main/java/space/space_spring/dao/VoiceRoomRepository.java
@@ -11,12 +11,15 @@
 @Repository
 public interface VoiceRoomRepository extends JpaRepository<VoiceRoom,Long> {
 
-    //Todo limit 개수 만큼 가져오도록 기능과 파라미터 수정
-    List<VoiceRoom> findBySpace(Space space);
-    @Query("SELECT MAX(r.order) FROM VoiceRoom r WHERE r.space = :space")
-    Integer findMaxOrderBySpace(@Param("space") Space space);
 
-    boolean existsByVoiceRoomId(long voiceRoomId);
-    boolean existsByName(String voiceRoomName);
-    VoiceRoom findById(long Id);
+    @Query("SELECT v FROM VoiceRoom v WHERE v.space = :space AND v.status = 'ACTIVE'")
+    List<VoiceRoom> findBySpace(@Param("space")Space space);
+    @Query("SELECT MAX(r.order) FROM VoiceRoom r WHERE r.space = :space AND r.status = 'ACTIVE'")
+    Integer findMaxOrderBySpace(@Param("space") Space space);
+    @Query("SELECT CASE WHEN COUNT(v) > 0 THEN true ELSE false END FROM VoiceRoom v WHERE v.voiceRoomId = :id AND v.status = 'ACTIVE'")
+    boolean existsByVoiceRoomId(@Param("id")long voiceRoomId);
+    @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);
 }
diff --git a/src/main/java/space/space_spring/interceptor/UserSpaceValidationInterceptor.java b/src/main/java/space/space_spring/interceptor/UserSpaceValidationInterceptor.java
@@ -42,11 +42,22 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 
         // URL에서 spaceId 추출
         Map pathVariables = (Map) request.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
-        Long spaceId = Long.parseLong((String) pathVariables.get("spaceId"));
+        //Long spaceId;
+        try {
+            Long spaceId = Long.parseLong((String) pathVariables.get("spaceId"));
+
+            if(spaceId==null){
+                throw new CustomException(SPACE_ID_PATHVARIABLE_NULL);
+            }
+            request.setAttribute("userSpaceId",getUserSpace(spaceId,userId));
+            System.out.print("userSpaceID:"+getUserSpace(spaceId,userId));
+            return true;
+
+        }catch (NumberFormatException e){
+            throw new CustomException(SPACE_ID_PATHVARIABLE_ERROR);
+
+        }
 
-        request.setAttribute("userSpaceId",getUserSpace(spaceId,userId));
-        System.out.print("userSpaceID:"+getUserSpace(spaceId,userId));
-        return true;
 
     }
 

diff --git a/src/main/java/space/space_spring/response/status/BaseExceptionResponseStatus.java b/src/main/java/space/space_spring/response/status/BaseExceptionResponseStatus.java
@@ -19,6 +19,9 @@ public enum BaseExceptionResponseStatus implements ResponseStatus {
     URL_NOT_FOUND(2001, HttpStatus.BAD_REQUEST, "유효하지 않은 URL 입니다."),
     METHOD_NOT_ALLOWED(2002, HttpStatus.METHOD_NOT_ALLOWED, "해당 URL에서는 지원하지 않는 HTTP Method 입니다."),
     HTTP_MESSAGE_NOT_READABLE(2003, HttpStatus.BAD_REQUEST,"request body 양식에 문제가 있습니다"),
+    SPACE_ID_PATHVARIABLE_ERROR(2004,HttpStatus.BAD_REQUEST,"URL에 포함된 SPACE_ID 값이 잘못되었습니다."),
+    SPACE_ID_PATHVARIABLE_NULL(2005,HttpStatus.BAD_REQUEST,"URL에 포함된 SPACE_ID 값이 없습니다"),
+
 
     /**
      * 3000: Server, Database 오류 (INTERNAL_SERVER_ERROR)

diff --git a/src/main/java/space/space_spring/service/VoiceRoomService.java b/src/main/java/space/space_spring/service/VoiceRoomService.java
@@ -237,6 +237,11 @@ public boolean updateVoiceRoom(List<PatchVoiceRoom.UpdateRoom> updateRoomList){
 
     public void deleteVoiceRoom(long voiceRoomId){
         //Todo Base Entity에 일괄적으로 soft Delete를 적용하는 방법을 다같이 정하는 것이 좋아보임
+        VoiceRoom voiceRoom = voiceRoomRepository.findById(voiceRoomId);
+        voiceRoom.updateInactive();
+        voiceRoomRepository.save(voiceRoom);
+
+
     }
 
     private String findProfileImageByUserId(Long userSpaceId){