Merge pull request #35 from Searchweb-Dev/feat/SW-61

jin2304 · web-flow · commit c81cd01dd047 · 2026-03-14T20:19:26.000+09:00
Feat/sw 61 폴더 CRUD 로직 마무리 작업
diff --git a/src/main/java/com/web/SearchWeb/bookmark/controller/BookmarkApiController.java b/src/main/java/com/web/SearchWeb/bookmark/controller/BookmarkApiController.java
@@ -4,7 +4,7 @@
 import com.web.SearchWeb.bookmark.controller.dto.BookmarkRequests;
 import com.web.SearchWeb.bookmark.domain.Bookmark;
 import com.web.SearchWeb.bookmark.service.BookmarkService;
-import com.web.SearchWeb.config.ApiResponse;
+import com.web.SearchWeb.config.common.ApiResponse;
 import com.web.SearchWeb.member.dto.CustomOAuth2User;
 import com.web.SearchWeb.member.dto.CustomUserDetails;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/web/SearchWeb/bookmark/dao/BookmarkDao.java b/src/main/java/com/web/SearchWeb/bookmark/dao/BookmarkDao.java
@@ -46,4 +46,7 @@ public interface BookmarkDao {
 
     // 북마크-태그 연결 일괄 추가 (Bulk Insert)
     int insertBookmarkTags(Long bookmarkId, List<Long> tagIds);
+
+    // 폴더 내 활성 북마크 존재 여부
+    boolean existsActiveBookmarkInFolder(Long memberFolderId);
 }
diff --git a/src/main/java/com/web/SearchWeb/bookmark/dao/MybatisBookmarkDao.java b/src/main/java/com/web/SearchWeb/bookmark/dao/MybatisBookmarkDao.java
@@ -136,4 +136,9 @@ public List<MemberTagResultDto> insertAndSelectTags(Long memberId, List<String>
     public int insertBookmarkTags(Long bookmarkId, List<Long> tagIds) {
         return mapper.insertBookmarkTags(bookmarkId, tagIds);
     }
+
+    @Override
+    public boolean existsActiveBookmarkInFolder(Long memberFolderId) {
+        return mapper.existsActiveBookmarkInFolder(memberFolderId);
+    }
 }
diff --git a/src/main/java/com/web/SearchWeb/bookmark/error/BookmarkErrorCode.java b/src/main/java/com/web/SearchWeb/bookmark/error/BookmarkErrorCode.java
@@ -1,6 +1,6 @@
 package com.web.SearchWeb.bookmark.error;
 
-import com.web.SearchWeb.config.ErrorCode;
+import com.web.SearchWeb.config.exception.ErrorCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
diff --git a/src/main/java/com/web/SearchWeb/bookmark/service/BookmarkServiceImpl.java b/src/main/java/com/web/SearchWeb/bookmark/service/BookmarkServiceImpl.java
@@ -15,8 +15,8 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import com.web.SearchWeb.bookmark.error.BookmarkErrorCode;
-import com.web.SearchWeb.config.BusinessException;
-import com.web.SearchWeb.config.CommonErrorCode;
+import com.web.SearchWeb.config.exception.BusinessException;
+import com.web.SearchWeb.config.exception.CommonErrorCode;
 
 import com.web.SearchWeb.bookmark.dto.MemberTagResultDto;
 import org.jsoup.Jsoup;
diff --git a/src/main/java/com/web/SearchWeb/config/common/ApiResponse.java b/src/main/java/com/web/SearchWeb/config/common/ApiResponse.java
@@ -1,5 +1,6 @@
-package com.web.SearchWeb.config;
+package com.web.SearchWeb.config.common;
 
+import com.web.SearchWeb.config.exception.ErrorCode;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/com/web/SearchWeb/config/exception/BusinessException.java b/src/main/java/com/web/SearchWeb/config/exception/BusinessException.java
@@ -1,4 +1,4 @@
-package com.web.SearchWeb.config;
+package com.web.SearchWeb.config.exception;
 
 import lombok.Getter;
 
diff --git a/src/main/java/com/web/SearchWeb/config/exception/CommonErrorCode.java b/src/main/java/com/web/SearchWeb/config/exception/CommonErrorCode.java
@@ -1,4 +1,4 @@
-package com.web.SearchWeb.config;
+package com.web.SearchWeb.config.exception;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -7,6 +7,7 @@
 @Getter
 @RequiredArgsConstructor
 public enum CommonErrorCode implements ErrorCode{
+    UNAUTHORIZED(HttpStatus.UNAUTHORIZED, "C001", "로그인된 사용자만 접근 가능합니다."),
     // 500 Internal Server Error: 서버 내부 오류
     INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "C006", "서버에 오류가 발생했습니다.");
 
diff --git a/src/main/java/com/web/SearchWeb/config/exception/ErrorCode.java b/src/main/java/com/web/SearchWeb/config/exception/ErrorCode.java
@@ -1,4 +1,4 @@
-package com.web.SearchWeb.config;
+package com.web.SearchWeb.config.exception;
 
 import org.springframework.http.HttpStatus;
 
diff --git a/src/main/java/com/web/SearchWeb/config/security/CustomAuthenticationFailureHandler.java b/src/main/java/com/web/SearchWeb/config/security/CustomAuthenticationFailureHandler.java
@@ -1,4 +1,4 @@
-package com.web.SearchWeb.config;
+package com.web.SearchWeb.config.security;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
diff --git a/src/main/java/com/web/SearchWeb/config/security/CustomAuthenticationSuccessHandler.java b/src/main/java/com/web/SearchWeb/config/security/CustomAuthenticationSuccessHandler.java
@@ -1,4 +1,4 @@
-package com.web.SearchWeb.config;
+package com.web.SearchWeb.config.security;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/src/main/java/com/web/SearchWeb/config/security/GlobalExceptionHandler.java b/src/main/java/com/web/SearchWeb/config/security/GlobalExceptionHandler.java
@@ -1,5 +1,9 @@
-package com.web.SearchWeb.config;
+package com.web.SearchWeb.config.security;
 
+import com.web.SearchWeb.config.common.ApiResponse;
+import com.web.SearchWeb.config.exception.BusinessException;
+import com.web.SearchWeb.config.exception.CommonErrorCode;
+import com.web.SearchWeb.config.exception.ErrorCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/com/web/SearchWeb/config/security/SecurityConfig.java b/src/main/java/com/web/SearchWeb/config/security/SecurityConfig.java
@@ -1,4 +1,4 @@
-package com.web.SearchWeb.config;
+package com.web.SearchWeb.config.security;
 
 import com.web.SearchWeb.member.service.CustomOAuth2UserService;
 import org.springframework.context.annotation.Bean;
diff --git a/src/main/java/com/web/SearchWeb/config/security/SecurityUtils.java b/src/main/java/com/web/SearchWeb/config/security/SecurityUtils.java
@@ -0,0 +1,35 @@
+package com.web.SearchWeb.config.security;
+
+import com.web.SearchWeb.config.exception.BusinessException;
+import com.web.SearchWeb.config.exception.CommonErrorCode;
+import com.web.SearchWeb.member.dto.CustomOAuth2User;
+import com.web.SearchWeb.member.dto.CustomUserDetails;
+import org.springframework.security.core.Authentication;
+
+public final class SecurityUtils {
+
+    private SecurityUtils() {
+    }
+
+    public static Long extractMemberId(Authentication authentication) {
+        if (authentication == null || !authentication.isAuthenticated()) {
+            throw BusinessException.from(CommonErrorCode.UNAUTHORIZED);
+        }
+
+        Object principal = authentication.getPrincipal();
+
+        if ("anonymousUser".equals(principal)) {
+            throw BusinessException.from(CommonErrorCode.UNAUTHORIZED);
+        }
+
+        if (principal instanceof CustomUserDetails userDetails) {
+            return userDetails.getMemberId();
+        }
+
+        if (principal instanceof CustomOAuth2User oauth2User) {
+            return oauth2User.getMemberId();
+        }
+
+        throw BusinessException.from(CommonErrorCode.UNAUTHORIZED);
+    }
+}
diff --git a/src/main/java/com/web/SearchWeb/folder/controller/MemberFolderController.java b/src/main/java/com/web/SearchWeb/folder/controller/MemberFolderController.java
@@ -1,15 +1,18 @@
 package com.web.SearchWeb.folder.controller;
 
-import com.web.SearchWeb.config.ApiResponse;
+import com.web.SearchWeb.config.common.ApiResponse;
+import com.web.SearchWeb.config.security.SecurityUtils;
 import com.web.SearchWeb.folder.controller.dto.MemberFolderRequests;
 import com.web.SearchWeb.folder.controller.dto.MemberFolderResponses;
 import com.web.SearchWeb.folder.domain.MemberFolder;
 import com.web.SearchWeb.folder.service.MemberFolderService;
+import jakarta.validation.Valid;
 import java.util.List;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -28,9 +31,10 @@ public class MemberFolderController {
 
     // 생성 (201 Created 응답)
     @PostMapping
-    public ResponseEntity<ApiResponse<Long>> create(@RequestBody MemberFolderRequests.Create req) {
+    public ResponseEntity<ApiResponse<Long>> create(Authentication authentication, @Valid @RequestBody MemberFolderRequests.Create req) {
+        Long loginId = SecurityUtils.extractMemberId(authentication);
         Long folderId = memberFolderService.create(
-            req.ownerMemberId,
+            loginId,
             req.parentFolderId,
             req.folderName,
             req.description
@@ -40,17 +44,22 @@ public ResponseEntity<ApiResponse<Long>> create(@RequestBody MemberFolderRequest
             .body(ApiResponse.success(folderId));
     }
 
-    // 단건 조회
+    // 폴더 정보 단건 조회
     @GetMapping("/{folderId}")
-    public ResponseEntity<ApiResponse<MemberFolderResponses>> get(@PathVariable Long folderId) {
-        MemberFolder folder = memberFolderService.get(folderId);
+    public ResponseEntity<ApiResponse<MemberFolderResponses>> get(Authentication authentication, @PathVariable Long folderId) {
+        Long loginId = SecurityUtils.extractMemberId(authentication);
+        MemberFolder folder = memberFolderService.get(loginId, folderId);
         return ResponseEntity.ok(ApiResponse.success(MemberFolderResponses.from(folder)));
     }
 
     // 루트 폴더 조회
     @GetMapping("/owners/{ownerMemberId}/root")
-    public ResponseEntity<ApiResponse<List<MemberFolderResponses>>> listRoot(@PathVariable Long ownerMemberId) {
-        List<MemberFolderResponses> responses = memberFolderService.listRootFolders(ownerMemberId)
+    public ResponseEntity<ApiResponse<List<MemberFolderResponses>>> listRoot(
+        Authentication authentication,
+        @PathVariable Long ownerMemberId
+    ) {
+        Long loginId = SecurityUtils.extractMemberId(authentication);
+        List<MemberFolderResponses> responses = memberFolderService.listRootFolders(loginId, ownerMemberId)
             .stream()
             .map(MemberFolderResponses::from)
             .collect(Collectors.toList());
@@ -61,10 +70,12 @@ public ResponseEntity<ApiResponse<List<MemberFolderResponses>>> listRoot(@PathVa
     // 하위 폴더 조회
     @GetMapping("/owners/{ownerMemberId}/children/{parentFolderId}")
     public ResponseEntity<ApiResponse<List<MemberFolderResponses>>> listChildren(
+        Authentication authentication,
         @PathVariable Long ownerMemberId,
         @PathVariable Long parentFolderId
     ) {
-        List<MemberFolderResponses> responses = memberFolderService.listChildren(ownerMemberId, parentFolderId)
+        Long loginId = SecurityUtils.extractMemberId(authentication);
+        List<MemberFolderResponses> responses = memberFolderService.listChildren(loginId, ownerMemberId, parentFolderId)
             .stream()
             .map(MemberFolderResponses::from)
             .collect(Collectors.toList());
@@ -74,22 +85,27 @@ public ResponseEntity<ApiResponse<List<MemberFolderResponses>>> listChildren(
 
     // 수정 (200 OK)
     @PutMapping("/{folderId}")
-    public ResponseEntity<ApiResponse<Void>> update(@PathVariable Long folderId, @RequestBody MemberFolderRequests.Update req) {
-        memberFolderService.update(folderId, req.folderName, req.description);
+    public ResponseEntity<ApiResponse<Void>> update(Authentication authentication, @PathVariable Long folderId,
+        @Valid @RequestBody MemberFolderRequests.Update req) {
+        Long loginId = SecurityUtils.extractMemberId(authentication);
+        memberFolderService.update(loginId, folderId, req.folderName, req.description);
         return ResponseEntity.ok(ApiResponse.success(null));
     }
 
     // 이동(부모 변경)
     @PutMapping("/{folderId}/move")
-    public ResponseEntity<ApiResponse<Void>> move(@PathVariable Long folderId, @RequestBody MemberFolderRequests.Move req) {
-        memberFolderService.move(folderId, req.newParentFolderId);
+    public ResponseEntity<ApiResponse<Void>> move(Authentication authentication, @PathVariable Long folderId,
+        @Valid @RequestBody MemberFolderRequests.Move req) {
+        Long loginId = SecurityUtils.extractMemberId(authentication);
+        memberFolderService.move(loginId, folderId, req.newParentFolderId);
         return ResponseEntity.ok(ApiResponse.success(null));
     }
 
     // 삭제
     @DeleteMapping("/{folderId}")
-    public ResponseEntity<ApiResponse<Void>> delete(@PathVariable Long folderId) {
-        memberFolderService.delete(folderId);
+    public ResponseEntity<ApiResponse<Void>> delete(Authentication authentication, @PathVariable Long folderId) {
+        Long loginId = SecurityUtils.extractMemberId(authentication);
+        memberFolderService.delete(loginId, folderId);
         return ResponseEntity.ok(ApiResponse.success(null));
     }
-}
+}
diff --git a/src/main/java/com/web/SearchWeb/folder/controller/dto/MemberFolderRequests.java b/src/main/java/com/web/SearchWeb/folder/controller/dto/MemberFolderRequests.java
@@ -1,29 +1,53 @@
 package com.web.SearchWeb.folder.controller.dto;
 
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.Size;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
 public class MemberFolderRequests {
 
     /**
      * 폴더 생성 요청
      */
+
+    @Getter
+    @NoArgsConstructor
     public static class Create {
-        public Long ownerMemberId;
-        public Long parentFolderId; // null이면 루트
+        // null이면 루트 폴더
+        @Positive(message = "parentFolderId는 양수여야 합니다.")
+        public Long parentFolderId;
+
+        @NotBlank(message = "folderName은 비어 있을 수 없습니다.")
+        @Size(max = 50, message = "folderName은 최대 50자까지 가능합니다.")
         public String folderName;
+
+        @Size(max = 200, message = "description은 최대 200자까지 가능합니다.")
         public String description;
     }
 
     /**
      * 폴더 수정 요청
      */
+    @Getter
+    @NoArgsConstructor
     public static class Update {
+        @Size(max = 50, message = "folderName은 최대 50자까지 가능합니다.")
         public String folderName;
+
+        @Size(max = 200, message = "description은 최대 200자까지 가능합니다.")
         public String description;
     }
 
     /**
      * 폴더 이동 요청
      */
+    @Getter
+    @NoArgsConstructor
     public static class Move {
-        public Long newParentFolderId; // null이면 루트로 이동
+        // null이면 루트로 이동
+        @Positive(message = "newParentFolderId는 양수여야 합니다.")
+        public Long newParentFolderId;
     }
 }
diff --git a/src/main/java/com/web/SearchWeb/folder/dao/MemberFolderJpaDao.java b/src/main/java/com/web/SearchWeb/folder/dao/MemberFolderJpaDao.java
@@ -14,4 +14,10 @@ public interface MemberFolderJpaDao extends JpaRepository<MemberFolder, Long> {
 
     // 사용자 전체 폴더
     List<MemberFolder> findAllByOwnerMemberId(Long ownerMemberId);
+
+    boolean existsByParentFolderId(Long parentFolderId);
+
+    boolean existsByOwnerMemberIdAndParentFolderIdAndFolderName(Long loginId, Long parentFolderId, String normalizedFolderName);
+
+    boolean existsByOwnerMemberIdAndParentFolderIdIsNullAndFolderName(Long loginId, String normalizedFolderName);
 }
diff --git a/src/main/java/com/web/SearchWeb/folder/error/FolderErrorCode.java b/src/main/java/com/web/SearchWeb/folder/error/FolderErrorCode.java
@@ -1,6 +1,6 @@
 package com.web.SearchWeb.folder.error;
 
-import com.web.SearchWeb.config.ErrorCode;
+import com.web.SearchWeb.config.exception.ErrorCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
@@ -9,7 +9,11 @@
 @RequiredArgsConstructor
 public enum FolderErrorCode implements ErrorCode {
     FOLDER_NOT_FOUND(HttpStatus.NOT_FOUND, "F001", "폴더를 찾을 수 없습니다."),
-    DUPLICATE_FOLDER_NAME(HttpStatus.BAD_REQUEST, "F002", "이미 존재하는 폴더명입니다.");
+    DUPLICATE_FOLDER_NAME(HttpStatus.BAD_REQUEST, "F002", "이미 존재하는 폴더명입니다."),
+    FOLDER_FORBIDDEN(HttpStatus.FORBIDDEN,"Foo3" ,"접근이 제한된 폴더입니다." ),
+    INVALID_FOLDER_NAME(HttpStatus.BAD_REQUEST,"F004","폴더명으로 적절하지 않습니다" ),
+    INVALID_FOLDER_MOVE(HttpStatus.BAD_REQUEST, "F005", "유효하지 않은 폴더 이동입니다."),
+    FOLDER_NOT_EMPTY(HttpStatus.BAD_REQUEST, "F006", "하위 폴더 또는 북마크가 남아 있어 삭제할 수 없습니다.");
 
     private final HttpStatus status;
     private final String code;
diff --git a/src/main/java/com/web/SearchWeb/folder/error/FolderException.java b/src/main/java/com/web/SearchWeb/folder/error/FolderException.java
@@ -1,19 +1,13 @@
 package com.web.SearchWeb.folder.error;
 
-import com.web.SearchWeb.config.BusinessException;
-import com.web.SearchWeb.config.ErrorCode;
+import com.web.SearchWeb.config.exception.BusinessException;
+import com.web.SearchWeb.config.exception.ErrorCode;
 import lombok.Getter;
 
 @Getter
 public class FolderException extends BusinessException {
 
-    private FolderException(ErrorCode errorCode) {
+    public FolderException(ErrorCode errorCode) {
         super(errorCode);
     }
-
-    public static class NotFound extends FolderException {
-        public NotFound() {
-            super(FolderErrorCode.FOLDER_NOT_FOUND);
-        }
-    }
 }
diff --git a/src/main/java/com/web/SearchWeb/folder/service/MemberFolderService.java b/src/main/java/com/web/SearchWeb/folder/service/MemberFolderService.java
@@ -6,17 +6,17 @@
 
 public interface MemberFolderService {
 
-    Long create(Long ownerMemberId, Long parentFolderId, String folderName, String description);
+    Long create(Long loginId, Long parentFolderId, String folderName, String description);
 
-    MemberFolder get(Long memberFolderId);
+    MemberFolder get(Long loginId, Long memberFolderId);
 
-    List<MemberFolder> listRootFolders(Long ownerMemberId);
+    List<MemberFolder> listRootFolders(Long loginId, Long ownerMemberId);
 
-    List<MemberFolder> listChildren(Long ownerMemberId, Long parentFolderId);
+    List<MemberFolder> listChildren(Long loginId, Long ownerMemberId, Long parentFolderId);
 
-    void update(Long memberFolderId, String folderName, String description);
+    void update(Long loginId, Long memberFolderId, String folderName, String description);
 
-    void move(Long memberFolderId, Long newParentFolderId);
+    void move(Long loginId, Long memberFolderId, Long newParentFolderId);
 
-    void delete(Long memberFolderId);
+    void delete(Long loginId, Long memberFolderId);
 }
diff --git a/src/main/java/com/web/SearchWeb/folder/service/MemberFolderServiceImpl.java b/src/main/java/com/web/SearchWeb/folder/service/MemberFolderServiceImpl.java
diff --git a/src/main/java/com/web/SearchWeb/mypage/controller/MyPageController.java b/src/main/java/com/web/SearchWeb/mypage/controller/MyPageController.java
diff --git a/src/main/java/com/web/SearchWeb/tag/controller/MemberTagController.java b/src/main/java/com/web/SearchWeb/tag/controller/MemberTagController.java
diff --git a/src/main/java/com/web/SearchWeb/tag/error/TagErrorCode.java b/src/main/java/com/web/SearchWeb/tag/error/TagErrorCode.java
diff --git a/src/main/java/com/web/SearchWeb/tag/error/TagException.java b/src/main/java/com/web/SearchWeb/tag/error/TagException.java
diff --git a/src/main/resources/mapper/bookmark-mapper.xml b/src/main/resources/mapper/bookmark-mapper.xml

Original file line number	Diff line number	Diff line change
`@@ -46,4 +46,7 @@ public interface BookmarkDao {`
`46`	`46`
`47`	`47`	`// 북마크-태그 연결 일괄 추가 (Bulk Insert)`
`48`	`48`	`int insertBookmarkTags(Long bookmarkId, List<Long> tagIds);`
	`49`	`+`
	`50`	`+ // 폴더 내 활성 북마크 존재 여부`
	`51`	`+ boolean existsActiveBookmarkInFolder(Long memberFolderId);`
`49`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,4 +136,9 @@ public List<MemberTagResultDto> insertAndSelectTags(Long memberId, List<String>`
`136`	`136`	`public int insertBookmarkTags(Long bookmarkId, List<Long> tagIds) {`
`137`	`137`	`return mapper.insertBookmarkTags(bookmarkId, tagIds);`
`138`	`138`	`}`
	`139`	`+`
	`140`	`+ @Override`
	`141`	`+ public boolean existsActiveBookmarkInFolder(Long memberFolderId) {`
	`142`	`+ return mapper.existsActiveBookmarkInFolder(memberFolderId);`
	`143`	`+ }`
`139`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.web.SearchWeb.config;`
	`1`	`+package com.web.SearchWeb.config.exception;`
`2`	`2`
`3`	`3`	`import lombok.Getter;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.web.SearchWeb.config;`
	`1`	`+package com.web.SearchWeb.config.security;`
`2`	`2`
`3`	`3`	`import jakarta.servlet.ServletException;`
`4`	`4`	`import jakarta.servlet.http.HttpServletRequest;`