[RELEASE] 250215 릴리즈

src/main/java/com/example/solidconnection/application/controller/ApplicationController.java

@@ -19,15 +19,15 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RequiredArgsConstructor
-@RequestMapping("/application")
+@RequestMapping("/applications")
 @RestController
 public class ApplicationController {
 
     private final ApplicationSubmissionService applicationSubmissionService;
     private final ApplicationQueryService applicationQueryService;
 
     // 지원서 제출하기 api
-    @PostMapping()
+    @PostMapping
     public ResponseEntity<ApplicationSubmissionResponse> apply(
             @AuthorizedUser SiteUser siteUser,
             @Valid @RequestBody ApplyRequest applyRequest

src/main/java/com/example/solidconnection/auth/controller/AuthController.java

@@ -16,14 +16,15 @@
 import com.example.solidconnection.auth.service.oauth.AppleOAuthService;
 import com.example.solidconnection.auth.service.oauth.KakaoOAuthService;
 import com.example.solidconnection.auth.service.oauth.OAuthSignUpService;
+import com.example.solidconnection.custom.exception.CustomException;
+import com.example.solidconnection.custom.exception.ErrorCode;
 import com.example.solidconnection.custom.resolver.AuthorizedUser;
-import com.example.solidconnection.custom.resolver.ExpiredToken;
-import com.example.solidconnection.custom.security.authentication.ExpiredTokenAuthentication;
 import com.example.solidconnection.siteuser.domain.AuthType;
 import com.example.solidconnection.siteuser.domain.SiteUser;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -93,9 +94,13 @@ public ResponseEntity<SignInResponse> signUp(
 
     @PostMapping("/sign-out")
     public ResponseEntity<Void> signOut(
-            @ExpiredToken ExpiredTokenAuthentication expiredToken
+            Authentication authentication
     ) {
-        authService.signOut(expiredToken.getToken());
+        String token = authentication.getCredentials().toString();
+        if (token == null) {
+            throw new CustomException(ErrorCode.AUTHENTICATION_FAILED, "토큰이 없습니다.");
+        }
+        authService.signOut(token);
         return ResponseEntity.ok().build();
     }
 
@@ -109,9 +114,13 @@ public ResponseEntity<Void> quit(
 
     @PostMapping("/reissue")
     public ResponseEntity<ReissueResponse> reissueToken(
-            @ExpiredToken ExpiredTokenAuthentication expiredToken
+            Authentication authentication
     ) {
-        ReissueResponse reissueResponse = authService.reissue(expiredToken.getSubject());
+        String token = authentication.getCredentials().toString();
+        if (token == null) {
+            throw new CustomException(ErrorCode.AUTHENTICATION_FAILED, "토큰이 없습니다.");
+        }
+        ReissueResponse reissueResponse = authService.reissue(token);
         return ResponseEntity.ok(reissueResponse);
     }
 }

src/main/java/com/example/solidconnection/auth/service/EmailSignInService.java

@@ -35,7 +35,7 @@ public SignInResponse signIn(EmailSignInRequest signInRequest) {
         throw new CustomException(USER_NOT_FOUND, "이메일과 비밀번호를 확인해주세요.");
     }
 
-    private void validatePassword(String rawPassword, String encodedPassword) throws CustomException {
+    private void validatePassword(String rawPassword, String encodedPassword) {
         if (!passwordEncoder.matches(rawPassword, encodedPassword)) {
             throw new CustomException(USER_NOT_FOUND, "이메일과 비밀번호를 확인해주세요.");
         }

src/main/java/com/example/solidconnection/community/board/controller/BoardController.java

@@ -1,27 +1,42 @@
 package com.example.solidconnection.community.board.controller;
 
+import com.example.solidconnection.community.post.dto.PostListResponse;
+import com.example.solidconnection.community.post.service.PostQueryService;
 import com.example.solidconnection.type.BoardCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/communities")
+@RequestMapping("/boards")
 public class BoardController {
 
+    private final PostQueryService postQueryService;
+
     // todo: 회원별로 접근 가능한 게시판 목록 조회 기능 개발
-    @GetMapping()
+    @GetMapping
     public ResponseEntity<?> findAccessibleCodes() {
         List<String> accessibleCodeList = new ArrayList<>();
         for (BoardCode boardCode : BoardCode.values()) {
             accessibleCodeList.add(String.valueOf(boardCode));
         }
         return ResponseEntity.ok().body(accessibleCodeList);
     }
+
+    @GetMapping("/{code}")
+    public ResponseEntity<?> findPostsByCodeAndCategory(
+            @PathVariable(value = "code") String code,
+            @RequestParam(value = "category", defaultValue = "전체") String category) {
+        List<PostListResponse> postsByCodeAndPostCategory = postQueryService
+                .findPostsByCodeAndPostCategory(code, category);
+        return ResponseEntity.ok().body(postsByCodeAndPostCategory);
+    }
 }

src/main/java/com/example/solidconnection/community/comment/controller/CommentController.java

@@ -21,39 +21,36 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/posts")
+@RequestMapping("/comments")
 public class CommentController {
 
     private final CommentService commentService;
 
-    @PostMapping("/{post_id}/comments")
+    @PostMapping
     public ResponseEntity<?> createComment(
             @AuthorizedUser SiteUser siteUser,
-            @PathVariable("post_id") Long postId,
             @Valid @RequestBody CommentCreateRequest commentCreateRequest
     ) {
-        CommentCreateResponse response = commentService.createComment(siteUser, postId, commentCreateRequest);
+        CommentCreateResponse response = commentService.createComment(siteUser, commentCreateRequest);
         return ResponseEntity.ok().body(response);
     }
 
-    @PatchMapping("/{post_id}/comments/{comment_id}")
+    @PatchMapping("/{comment_id}")
     public ResponseEntity<?> updateComment(
             @AuthorizedUser SiteUser siteUser,
-            @PathVariable("post_id") Long postId,
             @PathVariable("comment_id") Long commentId,
             @Valid @RequestBody CommentUpdateRequest commentUpdateRequest
     ) {
-        CommentUpdateResponse response = commentService.updateComment(siteUser, postId, commentId, commentUpdateRequest);
+        CommentUpdateResponse response = commentService.updateComment(siteUser, commentId, commentUpdateRequest);
         return ResponseEntity.ok().body(response);
     }
 
-    @DeleteMapping("/{post_id}/comments/{comment_id}")
+    @DeleteMapping("/{comment_id}")
     public ResponseEntity<?> deleteCommentById(
             @AuthorizedUser SiteUser siteUser,
-            @PathVariable("post_id") Long postId,
             @PathVariable("comment_id") Long commentId
     ) {
-        CommentDeleteResponse response = commentService.deleteCommentById(siteUser, postId, commentId);
+        CommentDeleteResponse response = commentService.deleteCommentById(siteUser, commentId);
         return ResponseEntity.ok().body(response);
     }
 }

src/main/java/com/example/solidconnection/community/comment/dto/CommentCreateRequest.java

@@ -4,9 +4,13 @@
 import com.example.solidconnection.community.post.domain.Post;
 import com.example.solidconnection.siteuser.domain.SiteUser;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 
 public record CommentCreateRequest(
+        @NotNull(message = "게시글 ID를 설정해주세요.")
+        Long postId,
+
         @NotBlank(message = "댓글 내용은 빈 값일 수 없습니다.")
         @Size(min = 1, max = 255, message = "댓글 내용은 최소 1자 이상, 최대 255자 이하여야 합니다.")
         String content,

src/main/java/com/example/solidconnection/community/comment/service/CommentService.java

@@ -8,10 +8,11 @@
 import com.example.solidconnection.community.comment.dto.CommentUpdateResponse;
 import com.example.solidconnection.community.comment.dto.PostFindCommentResponse;
 import com.example.solidconnection.community.comment.repository.CommentRepository;
-import com.example.solidconnection.custom.exception.CustomException;
 import com.example.solidconnection.community.post.domain.Post;
 import com.example.solidconnection.community.post.repository.PostRepository;
+import com.example.solidconnection.custom.exception.CustomException;
 import com.example.solidconnection.siteuser.domain.SiteUser;
+import com.example.solidconnection.siteuser.repository.SiteUserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,13 +23,15 @@
 import static com.example.solidconnection.custom.exception.ErrorCode.CAN_NOT_UPDATE_DEPRECATED_COMMENT;
 import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_COMMENT_LEVEL;
 import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_POST_ACCESS;
+import static com.example.solidconnection.custom.exception.ErrorCode.USER_NOT_FOUND;
 
 @Service
 @RequiredArgsConstructor
 public class CommentService {
 
     private final CommentRepository commentRepository;
     private final PostRepository postRepository;
+    private final SiteUserRepository siteUserRepository;
 
     @Transactional(readOnly = true)
     public List<PostFindCommentResponse> findCommentsByPostId(SiteUser siteUser, Long postId) {
@@ -43,15 +46,23 @@ private Boolean isOwner(Comment comment, SiteUser siteUser) {
     }
 
     @Transactional
-    public CommentCreateResponse createComment(SiteUser siteUser, Long postId, CommentCreateRequest commentCreateRequest) {
-        Post post = postRepository.getById(postId);
+    public CommentCreateResponse createComment(SiteUser siteUser, CommentCreateRequest commentCreateRequest) {
+        Post post = postRepository.getById(commentCreateRequest.postId());
 
         Comment parentComment = null;
         if (commentCreateRequest.parentId() != null) {
             parentComment = commentRepository.getById(commentCreateRequest.parentId());
             validateCommentDepth(parentComment);
         }
-        Comment createdComment = commentRepository.save(commentCreateRequest.toEntity(siteUser, post, parentComment));
+
+        /*
+         * todo: siteUser를 영속 상태로 만들 수 있도록 컨트롤러에서 siteUserId 를 넘겨줄 것인지,
+         *  siteUser 에 postList 를 FetchType.EAGER 로 설정할 것인지,
+         *  post 와 siteUser 사이의 양방향을 끊을 것인지 생각해봐야한다.
+         */
+        SiteUser siteUser1 = siteUserRepository.findById(siteUser.getId()).orElseThrow(() -> new CustomException(USER_NOT_FOUND));
+        Comment comment = commentCreateRequest.toEntity(siteUser1, post, parentComment);
+        Comment createdComment = commentRepository.save(comment);
 
         return CommentCreateResponse.from(createdComment);
     }
@@ -64,8 +75,7 @@ private void validateCommentDepth(Comment parentComment) {
     }
 
     @Transactional
-    public CommentUpdateResponse updateComment(SiteUser siteUser, Long postId, Long commentId, CommentUpdateRequest commentUpdateRequest) {
-        Post post = postRepository.getById(postId);
+    public CommentUpdateResponse updateComment(SiteUser siteUser, Long commentId, CommentUpdateRequest commentUpdateRequest) {
         Comment comment = commentRepository.getById(commentId);
         validateDeprecated(comment);
         validateOwnership(comment, siteUser);
@@ -82,8 +92,7 @@ private void validateDeprecated(Comment comment) {
     }
 
     @Transactional
-    public CommentDeleteResponse deleteCommentById(SiteUser siteUser, Long postId, Long commentId) {
-        Post post = postRepository.getById(postId);
+    public CommentDeleteResponse deleteCommentById(SiteUser siteUser, Long commentId) {
         Comment comment = commentRepository.getById(commentId);
         validateOwnership(comment, siteUser);
 

src/main/java/com/example/solidconnection/community/post/controller/PostController.java

@@ -1,7 +1,5 @@
 package com.example.solidconnection.community.post.controller;
 
-import com.example.solidconnection.community.post.dto.PostListResponse;
-import com.example.solidconnection.custom.resolver.AuthorizedUser;
 import com.example.solidconnection.community.post.dto.PostCreateRequest;
 import com.example.solidconnection.community.post.dto.PostCreateResponse;
 import com.example.solidconnection.community.post.dto.PostDeleteResponse;
@@ -13,6 +11,7 @@
 import com.example.solidconnection.community.post.service.PostCommandService;
 import com.example.solidconnection.community.post.service.PostLikeService;
 import com.example.solidconnection.community.post.service.PostQueryService;
+import com.example.solidconnection.custom.resolver.AuthorizedUser;
 import com.example.solidconnection.siteuser.domain.SiteUser;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -33,41 +32,29 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/communities")
+@RequestMapping("/posts")
 public class PostController {
 
     private final PostQueryService postQueryService;
     private final PostCommandService postCommandService;
     private final PostLikeService postLikeService;
 
-    @GetMapping("/{code}")
-    public ResponseEntity<?> findPostsByCodeAndCategory(
-            @PathVariable(value = "code") String code,
-            @RequestParam(value = "category", defaultValue = "전체") String category) {
-
-        List<PostListResponse> postsByCodeAndPostCategory = postQueryService
-                .findPostsByCodeAndPostCategory(code, category);
-        return ResponseEntity.ok().body(postsByCodeAndPostCategory);
-    }
-
-    @PostMapping(value = "/{code}/posts")
+    @PostMapping
     public ResponseEntity<?> createPost(
             @AuthorizedUser SiteUser siteUser,
-            @PathVariable("code") String code,
             @Valid @RequestPart("postCreateRequest") PostCreateRequest postCreateRequest,
             @RequestParam(value = "file", required = false) List<MultipartFile> imageFile
     ) {
         if (imageFile == null) {
             imageFile = Collections.emptyList();
         }
-        PostCreateResponse post = postCommandService.createPost(siteUser, code, postCreateRequest, imageFile);
+        PostCreateResponse post = postCommandService.createPost(siteUser, postCreateRequest, imageFile);
         return ResponseEntity.ok().body(post);
     }
 
-    @PatchMapping(value = "/{code}/posts/{post_id}")
+    @PatchMapping(value = "/{post_id}")
     public ResponseEntity<?> updatePost(
             @AuthorizedUser SiteUser siteUser,
-            @PathVariable("code") String code,
             @PathVariable("post_id") Long postId,
             @Valid @RequestPart("postUpdateRequest") PostUpdateRequest postUpdateRequest,
             @RequestParam(value = "file", required = false) List<MultipartFile> imageFile
@@ -76,48 +63,44 @@ public ResponseEntity<?> updatePost(
             imageFile = Collections.emptyList();
         }
         PostUpdateResponse postUpdateResponse = postCommandService.updatePost(
-                siteUser, code, postId, postUpdateRequest, imageFile
+                siteUser, postId, postUpdateRequest, imageFile
         );
         return ResponseEntity.ok().body(postUpdateResponse);
     }
 
-    @GetMapping("/{code}/posts/{post_id}")
+    @GetMapping("/{post_id}")
     public ResponseEntity<?> findPostById(
             @AuthorizedUser SiteUser siteUser,
-            @PathVariable("code") String code,
             @PathVariable("post_id") Long postId
     ) {
-        PostFindResponse postFindResponse = postQueryService.findPostById(siteUser, code, postId);
+        PostFindResponse postFindResponse = postQueryService.findPostById(siteUser, postId);
         return ResponseEntity.ok().body(postFindResponse);
     }
 
-    @DeleteMapping(value = "/{code}/posts/{post_id}")
+    @DeleteMapping(value = "/{post_id}")
     public ResponseEntity<?> deletePostById(
             @AuthorizedUser SiteUser siteUser,
-            @PathVariable("code") String code,
             @PathVariable("post_id") Long postId
     ) {
-        PostDeleteResponse postDeleteResponse = postCommandService.deletePostById(siteUser, code, postId);
+        PostDeleteResponse postDeleteResponse = postCommandService.deletePostById(siteUser, postId);
         return ResponseEntity.ok().body(postDeleteResponse);
     }
 
-    @PostMapping(value = "/{code}/posts/{post_id}/like")
+    @PostMapping(value = "/{post_id}/like")
     public ResponseEntity<?> likePost(
             @AuthorizedUser SiteUser siteUser,
-            @PathVariable("code") String code,
             @PathVariable("post_id") Long postId
     ) {
-        PostLikeResponse postLikeResponse = postLikeService.likePost(siteUser, code, postId);
+        PostLikeResponse postLikeResponse = postLikeService.likePost(siteUser, postId);
         return ResponseEntity.ok().body(postLikeResponse);
     }
 
-    @DeleteMapping(value = "/{code}/posts/{post_id}/like")
+    @DeleteMapping(value = "/{post_id}/like")
     public ResponseEntity<?> dislikePost(
             @AuthorizedUser SiteUser siteUser,
-            @PathVariable("code") String code,
             @PathVariable("post_id") Long postId
     ) {
-        PostDislikeResponse postDislikeResponse = postLikeService.dislikePost(siteUser, code, postId);
+        PostDislikeResponse postDislikeResponse = postLikeService.dislikePost(siteUser, postId);
         return ResponseEntity.ok().body(postDislikeResponse);
     }
 }

src/main/java/com/example/solidconnection/community/post/dto/PostCreateRequest.java

@@ -9,6 +9,9 @@
 import jakarta.validation.constraints.Size;
 
 public record PostCreateRequest(
+        @NotNull(message = "게시글 카테고리를 설정해주세요.")
+        String boardCode,
+
         @NotNull(message = "게시글 카테고리를 설정해주세요.")
         String postCategory,