comment component 연관관계 제거 (#281)

resumeme · Nov 24, 2023 · 2c56600 · 2c56600
1 parent 41fa368
commit 2c56600
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 37 deletions.
diff --git a/src/main/java/org/devcourse/resumeme/business/comment/controller/CommentController.java b/src/main/java/org/devcourse/resumeme/business/comment/controller/CommentController.java
@@ -5,15 +5,12 @@
 import org.devcourse.resumeme.business.comment.controller.dto.CommentResponse;
 import org.devcourse.resumeme.business.comment.controller.dto.CommentUpdateRequest;
 import org.devcourse.resumeme.business.comment.controller.dto.CommentWithReviewResponse;
-import org.devcourse.resumeme.business.event.domain.Event;
-import org.devcourse.resumeme.business.event.domain.MenteeToEvent;
-import org.devcourse.resumeme.business.resume.domain.Resume;
 import org.devcourse.resumeme.business.comment.domain.Comment;
+import org.devcourse.resumeme.business.comment.service.CommentService;
+import org.devcourse.resumeme.business.event.domain.Event;
 import org.devcourse.resumeme.business.event.service.EventService;
-import org.devcourse.resumeme.business.resume.entity.Component;
-import org.devcourse.resumeme.business.resume.service.ComponentService;
+import org.devcourse.resumeme.business.resume.domain.Resume;
 import org.devcourse.resumeme.business.resume.service.ResumeService;
-import org.devcourse.resumeme.business.comment.service.CommentService;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
@@ -36,15 +33,12 @@ public class CommentController {
 
     private final EventService eventService;
 
-    private final ComponentService componentService;
-
     @PostMapping
     public CommentResponse createReview(@PathVariable Long resumeId, @RequestBody CommentCreateRequest request) {
         Resume resume = resumeService.getOne(resumeId);
-        Component component = componentService.getOne(request.componentId());
-        Comment review = commentService.create(request.toEntity(resume, component), resumeId);
+        Comment review = commentService.create(request.toEntity(resume), resumeId);
 
-        return new CommentResponse(review.getId(), review.getContent(), component.getId(), review.getLastModifiedDate());
+        return new CommentResponse(review.getId(), review.getContent(), request.componentId(), review.getLastModifiedDate());
     }
 
     @GetMapping

diff --git a/...ain/java/org/devcourse/resumeme/business/comment/controller/dto/CommentCreateRequest.java b/...ain/java/org/devcourse/resumeme/business/comment/controller/dto/CommentCreateRequest.java
@@ -2,12 +2,11 @@
 
 import org.devcourse.resumeme.business.comment.domain.Comment;
 import org.devcourse.resumeme.business.resume.domain.Resume;
-import org.devcourse.resumeme.business.resume.entity.Component;
 
 public record CommentCreateRequest(Long componentId, String content) {
 
-    public Comment toEntity(Resume resume, Component component) {
-        return new Comment(content, component, resume);
+    public Comment toEntity(Resume resume) {
+        return new Comment(content, componentId, resume);
     }
 
 }
diff --git a/src/main/java/org/devcourse/resumeme/business/comment/controller/dto/CommentResponse.java b/src/main/java/org/devcourse/resumeme/business/comment/controller/dto/CommentResponse.java
@@ -7,7 +7,7 @@
 public record CommentResponse(Long commentId, String content, Long componentId, LocalDateTime lastModifiedAt) {
 
     public CommentResponse(Comment comment) {
-        this(comment.getId(), comment.getContent(), comment.getComponent().getId(), comment.getLastModifiedDate());
+        this(comment.getId(), comment.getContent(), comment.getComponentId(), comment.getLastModifiedDate());
     }
 
 }
diff --git a/src/main/java/org/devcourse/resumeme/business/comment/domain/Comment.java b/src/main/java/org/devcourse/resumeme/business/comment/domain/Comment.java
@@ -9,7 +9,6 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.devcourse.resumeme.business.resume.domain.Resume;
-import org.devcourse.resumeme.business.resume.entity.Component;
 import org.devcourse.resumeme.common.domain.BaseEntity;
 import org.devcourse.resumeme.global.exception.CustomException;
 
@@ -35,22 +34,20 @@ public class Comment extends BaseEntity {
     private String content;
 
     @Getter
-    @ManyToOne(fetch = LAZY)
-    @JoinColumn(name = "component_id")
-    private Component component;
+    private Long componentId;
 
     @ManyToOne(fetch = LAZY)
     @JoinColumn(name = "resume_id")
     private Resume resume;
 
-    public Comment(String content, Component component, Resume resume) {
+    public Comment(String content, Long componentId, Resume resume) {
         check(isBlank(content), NO_EMPTY_VALUE);
         notNull(resume);
-        notNull(component);
+        notNull(componentId);
 
         this.content = content;
         this.resume = resume;
-        this.component = component;
+        this.componentId = componentId;
     }
 
     public void checkSameResume(Long resumeId) {

diff --git a/src/main/java/org/devcourse/resumeme/business/comment/repository/CommentRepository.java b/src/main/java/org/devcourse/resumeme/business/comment/repository/CommentRepository.java
@@ -1,12 +1,19 @@
 package org.devcourse.resumeme.business.comment.repository;
 
+import io.lettuce.core.dynamic.annotation.Param;
 import org.devcourse.resumeme.business.comment.domain.Comment;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
 public interface CommentRepository extends JpaRepository<Comment, Long> {
 
     List<Comment> findAllByResumeId(Long resumeId);
 
+    @Modifying
+    @Query("update Comment c SET c.componentId = :newComponentId where c.componentId = :oldComponentId")
+    void updateComment(@Param("newComponentId") Long newComponentId, @Param("oldComponentId") Long oldComponentId);
+
 }
diff --git a/src/main/java/org/devcourse/resumeme/business/resume/service/ComponentService.java b/src/main/java/org/devcourse/resumeme/business/resume/service/ComponentService.java
@@ -1,6 +1,9 @@
 package org.devcourse.resumeme.business.resume.service;
 
 import lombok.RequiredArgsConstructor;
+import org.devcourse.resumeme.business.comment.controller.dto.CommentResponse;
+import org.devcourse.resumeme.business.comment.domain.Comment;
+import org.devcourse.resumeme.business.comment.repository.CommentRepository;
 import org.devcourse.resumeme.business.resume.entity.Component;
 import org.devcourse.resumeme.business.resume.repository.ComponentRepository;
 import org.devcourse.resumeme.global.exception.CustomException;
@@ -20,6 +23,8 @@ public class ComponentService {
 
     private final ComponentRepository componentRepository;
 
+    private final CommentRepository commentRepository;
+
     public Long create(Component block, String type) {
         Long resumeId = block.getResumeId();
         Optional<Component> existBlock1 = componentRepository.findExistBlock(resumeId, type);
@@ -61,7 +66,10 @@ public Long update(Long componentId, Component newComponent, String type) {
 
         newComponent.updateOriginDate(component.getCreatedDate());
 
-        return create(newComponent, type);
+        Long newComponentId = create(newComponent, type);
+        commentRepository.updateComment(newComponentId, componentId);
+
+        return newComponentId;
     }
 
     public void copy(Long originResumeId, Long newResumeId) {

diff --git a/src/test/java/org/devcourse/resumeme/business/comment/controller/CommentControllerTest.java b/src/test/java/org/devcourse/resumeme/business/comment/controller/CommentControllerTest.java
@@ -6,7 +6,6 @@
 import org.devcourse.resumeme.business.event.domain.Event;
 import org.devcourse.resumeme.business.event.domain.EventInfo;
 import org.devcourse.resumeme.business.event.domain.EventTimeInfo;
-import org.devcourse.resumeme.business.event.domain.MenteeToEvent;
 import org.devcourse.resumeme.business.resume.domain.Resume;
 import org.devcourse.resumeme.business.resume.entity.Component;
 import org.devcourse.resumeme.business.user.domain.Provider;
@@ -91,7 +90,7 @@ void setUp() {
         Component component = new Component("career", "career", null, null, resumeId, List.of());
         Resume resume = new Resume("titlem", mentee);
 
-        Comment comment = request.toEntity(resume, component);
+        Comment comment = request.toEntity(resume);
         setId(comment, 1L);
         setId(component, 1L);
         Field lastModifiedAt = comment.getClass().getSuperclass().getDeclaredField("lastModifiedDate");
@@ -142,7 +141,7 @@ void setUp() {
         event.acceptMentee(1L, 1L);
 
         given(eventService.getOne(eventId)).willReturn(event);
-        Comment comment = new Comment("리뷰 내용내용", component, new Resume("title", mentee));
+        Comment comment = new Comment("리뷰 내용내용", 1L, new Resume("title", mentee));
         setId(comment, 1L);
         setId(component, 1L);
         Field lastModifiedAt = comment.getClass().getSuperclass().getDeclaredField("lastModifiedDate");

diff --git a/src/test/java/org/devcourse/resumeme/business/comment/domain/CommentTest.java b/src/test/java/org/devcourse/resumeme/business/comment/domain/CommentTest.java
@@ -45,17 +45,17 @@ class CommentTest {
         Component component = new Component("career", "career", null, null, 1L, List.of());
 
         // when
-        Comment comment = new Comment(content, component, resume);
+        Comment comment = new Comment(content, 1L, resume);
 
         // then
         assertThat(comment).isNotNull();
     }
 
     @ParameterizedTest
     @MethodSource("reviewCreate")
-    void 이벤트포지션_생성_검증조건_미달로인해_생성에_실패한다_null입력_오류(String content, BlockType type, Component component, Resume resume) {
+    void 이벤트포지션_생성_검증조건_미달로인해_생성에_실패한다_null입력_오류(String content, Resume resume) {
         // then
-        assertThatThrownBy(() -> new Comment(content, component, resume))
+        assertThatThrownBy(() -> new Comment(content, 1L, resume))
                 .isInstanceOf(CustomException.class);
     }
 
@@ -76,15 +76,11 @@ static Stream<Arguments> reviewCreate() {
 
         Resume resume = new Resume("title", mentee);
 
-        Component component = new Component("career", "career", null, null, 1L, List.of());
-
         return Stream.of(
-                Arguments.of(null, null, component, null),
-                Arguments.of(content, null, component, null),
-                Arguments.of(null, type, component, null),
-                Arguments.of(null, null, component, resume),
-                Arguments.of("", type, component, null),
-                Arguments.of("   ", null, null, resume)
+                Arguments.of(null, null),
+                Arguments.of(content, null),
+                Arguments.of(null, resume),
+                Arguments.of("", null)
         );
     }