fix: SurveyBookmark 변경감지가 동작하지 않는 버그를 수정한다

depromeet · Feb 25, 2024 · 11e9d97 · 11e9d97
1 parent 61d1dfa
commit 11e9d97
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 6 deletions.
diff --git a/core/data/src/main/java/me/nalab/core/data/target/SurveyBookmarkEntity.java b/core/data/src/main/java/me/nalab/core/data/target/SurveyBookmarkEntity.java
@@ -3,8 +3,14 @@
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
 import javax.persistence.JoinColumn;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
+@Getter
 @Embeddable
+@NoArgsConstructor
+@AllArgsConstructor
 public class SurveyBookmarkEntity {
 
     @Column(name = "bookmarked_survey_id")

diff --git a/core/data/src/main/java/me/nalab/core/data/target/TargetEntity.java b/core/data/src/main/java/me/nalab/core/data/target/TargetEntity.java
@@ -1,5 +1,6 @@
 package me.nalab.core.data.target;
 
+import java.util.HashSet;
 import java.util.Set;
 import javax.persistence.CollectionTable;
 import javax.persistence.Column;
@@ -11,6 +12,7 @@
 
 import javax.persistence.Version;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -47,7 +49,8 @@ public class TargetEntity extends TimeBaseEntity {
         name = "bookmarked_survey",
         joinColumns = @JoinColumn(name = "target_id")
     )
-    private Set<SurveyBookmarkEntity> bookmarkedSurveys;
+    @Builder.Default
+    private Set<SurveyBookmarkEntity> bookmarkedSurveys = new HashSet<>();
 
     @Version
     @Column(name = "version")

diff --git a/...ookmark/SurveyBookmarkReplaceUseCase.java → ...n/web/bookmark/SurveyBookmarkUseCase.java b/...ookmark/SurveyBookmarkReplaceUseCase.java → ...n/web/bookmark/SurveyBookmarkUseCase.java
@@ -2,7 +2,7 @@
 
 import me.nalab.survey.application.common.survey.dto.SurveyBookmarkDto;
 
-public interface SurveyBookmarkReplaceUseCase {
+public interface SurveyBookmarkUseCase {
 
     /**
      * targetId에 해당하는 유저에게 survey를 북마크합니다.

diff --git a/...in/java/me/nalab/survey/application/port/out/persistence/bookmark/SurveyBookmarkPort.java b/...in/java/me/nalab/survey/application/port/out/persistence/bookmark/SurveyBookmarkPort.java
@@ -0,0 +1,8 @@
+package me.nalab.survey.application.port.out.persistence.bookmark;
+
+import me.nalab.survey.domain.target.Target;
+
+public interface SurveyBookmarkPort {
+
+    void bookmark(Target target);
+}
diff --git a/...ookmark/SurveyBookmarkReplaceService.java → ...rvice/bookmark/SurveyBookmarkService.java b/...ookmark/SurveyBookmarkReplaceService.java → ...rvice/bookmark/SurveyBookmarkService.java
@@ -3,18 +3,20 @@
 import lombok.RequiredArgsConstructor;
 import me.nalab.survey.application.common.survey.dto.SurveyBookmarkDto;
 import me.nalab.survey.application.exception.SurveyDoesNotExistException;
-import me.nalab.survey.application.port.in.web.bookmark.SurveyBookmarkReplaceUseCase;
+import me.nalab.survey.application.port.in.web.bookmark.SurveyBookmarkUseCase;
+import me.nalab.survey.application.port.out.persistence.bookmark.SurveyBookmarkPort;
 import me.nalab.survey.application.port.out.persistence.findfeedback.SurveyExistCheckPort;
 import me.nalab.survey.application.port.out.persistence.findtarget.TargetFindPort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @RequiredArgsConstructor
-public class SurveyBookmarkReplaceService implements SurveyBookmarkReplaceUseCase {
+public class SurveyBookmarkService implements SurveyBookmarkUseCase {
 
     private final TargetFindPort targetFindPort;
     private final SurveyExistCheckPort surveyExistCheckPort;
+    private final SurveyBookmarkPort surveyBookmarkPort;
 
     @Override
     @Transactional
@@ -26,6 +28,7 @@ public SurveyBookmarkDto bookmark(Long targetId, Long surveyId) {
         }
 
         target.bookmark(surveyId);
+        surveyBookmarkPort.bookmark(target);
 
         return SurveyBookmarkDto.from(surveyId, target);
     }

diff --git a/survey/survey-domain/src/main/java/me/nalab/survey/domain/target/Target.java b/survey/survey-domain/src/main/java/me/nalab/survey/domain/target/Target.java
@@ -25,6 +25,7 @@ public class Target implements IdGeneratable {
     private final String nickname;
     private final String job;
     private final String imageUrl;
+    @Builder.Default
     private final Set<SurveyBookmark> bookmarkedSurveys = NONE_BOOKMARKED_SURVEYS;
     private String position;
 

diff --git a/...jpa-adaptor/src/main/java/me/nalab/survey/jpa/adaptor/bookmark/SurveyBookmarkAdaptor.java b/...jpa-adaptor/src/main/java/me/nalab/survey/jpa/adaptor/bookmark/SurveyBookmarkAdaptor.java
@@ -0,0 +1,24 @@
+package me.nalab.survey.jpa.adaptor.bookmark;
+
+import lombok.RequiredArgsConstructor;
+import me.nalab.survey.application.exception.TargetDoesNotExistException;
+import me.nalab.survey.application.port.out.persistence.bookmark.SurveyBookmarkPort;
+import me.nalab.survey.domain.target.Target;
+import me.nalab.survey.jpa.adaptor.common.mapper.TargetEntityMapper;
+import me.nalab.survey.jpa.adaptor.find.repository.TargetFindRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class SurveyBookmarkAdaptor implements SurveyBookmarkPort {
+
+    private final TargetFindRepository targetFindRepository;
+
+    @Override
+    public void bookmark(Target target) {
+        var savedTarget = targetFindRepository.findById(target.getId())
+            .orElseThrow(() -> new TargetDoesNotExistException(target.getId()));
+
+        savedTarget.setBookmarkedSurveys(TargetEntityMapper.toSurveyBookmarkEntity(target.getBookmarkedSurveys()));
+    }
+}
diff --git a/...a-adaptor/src/main/java/me/nalab/survey/jpa/adaptor/common/mapper/TargetEntityMapper.java b/...a-adaptor/src/main/java/me/nalab/survey/jpa/adaptor/common/mapper/TargetEntityMapper.java
@@ -1,6 +1,10 @@
 package me.nalab.survey.jpa.adaptor.common.mapper;
 
+import java.util.Set;
+import java.util.stream.Collectors;
+import me.nalab.core.data.target.SurveyBookmarkEntity;
 import me.nalab.core.data.target.TargetEntity;
+import me.nalab.survey.domain.target.SurveyBookmark;
 import me.nalab.survey.domain.target.Target;
 
 public class TargetEntityMapper {
@@ -16,15 +20,29 @@ public static TargetEntity toTargetEntity(Target target) {
 			.position(target.getPosition())
 			.imageUrl(target.getImageUrl())
 			.job(target.getJob())
+			.bookmarkedSurveys(toSurveyBookmarkEntity(target.getBookmarkedSurveys()))
 			.build();
 	}
 
+    public static Set<SurveyBookmarkEntity> toSurveyBookmarkEntity(Set<SurveyBookmark> surveyBookmarks) {
+        return surveyBookmarks.stream()
+            .map(surveyBookmark -> new SurveyBookmarkEntity(surveyBookmark.surveyId()))
+            .collect(Collectors.toSet());
+    }
+
 	public static Target toTarget(TargetEntity targetEntity) {
 		return Target.builder()
 			.id(targetEntity.getId())
 			.nickname(targetEntity.getNickname())
 			.position(targetEntity.getPosition())
 			.job(targetEntity.getJob())
+            .bookmarkedSurveys(toSurveyBookmark(targetEntity.getBookmarkedSurveys()))
 			.build();
 	}
+
+    public static Set<SurveyBookmark> toSurveyBookmark(Set<SurveyBookmarkEntity> surveyBookmarkEntities) {
+        return surveyBookmarkEntities.stream()
+            .map(surveyBookmarkEntity -> new SurveyBookmark(surveyBookmarkEntity.getSurveyId()))
+            .collect(Collectors.toSet());
+    }
 }
diff --git a/...r/src/main/java/me/nalab/survey/web/adaptor/bookmark/SurveyBookmarkReplaceController.java b/...r/src/main/java/me/nalab/survey/web/adaptor/bookmark/SurveyBookmarkReplaceController.java
@@ -1,7 +1,7 @@
 package me.nalab.survey.web.adaptor.bookmark;
 
 import lombok.RequiredArgsConstructor;
-import me.nalab.survey.application.port.in.web.bookmark.SurveyBookmarkReplaceUseCase;
+import me.nalab.survey.application.port.in.web.bookmark.SurveyBookmarkUseCase;
 import me.nalab.survey.web.adaptor.bookmark.response.SurveyBookmarkResponse;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -16,7 +16,7 @@
 @RequiredArgsConstructor
 public class SurveyBookmarkReplaceController {
 
-    private final SurveyBookmarkReplaceUseCase surveyBookmarkReplaceUseCase;
+    private final SurveyBookmarkUseCase surveyBookmarkReplaceUseCase;
 
     @ResponseStatus(HttpStatus.OK)
     @PostMapping("/surveys/{survey_id}/bookmarks")