Merge pull request #394 from 6QuizOnTheBlock/BE_develop

Be develop
6QuizOnTheBlock · May 28, 2024 · dee1e1d · dee1e1d
2 parents 272ba3c + 44bdbb0
commit dee1e1d
Show file tree

Hide file tree

Showing 68 changed files with 820 additions and 743 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,8 +19,8 @@ jobs:
 
       - name: Configure Git
         run: |
-          git config user.name "차성원"
-          git config user.email "sungwon4728@naver.com"
+          git config user.name "전수민"
+          git config user.email "wjsaos2081@gmail.com"
 
       - name: Push to GitLab
         env:

diff --git a/backEnd/build.gradle b/backEnd/build.gradle
@@ -101,7 +101,11 @@ dependencies {
     implementation 'org.apache.kafka:kafka-clients'
     implementation 'org.springframework.retry:spring-retry'
 
-    implementation 'org.ojalgo:ojalgo:51.4.1'
+    // K-means 클러스터링 라이브러리
+    implementation 'org.apache.commons:commons-math3:3.6.1'
+
+    // 행렬 연산
+    implementation 'org.ejml:ejml-simple:0.41'
 
 }
 

diff --git a/backEnd/src/main/java/com/quiz/ourclass/domain/board/controller/CommentController.java b/backEnd/src/main/java/com/quiz/ourclass/domain/board/controller/CommentController.java
@@ -22,31 +22,31 @@ public class CommentController implements CommentControllerDocs {
     private final CommentService commentService;
 
     @PostMapping
-    public ResponseEntity<ResultResponse<Long>> write(
+    public ResponseEntity<ResultResponse<Long>> commentWrite(
         @RequestBody CommentRequest request) {
-        Long commentId = commentService.write(request);
+        Long commentId = commentService.commentWrite(request);
         return ResponseEntity.ok(ResultResponse.success(commentId));
     }
 
     @PatchMapping("/{id}")
-    public ResponseEntity<ResultResponse<Long>> modify(
+    public ResponseEntity<ResultResponse<Long>> commentModify(
         @PathVariable(value = "id") Long id,
         @RequestBody UpdateCommentRequest request) {
-        Long commentId = commentService.modify(id, request);
+        Long commentId = commentService.commentModify(id, request);
         return ResponseEntity.ok(ResultResponse.success(commentId));
     }
 
     @DeleteMapping("/{id}")
-    public ResponseEntity<ResultResponse<Boolean>> delete(
+    public ResponseEntity<ResultResponse<Boolean>> commentDelete(
         @PathVariable(value = "id") Long id) {
-        Boolean isDelete = commentService.delete(id);
+        Boolean isDelete = commentService.commentDelete(id);
         return ResponseEntity.ok(ResultResponse.success(isDelete));
     }
 
     @PostMapping("/{id}/report")
-    public ResponseEntity<ResultResponse<Boolean>> report(
+    public ResponseEntity<ResultResponse<Boolean>> commentReport(
         @PathVariable(value = "id") Long id) {
-        Boolean isReport = commentService.report(id);
+        Boolean isReport = commentService.commentReport(id);
         return ResponseEntity.ok(ResultResponse.success(isReport));
     }
 }
diff --git a/backEnd/src/main/java/com/quiz/ourclass/domain/board/controller/CommentControllerDocs.java b/backEnd/src/main/java/com/quiz/ourclass/domain/board/controller/CommentControllerDocs.java
@@ -42,7 +42,7 @@ public interface CommentControllerDocs {
         }
     )
     @PostMapping
-    ResponseEntity<ResultResponse<Long>> write(
+    ResponseEntity<ResultResponse<Long>> commentWrite(
         @Parameter(name = "request", description = "댓글 작성 DTO", required = true, in = ParameterIn.DEFAULT)
         @RequestBody CommentRequest request
     );
@@ -61,7 +61,7 @@ ResponseEntity<ResultResponse<Long>> write(
         }
     )
     @PatchMapping("/{id}")
-    ResponseEntity<ResultResponse<Long>> modify(
+    ResponseEntity<ResultResponse<Long>> commentModify(
         @Parameter(name = "id", description = "댓글 PK 값", required = true, in = ParameterIn.PATH)
         @PathVariable(value = "id") Long id,
         @Parameter(name = "request", description = "댓글 수정 DTO", required = true, in = ParameterIn.DEFAULT)
@@ -82,7 +82,7 @@ ResponseEntity<ResultResponse<Long>> modify(
         }
     )
     @DeleteMapping("/{id}")
-    ResponseEntity<ResultResponse<Boolean>> delete(
+    ResponseEntity<ResultResponse<Boolean>> commentDelete(
         @Parameter(name = "id", description = "댓글 PK 값", required = true, in = ParameterIn.PATH)
         @PathVariable(value = "id") Long id
     );
@@ -106,7 +106,7 @@ ResponseEntity<ResultResponse<Boolean>> delete(
         }
     )
     @PostMapping("/{id}/report")
-    ResponseEntity<ResultResponse<Boolean>> report(
+    ResponseEntity<ResultResponse<Boolean>> commentReport(
         @Parameter(name = "id", description = "댓글 PK 값", required = true, in = ParameterIn.PATH)
         @PathVariable(value = "id") Long id
     );

diff --git a/backEnd/src/main/java/com/quiz/ourclass/domain/board/controller/PostController.java b/backEnd/src/main/java/com/quiz/ourclass/domain/board/controller/PostController.java
@@ -29,46 +29,47 @@ public class PostController implements PostControllerDocs {
     private final PostService postService;
 
     @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public ResponseEntity<ResultResponse<?>> write(
+    public ResponseEntity<ResultResponse<Long>> postWrite(
         @RequestParam("organizationId") Long organizationId,
         @RequestPart(value = "request") PostRequest request,
         @RequestPart(value = "file", required = false) MultipartFile file) {
-        Long postId = postService.write(organizationId, file, request);
+        Long postId = postService.postWrite(organizationId, file, request);
         return ResponseEntity.ok(ResultResponse.success(postId));
     }
 
     @PatchMapping(value = "/{id}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public ResponseEntity<ResultResponse<?>> modify(
+    public ResponseEntity<ResultResponse<Long>> postModify(
         @PathVariable(value = "id") Long id,
         @RequestPart(value = "request") UpdatePostRequest request,
         @RequestPart(value = "file", required = false) MultipartFile file) {
-        Long postId = postService.modify(id, file, request);
+        Long postId = postService.postModify(id, file, request);
         return ResponseEntity.ok(ResultResponse.success(postId));
     }
 
     @DeleteMapping(value = "{id}")
-    public ResponseEntity<ResultResponse<?>> delete(@PathVariable(value = "id") Long id) {
-        return ResponseEntity.ok(ResultResponse.success(postService.delete(id)));
+    public ResponseEntity<ResultResponse<Boolean>> postDelete(@PathVariable(value = "id") Long id) {
+        Boolean isDelete = postService.postDelete(id);
+        return ResponseEntity.ok(ResultResponse.success(isDelete));
     }
 
     @GetMapping(value = "/{id}")
-    public ResponseEntity<ResultResponse<?>> detailView(
+    public ResponseEntity<ResultResponse<PostDetailResponse>> postDetailView(
         @PathVariable(value = "id") Long id) {
-        PostDetailResponse response = postService.detailView(id);
+        PostDetailResponse response = postService.postDetailView(id);
         return ResponseEntity.ok(ResultResponse.success(response));
     }
 
     @PostMapping(value = "/{id}/report")
-    public ResponseEntity<ResultResponse<?>> report(
+    public ResponseEntity<ResultResponse<Boolean>> postReport(
         @PathVariable(value = "id") Long id) {
-        boolean isReport = postService.report(id);
+        boolean isReport = postService.postReport(id);
         return ResponseEntity.ok(ResultResponse.success(isReport));
     }
 
     @GetMapping
-    public ResponseEntity<ResultResponse<?>> listView(
+    public ResponseEntity<ResultResponse<PostListResponse>> postListView(
         PostSliceRequest request) {
-        PostListResponse response = postService.listView(request);
+        PostListResponse response = postService.postListView(request);
         return ResponseEntity.ok(ResultResponse.success(response));
     }
 }
diff --git a/backEnd/src/main/java/com/quiz/ourclass/domain/board/controller/PostControllerDocs.java b/backEnd/src/main/java/com/quiz/ourclass/domain/board/controller/PostControllerDocs.java
@@ -39,7 +39,7 @@ public interface PostControllerDocs {
             @ApiResponse(responseCode = "500", description = "(message : \"첨부한 파일이 S3에 업로드 되지 않았습니다.\")", content = @Content)
         })
     @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    ResponseEntity<ResultResponse<?>> write(
+    ResponseEntity<ResultResponse<Long>> postWrite(
         @Parameter(name = "organizationId", description = "단체 PK 값", required = true, in = ParameterIn.QUERY)
         @RequestParam("organizationId") Long classId,
         @Parameter(name = "request", description = "게시글 작성 DTO", required = true, in = ParameterIn.DEFAULT)
@@ -60,7 +60,7 @@ ResponseEntity<ResultResponse<?>> write(
         }
     )
     @PatchMapping(value = "/{id}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    ResponseEntity<ResultResponse<?>> modify(
+    ResponseEntity<ResultResponse<Long>> postModify(
         @Parameter(name = "id", description = "게시글 PK 값", required = true, in = ParameterIn.PATH)
         @PathVariable(value = "id") Long id,
         @Parameter(name = "request", description = "게시글 작성 DTO", required = true, in = ParameterIn.DEFAULT)
@@ -80,7 +80,7 @@ ResponseEntity<ResultResponse<?>> modify(
         }
     )
     @DeleteMapping(value = "{id}")
-    ResponseEntity<ResultResponse<?>> delete(
+    ResponseEntity<ResultResponse<Boolean>> postDelete(
         @Parameter(name = "id", description = "게시글 PK 값", required = true, in = ParameterIn.PATH)
         @PathVariable(value = "id") Long id
     );
@@ -99,7 +99,7 @@ ResponseEntity<ResultResponse<?>> delete(
         }
     )
     @GetMapping(value = "/{id}")
-    ResponseEntity<ResultResponse<?>> detailView(
+    ResponseEntity<ResultResponse<PostDetailResponse>> postDetailView(
         @Parameter(name = "id", description = "게시글 PK 값", required = true, in = ParameterIn.PATH)
         @PathVariable(value = "id") Long id
     );
@@ -123,7 +123,7 @@ ResponseEntity<ResultResponse<?>> detailView(
         }
     )
     @PostMapping(value = "/{id}/report")
-    ResponseEntity<ResultResponse<?>> report(
+    ResponseEntity<ResultResponse<Boolean>> postReport(
         @Parameter(name = "id", description = "게시글 PK 값", required = true, in = ParameterIn.PATH)
         @PathVariable(value = "id") Long id
     );
@@ -138,7 +138,7 @@ ResponseEntity<ResultResponse<?>> report(
         }
     )
     @GetMapping
-    ResponseEntity<ResultResponse<?>> listView(
+    ResponseEntity<ResultResponse<PostListResponse>> postListView(
         PostSliceRequest request
     );
 }
diff --git a/backEnd/src/main/java/com/quiz/ourclass/domain/board/mapper/CommentMapper.java b/backEnd/src/main/java/com/quiz/ourclass/domain/board/mapper/CommentMapper.java
@@ -21,7 +21,7 @@ public interface CommentMapper {
     CommentDTO commentToCommentDTOWithChildren(Comment comment, List<CommentChildrenDTO> children);
 
     @Mapping(source = "boardId", target = "post.id")
-    Comment CommentRequestTocomment(CommentRequest commentRequest);
+    Comment commentRequestTocomment(CommentRequest commentRequest);
 
     void updateCommentFromRequest(UpdateCommentRequest request, @MappingTarget Comment comment);
 

diff --git a/...n/java/com/quiz/ourclass/domain/board/repository/querydsl/PostRepositoryQuerydslImpl.java b/...n/java/com/quiz/ourclass/domain/board/repository/querydsl/PostRepositoryQuerydslImpl.java
@@ -50,7 +50,7 @@ public PostListResponse getPostList(PostSliceRequest request) {
             .leftJoin(post.comments, comment)
             .groupBy(post.id)
             .where(postCondition)
-            .limit(pageable.getPageSize() + 1)
+            .limit(pageable.getPageSize() + 1L)
             .offset(pageable.getOffset())
             .orderBy(post.id.desc())
             .fetch();

diff --git a/backEnd/src/main/java/com/quiz/ourclass/domain/board/sevice/CommentService.java b/backEnd/src/main/java/com/quiz/ourclass/domain/board/sevice/CommentService.java
@@ -5,11 +5,11 @@
 
 public interface CommentService {
 
-    Long write(CommentRequest request);
+    Long commentWrite(CommentRequest request);
 
-    Long modify(Long commentId, UpdateCommentRequest request);
+    Long commentModify(Long commentId, UpdateCommentRequest request);
 
-    Boolean delete(Long commentId);
-    
-    Boolean report(Long commentId);
+    Boolean commentDelete(Long commentId);
+
+    Boolean commentReport(Long commentId);
 }