Merge branch 'develop' of https://github.com/Codiary-UMC-6th/Backend-…

…Codiary into develop

src/main/java/com/codiary/backend/domain/post/controller/PostController.java

@@ -1,33 +1,45 @@
 package com.codiary.backend.domain.post.controller;
 
+import com.codiary.backend.domain.member.entity.Member;
+import com.codiary.backend.domain.member.security.CustomMemberDetails;
 import com.codiary.backend.domain.member.service.MemberCommandService;
 import com.codiary.backend.domain.post.converter.PostConverter;
-import com.codiary.backend.domain.post.dto.response.PostResponseDTO;
 import com.codiary.backend.domain.post.dto.request.PostRequestDTO;
+import com.codiary.backend.domain.post.dto.response.PostResponseDTO;
+import com.codiary.backend.domain.post.entity.Bookmark;
 import com.codiary.backend.domain.post.entity.Post;
-import com.codiary.backend.domain.member.entity.Member;
+import com.codiary.backend.domain.post.service.BookmarkService;
 import com.codiary.backend.domain.post.service.PostCommandService;
 import com.codiary.backend.domain.post.service.PostQueryService;
 import com.codiary.backend.domain.post.service.PostService;
 import com.codiary.backend.global.apiPayload.ApiResponse;
 import com.codiary.backend.global.apiPayload.code.status.SuccessStatus;
+import com.codiary.backend.global.jwt.JwtTokenProvider;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
+import java.util.Optional;
+import java.util.Set;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.data.domain.Pageable;
-import com.codiary.backend.global.jwt.JwtTokenProvider;
-
-import java.util.Optional;
-import java.util.Set;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 
 @RequiredArgsConstructor
@@ -43,6 +55,7 @@ public class PostController {
     private final PostQueryService postQueryService;
     private final MemberCommandService memberCommandService;
     private final JwtTokenProvider jwtTokenProvider;
+    private final BookmarkService bookmarkService;
 
     // 게시글 생성하기
     @PostMapping(consumes = "multipart/form-data")
@@ -170,4 +183,30 @@ public ApiResponse<PostResponseDTO.UpdatePostResultDTO> setPostCategory(@PathVar
         Post updatedPost = postCommandService.setPostCategories(postId, categoryNames);
         return ApiResponse.onSuccess(SuccessStatus.POST_OK, PostConverter.toSetPostCategoriesResultDTO(updatedPost));
     }
+
+    // 북마크 추가
+    @PostMapping("/{post_id}/bookmark")
+    @Operation(summary = "게시글 북마크")
+    public ApiResponse<PostResponseDTO.BookmarkDTO> bookmarkPost(
+            @PathVariable("post_id") Long postId,
+            @AuthenticationPrincipal CustomMemberDetails memberDetails
+    ) {
+        Long memberId = memberDetails.getId();
+        Bookmark bookmark = bookmarkService.bookmarkPost(memberId, postId);
+
+        return ApiResponse.onSuccess(SuccessStatus.BOOKMARK_OK, PostConverter.toBookmarkDTO(bookmark));
+    }
+
+    // 북마크 삭제
+    @DeleteMapping("/{post_id}/bookmark")
+    @Operation(summary = "게시글 북마크 취소")
+    public ApiResponse<String> cancelBookmark(
+            @PathVariable("post_id") Long postId,
+            @AuthenticationPrincipal CustomMemberDetails memberDetails
+    ) {
+        Long memberId = memberDetails.getId();
+        String response = bookmarkService.cancelBookmark(memberId, postId);
+
+        return ApiResponse.onSuccess(SuccessStatus.BOOKMARK_OK, response);
+    }
 }

src/main/java/com/codiary/backend/domain/post/converter/PostConverter.java

@@ -1,18 +1,18 @@
 package com.codiary.backend.domain.post.converter;
 
+import com.codiary.backend.domain.category.entity.Category;
 import com.codiary.backend.domain.post.dto.request.PostRequestDTO;
 import com.codiary.backend.domain.post.dto.response.PostResponseDTO;
+import com.codiary.backend.domain.post.entity.Bookmark;
 import com.codiary.backend.domain.post.entity.Post;
-import com.codiary.backend.domain.category.entity.Category;
 import com.codiary.backend.domain.post.enumerate.PostAccess;
 import com.codiary.backend.domain.project.entity.Project;
-import com.codiary.backend.domain.team.entity.Team;
-import org.springframework.data.domain.Page;
 import com.codiary.backend.domain.project.repository.ProjectRepository;
+import com.codiary.backend.domain.team.entity.Team;
 import com.codiary.backend.domain.team.repository.TeamRepository;
-
 import java.util.List;
 import java.util.stream.Collectors;
+import org.springframework.data.domain.Page;
 
 public class PostConverter {
 
@@ -426,5 +426,12 @@ public static PostResponseDTO.UpdatePostResultDTO toSetPostCategoriesResultDTO(P
                 .build();
     }
 
+    public static PostResponseDTO.BookmarkDTO toBookmarkDTO(Bookmark bookmark) {
+        return PostResponseDTO.BookmarkDTO.builder()
+                .bookmarkId(bookmark.getId())
+                .postId(bookmark.getPost().getPostId())
+                .memberId(bookmark.getMember().getMemberId())
+                .build();
+    }
 
 }

src/main/java/com/codiary/backend/domain/post/dto/response/PostResponseDTO.java

@@ -4,11 +4,12 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
-import lombok.*;
-
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Set;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
 
 public class PostResponseDTO {
 
@@ -312,8 +313,13 @@ public record PostAdjacentPreviewDTO(
         }
     }
 
-
-
-
-
+    @Builder
+    @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public record BookmarkDTO(
+            Long bookmarkId,
+            Long memberId,
+            Long postId
+    ) {
+    }
 }

src/main/java/com/codiary/backend/domain/post/entity/Bookmark.java

@@ -2,8 +2,18 @@
 
 import com.codiary.backend.domain.member.entity.Member;
 import com.codiary.backend.global.common.BaseEntity;
-import jakarta.persistence.*;
-import lombok.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Entity
 @Getter
@@ -42,4 +52,10 @@ public void setPost(Post post) {
         post.getBookmarkList().add(this);
     }
 
+    @Builder
+    public Bookmark(Member member, Post post) {
+        this.member = member;
+        this.post = post;
+    }
+
 }

src/main/java/com/codiary/backend/domain/post/repository/BookmarkRepository.java

@@ -0,0 +1,14 @@
+package com.codiary.backend.domain.post.repository;
+
+import com.codiary.backend.domain.member.entity.Member;
+import com.codiary.backend.domain.post.entity.Bookmark;
+import com.codiary.backend.domain.post.entity.Post;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface BookmarkRepository extends JpaRepository<Bookmark, Long> {
+
+    Boolean existsByMemberAndPost(Member member, Post post);
+
+    Optional<Bookmark> findByMemberAndPost(Member member, Post post);
+}

src/main/java/com/codiary/backend/domain/post/service/BookmarkService.java

@@ -0,0 +1,81 @@
+package com.codiary.backend.domain.post.service;
+
+import com.codiary.backend.domain.member.entity.Member;
+import com.codiary.backend.domain.member.repository.MemberRepository;
+import com.codiary.backend.domain.post.entity.Bookmark;
+import com.codiary.backend.domain.post.entity.Post;
+import com.codiary.backend.domain.post.enumerate.PostAccess;
+import com.codiary.backend.domain.post.repository.BookmarkRepository;
+import com.codiary.backend.domain.post.repository.PostRepository;
+import com.codiary.backend.domain.team.entity.Team;
+import com.codiary.backend.domain.team.repository.TeamRepository;
+import com.codiary.backend.global.apiPayload.code.status.ErrorStatus;
+import com.codiary.backend.global.apiPayload.exception.GeneralException;
+import com.codiary.backend.global.apiPayload.exception.handler.BookmarkHandler;
+import com.codiary.backend.global.apiPayload.exception.handler.MemberHandler;
+import com.codiary.backend.global.apiPayload.exception.handler.PostHandler;
+import com.codiary.backend.global.apiPayload.exception.handler.TeamHandler;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class BookmarkService {
+
+    private final MemberRepository memberRepository;
+    private final PostRepository postRepository;
+    private final BookmarkRepository bookmarkRepository;
+    private final TeamRepository teamRepository;
+
+    public Bookmark bookmarkPost(Long memberId, Long postId) {
+        // validation: member, post 여부
+        Member member = memberRepository.findById(memberId)
+                .orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND));
+        Post post = postRepository.findById(postId).orElseThrow(() -> new PostHandler(ErrorStatus.POST_NOT_FOUND));
+
+        // validation: 이미 북마크한 상태
+        if (bookmarkRepository.existsByMemberAndPost(member, post)) {
+            throw new BookmarkHandler(ErrorStatus.BOOKMARK_ALREADY_EXIST);
+        }
+
+        // validation: post 권한 확인
+        if (post.getPostAccess().equals(PostAccess.MEMBER) && post.getMember() != member) {
+            throw new GeneralException(ErrorStatus.BOOKMARK_CREATE_UNAUTHORIZED);
+        } else if (post.getPostAccess().equals(PostAccess.TEAM)) {
+            Team teamOfPost = teamRepository.findByIdWithTeamMemberList(post.getTeam().getTeamId())
+                    .orElseThrow(() -> new TeamHandler(ErrorStatus.TEAM_NOT_FOUND));
+            if (!teamRepository.isTeamMember(teamOfPost, member)) {
+                throw new GeneralException((ErrorStatus.BOOKMARK_CREATE_UNAUTHORIZED));
+            }
+        }
+
+        // business logic
+        Bookmark bookmark = Bookmark.builder()
+                .member(member)
+                .post(post)
+                .build();
+        Bookmark savedBookmark = bookmarkRepository.save(bookmark);
+
+        // response
+        return savedBookmark;
+    }
+
+    public String cancelBookmark(Long memberId, Long postId) {
+        // validation: member, post, bookmark 여부
+        Member member = memberRepository.findById(memberId)
+                .orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND));
+        Post post = postRepository.findById(postId).orElseThrow(() -> new PostHandler(ErrorStatus.POST_NOT_FOUND));
+        Bookmark bookmark = bookmarkRepository.findByMemberAndPost(member, post)
+                .orElseThrow(() -> new BookmarkHandler(ErrorStatus.BOOKMARK_ALREADY_CANCELED));
+
+        // business logic
+        member.getBookmarkList().remove(bookmark);
+        post.getBookmarkList().remove(bookmark);
+        bookmarkRepository.deleteById(bookmark.getId());
+
+        // response
+        return "북마크가 취소되었습니다.";
+    }
+}

src/main/java/com/codiary/backend/global/apiPayload/code/status/ErrorStatus.java

@@ -64,11 +64,13 @@ public enum ErrorStatus implements BaseErrorCode {
 
 
     // 북마크 관련 에러 6000
-//    BOOKMARK_CREATE_UNAUTHORIZED(HttpStatus.BAD_REQUEST, "BOOKMARK_6001", "북마크 추가 권한이 없습니다."),
-//    BOOKMARK_VIEW_UNAUTHORIZED(HttpStatus.BAD_REQUEST, "BOOKMARK_6002", "북마크 게시글 리스트 조회 권한이 없습니다."),
+    BOOKMARK_CREATE_UNAUTHORIZED(HttpStatus.BAD_REQUEST, "BOOKMARK_6001", "북마크 추가 권한이 없습니다."),
+    BOOKMARK_VIEW_UNAUTHORIZED(HttpStatus.BAD_REQUEST, "BOOKMARK_6002", "북마크 게시글 리스트 조회 권한이 없습니다."),
 //    BOOKMARK_COUNT_ERROR(HttpStatus.BAD_REQUEST, "BOOKMARK_6003", "북마크 개수 계산에 에러가 있습니다."),
 //    BOOKMARK_DELETE_UNAUTHORIZED(HttpStatus.BAD_REQUEST, "BOOKMARK_6004", "북마크 삭제 권한이 없습니다."),
     BOOKMARK_NOT_FOUND(HttpStatus.BAD_REQUEST, "BOOKMARK_6005", "북마크가 없습니다."),
+    BOOKMARK_ALREADY_EXIST(HttpStatus.BAD_REQUEST, "BOOKMARK_6006", "이미 북마크한 포스트입니다."),
+    BOOKMARK_ALREADY_CANCELED(HttpStatus.BAD_REQUEST, "BOOKMARK_6007", "이미 북마크 상태가 아닌 포스트입니다."),
 
     // 카테고리 관련 에러 7000
     CATEGORY_NOT_FOUND(HttpStatus.BAD_REQUEST, "CATEGORY_7001", "카테고리가 없습니다."),