From 44187adb68403cd9f1030620e315ae730c2021d7 Mon Sep 17 00:00:00 2001 From: sungchae Date: Wed, 27 Aug 2025 16:09:00 +0900 Subject: [PATCH 01/10] =?UTF-8?q?=C3=AC=EC=9E=84=EC=8B=9C=20=EC=BB=A4?= =?UTF-8?q?=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 3 + .gitignore | 37 +++ .gradle/8.14.3/checksums/checksums.lock | Bin 0 -> 17 bytes .../executionHistory/executionHistory.lock | Bin 0 -> 17 bytes .gradle/8.14.3/fileChanges/last-build.bin | Bin 0 -> 1 bytes .gradle/8.14.3/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes .gradle/8.14.3/gc.properties | 0 .../buildOutputCleanup.lock | Bin 0 -> 17 bytes .gradle/buildOutputCleanup/cache.properties | 2 + .gradle/vcs-1/gc.properties | 0 HELP.md | 47 ++++ build.gradle | 48 ++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 251 ++++++++++++++++++ gradlew.bat | 94 +++++++ settings.gradle | 1 + .../controller/CommentController.java | 86 ++++++ .../example/issueDive/dto/CommentRequest.java | 4 + .../issueDive/dto/CommentResponse.java | 4 + .../com/example/issueDive/entity/Comment.java | 47 ++++ .../repository/CommentRepository.java | 16 ++ .../issueDive/service/CommentService.java | 125 +++++++++ src/main/resources/application.properties | 1 + 24 files changed, 773 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .gradle/8.14.3/checksums/checksums.lock create mode 100644 .gradle/8.14.3/executionHistory/executionHistory.lock create mode 100644 .gradle/8.14.3/fileChanges/last-build.bin create mode 100644 .gradle/8.14.3/fileHashes/fileHashes.lock create mode 100644 .gradle/8.14.3/gc.properties create mode 100644 .gradle/buildOutputCleanup/buildOutputCleanup.lock create mode 100644 .gradle/buildOutputCleanup/cache.properties create mode 100644 .gradle/vcs-1/gc.properties create mode 100644 HELP.md create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/example/issueDive/controller/CommentController.java create mode 100644 src/main/java/com/example/issueDive/dto/CommentRequest.java create mode 100644 src/main/java/com/example/issueDive/dto/CommentResponse.java create mode 100644 src/main/java/com/example/issueDive/entity/Comment.java create mode 100644 src/main/java/com/example/issueDive/repository/CommentRepository.java create mode 100644 src/main/java/com/example/issueDive/service/CommentService.java create mode 100644 src/main/resources/application.properties diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/.gradle/8.14.3/checksums/checksums.lock b/.gradle/8.14.3/checksums/checksums.lock new file mode 100644 index 0000000000000000000000000000000000000000..0cb0f1b92daf33f285f31c78fce9caa90a28ed0a GIT binary patch literal 17 TcmZSPe$Kc;xA=`G0~7!NDd_`r literal 0 HcmV?d00001 diff --git a/.gradle/8.14.3/executionHistory/executionHistory.lock b/.gradle/8.14.3/executionHistory/executionHistory.lock new file mode 100644 index 0000000000000000000000000000000000000000..8c1957c14b211d65fe1aecdf189470020bf480aa GIT binary patch literal 17 ScmZQJ(>>6buHqZP00jUe&H~r~ literal 0 HcmV?d00001 diff --git a/.gradle/8.14.3/fileChanges/last-build.bin b/.gradle/8.14.3/fileChanges/last-build.bin new file mode 100644 index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d GIT binary patch literal 1 IcmZPo000310RR91 literal 0 HcmV?d00001 diff --git a/.gradle/8.14.3/fileHashes/fileHashes.lock b/.gradle/8.14.3/fileHashes/fileHashes.lock new file mode 100644 index 0000000000000000000000000000000000000000..9c2b2b2fa646f316cc194d700610da45dc739b2e GIT binary patch literal 17 TcmZQBKYnrIdDBnV8K3|FLnZ}r literal 0 HcmV?d00001 diff --git a/.gradle/8.14.3/gc.properties b/.gradle/8.14.3/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000000000000000000000000000000000000..e92d782ae13cde85b05408b9b55f63c3cede67a0 GIT binary patch literal 17 UcmZSHG$eqJB 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..1f19b78 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'issueDive' diff --git a/src/main/java/com/example/issueDive/controller/CommentController.java b/src/main/java/com/example/issueDive/controller/CommentController.java new file mode 100644 index 0000000..bc68673 --- /dev/null +++ b/src/main/java/com/example/issueDive/controller/CommentController.java @@ -0,0 +1,86 @@ +package com.example.issueDive.controller; + +import com.example.issueDive.dto.CommentResponse; +import com.example.issueDive.service.CommentService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/issues/{issues_id}/comments") +public class CommentController { + private final CommentService commentService; + + @GetMapping + public ResponseEntity> getComment(@PathVariable Long issueId){ + + } + + @PostMapping + public ResponseEntity createComment(){ + + } + + @PatchMapping("/{commentId}") + public ResponseEntity updateComment(){ + + } + + @DeleteMapping("/{commentId}") + public ResponseEntity deleteComment(){ + + } + + @GetMapping("/count") + public ResponseEntity countComment(){ + + } +} +//package com.BugJava.EduConnect.assignment.controller; +//import com.BugJava.EduConnect.assignment.dto.AssignmentCommentRequest; +//import com.BugJava.EduConnect.assignment.dto.AssignmentCommentResponse; +//import com.BugJava.EduConnect.assignment.service.AssignmentCommentService; +// +//import jakarta.validation.Valid; +//import lombok.RequiredArgsConstructor; +//import org.springframework.http.ResponseEntity; +//import org.springframework.security.core.annotation.AuthenticationPrincipal; +//import org.springframework.web.bind.annotation.*; +// +// import java.net.URI; +// +//@RestController +//@RequestMapping("/api/assignments/{assignmentId}/comments") +//@RequiredArgsConstructor +//public class AssignmentCommentController { +// +// private final AssignmentCommentService assignmentCommentService; +// +// //댓글 생성 +// @PostMapping +// public ResponseEntity createComment(@PathVariable Long assignmentId, @Valid @RequestBody AssignmentCommentRequest request, +// @AuthenticationPrincipal Long userId){ +// +// AssignmentCommentResponse created = assignmentCommentService.createComment(assignmentId, request, userId); +// +// URI location = URI.create("/api/assignments/" + assignmentId + "/comments/" + created.getId()); +// return ResponseEntity.created(location).body(created); +// } +// +// //댓글 수정 +// @PatchMapping("/{id}") +// public ResponseEntity updateComment(@PathVariable Long id, @RequestBody @Valid AssignmentCommentRequest request, +// @AuthenticationPrincipal Long userId) { +// return ResponseEntity.ok(assignmentCommentService.updateComment(id, request, userId)); +// } +// +// //댓글 삭제 +// @DeleteMapping("/{id}") +// public ResponseEntity deleteComment(@PathVariable Long id, @AuthenticationPrincipal Long userId){ +// assignmentCommentService.deleteComment(id, userId); +// return ResponseEntity.noContent().build(); +// } +//} \ No newline at end of file diff --git a/src/main/java/com/example/issueDive/dto/CommentRequest.java b/src/main/java/com/example/issueDive/dto/CommentRequest.java new file mode 100644 index 0000000..212bd65 --- /dev/null +++ b/src/main/java/com/example/issueDive/dto/CommentRequest.java @@ -0,0 +1,4 @@ +package com.example.issueDive.dto; + +public class CommentRequest { +} diff --git a/src/main/java/com/example/issueDive/dto/CommentResponse.java b/src/main/java/com/example/issueDive/dto/CommentResponse.java new file mode 100644 index 0000000..3bcd6ca --- /dev/null +++ b/src/main/java/com/example/issueDive/dto/CommentResponse.java @@ -0,0 +1,4 @@ +package com.example.issueDive.dto; + +public class CommentResponse { +} diff --git a/src/main/java/com/example/issueDive/entity/Comment.java b/src/main/java/com/example/issueDive/entity/Comment.java new file mode 100644 index 0000000..99d29d5 --- /dev/null +++ b/src/main/java/com/example/issueDive/entity/Comment.java @@ -0,0 +1,47 @@ +package com.example.issueDive.entity; + +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table(name = "comments") +@Getter +@Setter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +@Builder +public class Comment { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + // 어떤 이슈에 달린 댓글인지 + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "issue_id", nullable = false) + private Issue issue; + + // 댓글 작성자 + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private User user; + + // 댓글 내용 + @Lob + @Column(nullable = false) + private String description; + + // 부모 댓글 (null이면 일반 댓글, 있으면 대댓글) + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "parent_id") + private Comment parent; + + // 자식 댓글들 (대댓글 리스트) + @Builder.Default + @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, orphanRemoval = true) + private List children = new ArrayList<>(); + +} diff --git a/src/main/java/com/example/issueDive/repository/CommentRepository.java b/src/main/java/com/example/issueDive/repository/CommentRepository.java new file mode 100644 index 0000000..5f3d82e --- /dev/null +++ b/src/main/java/com/example/issueDive/repository/CommentRepository.java @@ -0,0 +1,16 @@ +package com.example.issueDive.repository; +import com.example.issueDive.entity.Comment; +import org.springframework.data.jpa.repository.EntityGraph; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; + +public interface CommentRepository extends JpaRepository { + + List findAllByIssueIdWithAuthor(Long issueId); + long countByIssueId(Long issueId); + + @EntityGraph(attributePaths = {"user", ""}) + Optional findById(Long id); +} diff --git a/src/main/java/com/example/issueDive/service/CommentService.java b/src/main/java/com/example/issueDive/service/CommentService.java new file mode 100644 index 0000000..211ce0d --- /dev/null +++ b/src/main/java/com/example/issueDive/service/CommentService.java @@ -0,0 +1,125 @@ +package com.example.issueDive.service; + + +import com.example.issueDive.dto.CommentRequest; +import com.example.issueDive.dto.CommentResponse; +import com.example.issueDive.entity.Comment; +import com.example.issueDive.repository.CommentRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class CommentService { + private final CommentRepository commentRepository; + private final UserRepository userRepository; + private final IssueRepository issueRepository; + + @Transactional + public CommentResponse createComment(Long issueId, CommentRequest request, Long userId){ + User user = userRepository.findById(userId) + .orElseThrow(() -> new UserNotFoundException("사용자를 찾을 수 없습니다.")); + Issue issue = IssueRepository.findById(issueId) + .orElseThrow(() -> new CommentNotFoundException("댓글을 찾을 수 없습니다.")); + + Comment.CommentBuilder commentBuilder = Comment.builder() + .description(request.getDecription()) + .user(user) + .issue(issue); + + if(request.getParentId() != null){ + Comment parent = commentRepository.findById(request.getParentId()) + .orElseThrow(() -> new CommentNotFoundException("부모 댓글을 찾을 수 없습니다.")); + + if(!parent.getIssue().getId().equals(issueId)){ + throw new CommentNotFoundException("부모 댓글과 같은 이슈의 댓글입니다."); + } + + commentBuilder.parent(parent); + } + Comment comment = commentBuilder.build(); + + Comment saved = commentRepository.save(comment); + return CommentResponse.from(saved); + } + + @Transactional + public CommentResponse updateComment(Long id, CommentRequest request, Long userId){ + Comment comment = commentRepository.findById(id) + .orElseThrow(() -> new CommentNotFoundException("댓글을 찾을 수 없습니다.")); + + comment.setDescription(request.getDescription()); + return CommentResponse.from(comment); + } + + @Transactional + public void deleteComment(Long id, Long userId){ + Comment comment = commentRepository.findById(id) + .orElseThrow(() -> new CommentNotFoundException("댓글을 찾을 수 없습니다.")); + + commentRepository.delete(comment); + } + + +} + +//private final AssignmentCommentRepository commentRepository; +//private final AssignmentRepository assignmentRepository; +//private final UserRepository userRepository; +//private final AuthorizationUtil authorizationUtil; +// +//댓글 등록 +//@Transactional +//public AssignmentCommentResponse createComment(Long assignmentId, AssignmentCommentRequest request, Long userId){ +// Users user = userRepository.findById(userId) +// .orElseThrow(() -> new UserNotFoundException("사용자를 찾을 수 없습니다. (ID: " + userId + ")")); // 수정 +// Assignment assignment = assignmentRepository.findById(assignmentId) +// .orElseThrow(() -> new AssignmentNotFoundException("게시글을 찾을 수 없습니다. (ID: " + assignmentId + ")")); +// +// AssignmentComment.AssignmentCommentBuilder commentBuilder = AssignmentComment.builder() +// .content(request.getContent()) +// .user(user) +// .assignment(assignment); +// +// // 대댓글인 경우 부모 댓글 설정 +// if (request.getParentId() != null) { +// AssignmentComment parent = commentRepository.findById(request.getParentId()) +// .orElseThrow(() -> new AssignmentCommentNotFoundException("대댓글의 부모 댓글을 찾을 수 없습니다. (ID: " + request.getParentId() + ")")); +// +// // 부모 댓글이 같은 게시글의 댓글인지 확인 +// if (!parent.getAssignment().getId().equals(assignmentId)) { +// throw new AssignmentCommentNotFoundException("부모 댓글이 다른 과제에 속해있습니다."); +// } +// +// commentBuilder.parent(parent); +// } +// +// AssignmentComment comment = commentBuilder.build(); +// +// AssignmentComment saved = commentRepository.save(comment); +// return AssignmentCommentResponse.from(saved); +//} +// +////댓글 수정 +//@Transactional +//public AssignmentCommentResponse updateComment(Long id, AssignmentCommentRequest request, Long userId){ +// AssignmentComment comment = commentRepository.findById(id) +// .orElseThrow(() -> new AssignmentCommentNotFoundException("댓글을 찾을 수 없습니다.")); +// +// authorizationUtil.checkOwnerOrAdmin(comment.getUser().getId()); +// +// comment.setContent(request.getContent()); +// +// return AssignmentCommentResponse.from(comment); +//} +// +////댓글 삭제 +//@Transactional +//public void deleteComment(Long id, Long userId){ +// AssignmentComment comment = commentRepository.findById(id) +// .orElseThrow(() -> new AssignmentCommentNotFoundException("댓글을 찾을 수 없습니다.")); +// +// authorizationUtil.checkOwnerOrAdmin(comment.getUser().getId()); +// +// commentRepository.delete(comment); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..39657fe --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=issueDive From edc4da9f8847a999f2246a93d392213fedf8c989 Mon Sep 17 00:00:00 2001 From: sungchae Date: Thu, 28 Aug 2025 10:16:38 +0900 Subject: [PATCH 02/10] =?UTF-8?q?[#1]=20feat:=20Comment=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B0=9C=EB=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommentController.java | 26 +++++++++++++------ .../example/issueDive/dto/CommentRequest.java | 4 --- .../issueDive/dto/CommentResponse.java | 24 +++++++++++++++++ .../issueDive/dto/CreateCommentRequest.java | 12 +++++++++ .../issueDive/dto/UpdateCommentRequest.java | 13 ++++++++++ .../com/example/issueDive/entity/Comment.java | 6 +---- .../exception/CommentNotFoundException.java | 4 +++ .../repository/CommentRepository.java | 4 +-- .../issueDive/service/CommentService.java | 21 ++++++++++----- 9 files changed, 89 insertions(+), 25 deletions(-) delete mode 100644 src/main/java/com/example/issueDive/dto/CommentRequest.java create mode 100644 src/main/java/com/example/issueDive/dto/CreateCommentRequest.java create mode 100644 src/main/java/com/example/issueDive/dto/UpdateCommentRequest.java create mode 100644 src/main/java/com/example/issueDive/exception/CommentNotFoundException.java diff --git a/src/main/java/com/example/issueDive/controller/CommentController.java b/src/main/java/com/example/issueDive/controller/CommentController.java index bc68673..4172ded 100644 --- a/src/main/java/com/example/issueDive/controller/CommentController.java +++ b/src/main/java/com/example/issueDive/controller/CommentController.java @@ -1,8 +1,12 @@ package com.example.issueDive.controller; import com.example.issueDive.dto.CommentResponse; +import com.example.issueDive.dto.CreateCommentRequest; +import com.example.issueDive.dto.UpdateCommentRequest; import com.example.issueDive.service.CommentService; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -16,27 +20,33 @@ public class CommentController { @GetMapping public ResponseEntity> getComment(@PathVariable Long issueId){ - + List tree = commentService.getTreeByIssue(issueId); + return ResponseEntity.ok(tree); } @PostMapping - public ResponseEntity createComment(){ + public ResponseEntity createComment(@PathVariable Long issueId, @RequestBody @Valid CreateCommentRequest request){ + CommentResponse created = commentService.createComment(issueId, request); + return ResponseEntity.status(HttpStatus.CREATED).body(created); } @PatchMapping("/{commentId}") - public ResponseEntity updateComment(){ - + public ResponseEntity updateComment(@PathVariable Long commentId, @RequestBody @Valid UpdateCommentRequest request){ + CommentResponse updated = commentService.updateComment(commentId, request); + return ResponseEntity.ok(updated); } @DeleteMapping("/{commentId}") - public ResponseEntity deleteComment(){ - + public ResponseEntity deleteComment(@PathVariable Long commentId){ + commentService.deleteComment(commentId); + return ResponseEntity.noContent().build(); } @GetMapping("/count") - public ResponseEntity countComment(){ - + public ResponseEntity countComment(@PathVariable Long issueId){ + long count = commentService.countByIssue(issueId); + return ResponseEntity.ok(count); } } //package com.BugJava.EduConnect.assignment.controller; diff --git a/src/main/java/com/example/issueDive/dto/CommentRequest.java b/src/main/java/com/example/issueDive/dto/CommentRequest.java deleted file mode 100644 index 212bd65..0000000 --- a/src/main/java/com/example/issueDive/dto/CommentRequest.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.issueDive.dto; - -public class CommentRequest { -} diff --git a/src/main/java/com/example/issueDive/dto/CommentResponse.java b/src/main/java/com/example/issueDive/dto/CommentResponse.java index 3bcd6ca..99f9cd4 100644 --- a/src/main/java/com/example/issueDive/dto/CommentResponse.java +++ b/src/main/java/com/example/issueDive/dto/CommentResponse.java @@ -1,4 +1,28 @@ package com.example.issueDive.dto; +import lombok.*; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +@Getter +@Setter +@Builder +@AllArgsConstructor +@NoArgsConstructor public class CommentResponse { + + private Long id; + private Long issueId; + private Long userId; + private String author; + private String content; + private Long parentId; + private LocalDateTime createdAt; + private LocalDateTime updatedAt; + @Builder.Default + private List children = new ArrayList<>(); + + } diff --git a/src/main/java/com/example/issueDive/dto/CreateCommentRequest.java b/src/main/java/com/example/issueDive/dto/CreateCommentRequest.java new file mode 100644 index 0000000..a939797 --- /dev/null +++ b/src/main/java/com/example/issueDive/dto/CreateCommentRequest.java @@ -0,0 +1,12 @@ +package com.example.issueDive.dto; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class CreateCommentRequest { + @NotBlank + private String content; + private Long parentId; +} diff --git a/src/main/java/com/example/issueDive/dto/UpdateCommentRequest.java b/src/main/java/com/example/issueDive/dto/UpdateCommentRequest.java new file mode 100644 index 0000000..993cf06 --- /dev/null +++ b/src/main/java/com/example/issueDive/dto/UpdateCommentRequest.java @@ -0,0 +1,13 @@ +package com.example.issueDive.dto; + +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class UpdateCommentRequest { + + @NotBlank + private String content; +} diff --git a/src/main/java/com/example/issueDive/entity/Comment.java b/src/main/java/com/example/issueDive/entity/Comment.java index 99d29d5..c1ba5aa 100644 --- a/src/main/java/com/example/issueDive/entity/Comment.java +++ b/src/main/java/com/example/issueDive/entity/Comment.java @@ -19,29 +19,25 @@ public class Comment { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - // 어떤 이슈에 달린 댓글인지 @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "issue_id", nullable = false) private Issue issue; - // 댓글 작성자 @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id", nullable = false) private User user; - // 댓글 내용 @Lob @Column(nullable = false) private String description; - // 부모 댓글 (null이면 일반 댓글, 있으면 대댓글) @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "parent_id") private Comment parent; - // 자식 댓글들 (대댓글 리스트) @Builder.Default @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, orphanRemoval = true) private List children = new ArrayList<>(); + public void changeDescription(String content) { this.description = description; } } diff --git a/src/main/java/com/example/issueDive/exception/CommentNotFoundException.java b/src/main/java/com/example/issueDive/exception/CommentNotFoundException.java new file mode 100644 index 0000000..8d960e1 --- /dev/null +++ b/src/main/java/com/example/issueDive/exception/CommentNotFoundException.java @@ -0,0 +1,4 @@ +package com.example.issueDive.exception; + +public class CommentNotFoundException { +} diff --git a/src/main/java/com/example/issueDive/repository/CommentRepository.java b/src/main/java/com/example/issueDive/repository/CommentRepository.java index 5f3d82e..ee9cede 100644 --- a/src/main/java/com/example/issueDive/repository/CommentRepository.java +++ b/src/main/java/com/example/issueDive/repository/CommentRepository.java @@ -9,8 +9,8 @@ public interface CommentRepository extends JpaRepository { List findAllByIssueIdWithAuthor(Long issueId); + long countByIssueId(Long issueId); - @EntityGraph(attributePaths = {"user", ""}) - Optional findById(Long id); + boolean existsByIdAndUser_Id(Long commentId, Long userId); } diff --git a/src/main/java/com/example/issueDive/service/CommentService.java b/src/main/java/com/example/issueDive/service/CommentService.java index 211ce0d..658b778 100644 --- a/src/main/java/com/example/issueDive/service/CommentService.java +++ b/src/main/java/com/example/issueDive/service/CommentService.java @@ -1,10 +1,14 @@ package com.example.issueDive.service; - -import com.example.issueDive.dto.CommentRequest; import com.example.issueDive.dto.CommentResponse; +import com.example.issueDive.dto.CreateCommentRequest; +import com.example.issueDive.dto.UpdateCommentRequest; import com.example.issueDive.entity.Comment; +import com.example.issueDive.entity.Issue; +import com.example.issueDive.entity.User; import com.example.issueDive.repository.CommentRepository; +import com.example.issueDive.repository.IssueRepository; +import com.example.issueDive.repository.UserRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -17,14 +21,14 @@ public class CommentService { private final IssueRepository issueRepository; @Transactional - public CommentResponse createComment(Long issueId, CommentRequest request, Long userId){ + public CommentResponse createComment(Long issueId, CreateCommentRequest request, Long userId){ User user = userRepository.findById(userId) .orElseThrow(() -> new UserNotFoundException("사용자를 찾을 수 없습니다.")); Issue issue = IssueRepository.findById(issueId) .orElseThrow(() -> new CommentNotFoundException("댓글을 찾을 수 없습니다.")); Comment.CommentBuilder commentBuilder = Comment.builder() - .description(request.getDecription()) + .description(request.getDescription()) .user(user) .issue(issue); @@ -45,11 +49,11 @@ public CommentResponse createComment(Long issueId, CommentRequest request, Long } @Transactional - public CommentResponse updateComment(Long id, CommentRequest request, Long userId){ + public CommentResponse updateComment(Long id, UpdateCommentRequest request, Long userId){ Comment comment = commentRepository.findById(id) .orElseThrow(() -> new CommentNotFoundException("댓글을 찾을 수 없습니다.")); - comment.setDescription(request.getDescription()); + comment.changeDescription(request.getDescription()); return CommentResponse.from(comment); } @@ -61,6 +65,11 @@ public void deleteComment(Long id, Long userId){ commentRepository.delete(comment); } + @Transactional(readOnly = true) + public long countByIssue(Long issueId) { + return commentRepository.countByIssueId(issueId); + } + } From 16231975de7c0591d174fa5a74101c11b8d40672 Mon Sep 17 00:00:00 2001 From: sungchae Date: Thu, 28 Aug 2025 14:07:15 +0900 Subject: [PATCH 03/10] =?UTF-8?q?[#1]=20Feat:=20Comment=20API=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 0 -> 6148 bytes .gradle/8.14.3/checksums/checksums.lock | Bin 17 -> 17 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/8.14.3/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes src/.DS_Store | Bin 0 -> 6148 bytes src/main/.DS_Store | Bin 0 -> 6148 bytes src/main/java/.DS_Store | Bin 0 -> 6148 bytes src/main/java/com/.DS_Store | Bin 0 -> 6148 bytes .../controller/CommentController.java | 84 +++-------- .../com/issueDive/dto/CommentResponse.java | 52 ++++++- .../issueDive/dto/CountCommentResponse.java | 13 ++ .../issueDive/dto/CreateCommentRequest.java | 4 +- .../issueDive/dto/UpdateCommentRequest.java | 4 +- .../java/com/issueDive/entity/Comment.java | 11 +- .../exception/CommentNotFoundException.java | 12 +- .../com/issueDive/exception/ErrorCode.java | 2 +- .../exception/GlobalExceptionHandler.java | 26 +++- .../exception/UserNotFoundException.java | 10 ++ .../repository/CommentRepository.java | 8 +- .../com/issueDive/service/CommentService.java | 131 +++++++----------- src/test/.DS_Store | Bin 0 -> 6148 bytes src/test/java/.DS_Store | Bin 0 -> 6148 bytes src/test/java/com/.DS_Store | Bin 0 -> 6148 bytes src/test/java/com/issueDive/.DS_Store | Bin 0 -> 6148 bytes 25 files changed, 196 insertions(+), 161 deletions(-) create mode 100644 .DS_Store create mode 100644 src/.DS_Store create mode 100644 src/main/.DS_Store create mode 100644 src/main/java/.DS_Store create mode 100644 src/main/java/com/.DS_Store create mode 100644 src/main/java/com/issueDive/dto/CountCommentResponse.java create mode 100644 src/main/java/com/issueDive/exception/UserNotFoundException.java create mode 100644 src/test/.DS_Store create mode 100644 src/test/java/.DS_Store create mode 100644 src/test/java/com/.DS_Store create mode 100644 src/test/java/com/issueDive/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0b6a196b78efe55acc23c46dbf6fe8ed8e8fc9c7 GIT binary patch literal 6148 zcmeHK%}&BV5S|5u5@NzZ6ONmBB@snTh?fTO1+3A78f-1W#@Zzm&_Z z7bAjKwJ)7=aHVEPub3U>HZ~xY2kOxqM-xSaM2E#kuzG)YKdM<4M}_N0+oZ zQz{M?b3Ztb`qN%@>sTdYKT7%|9T0_mbh)~Sl2A=MYLbMhj`hrjQ+CR|YHc=aHClDq zY`5lhIcx7X>hhp@IG>lD?Va7D)82jjkfi(bTFeaM4vH|Lh$d9n7DJeDv`g#fTFeZZa1gfn5cbW&b|^x>9iK0? zI|$bxkIVowu*^W-EUQ%iPrmN|mxFl43@`(KiUCpRdfg7DWNYh6a#U+2>J2Ih`DF&* kLvW%?G5S&|uAyo{yQB%CYcVs378L#w&@}MC416mCZ{e1QD*ylh literal 0 HcmV?d00001 diff --git a/.gradle/8.14.3/checksums/checksums.lock b/.gradle/8.14.3/checksums/checksums.lock index 0cb0f1b92daf33f285f31c78fce9caa90a28ed0a..461b61cd969d3ab993a09a28df590e2df28f7fab 100644 GIT binary patch literal 17 UcmZSPe$Kc;xA=`G0|ZP304jb22><{9 literal 17 TcmZSPe$Kc;xA=`G0~7!NDd_`r diff --git a/.gradle/8.14.3/executionHistory/executionHistory.lock b/.gradle/8.14.3/executionHistory/executionHistory.lock index 8c1957c14b211d65fe1aecdf189470020bf480aa..ff924365e5ed45bf0f20aee5891d34abfaf0106a 100644 GIT binary patch literal 17 TcmZQJ(>>6buHqZP00ArjBhmug literal 17 ScmZQJ(>>6buHqZP00jUe&H~r~ diff --git a/.gradle/8.14.3/fileHashes/fileHashes.lock b/.gradle/8.14.3/fileHashes/fileHashes.lock index d39bce9ac5f62ce8bb92052bc7f23b56c2f8a326..4bed5fe7081cc1a294397e11676e5b3f1a6a33f0 100644 GIT binary patch literal 17 UcmZQBKYnrIdDBnV86cn^07JC~00000 literal 17 UcmZQBKYnrIdDBnV86bcO07EDRa{vGU diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index e92d782ae13cde85b05408b9b55f63c3cede67a0..f4390fab0499d6fc3ee246559f189d034f73bec9 100644 GIT binary patch literal 17 UcmZSHIdnU_&v_- zZcA&m$09ldvu}5HCgHt=Yz6>Cqt~helmNg*CoB|k_{M0Te8vhk;vfpTM%Ygu!&rs5 zexJ$az;9H5o}B|72q1!F^7)02ag=72%7-W{Im;`n?y9@y-uU;b?`J{QOB+G=idN@J z#o=fkgcnh}-z;q$t0W7eq}|m8QLBw9*OyV!QvHVNC9PD~`ewr|y2WN`doZY1>Sb9w ztPjg_aJW|~%l+EHa9DIVcXp4?nh$X&Q7=YBf$y8Pb&Df-#mSh@liy8ZmE2*B@*T*a z4Jl+3Jl_`1a|?M^t7TcQ&Y}5i`20wdWEj)=LerG;$O^CmtiT)v>^Ib1o0G#^tN<(U zKNXl^VOtDg$}ui&o@X&P zXv#s@=0n&!3)`UxeRsUR)af8RgFLbVtiZGaOJ-T3^Z)ec{(riNSF8Xl@TU|I&WV50 zKuY#(ogqhOtwg^?C!@UF;J5@Q`Y6U+I*PZ^wP9S+1ktmY8^j12{|IOqcwhwCa literal 0 HcmV?d00001 diff --git a/src/main/.DS_Store b/src/main/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4b9d0b7b9a8d2e8d41b05aa0b55cfc049bc181cd GIT binary patch literal 6148 zcmeHK%}T>S5T0$TO(;SS3Oz1(Em*A;ikDF93mDOZN=8b<1aEm->v}95WpCM@82)%$5A@0)jmZoU)b6%Iz^}C-1$#x;tzx2C~XCU8=74z z6^C;>2(O~vq*LBKQ^_!hlHNckMBN^S++IgXS4~=Klyp;_>zf6~b=*$5GMzSRjjF6S z8?&mMHjipmd0ao4&0J@1|KRkZ^Af)%>dlZS@PE^?V{s1eXe{a(`-3D_$s_tG-h~15 zAO!^@v>wR*Clzm~Y^C-&Ka9)(Gr$ZG19lH}N=yeczzi@0D-6*7AW;cDiab>N^| z07SY*YC)TN3CfWcJ&Tz^TtN{g715*$+hPclj(%z5Jd2q@lMcc*AHu#_*bYVLx8w7r z4hP{Gw|K%i}F$2uNzhXcX+J3u*CE2retvEVsCF(sY3B_dw l7b$4yqZni9D6XJtLBAve(X*HtL=OsI1T+miFay8Jz!$AeilzVn literal 0 HcmV?d00001 diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..265290983d4d2eae6f7934ee1b86d688972a9c41 GIT binary patch literal 6148 zcmeHK%}T>S5Z<-brW7Fug&r5Y7L3*k#Y>3w1&ruHr6#6mFwK@GHHT8jSzpK}@p+ut z-GIfMMeGdhe)GGV{UH0p7~|d|I%3Rbj9JhSIVv@R?%L3nNk-&2Mm7r*8G`i@&P?pD z1AcphJu=CrVe$R@lQ_#A=aX+Wn%g@qt7Ubpd;eJ$ejenD%nRnXXkAH}gq0qI*YTtn z+k59S&4W0d%vC`gO(5m&CQc(+cyf_OnX2`5z-n9VvE5xR2hN};`oqDhCziuwrzcMO zr>j-l+CMlvyBxnH(^S4`IytbdWY=H?@1U5~y!!Jrk?9k7s_ZI@kQg8ahyh|?vl%ew zg4Nk<8ff*z05MR*0PYV08lr2k)Tp)&=7p`UpzfkFnyBet{28e-m1{&J5@%+DlU#9kvzg|KX zF+dFbGX{8b=84k**5rxIi89T!W=X90mQV Q9FQ&oiV*6EfnQ+Y3)+%Nb^rhX literal 0 HcmV?d00001 diff --git a/src/main/java/com/.DS_Store b/src/main/java/com/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..af95c32dd629605868c812ed00fbb7f34c4f4682 GIT binary patch literal 6148 zcmeHKPfNov6i>G4T86NL!j1v21FLhw@KWmh0#@{(GFMi#SevnS>tPIf)-U8I@$>jz zl8R#!Jc+pX%F8c#e;V>j$!i#6+?$RL8EZ1eEKtOX4b2)sKkAB9j0KUacZ96ZA~s`T zkgr6O;V&|PduPL*rSMGIm;Fn}K`aCCz6IkrN;AiK=ap)0YrAgMt%h~yKg!(ChS@ar zhLal{T}l}TWq%l4MPWW@?w-jc8%9YuQ3=r~gpk|oC>hDzlhb6Bs$5??EZedN&DMP0 zb-HcQ>2()vG4CBYZE@T=SuAX8Z~x%*V(=6{C-Ozp$>GaWvSYA>SLm!++036Lu}mJo zTV|FSgv03;4E&e@JRbxoqHD0wsE!V3@b?k@HAEEX<6Qz# z7<3I58o>j?bt<4v<>rdPbvoFEiE|AW8g)A3YG!zknVFj#3Rkm(U8r!zU5(Td1H`~G z164h2V*Nk={{Fw5L?dE=82DEV@LJ#Rd$1%^TUQo`wN`-MgQ8$uq46^XI;s>yESBOH bs1mRX>;Sq33yoj_p&tQ712x3JuQKof4~$JC literal 0 HcmV?d00001 diff --git a/src/main/java/com/issueDive/controller/CommentController.java b/src/main/java/com/issueDive/controller/CommentController.java index 4172ded..b5a49b8 100644 --- a/src/main/java/com/issueDive/controller/CommentController.java +++ b/src/main/java/com/issueDive/controller/CommentController.java @@ -1,9 +1,7 @@ -package com.example.issueDive.controller; +package com.issueDive.controller; -import com.example.issueDive.dto.CommentResponse; -import com.example.issueDive.dto.CreateCommentRequest; -import com.example.issueDive.dto.UpdateCommentRequest; -import com.example.issueDive.service.CommentService; +import com.issueDive.dto.*; +import com.issueDive.service.CommentService; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -14,83 +12,39 @@ @RestController @RequiredArgsConstructor -@RequestMapping("/issues/{issues_id}/comments") +@RequestMapping("/issues/{issueId}/comments") public class CommentController { private final CommentService commentService; @GetMapping - public ResponseEntity> getComment(@PathVariable Long issueId){ + public ResponseEntity>> getComment(@PathVariable Long issueId){ List tree = commentService.getTreeByIssue(issueId); - return ResponseEntity.ok(tree); + return ResponseEntity.ok(ApiResponse.ok(tree)); } @PostMapping - public ResponseEntity createComment(@PathVariable Long issueId, @RequestBody @Valid CreateCommentRequest request){ + public ResponseEntity> createComment(@PathVariable Long issueId, @RequestBody @Valid CreateCommentRequest request + ,@RequestHeader("X-USER-ID") Long userId){ - CommentResponse created = commentService.createComment(issueId, request); - return ResponseEntity.status(HttpStatus.CREATED).body(created); + CommentResponse created = commentService.createComment(issueId, request, userId); + return ResponseEntity.status(HttpStatus.CREATED).body(ApiResponse.ok(created)); } @PatchMapping("/{commentId}") - public ResponseEntity updateComment(@PathVariable Long commentId, @RequestBody @Valid UpdateCommentRequest request){ - CommentResponse updated = commentService.updateComment(commentId, request); - return ResponseEntity.ok(updated); + public ResponseEntity> updateComment(@PathVariable Long issueId, @PathVariable Long commentId, @RequestBody @Valid UpdateCommentRequest request, @RequestHeader("X-USER-ID") Long userId){ + CommentResponse updated = commentService.updateComment(issueId, commentId, request, userId); + return ResponseEntity.ok(ApiResponse.ok(updated)); } @DeleteMapping("/{commentId}") - public ResponseEntity deleteComment(@PathVariable Long commentId){ - commentService.deleteComment(commentId); + public ResponseEntity deleteComment(@PathVariable Long issueId, @PathVariable Long commentId, @RequestHeader("X-USER-ID") Long userId){ + commentService.deleteComment(issueId, commentId, userId); return ResponseEntity.noContent().build(); } @GetMapping("/count") - public ResponseEntity countComment(@PathVariable Long issueId){ - long count = commentService.countByIssue(issueId); - return ResponseEntity.ok(count); + public ResponseEntity> countComment(@PathVariable Long issueId){ + CountCommentResponse response = commentService.countByIssue(issueId); + return ResponseEntity.ok(ApiResponse.ok(response)); } -} -//package com.BugJava.EduConnect.assignment.controller; -//import com.BugJava.EduConnect.assignment.dto.AssignmentCommentRequest; -//import com.BugJava.EduConnect.assignment.dto.AssignmentCommentResponse; -//import com.BugJava.EduConnect.assignment.service.AssignmentCommentService; -// -//import jakarta.validation.Valid; -//import lombok.RequiredArgsConstructor; -//import org.springframework.http.ResponseEntity; -//import org.springframework.security.core.annotation.AuthenticationPrincipal; -//import org.springframework.web.bind.annotation.*; -// -// import java.net.URI; -// -//@RestController -//@RequestMapping("/api/assignments/{assignmentId}/comments") -//@RequiredArgsConstructor -//public class AssignmentCommentController { -// -// private final AssignmentCommentService assignmentCommentService; -// -// //댓글 생성 -// @PostMapping -// public ResponseEntity createComment(@PathVariable Long assignmentId, @Valid @RequestBody AssignmentCommentRequest request, -// @AuthenticationPrincipal Long userId){ -// -// AssignmentCommentResponse created = assignmentCommentService.createComment(assignmentId, request, userId); -// -// URI location = URI.create("/api/assignments/" + assignmentId + "/comments/" + created.getId()); -// return ResponseEntity.created(location).body(created); -// } -// -// //댓글 수정 -// @PatchMapping("/{id}") -// public ResponseEntity updateComment(@PathVariable Long id, @RequestBody @Valid AssignmentCommentRequest request, -// @AuthenticationPrincipal Long userId) { -// return ResponseEntity.ok(assignmentCommentService.updateComment(id, request, userId)); -// } -// -// //댓글 삭제 -// @DeleteMapping("/{id}") -// public ResponseEntity deleteComment(@PathVariable Long id, @AuthenticationPrincipal Long userId){ -// assignmentCommentService.deleteComment(id, userId); -// return ResponseEntity.noContent().build(); -// } -//} \ No newline at end of file +} \ No newline at end of file diff --git a/src/main/java/com/issueDive/dto/CommentResponse.java b/src/main/java/com/issueDive/dto/CommentResponse.java index 99f9cd4..7085055 100644 --- a/src/main/java/com/issueDive/dto/CommentResponse.java +++ b/src/main/java/com/issueDive/dto/CommentResponse.java @@ -1,10 +1,13 @@ -package com.example.issueDive.dto; +package com.issueDive.dto; +import com.issueDive.entity.Comment; import lombok.*; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; @Getter @Setter @@ -17,12 +20,53 @@ public class CommentResponse { private Long issueId; private Long userId; private String author; - private String content; + private String description; private Long parentId; private LocalDateTime createdAt; private LocalDateTime updatedAt; - @Builder.Default - private List children = new ArrayList<>(); + private List children; + + public static CommentResponse from(Comment comment){ + return CommentResponse.builder() + .id(comment.getId()) + .issueId(comment.getIssue().getId()) + .userId(comment.getUser().getId()) + .author(comment.getUser().getUsername()) + .description(comment.getDescription()) + .parentId(comment.getParent() != null ? comment.getParent().getId() : null) + .createdAt(comment.getCreatedAt()) + .updatedAt(comment.getUpdatedAt()) + .build(); + } + + public static List fromAllToTree(List comments){ + Map map = new LinkedHashMap<>(); + List roots = new ArrayList<>(); + + // 1) 모든 엔티티 → DTO 변환 & 인덱싱 + for (Comment c : comments) { + map.put(c.getId(), from(c)); + } + + // 2) 부모-자식 연결 + for (Comment c : comments) { + Long parentId = (c.getParent() != null) ? c.getParent().getId() : null; + CommentResponse dto = map.get(c.getId()); + + if (parentId == null) { + roots.add(dto); + } else { + CommentResponse parentDto = map.get(parentId); + if (parentDto != null) { + parentDto.getChildren().add(dto); + } else { + // 데이터 정합성 이슈 방어: 부모 DTO가 없으면 루트로 승격 + roots.add(dto); + } + } + } + return roots; + } } diff --git a/src/main/java/com/issueDive/dto/CountCommentResponse.java b/src/main/java/com/issueDive/dto/CountCommentResponse.java new file mode 100644 index 0000000..dfabc8d --- /dev/null +++ b/src/main/java/com/issueDive/dto/CountCommentResponse.java @@ -0,0 +1,13 @@ +package com.issueDive.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class CountCommentResponse { + private Long issueId; + private Long count; +} diff --git a/src/main/java/com/issueDive/dto/CreateCommentRequest.java b/src/main/java/com/issueDive/dto/CreateCommentRequest.java index a939797..ad2f21c 100644 --- a/src/main/java/com/issueDive/dto/CreateCommentRequest.java +++ b/src/main/java/com/issueDive/dto/CreateCommentRequest.java @@ -1,4 +1,4 @@ -package com.example.issueDive.dto; +package com.issueDive.dto; import jakarta.validation.constraints.NotBlank; import lombok.Getter; import lombok.Setter; @@ -7,6 +7,6 @@ @Setter public class CreateCommentRequest { @NotBlank - private String content; + private String description; private Long parentId; } diff --git a/src/main/java/com/issueDive/dto/UpdateCommentRequest.java b/src/main/java/com/issueDive/dto/UpdateCommentRequest.java index 993cf06..6bdad90 100644 --- a/src/main/java/com/issueDive/dto/UpdateCommentRequest.java +++ b/src/main/java/com/issueDive/dto/UpdateCommentRequest.java @@ -1,4 +1,4 @@ -package com.example.issueDive.dto; +package com.issueDive.dto; import jakarta.validation.constraints.NotBlank; import lombok.Getter; @@ -9,5 +9,5 @@ public class UpdateCommentRequest { @NotBlank - private String content; + private String description; } diff --git a/src/main/java/com/issueDive/entity/Comment.java b/src/main/java/com/issueDive/entity/Comment.java index c1ba5aa..6763c16 100644 --- a/src/main/java/com/issueDive/entity/Comment.java +++ b/src/main/java/com/issueDive/entity/Comment.java @@ -1,8 +1,9 @@ -package com.example.issueDive.entity; +package com.issueDive.entity; import jakarta.persistence.*; import lombok.*; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -39,5 +40,13 @@ public class Comment { @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, orphanRemoval = true) private List children = new ArrayList<>(); + @Column(name = "created_at", updatable = false, insertable = false, + columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP") + private LocalDateTime createdAt; + + @Column(name = "updated_at", insertable = false, + columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP") + private LocalDateTime updatedAt; + public void changeDescription(String content) { this.description = description; } } diff --git a/src/main/java/com/issueDive/exception/CommentNotFoundException.java b/src/main/java/com/issueDive/exception/CommentNotFoundException.java index 8d960e1..2a5975b 100644 --- a/src/main/java/com/issueDive/exception/CommentNotFoundException.java +++ b/src/main/java/com/issueDive/exception/CommentNotFoundException.java @@ -1,4 +1,12 @@ -package com.example.issueDive.exception; +package com.issueDive.exception; -public class CommentNotFoundException { +public class CommentNotFoundException extends RuntimeException{ + + public CommentNotFoundException(String message) { + super(message); + } + + public CommentNotFoundException(String message, Throwable cause) { + super(message, cause); + } } diff --git a/src/main/java/com/issueDive/exception/ErrorCode.java b/src/main/java/com/issueDive/exception/ErrorCode.java index 14ed9ef..a010f6a 100644 --- a/src/main/java/com/issueDive/exception/ErrorCode.java +++ b/src/main/java/com/issueDive/exception/ErrorCode.java @@ -1,7 +1,7 @@ package com.issueDive.exception; public enum ErrorCode { - ValidationError, InvalidQueryParam, Unauthorized, Forbidden, InternalServerError, + ValidationError, InvalidQueryParam, Unauthorized, Forbidden, BadRequest, InternalServerError, IssueNotFound, InvalidStatus, LabelNotFound, IssueLabelNotFound, DuplicateLabel, diff --git a/src/main/java/com/issueDive/exception/GlobalExceptionHandler.java b/src/main/java/com/issueDive/exception/GlobalExceptionHandler.java index ee5a610..16d79b3 100644 --- a/src/main/java/com/issueDive/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/issueDive/exception/GlobalExceptionHandler.java @@ -28,8 +28,32 @@ public ResponseEntity handleGeneric(Exception e) { } @ExceptionHandler(LabelNotFoundException.class) - public ResponseEntity handleLabelNotFound(LabelNotFoundException e) { + public ResponseEntity handleCommentNotFound(LabelNotFoundException e) { return ResponseEntity.status(HttpStatus.NOT_FOUND) .body(ErrorResponse.of(ErrorCode.LabelNotFound, e.getMessage())); } + + @ExceptionHandler(CommentNotFoundException.class) + public ResponseEntity handleCommentNotFound(CommentNotFoundException e) { + return ResponseEntity.status(HttpStatus.NOT_FOUND) + .body(ErrorResponse.of(ErrorCode.CommentNotFound, e.getMessage())); + } + + @ExceptionHandler(UserNotFoundException.class) + public ResponseEntity handleUserNotFound(UserNotFoundException e) { + return ResponseEntity.status(HttpStatus.NOT_FOUND) + .body(ErrorResponse.of(ErrorCode.UserNotFound, e.getMessage())); + } + + @ExceptionHandler(IllegalArgumentException.class) + public ResponseEntity handleBadRequest(IllegalArgumentException e) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .body(ErrorResponse.of(ErrorCode.BadRequest, e.getMessage())); + } + + @ExceptionHandler(SecurityException.class) + public ResponseEntity handleForbidden(SecurityException e) { + return ResponseEntity.status(HttpStatus.FORBIDDEN) + .body(ErrorResponse.of(ErrorCode.Forbidden, e.getMessage())); + } } diff --git a/src/main/java/com/issueDive/exception/UserNotFoundException.java b/src/main/java/com/issueDive/exception/UserNotFoundException.java new file mode 100644 index 0000000..caffd05 --- /dev/null +++ b/src/main/java/com/issueDive/exception/UserNotFoundException.java @@ -0,0 +1,10 @@ +package com.issueDive.exception; + +public class UserNotFoundException extends RuntimeException { + public UserNotFoundException(String message) { + super(message); + } + public UserNotFoundException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/src/main/java/com/issueDive/repository/CommentRepository.java b/src/main/java/com/issueDive/repository/CommentRepository.java index ee9cede..c6c695c 100644 --- a/src/main/java/com/issueDive/repository/CommentRepository.java +++ b/src/main/java/com/issueDive/repository/CommentRepository.java @@ -1,10 +1,8 @@ -package com.example.issueDive.repository; -import com.example.issueDive.entity.Comment; -import org.springframework.data.jpa.repository.EntityGraph; +package com.issueDive.repository; +import com.issueDive.entity.Comment; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; -import java.util.Optional; public interface CommentRepository extends JpaRepository { @@ -12,5 +10,5 @@ public interface CommentRepository extends JpaRepository { long countByIssueId(Long issueId); - boolean existsByIdAndUser_Id(Long commentId, Long userId); + } diff --git a/src/main/java/com/issueDive/service/CommentService.java b/src/main/java/com/issueDive/service/CommentService.java index 658b778..4e7e14c 100644 --- a/src/main/java/com/issueDive/service/CommentService.java +++ b/src/main/java/com/issueDive/service/CommentService.java @@ -1,18 +1,21 @@ -package com.example.issueDive.service; - -import com.example.issueDive.dto.CommentResponse; -import com.example.issueDive.dto.CreateCommentRequest; -import com.example.issueDive.dto.UpdateCommentRequest; -import com.example.issueDive.entity.Comment; -import com.example.issueDive.entity.Issue; -import com.example.issueDive.entity.User; -import com.example.issueDive.repository.CommentRepository; -import com.example.issueDive.repository.IssueRepository; -import com.example.issueDive.repository.UserRepository; +package com.issueDive.service; + +import com.issueDive.dto.CommentResponse; +import com.issueDive.dto.*; +import com.issueDive.entity.Comment; +import com.issueDive.entity.Issue; +import com.issueDive.entity.User; +import com.issueDive.repository.CommentRepository; +import com.issueDive.repository.IssueRepository; +import com.issueDive.repository.UserRepository; +import com.issueDive.exception.*; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.Objects; + @Service @RequiredArgsConstructor public class CommentService { @@ -20,12 +23,13 @@ public class CommentService { private final UserRepository userRepository; private final IssueRepository issueRepository; + @Transactional public CommentResponse createComment(Long issueId, CreateCommentRequest request, Long userId){ User user = userRepository.findById(userId) .orElseThrow(() -> new UserNotFoundException("사용자를 찾을 수 없습니다.")); - Issue issue = IssueRepository.findById(issueId) - .orElseThrow(() -> new CommentNotFoundException("댓글을 찾을 수 없습니다.")); + Issue issue = issueRepository.findById(issueId) + .orElseThrow(() -> new NotFoundException("이슈를 찾을 수 없습니다.")); Comment.CommentBuilder commentBuilder = Comment.builder() .description(request.getDescription()) @@ -37,7 +41,7 @@ public CommentResponse createComment(Long issueId, CreateCommentRequest request, .orElseThrow(() -> new CommentNotFoundException("부모 댓글을 찾을 수 없습니다.")); if(!parent.getIssue().getId().equals(issueId)){ - throw new CommentNotFoundException("부모 댓글과 같은 이슈의 댓글입니다."); + throw new IllegalArgumentException("부모 댓글이 다른 이슈에 소속되어 있습니다."); } commentBuilder.parent(parent); @@ -48,87 +52,58 @@ public CommentResponse createComment(Long issueId, CreateCommentRequest request, return CommentResponse.from(saved); } + @Transactional(readOnly = true) + public List getTreeByIssue(Long issueId){ + issueRepository.findById(issueId) + .orElseThrow(() -> new NotFoundException("이슈를 찾을 수 없습니다.")); + + List all = commentRepository.findAllByIssueIdWithAuthor(issueId); + return CommentResponse.fromAllToTree(all); + } + @Transactional - public CommentResponse updateComment(Long id, UpdateCommentRequest request, Long userId){ + public CommentResponse updateComment(Long issueId, Long id, UpdateCommentRequest request, Long userId){ Comment comment = commentRepository.findById(id) .orElseThrow(() -> new CommentNotFoundException("댓글을 찾을 수 없습니다.")); + issueRepository.findById(issueId) + .orElseThrow(() -> new NotFoundException("이슈를 찾을 수 없습니다.")); + if (!Objects.equals(comment.getIssue().getId(), issueId)) { + throw new IllegalArgumentException("요청한 이슈와 댓글의 소속이 일치하지 않습니다."); + } + + // 권한 검증 (403) + if (!Objects.equals(comment.getUser().getId(), userId)) { + throw new SecurityException("댓글 작성자가 아닙니다."); + } comment.changeDescription(request.getDescription()); return CommentResponse.from(comment); } @Transactional - public void deleteComment(Long id, Long userId){ + public void deleteComment(Long issueId, Long id, Long userId){ Comment comment = commentRepository.findById(id) .orElseThrow(() -> new CommentNotFoundException("댓글을 찾을 수 없습니다.")); + issueRepository.findById(issueId) + .orElseThrow(() -> new NotFoundException("이슈를 찾을 수 없습니다.")); + // 이슈-댓글 소속 검증 (400) + if (!Objects.equals(comment.getIssue().getId(), issueId)) { + throw new IllegalArgumentException("요청한 이슈와 댓글의 소속이 일치하지 않습니다."); + } + + // 권한 검증 (403) + if (!Objects.equals(comment.getUser().getId(), userId)) { + throw new SecurityException("댓글 작성자가 아닙니다."); + } commentRepository.delete(comment); } @Transactional(readOnly = true) - public long countByIssue(Long issueId) { - return commentRepository.countByIssueId(issueId); + public CountCommentResponse countByIssue(Long issueId){ + long count = commentRepository.countByIssueId(issueId); + return new CountCommentResponse(issueId, count); } } - -//private final AssignmentCommentRepository commentRepository; -//private final AssignmentRepository assignmentRepository; -//private final UserRepository userRepository; -//private final AuthorizationUtil authorizationUtil; -// -//댓글 등록 -//@Transactional -//public AssignmentCommentResponse createComment(Long assignmentId, AssignmentCommentRequest request, Long userId){ -// Users user = userRepository.findById(userId) -// .orElseThrow(() -> new UserNotFoundException("사용자를 찾을 수 없습니다. (ID: " + userId + ")")); // 수정 -// Assignment assignment = assignmentRepository.findById(assignmentId) -// .orElseThrow(() -> new AssignmentNotFoundException("게시글을 찾을 수 없습니다. (ID: " + assignmentId + ")")); -// -// AssignmentComment.AssignmentCommentBuilder commentBuilder = AssignmentComment.builder() -// .content(request.getContent()) -// .user(user) -// .assignment(assignment); -// -// // 대댓글인 경우 부모 댓글 설정 -// if (request.getParentId() != null) { -// AssignmentComment parent = commentRepository.findById(request.getParentId()) -// .orElseThrow(() -> new AssignmentCommentNotFoundException("대댓글의 부모 댓글을 찾을 수 없습니다. (ID: " + request.getParentId() + ")")); -// -// // 부모 댓글이 같은 게시글의 댓글인지 확인 -// if (!parent.getAssignment().getId().equals(assignmentId)) { -// throw new AssignmentCommentNotFoundException("부모 댓글이 다른 과제에 속해있습니다."); -// } -// -// commentBuilder.parent(parent); -// } -// -// AssignmentComment comment = commentBuilder.build(); -// -// AssignmentComment saved = commentRepository.save(comment); -// return AssignmentCommentResponse.from(saved); -//} -// -////댓글 수정 -//@Transactional -//public AssignmentCommentResponse updateComment(Long id, AssignmentCommentRequest request, Long userId){ -// AssignmentComment comment = commentRepository.findById(id) -// .orElseThrow(() -> new AssignmentCommentNotFoundException("댓글을 찾을 수 없습니다.")); -// -// authorizationUtil.checkOwnerOrAdmin(comment.getUser().getId()); -// -// comment.setContent(request.getContent()); -// -// return AssignmentCommentResponse.from(comment); -//} -// -////댓글 삭제 -//@Transactional -//public void deleteComment(Long id, Long userId){ -// AssignmentComment comment = commentRepository.findById(id) -// .orElseThrow(() -> new AssignmentCommentNotFoundException("댓글을 찾을 수 없습니다.")); -// -// authorizationUtil.checkOwnerOrAdmin(comment.getUser().getId()); -// -// commentRepository.delete(comment); diff --git a/src/test/.DS_Store b/src/test/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..957744bada44049bd12a8bab9d77ed787fcfd083 GIT binary patch literal 6148 zcmeHK%}T>S5T0$TO(;SSiXIod7HriD;w9Aj0!H+pQWIM=8ndP8&!H4@)fe(jd>&_Z zx5fT=5=3MMX203lnS}Wgc6R_kGzRS&Kp6lWRKlE#!wR8w(k01RPXSTTGs02Y4PzDJ z{Cz2!9eMZsY?1mlyrJJA!>IpuH&}K+v9P)R;$Q* zZBmir3#Cu#VPpoF0cOB3U^h{x#Dp*d%m6d6zyR$J5|z-im>JYt z2M)RgK%{G=7PP6Cpd4w@vzQsg6%=7o5lyPFEru}Z=$AImvzQq)=^$+LA?%xl?NEe% zJ3e3Pa1fqB9+?4VV4i`znU?ANKl{G_pHJc$Gr$b|D+WZN={Fl#l093OilehuqTZpB pP+VqkmV$;piZPas;vG~i=$B+5dKNQ-=t1F&fTn>5X5d#D_yiM~iXZ?0 literal 0 HcmV?d00001 diff --git a/src/test/java/.DS_Store b/src/test/java/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..20bd0ff1db9e63e151301280d5fa7051f4aa999e GIT binary patch literal 6148 zcmeHK-AcnS6i(c98AIrWqL%@02d?S_@ut-I0#@`wWwv%`v1`WG*^4pgt-g?N;`4Y; zl7eHq7IEi5@}1wL`Jnk>jB$S&yNo%EF#!#cqq0KKy)v|6lMy+NF&Raviop7eMmF}> z0l&S*o|t08sQCH)X)?(>oiDyot8Z>KL_@U1L-3-CAP@8D#1F@JXk9CnMwK2$H_4#r zJ3ALD%floajCDa04-B z&gV_BdvJJu)qhQgnR+*Dav)pFw#5oQK(UK?3&vThvS;vA*;N)HF+dCu1H{0ZGhhz} z(OPpJX!*ndF|f=4?hg_gqGz!*sJ9O2@cNALIwA___?AGF7CnolL5P5GQwnHGxqV`A zQx1M<^E`{CK~v7So*BlmGgprnu4f0o)ai_S2B{|oh=D~0YQ}W%{J(@>X5}M)v4kvQ zfEf5^4Dfm{==rcHd$uku56@Z&?GYLZ=9Q>`fWB}E00Z}teH}D$i8|zY7E6OT3i@?9 PAYBABA=D8AzresZ2-`_B literal 0 HcmV?d00001 diff --git a/src/test/java/com/.DS_Store b/src/test/java/com/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..90880d68186166c429f1b66efaa23641eaab2a56 GIT binary patch literal 6148 zcmeHKPfNov6i>G4T87YrqQ`*OfvY+}yp%e>fE7Kc%#{``)@H1oJ&ZxG`i1-^ejeXT zGI4BzClU8vdHE&pPeXnwc@1NX`{T%E%wddKpoldank9mM)CH*-3nEwVh*^&%?3u-3 zxe!f;zsLaYoeg`I!!u@I_AeiXsSLsU77o)SFFKufUaL3O)|*z-YFW3zgDit$P>geb zFuKOkg_LPH>kq=qBrf~T=BdnzL6XHIm5@X+gxp*uStLteja2cs;N**$n? znX?Q+Vt^PR23Cdva{yYcm02+@lo%iee#!uz4+0d?GgxUU31{7iw4D#Z|srFaKa a3D^a806l}1MzDa;kAR|q8e-sA8TbI4`Ap#e literal 0 HcmV?d00001 diff --git a/src/test/java/com/issueDive/.DS_Store b/src/test/java/com/issueDive/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..32361058fd4e7c63254d8f5dc470d933d3252a50 GIT binary patch literal 6148 zcmeHK!D`z;5S>ljSWYPTkkT9%dNtH;nn1`!xaki>Avv_gwQ7-ws9Gb*aljaKZGI?! z((lQe-E|;*rf8#9fnVKpiH!{QsSE{w_I#e5iFrpa{B-v46qYMACpVFS`pf-T>#(tKp5eKW~N zrHzf8BWMM!LHqq|cGT;2^igl#(X*3J-H!fzcs!rCf_EQ2o}LeGv){S-e$Wu?2^YeEFdz&pF~G%9Lm5MlwL>zR+Xs(1nxo&4==DR=z_~_U(ASw%bXC4rLSugn^d~Y`bNf>;Kn(_x~@0 zWF-s;0~^JFYMe!9eWc`T>q>H5Yc=#Il!f=z4s8eqUykjBOYs5J3VfO;z|dpu5Eh91 N5wJAKAPl@J15bzc%pU*% literal 0 HcmV?d00001 From 3875582b23da2a1381240e744932e4f764db846b Mon Sep 17 00:00:00 2001 From: sungchae Date: Thu, 28 Aug 2025 14:32:09 +0900 Subject: [PATCH 04/10] =?UTF-8?q?[#1]=20Feat:=20Comment=20API=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/issueDive/repository/CommentRepository.java | 2 +- src/main/java/com/issueDive/service/CommentService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/issueDive/repository/CommentRepository.java b/src/main/java/com/issueDive/repository/CommentRepository.java index c6c695c..0f71bf2 100644 --- a/src/main/java/com/issueDive/repository/CommentRepository.java +++ b/src/main/java/com/issueDive/repository/CommentRepository.java @@ -8,7 +8,7 @@ public interface CommentRepository extends JpaRepository { List findAllByIssueIdWithAuthor(Long issueId); - long countByIssueId(Long issueId); + long countByIssue_Id(Long issueId); } diff --git a/src/main/java/com/issueDive/service/CommentService.java b/src/main/java/com/issueDive/service/CommentService.java index 4e7e14c..6b3812b 100644 --- a/src/main/java/com/issueDive/service/CommentService.java +++ b/src/main/java/com/issueDive/service/CommentService.java @@ -101,7 +101,7 @@ public void deleteComment(Long issueId, Long id, Long userId){ @Transactional(readOnly = true) public CountCommentResponse countByIssue(Long issueId){ - long count = commentRepository.countByIssueId(issueId); + long count = commentRepository.countByIssue_Id(issueId); return new CountCommentResponse(issueId, count); } From c872b0ed4ce6333081aea0088ded5306a3057a9e Mon Sep 17 00:00:00 2001 From: sungchae Date: Thu, 28 Aug 2025 14:37:03 +0900 Subject: [PATCH 05/10] =?UTF-8?q?[#1]=20Feat:=20Comment=20API=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/issueDive/exception/GlobalExceptionHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/issueDive/exception/GlobalExceptionHandler.java b/src/main/java/com/issueDive/exception/GlobalExceptionHandler.java index 16d79b3..af8425b 100644 --- a/src/main/java/com/issueDive/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/issueDive/exception/GlobalExceptionHandler.java @@ -10,7 +10,7 @@ public class GlobalExceptionHandler { @ExceptionHandler(NotFoundException.class) - public ResponseEntity handleNotFound(NotFoundException e) { + public ResponseEntity handleLabelNotFound(NotFoundException e) { return ResponseEntity.status(HttpStatus.NOT_FOUND) .body(ErrorResponse.of(ErrorCode.IssueNotFound, e.getMessage())); } @@ -28,7 +28,7 @@ public ResponseEntity handleGeneric(Exception e) { } @ExceptionHandler(LabelNotFoundException.class) - public ResponseEntity handleCommentNotFound(LabelNotFoundException e) { + public ResponseEntity handleLabelNotFound(LabelNotFoundException e) { return ResponseEntity.status(HttpStatus.NOT_FOUND) .body(ErrorResponse.of(ErrorCode.LabelNotFound, e.getMessage())); } From 99ce0b2bfac939d5c97a5ddf9df5cf363f59842d Mon Sep 17 00:00:00 2001 From: sungchae Date: Thu, 28 Aug 2025 14:56:19 +0900 Subject: [PATCH 06/10] =?UTF-8?q?[#1]=20fix:=20=EB=8C=93=EA=B8=80=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20=EB=B0=8F=20=EC=97=94?= =?UTF-8?q?=ED=8B=B0=ED=8B=B0=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/issueDive/entity/Comment.java | 2 +- .../java/com/issueDive/repository/CommentRepository.java | 7 +++++-- src/main/java/com/issueDive/service/CommentService.java | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/issueDive/entity/Comment.java b/src/main/java/com/issueDive/entity/Comment.java index 6763c16..89c511e 100644 --- a/src/main/java/com/issueDive/entity/Comment.java +++ b/src/main/java/com/issueDive/entity/Comment.java @@ -48,5 +48,5 @@ public class Comment { columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP") private LocalDateTime updatedAt; - public void changeDescription(String content) { this.description = description; } + public void changeDescription(String description) { this.description = description; } } diff --git a/src/main/java/com/issueDive/repository/CommentRepository.java b/src/main/java/com/issueDive/repository/CommentRepository.java index 0f71bf2..fd3d75e 100644 --- a/src/main/java/com/issueDive/repository/CommentRepository.java +++ b/src/main/java/com/issueDive/repository/CommentRepository.java @@ -1,14 +1,17 @@ package com.issueDive.repository; import com.issueDive.entity.Comment; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import java.util.List; public interface CommentRepository extends JpaRepository { - List findAllByIssueIdWithAuthor(Long issueId); + @Query("SELECT c FROM Comment c JOIN FETCH c.user WHERE c.issue.id = :issueId") + List findAllByIssueIdWithUser(@Param("issueId") Long issueId); - long countByIssue_Id(Long issueId); + long countByIssueId(Long issueId); } diff --git a/src/main/java/com/issueDive/service/CommentService.java b/src/main/java/com/issueDive/service/CommentService.java index 6b3812b..6664588 100644 --- a/src/main/java/com/issueDive/service/CommentService.java +++ b/src/main/java/com/issueDive/service/CommentService.java @@ -57,7 +57,7 @@ public List getTreeByIssue(Long issueId){ issueRepository.findById(issueId) .orElseThrow(() -> new NotFoundException("이슈를 찾을 수 없습니다.")); - List all = commentRepository.findAllByIssueIdWithAuthor(issueId); + List all = commentRepository.findAllByIssueIdWithUser(issueId); return CommentResponse.fromAllToTree(all); } @@ -101,7 +101,7 @@ public void deleteComment(Long issueId, Long id, Long userId){ @Transactional(readOnly = true) public CountCommentResponse countByIssue(Long issueId){ - long count = commentRepository.countByIssue_Id(issueId); + long count = commentRepository.countByIssueId(issueId); return new CountCommentResponse(issueId, count); } From 8d9a6ef325a8ad053d5f6a2bdc2d17790dcb9663 Mon Sep 17 00:00:00 2001 From: sungchae Date: Fri, 29 Aug 2025 09:17:47 +0900 Subject: [PATCH 07/10] =?UTF-8?q?[#1]=20feat:=20Comment=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommentControllerTest.java | 185 ++++++++++++ .../issueDive/service/CommentServiceTest.java | 277 ++++++++++++++++++ 2 files changed, 462 insertions(+) create mode 100644 src/test/java/com/issueDive/controller/CommentControllerTest.java create mode 100644 src/test/java/com/issueDive/service/CommentServiceTest.java diff --git a/src/test/java/com/issueDive/controller/CommentControllerTest.java b/src/test/java/com/issueDive/controller/CommentControllerTest.java new file mode 100644 index 0000000..a186919 --- /dev/null +++ b/src/test/java/com/issueDive/controller/CommentControllerTest.java @@ -0,0 +1,185 @@ +package com.issueDive.controller; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.issueDive.dto.CommentResponse; +import com.issueDive.dto.CreateCommentRequest; +import com.issueDive.dto.UpdateCommentRequest; +import com.issueDive.exception.CommentNotFoundException; +import com.issueDive.service.CommentService; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; + +import java.time.LocalDateTime; +import java.util.Collections; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.*; +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import org.springframework.security.test.context.support.WithMockUser; + +@WithMockUser +@WebMvcTest(CommentController.class) +class CommentControllerTest { + + @Autowired + private MockMvc mockMvc; + + @Autowired + private ObjectMapper objectMapper; + + @MockitoBean + private CommentService commentService; + + private final Long issueId = 1L; + private final Long userId = 1L; + private final Long commentId = 1L; + + @Test + @DisplayName("이슈의 모든 댓글 조회 - 성공") + void getComments_Success() throws Exception { + // given + when(commentService.getTreeByIssue(issueId)).thenReturn(Collections.emptyList()); + + // when & then + mockMvc.perform(get("/issues/{issueId}/comments", issueId)) + .andDo(print()) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.success").value(true)); + } + + @Test + @DisplayName("댓글 생성 - 성공") + void createComment_Success() throws Exception { + // given + CreateCommentRequest request = new CreateCommentRequest(); + request.setDescription("New Comment"); + + CommentResponse response = CommentResponse.builder() + .id(commentId) + .description("New Comment") + .author("testuser") + .createdAt(LocalDateTime.now()) + .build(); + + when(commentService.createComment(eq(issueId), any(CreateCommentRequest.class), eq(userId))).thenReturn(response); + + // when & then + mockMvc.perform(post("/issues/{issueId}/comments", issueId) + .with(csrf()) + .header("X-USER-ID", userId) + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(request))) + .andDo(print()) + .andExpect(status().isCreated()) + .andExpect(jsonPath("$.success").value(true)) + .andExpect(jsonPath("$.data.description").value("New Comment")); + } + + @Test + @DisplayName("댓글 수정 - 성공") + void updateComment_Success() throws Exception { + // given + UpdateCommentRequest request = new UpdateCommentRequest(); + request.setDescription("Updated Comment"); + + CommentResponse response = CommentResponse.builder() + .id(commentId) + .description("Updated Comment") + .build(); + + when(commentService.updateComment(eq(issueId), eq(commentId), any(UpdateCommentRequest.class), eq(userId))).thenReturn(response); + + // when & then + mockMvc.perform(patch("/issues/{issueId}/comments/{commentId}", issueId, commentId) + .with(csrf()) + .header("X-USER-ID", userId) + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(request))) + .andDo(print()) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.success").value(true)) + .andExpect(jsonPath("$.data.description").value("Updated Comment")); + } + + @Test + @DisplayName("댓글 삭제 - 성공") + void deleteComment_Success() throws Exception { + // given + // when & then + mockMvc.perform(delete("/issues/{issueId}/comments/{commentId}", issueId, commentId) + .with(csrf()) + .header("X-USER-ID", userId)) + .andDo(print()) + .andExpect(status().isNoContent()); + + verify(commentService).deleteComment(issueId, commentId, userId); + } + + @Test + @DisplayName("댓글 생성 - 내용 없음 - 400 Bad Request") + void createComment_BlankDescription_ReturnsBadRequest() throws Exception { + // given + CreateCommentRequest request = new CreateCommentRequest(); + request.setDescription(""); // 유효성 검증에 실패할 내용 + + // when & then + mockMvc.perform(post("/issues/{issueId}/comments", issueId) + .with(csrf()) + .header("X-USER-ID", userId) + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(request))) + .andDo(print()) + .andExpect(status().isBadRequest()); + } + + @Test + @DisplayName("댓글 수정 - 댓글 없음 - 404 Not Found") + void updateComment_CommentNotFound_ReturnsNotFound() throws Exception { + // given + UpdateCommentRequest request = new UpdateCommentRequest(); + request.setDescription("Updated Comment"); + + when(commentService.updateComment(eq(issueId), eq(commentId), any(UpdateCommentRequest.class), eq(userId))) + .thenThrow(new CommentNotFoundException("댓글을 찾을 수 없습니다.")); + + // when & then + mockMvc.perform(patch("/issues/{issueId}/comments/{commentId}", issueId, commentId) + .with(csrf()) + .header("X-USER-ID", userId) + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(request))) + .andDo(print()) + .andExpect(status().isNotFound()) + .andExpect(jsonPath("$.success").value(false)) + .andExpect(jsonPath("$.error.code").value("CommentNotFound")); + } + + @Test + @DisplayName("댓글 삭제 - 권한 없음 - 403 Forbidden") + void deleteComment_NotOwner_ReturnsForbidden() throws Exception { + // given + Long notOwnerId = 999L; + doThrow(new SecurityException("댓글 작성자가 아닙니다.")) + .when(commentService).deleteComment(issueId, commentId, notOwnerId); + + // when & then + mockMvc.perform(delete("/issues/{issueId}/comments/{commentId}", issueId, commentId) + .with(csrf()) + .header("X-USER-ID", notOwnerId)) + .andDo(print()) + .andExpect(status().isForbidden()) + .andExpect(jsonPath("$.success").value(false)) + .andExpect(jsonPath("$.error.code").value("Forbidden")); + } +} diff --git a/src/test/java/com/issueDive/service/CommentServiceTest.java b/src/test/java/com/issueDive/service/CommentServiceTest.java new file mode 100644 index 0000000..9d2220a --- /dev/null +++ b/src/test/java/com/issueDive/service/CommentServiceTest.java @@ -0,0 +1,277 @@ +package com.issueDive.service; + +import com.issueDive.dto.CommentResponse; +import com.issueDive.dto.CreateCommentRequest; +import com.issueDive.dto.UpdateCommentRequest; +import com.issueDive.entity.Comment; +import com.issueDive.entity.Issue; +import com.issueDive.entity.User; +import com.issueDive.exception.CommentNotFoundException; +import com.issueDive.exception.NotFoundException; +import com.issueDive.exception.UserNotFoundException; +import com.issueDive.repository.CommentRepository; +import com.issueDive.repository.IssueRepository; +import com.issueDive.repository.UserRepository; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.util.Optional; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + +@ExtendWith(MockitoExtension.class) +class CommentServiceTest { + + @InjectMocks + private CommentService commentService; + + @Mock + private CommentRepository commentRepository; + + @Mock + private UserRepository userRepository; + + @Mock + private IssueRepository issueRepository; + + @Test + @DisplayName("댓글 생성 - 성공") + void createComment_Success() { + // given + Long userId = 1L; + Long issueId = 1L; + CreateCommentRequest request = new CreateCommentRequest(); + request.setDescription("Test Comment"); + + User user = User.builder().id(userId).username("testuser").build(); + Issue issue = Issue.builder().id(issueId).build(); + Comment comment = Comment.builder() + .id(1L) + .user(user) + .issue(issue) + .description("Test Comment") + .build(); + + when(userRepository.findById(userId)).thenReturn(Optional.of(user)); + when(issueRepository.findById(issueId)).thenReturn(Optional.of(issue)); + when(commentRepository.save(any(Comment.class))).thenReturn(comment); + + // when + CommentResponse response = commentService.createComment(issueId, request, userId); + + // then + assertThat(response.getDescription()).isEqualTo("Test Comment"); + assertThat(response.getAuthor()).isEqualTo("testuser"); + verify(commentRepository, times(1)).save(any(Comment.class)); + } + + @Test + @DisplayName("댓글 생성 - 유저 없음 - 실패") + void createComment_UserNotFound() { + // given + Long userId = 1L; + Long issueId = 1L; + CreateCommentRequest request = new CreateCommentRequest(); + request.setDescription("Test Comment"); + + when(userRepository.findById(userId)).thenReturn(Optional.empty()); + + // when & then + assertThrows(UserNotFoundException.class, + () -> commentService.createComment(issueId, request, userId)); + } + + @Test + @DisplayName("댓글 수정 - 성공") + void updateComment_Success() { + // given + Long userId = 1L; + Long issueId = 1L; + Long commentId = 1L; + UpdateCommentRequest request = new UpdateCommentRequest(); + request.setDescription("Updated Comment"); + + User user = User.builder().id(userId).build(); + Issue issue = Issue.builder().id(issueId).build(); + Comment comment = Comment.builder() + .id(commentId) + .user(user) + .issue(issue) + .description("Original Comment") + .build(); + + when(commentRepository.findById(commentId)).thenReturn(Optional.of(comment)); + when(issueRepository.findById(issueId)).thenReturn(Optional.of(issue)); + + // when + CommentResponse response = commentService.updateComment(issueId, commentId, request, userId); + + // then + assertThat(response.getDescription()).isEqualTo("Updated Comment"); + assertThat(comment.getDescription()).isEqualTo("Updated Comment"); + } + + @Test + @DisplayName("댓글 수정 - 댓글 없음 - 실패") + void updateComment_CommentNotFound() { + // given + Long userId = 1L; + Long issueId = 1L; + Long commentId = 1L; + UpdateCommentRequest request = new UpdateCommentRequest(); + request.setDescription("Updated Comment"); + + when(commentRepository.findById(commentId)).thenReturn(Optional.empty()); + + // when & then + assertThrows(CommentNotFoundException.class, + () -> commentService.updateComment(issueId, commentId, request, userId)); + } + + @Test + @DisplayName("댓글 수정 - 작성자 아님 - 실패") + void updateComment_NotOwner() { + // given + Long ownerId = 1L; + Long requesterId = 2L; + Long issueId = 1L; + Long commentId = 1L; + UpdateCommentRequest request = new UpdateCommentRequest(); + request.setDescription("Updated Comment"); + + User owner = User.builder().id(ownerId).build(); + Issue issue = Issue.builder().id(issueId).build(); + Comment comment = Comment.builder() + .id(commentId) + .user(owner) + .issue(issue) + .description("Original Comment") + .build(); + + when(commentRepository.findById(commentId)).thenReturn(Optional.of(comment)); + when(issueRepository.findById(issueId)).thenReturn(Optional.of(issue)); + + // when & then + assertThrows(SecurityException.class, + () -> commentService.updateComment(issueId, commentId, request, requesterId)); + } + + @Test + @DisplayName("댓글 삭제 - 성공") + void deleteComment_Success() { + // given + Long userId = 1L; + Long issueId = 1L; + Long commentId = 1L; + + User user = User.builder().id(userId).build(); + Issue issue = Issue.builder().id(issueId).build(); + Comment comment = Comment.builder() + .id(commentId) + .user(user) + .issue(issue) + .build(); + + when(commentRepository.findById(commentId)).thenReturn(Optional.of(comment)); + when(issueRepository.findById(issueId)).thenReturn(Optional.of(issue)); + + // when + commentService.deleteComment(issueId, commentId, userId); + + // then + verify(commentRepository, times(1)).delete(comment); + } + + @Test + @DisplayName("대댓글 생성 - 부모 댓글이 다른 이슈 소속 - 실패(400)") + void createComment_ParentInDifferentIssue_ThrowsException() { + // given + Long userId = 1L; + Long issueId = 1L; + Long anotherIssueId = 2L; + Long parentId = 2L; + + CreateCommentRequest request = new CreateCommentRequest(); + request.setDescription("A reply"); + request.setParentId(parentId); + + User user = User.builder().id(userId).build(); + Issue issue = Issue.builder().id(issueId).build(); + Issue anotherIssue = Issue.builder().id(anotherIssueId).build(); + Comment parent = Comment.builder().id(parentId).issue(anotherIssue).build(); + + when(userRepository.findById(userId)).thenReturn(Optional.of(user)); + when(issueRepository.findById(issueId)).thenReturn(Optional.of(issue)); + when(commentRepository.findById(parentId)).thenReturn(Optional.of(parent)); + + // when & then + assertThrows(IllegalArgumentException.class, + () -> commentService.createComment(issueId, request, userId)); + } + + @Test + @DisplayName("댓글 수정 - 이슈 불일치 - 실패(400)") + void updateComment_MismatchedIssue_ThrowsException() { + // given + Long userId = 1L; + Long issueId = 1L; + Long anotherIssueId = 2L; + Long commentId = 1L; + UpdateCommentRequest request = new UpdateCommentRequest(); + request.setDescription("Updated content"); + + User user = User.builder().id(userId).build(); + Issue anotherIssue = Issue.builder().id(anotherIssueId).build(); + Comment comment = Comment.builder().id(commentId).user(user).issue(anotherIssue).build(); + + when(commentRepository.findById(commentId)).thenReturn(Optional.of(comment)); + when(issueRepository.findById(issueId)).thenReturn(Optional.of(Issue.builder().id(issueId).build())); + + // when & then + assertThrows(IllegalArgumentException.class, + () -> commentService.updateComment(issueId, commentId, request, userId)); + } + + @Test + @DisplayName("댓글 삭제 - 댓글 없음 - 실패(404)") + void deleteComment_CommentNotFound_ThrowsException() { + // given + Long userId = 1L; + Long issueId = 1L; + Long commentId = 1L; + + when(commentRepository.findById(commentId)).thenReturn(Optional.empty()); + + // when & then + assertThrows(CommentNotFoundException.class, + () -> commentService.deleteComment(issueId, commentId, userId)); + } + + @Test + @DisplayName("댓글 삭제 - 작성자 아님 - 실패(403)") + void deleteComment_NotOwner_ThrowsException() { + // given + Long ownerId = 1L; + Long requesterId = 2L; + Long issueId = 1L; + Long commentId = 1L; + + User owner = User.builder().id(ownerId).build(); + Issue issue = Issue.builder().id(issueId).build(); + Comment comment = Comment.builder().id(commentId).user(owner).issue(issue).build(); + + when(commentRepository.findById(commentId)).thenReturn(Optional.of(comment)); + when(issueRepository.findById(issueId)).thenReturn(Optional.of(issue)); + + // when & then + assertThrows(SecurityException.class, + () -> commentService.deleteComment(issueId, commentId, requesterId)); + } +} From 33bb301e1c36aaf4bd15c1634f12aa704820c2ce Mon Sep 17 00:00:00 2001 From: sungchae Date: Fri, 29 Aug 2025 10:00:51 +0900 Subject: [PATCH 08/10] =?UTF-8?q?[#1]=20feat:=20Comment=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommentControllerTest.java | 17 +++++++++++++++++ .../controller/IssueControllerTest.java | 1 - .../issueDive/service/CommentServiceTest.java | 17 +++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/issueDive/controller/CommentControllerTest.java b/src/test/java/com/issueDive/controller/CommentControllerTest.java index a186919..77855fc 100644 --- a/src/test/java/com/issueDive/controller/CommentControllerTest.java +++ b/src/test/java/com/issueDive/controller/CommentControllerTest.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.issueDive.dto.CommentResponse; +import com.issueDive.dto.CountCommentResponse; import com.issueDive.dto.CreateCommentRequest; import com.issueDive.dto.UpdateCommentRequest; import com.issueDive.exception.CommentNotFoundException; @@ -182,4 +183,20 @@ void deleteComment_NotOwner_ReturnsForbidden() throws Exception { .andExpect(jsonPath("$.success").value(false)) .andExpect(jsonPath("$.error.code").value("Forbidden")); } + + @Test + @DisplayName("댓글 개수 조회 - 성공") + void countComment_Success() throws Exception { + // given + long count = 10L; + when(commentService.countByIssue(issueId)).thenReturn(new CountCommentResponse(issueId, count)); + + // when & then + mockMvc.perform(get("/issues/{issueId}/comments/count", issueId)) + .andDo(print()) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.success").value(true)) + .andExpect(jsonPath("$.data.issueId").value(issueId)) + .andExpect(jsonPath("$.data.count").value(count)); + } } diff --git a/src/test/java/com/issueDive/controller/IssueControllerTest.java b/src/test/java/com/issueDive/controller/IssueControllerTest.java index 5cd5eaf..eca117f 100644 --- a/src/test/java/com/issueDive/controller/IssueControllerTest.java +++ b/src/test/java/com/issueDive/controller/IssueControllerTest.java @@ -1,6 +1,5 @@ package com.issueDive.controller; -import com.issueDive.controller.IssueController; import com.issueDive.dto.CreateIssueRequest; import com.issueDive.dto.IssueFilterRequest; import com.issueDive.dto.IssueResponse; diff --git a/src/test/java/com/issueDive/service/CommentServiceTest.java b/src/test/java/com/issueDive/service/CommentServiceTest.java index 9d2220a..c3c9d98 100644 --- a/src/test/java/com/issueDive/service/CommentServiceTest.java +++ b/src/test/java/com/issueDive/service/CommentServiceTest.java @@ -274,4 +274,21 @@ void deleteComment_NotOwner_ThrowsException() { assertThrows(SecurityException.class, () -> commentService.deleteComment(issueId, commentId, requesterId)); } + + @Test + @DisplayName("이슈의 댓글 개수 조회 - 성공") + void countByIssue_Success() { + // given + Long issueId = 1L; + long expectedCount = 5L; + when(commentRepository.countByIssueId(issueId)).thenReturn(expectedCount); + + // when + var response = commentService.countByIssue(issueId); + + // then + assertThat(response.getIssueId()).isEqualTo(issueId); + assertThat(response.getCount()).isEqualTo(expectedCount); + verify(commentRepository, times(1)).countByIssueId(issueId); + } } From 3d8dc6aed949b7ee7288a0fc23be8e89be6d5b19 Mon Sep 17 00:00:00 2001 From: sungchae Date: Fri, 29 Aug 2025 10:04:14 +0900 Subject: [PATCH 09/10] =?UTF-8?q?[#1]=20feat:=20Comment=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/issueDive/exception/GlobalExceptionHandler.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/com/issueDive/exception/GlobalExceptionHandler.java b/src/main/java/com/issueDive/exception/GlobalExceptionHandler.java index af8425b..bbf0c76 100644 --- a/src/main/java/com/issueDive/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/issueDive/exception/GlobalExceptionHandler.java @@ -3,6 +3,7 @@ import com.issueDive.dto.ErrorResponse; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; @@ -56,4 +57,10 @@ public ResponseEntity handleForbidden(SecurityException e) { return ResponseEntity.status(HttpStatus.FORBIDDEN) .body(ErrorResponse.of(ErrorCode.Forbidden, e.getMessage())); } + + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity handleMethodArgumentNotValid(MethodArgumentNotValidException e) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .body(ErrorResponse.of(ErrorCode.BadRequest, e.getMessage())); + } } From e1e7217276a961abb4450d175fb9ef00efc40cde Mon Sep 17 00:00:00 2001 From: sungchae Date: Fri, 29 Aug 2025 10:04:46 +0900 Subject: [PATCH 10/10] =?UTF-8?q?[#34]=20fix:=20CommentResponse=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/8.14.3/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../com/issueDive/dto/CommentResponse.java | 37 +++++++++++------- src/main/resources/application.properties | 16 ++++++++ 5 files changed, 39 insertions(+), 14 deletions(-) diff --git a/.gradle/8.14.3/executionHistory/executionHistory.lock b/.gradle/8.14.3/executionHistory/executionHistory.lock index ff924365e5ed45bf0f20aee5891d34abfaf0106a..47ab024be7cd1c818687d235f06a6354c7875dbf 100644 GIT binary patch literal 17 TcmZQJ(>>6buHqZP00CtHBt!#F literal 17 TcmZQJ(>>6buHqZP00ArjBhmug diff --git a/.gradle/8.14.3/fileHashes/fileHashes.lock b/.gradle/8.14.3/fileHashes/fileHashes.lock index 4bed5fe7081cc1a294397e11676e5b3f1a6a33f0..f3408ebf8826cb4ca003ad791a91542c22e742a1 100644 GIT binary patch literal 17 VcmZQBKYnrIdDBnV8Nh&P1^`3C1`7ZH literal 17 UcmZQBKYnrIdDBnV86cn^07JC~00000 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index f4390fab0499d6fc3ee246559f189d034f73bec9..d8abf006f2feaebee756bc780debdf3469bbe0b1 100644 GIT binary patch literal 17 VcmZSH children; + + @Builder.Default + private List children = new ArrayList<>(); + + // 방어적 추가 헬퍼 + public void addChild(CommentResponse child) { + if (children == null) children = new ArrayList<>(); + children.add(child); + } + + // 널-세이프 getter + public List getChildren() { + if (children == null) children = new ArrayList<>(); + return children; + } public static CommentResponse from(Comment comment){ return CommentResponse.builder() @@ -43,30 +54,28 @@ public static List fromAllToTree(List comments){ Map map = new LinkedHashMap<>(); List roots = new ArrayList<>(); - // 1) 모든 엔티티 → DTO 변환 & 인덱싱 + // 1) 엔티티 → DTO 변환 & 인덱싱 for (Comment c : comments) { map.put(c.getId(), from(c)); } // 2) 부모-자식 연결 for (Comment c : comments) { - Long parentId = (c.getParent() != null) ? c.getParent().getId() : null; + Long pId = (c.getParent() != null) ? c.getParent().getId() : null; CommentResponse dto = map.get(c.getId()); - if (parentId == null) { + if (pId == null) { roots.add(dto); } else { - CommentResponse parentDto = map.get(parentId); - if (parentDto != null) { - parentDto.getChildren().add(dto); + CommentResponse parent = map.get(pId); + if (parent != null) { + parent.addChild(dto); } else { - // 데이터 정합성 이슈 방어: 부모 DTO가 없으면 루트로 승격 + // 부모 누락 방어: 루트에 승격(정책에 맞게 조정 가능) roots.add(dto); } } } return roots; } - - } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 39657fe..09b55b9 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +1,17 @@ spring.application.name=issueDive + +# ?????? ?? ?? +spring.datasource.url=jdbc:mysql://localhost:3306/issuedive +spring.datasource.username=root +spring.datasource.password=0661 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +# JPA & Hibernate ?? +spring.jpa.hibernate.ddl-auto=update +spring.jpa.database-platform=org.hibernate.dialect.MySQLDialect + +# --- Jackson --- +spring.jackson.date-format=yyyy-MM-dd HH:mm:ss +spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false + +spring.flyway.baseline-on-migrate=true \ No newline at end of file