fix: DELETE 매핑 수정 (#104)

umc-owncast · Aug 30, 2024 · 1a140f3 · 1a140f3
1 parent e42e32b
commit 1a140f3
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/src/main/java/com/umc/owncast/domain/playlist/controller/PlaylistController.java b/src/main/java/com/umc/owncast/domain/playlist/controller/PlaylistController.java
@@ -83,10 +83,12 @@ public ApiResponse<GetPlaylistDTO> getAllMyPlaylist(@AuthUser Member member) {
     }
 
     @CrossOrigin
-    @DeleteMapping("/playlist/{playlistId}")
+    @DeleteMapping("/playlist/{playlistId}/cast/{castId}")
     @Operation(summary = "플레이리스트에 남의 캐스트 삭제")
-    public ApiResponse<DeleteCastFromPlaylistDTO> deleteCastFromPlaylist(@PathVariable("playlistId") Long playlistId,
-                                                      @RequestBody DeleteCastFromPlaylistDTO deleteCastFromPlaylistDTO) {
-        return ApiResponse.onSuccess(playlistService.deleteCast(deleteCastFromPlaylistDTO, playlistId));
+    public ApiResponse<DeleteCastFromPlaylistDTO> deleteCastFromPlaylist
+            (@PathVariable("playlistId") Long playlistId,
+             @PathVariable("castId") Long castId,
+             @AuthUser Member member) {
+        return ApiResponse.onSuccess(playlistService.deleteCast(playlistId, castId, member));
     }
 }
diff --git a/src/main/java/com/umc/owncast/domain/playlist/service/PlaylistService.java b/src/main/java/com/umc/owncast/domain/playlist/service/PlaylistService.java
@@ -21,5 +21,5 @@ public interface PlaylistService {
 
     GetPlaylistDTO getAllMyPlaylists(Member member);
 
-    DeleteCastFromPlaylistDTO deleteCast(DeleteCastFromPlaylistDTO dto, Long playlistId);
+    DeleteCastFromPlaylistDTO deleteCast(Long playlistId, Long castId, Member member);
 }
diff --git a/src/main/java/com/umc/owncast/domain/playlist/service/PlaylistServiceImpl.java b/src/main/java/com/umc/owncast/domain/playlist/service/PlaylistServiceImpl.java
@@ -21,6 +21,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -196,12 +197,23 @@ public GetPlaylistDTO getAllMyPlaylists(Member member) {
 
     @Override
     @Transactional
-    public DeleteCastFromPlaylistDTO deleteCast(DeleteCastFromPlaylistDTO dto, Long playlistId) {
-        Cast cast = castRepository.findById(dto.getCastId()).orElseThrow(() -> new UserHandler(ErrorCode.CAST_NOT_FOUND));
+    public DeleteCastFromPlaylistDTO deleteCast(Long playlistId, Long castId, Member member) {
+        Cast cast = castRepository.findById(castId).orElseThrow(() -> new UserHandler(ErrorCode.CAST_NOT_FOUND));
         Playlist playlist = playlistRepository.findById(playlistId).orElseThrow(() -> new UserHandler(ErrorCode.PLAYLIST_NOT_FOUND));
+
+        if(!Objects.equals(playlist.getMember().getId(), member.getId())){ // 본인의 플레이리스트가 아닌 경우
+            throw new UserHandler(ErrorCode.PLAYLIST_UNAUTHORIZED_ACCESS);
+        }
+
+        if(Objects.equals(cast.getMember().getId(), playlist.getMember().getId())) { // 본인이 만든 캐스트인 경우
+            throw new UserHandler(ErrorCode._BAD_REQUEST);
+        }
+
         castPlaylistRepository.deleteByCastAndPlaylist(cast, playlist);
 
-        return dto;
+        return DeleteCastFromPlaylistDTO.builder()
+                .castId(castId)
+                .build();
     }
 
     @Override