[deploy] ec2 서버 이전 작업

.github/workflows/gradle.yml

@@ -30,16 +30,6 @@ jobs:
         with:
           arguments: build
 
-      - name: 테스트 커버리지를 PR에 코멘트로 등록합니다
-        id: jacoco
-        uses: madrapps/jacoco-report@v1.2
-        with:
-          title: 📝 테스트 커버리지 리포트입니다
-          paths: ${{ github.workspace }}/build/reports/jacoco/test/jacocoTestReport.xml
-          token: ${{ secrets.GITHUB_TOKEN }}
-          min-coverage-overall: 50
-          min-coverage-changed-files: 50
-
       # 3. Docker 이미지 빌드
       - name: docker image build
         run: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/honeycourses-backend-spring-prod .

.github/workflows/tests.yml

@@ -31,3 +31,13 @@ jobs:
         if: ${{ always() }}  # 테스트가 실패하여도 Report를 보기 위해 `always`로 설정
         with:
           files: build/test-results/**/*.xml
+
+      - name: 테스트 커버리지를 PR에 코멘트로 등록합니다
+        id: jacoco
+        uses: madrapps/jacoco-report@v1.2
+        with:
+          title: 📝 테스트 커버리지 리포트입니다
+          paths: ${{ github.workspace }}/build/reports/jacoco/test/jacocoTestReport.xml
+          token: ${{ secrets.GITHUB_TOKEN }}
+          min-coverage-overall: 50
+          min-coverage-changed-files: 50

build.gradle

@@ -104,7 +104,7 @@ jacocoTestCoverageVerification {
                 minimum = 0.75
             }
 
-            excludes = ['*.*Controller', '*.advice.*', '*.dto.*', '*.config.*', '*.domain.*', '*.support.*']
+            excludes = ['*.*Controller', '*.advice.*', '*.dto.*', '*.global.*', '*.domain.*']
         }
     }
 }

src/docs/asciidoc/index.adoc

@@ -29,30 +29,28 @@ operation::reviews/find/success[snippets='http-request,http-response']
 ==== 실패
 ===== 최근 작성한 리뷰가 6개월 이상이거나, 없을경우
 operation::reviews/find/fail/denied[snippets='http-request,http-response']
-===== 수업이 존재하지 않을 경우
-operation::reviews/find/fail/noCourse[snippets='http-request,http-response']
 
 === 특정 강의의 리뷰 작성하기 (POST /courses/{id}/reviews)
 ==== 성공
 operation::reviews/create/success[snippets='http-request,http-response']
 
-=== 리뷰 좋아요 (PUT /courses/reviews/{rid})
+=== 리뷰 좋아요 (PUT /reviews/{id}/like)
 ==== 성공
 operation::reviews/like/success[snippets='http-request,http-response']
 
-=== 내 리뷰 보기 (GET /courses/reviews/me)
+=== 내 리뷰 보기 (GET /reviews/me)
 ==== 성공
 operation::reviews/find/me/success[snippets='http-request,http-response']
 
-=== 리뷰 수정 (PUT /courses/reviews/{rid})
+=== 리뷰 수정 (PUT /reviews/{id})
 ==== 성공
 operation::reviews/update/success[snippets='http-request,http-response']
 
 ==== 실패
 ===== 권한이 없는 경우
 operation::reviews/update/fail/noAuth[snippets='http-request,http-response']
 
-=== 리뷰 삭제 (DELETE /courses/reviews/{rid})
+=== 리뷰 삭제 (DELETE /reviews/{id})
 ==== 성공
 operation::reviews/delete/success[snippets='http-request,http-response']
 
@@ -62,36 +60,36 @@ operation::reviews/delete/fail/noAuth[snippets='http-request,http-response']
 
 == 게시글 관리
 
-=== 모든 게시글 보기 (GET /community)
+=== 모든 게시글 보기 (GET /posts)
 ==== 성공
 operation::post/find/all/success[snippets='http-request,http-response']
 
-=== 특정 카테고리 게시글 보기 (GET /community/category/{category})
-유효한 category 값: free(자유), question(질문), trade(중고거래), offer(구인)
+=== 특정 카테고리 게시글 보기 (GET /posts?page=1&category=free)
+유효한 category 값: free(자유), question(질문), trade(중고거래), offer(구인), notice(공지)
 
 ==== 성공
 operation::post/find/category/success[snippets='http-request,http-response']
 
-=== 특정 게시글 보기 (GET /community/{id})
+=== 특정 게시글 보기 (GET /posts/{id})
 ==== 성공
 operation::post/find/one/success[snippets='http-request,http-response']
 
-=== 게시글 작성하기 (POST /community)
+=== 게시글 작성하기 (POST /posts)
 ==== 성공
 operation::post/create/success[snippets='http-request,http-response']
 ==== 실패
 ===== 제목에 내용이 없는 경우
 operation::post/create/fail/noTitle[snippets='http-request,http-response']
 
-=== 내 게시글 보기 (GET /community/me)
+=== 내 게시글 보기 (GET /posts/me)
 ==== 성공
 operation::post/find/me/success[snippets='http-request,http-response']
 
-=== 게시글 좋아요 (PUT /community/{id}/like)
+=== 게시글 좋아요 (PUT /posts/{id}/like)
 ==== 성공
 operation::post/like/success[snippets='http-request,http-response']
 
-=== 게시글 수정 (PUT /community/{id})
+=== 게시글 수정 (PUT /posts/{id})
 ==== 성공
 operation::post/update/success[snippets='http-request,http-response']
 ==== 실패
@@ -100,7 +98,7 @@ operation::post/update/fail/noAuth[snippets='http-request,http-response']
 ===== 제목에 내용이 없는 경우
 operation::post/update/fail/noTitle[snippets='http-request,http-response']
 
-=== 게시글 삭제 (DELETE /community/{id})
+=== 게시글 삭제 (DELETE /posts/{id})
 ==== 성공
 operation::post/delete/success[snippets='http-request,http-response']
 ==== 실패

src/main/java/org/wooriverygood/api/SampleApi.java

@@ -0,0 +1,15 @@
+package org.wooriverygood.api;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class SampleApi {
+
+    @GetMapping("/")
+    public ResponseEntity<String> sample() {
+        return ResponseEntity.ok("api is online");
+    }
+
+}

src/main/java/org/wooriverygood/api/comment/api/CommentApi.java

@@ -0,0 +1,73 @@
+package org.wooriverygood.api.comment.api;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.wooriverygood.api.comment.application.*;
+import org.wooriverygood.api.comment.dto.*;
+import org.wooriverygood.api.global.auth.AuthInfo;
+import org.wooriverygood.api.global.auth.Login;
+
+@RestController
+@RequiredArgsConstructor
+public class CommentApi {
+
+    private final CommentLikeToggleService commentLikeToggleService;
+
+    private final CommentFindService commentFindService;
+
+    private final CommentCreateService commentCreateService;
+
+    private final CommentDeleteService commentDeleteService;
+
+    private final CommentUpdateService commentUpdateService;
+
+
+    @GetMapping("/posts/{id}/comments")
+    public ResponseEntity<CommentsResponse> findAllCommentsByPostId(@PathVariable("id") Long postId,
+                                                                    @Login AuthInfo authInfo) {
+        CommentsResponse response = commentFindService.findAllCommentsByPostId(postId, authInfo);
+        return  ResponseEntity.ok(response);
+    }
+
+    @PostMapping("/posts/{id}/comments")
+    public ResponseEntity<Void> addComment(@PathVariable("id") Long postId,
+                                           @Login AuthInfo authInfo,
+                                           @Valid @RequestBody NewCommentRequest newCommentRequest) {
+        commentCreateService.addComment(authInfo, postId, newCommentRequest);
+        return ResponseEntity.status(HttpStatus.CREATED).build();
+    }
+
+    @PutMapping("/comments/{id}/like")
+    public ResponseEntity<CommentLikeResponse> toggleCommentLike(@PathVariable("id") Long commentId,
+                                                                 @Login AuthInfo authInfo) {
+        CommentLikeResponse response = commentLikeToggleService.likeComment(commentId, authInfo);
+        return ResponseEntity.ok(response);
+    }
+
+    @PutMapping("/comments/{id}")
+    public ResponseEntity<Void> updateComment(@PathVariable("id") Long commentId,
+                                              @Valid @RequestBody CommentUpdateRequest request,
+                                              @Login AuthInfo authInfo) {
+        commentUpdateService.updateComment(commentId, request, authInfo);
+        return ResponseEntity.noContent().build();
+    }
+
+    @DeleteMapping("/comments/{id}")
+    public ResponseEntity<Void> deleteComment(@PathVariable("id") Long commentId,
+                                              @Login AuthInfo authInfo) {
+        commentDeleteService.deleteComment(commentId, authInfo);
+        return ResponseEntity.noContent().build();
+    }
+
+    @PostMapping("/comments/{id}/reply")
+    public ResponseEntity<Void> addReply(@PathVariable("id") Long commentId,
+                                         @RequestBody NewReplyRequest request,
+                                         @Login AuthInfo authInfo) {
+        commentCreateService.addReply(commentId, request, authInfo);
+        return ResponseEntity.status(HttpStatus.CREATED).build();
+    }
+
+}

src/main/java/org/wooriverygood/api/comment/application/CommentCreateService.java

@@ -0,0 +1,68 @@
+package org.wooriverygood.api.comment.application;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.wooriverygood.api.comment.exception.CommentNotFoundException;
+import org.wooriverygood.api.comment.exception.ReplyDepthException;
+import org.wooriverygood.api.comment.domain.Comment;
+import org.wooriverygood.api.comment.dto.NewCommentRequest;
+import org.wooriverygood.api.comment.dto.NewReplyRequest;
+import org.wooriverygood.api.comment.repository.CommentRepository;
+import org.wooriverygood.api.global.auth.AuthInfo;
+import org.wooriverygood.api.member.domain.Member;
+import org.wooriverygood.api.member.exception.MemberNotFoundException;
+import org.wooriverygood.api.member.repository.MemberRepository;
+import org.wooriverygood.api.post.domain.Post;
+import org.wooriverygood.api.post.exception.PostNotFoundException;
+import org.wooriverygood.api.post.repository.PostRepository;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class CommentCreateService {
+
+    private final PostRepository postRepository;
+
+    private final CommentRepository commentRepository;
+
+    private final MemberRepository memberRepository;
+
+
+    public void addComment(AuthInfo authInfo, Long postId, NewCommentRequest request) {
+        Member member = memberRepository.findById(authInfo.getMemberId())
+                .orElseThrow(MemberNotFoundException::new);
+        Post post = postRepository.findById(postId)
+                .orElseThrow(PostNotFoundException::new);
+
+        Comment comment = Comment.builder()
+                .content(request.getContent())
+                .post(post)
+                .member(member)
+                .build();
+
+        commentRepository.save(comment);
+    }
+
+    public void addReply(Long commentId, NewReplyRequest request, AuthInfo authInfo) {
+        Comment parent = commentRepository.findById(commentId)
+                .orElseThrow(CommentNotFoundException::new);
+
+        if (!parent.isParent())
+            throw new ReplyDepthException();
+
+        Member member = memberRepository.findById(authInfo.getMemberId())
+                .orElseThrow(MemberNotFoundException::new);
+
+        Comment child = Comment.builder()
+                .content(request.getContent())
+                .post(parent.getPost())
+                .parent(parent)
+                .member(member)
+                .build();
+        parent.addReply(child);
+
+        commentRepository.save(child);
+    }
+
+}