[feat]: survey에 북마크 취소기능 개발

auth/auth-interceptor/src/main/java/me/nalab/auth/interceptor/JwtDecryptInterceptorConfigurer.java

@@ -29,6 +29,7 @@ public class JwtDecryptInterceptorConfigurer implements WebMvcConfigurer {
 		"/v1/users",
 		"/v1/gallerys/previews",
 		"/v1/surveys/*/bookmarks",
+		"/v1/surveys/*/bookmarks/cancels",
 		"/v1/gallerys/logins",
 		"/v1/gallerys",
 	};

gallery/src/main/kotlin/me/nalab/gallery/domain/Gallery.kt

@@ -40,7 +40,7 @@ class Gallery(
 
     fun getBookmarkedCount(): Int = survey.bookmarkedCount
 
-    fun increaseBookmarkedCount() {
-        survey.bookmarkedCount++
+    fun setBookmarkedCount(bookmarkedCount: Int) {
+        survey.bookmarkedCount = bookmarkedCount
     }
 }

gallery/src/main/kotlin/me/nalab/gallery/domain/GalleryService.kt

@@ -26,8 +26,8 @@ class GalleryService(
     }
 
     @Transactional
-    fun increaseBookmarkCount(targetId: Long) {
-        galleryRepository.findByTargetIdOrNull(targetId)?.increaseBookmarkedCount()
+    fun setBookmarkCount(targetId: Long, bookmarkCount: Int) {
+        galleryRepository.findByTargetIdOrNull(targetId)?.setBookmarkedCount(bookmarkCount)
     }
 
     fun getGalleries(job: String, pageable: Pageable): Page<Gallery> {

gallery/src/main/kotlin/me/nalab/gallery/infra/SurveyBookmarkedListener.kt

@@ -1,6 +1,7 @@
 package me.nalab.gallery.infra
 
 import me.nalab.gallery.domain.GalleryService
+import me.nalab.survey.application.common.survey.dto.TargetDto
 import me.nalab.survey.application.port.out.persistence.bookmark.SurveyBookmarkListenPort
 import org.springframework.dao.OptimisticLockingFailureException
 import org.springframework.scheduling.annotation.Async
@@ -13,14 +14,14 @@ class SurveyBookmarkedListener(
 ) : SurveyBookmarkListenPort {
 
     @Async
-    override fun listenBookmarked(targetId: Long) {
+    override fun listenBookmarked(target: TargetDto) {
         runCatching {
-            galleryService.increaseBookmarkCount(targetId)
+            galleryService.setBookmarkCount(target.id, target.bookmarkedSurveys.count())
         }.recoverCatching {
             when (it is OptimisticLockingFailureException) {
                 true -> {
                     waitJitter()
-                    listenBookmarked(targetId)
+                    listenBookmarked(target)
                 }
 
                 false -> throw it

support/e2e/v1_11_cancel_bookmark_survey.hurl

@@ -0,0 +1,124 @@
+POST http://nalab-server:8080/v1/oauth/default # Default provider를 통해서 로그인 진행
+{
+    "nickname": "cancel_bookmark_survey",
+    "email": "cancel_bookmark_survey@123456"
+}
+
+HTTP 200
+[Asserts]
+header "Content-type" == "application/json"
+
+jsonpath "$.access_token" exists
+jsonpath "$.token_type" exists
+
+[Captures]
+token_type: jsonpath "$.token_type"
+auth_token: jsonpath "$.access_token"
+
+##########
+
+POST http://nalab-server:8080/v1/surveys # 발급받은 토큰으로 survey를 생성한다.
+Authorization: {{ token_type }} {{ auth_token }}
+{
+    "question_count": 2,
+    "question": [
+        {
+            "type": "choice",
+            "form_type": "tendency",
+            "title": "저는 UI, UI, GUI 중에 어떤 분야를 가장 잘하는 것 같나요?",
+            "choices": [
+                {
+                    "content": "UI",
+                    "order": 1
+                },
+                {
+                    "content": "UX",
+                    "order": 2
+                },
+                {
+                    "content": "GUI",
+                    "order": 3
+                }
+            ],
+            "max_selectable_count": 1,
+            "order": 1
+        },
+        {
+            "type": "short",
+            "form_type": "strength",
+            "title": "저는 UX, UI, GUI 중에 어떤 분야에 더 강점이 있나요?",
+            "order": 2
+        }
+    ]
+}
+
+HTTP 201
+[Asserts]
+header "Content-type" == "application/json"
+
+jsonpath "$.survey_id" exists
+
+[Captures]
+survey_id: jsonpath "$.survey_id"
+
+##########
+
+GET http://nalab-server:8080/v1/surveys/{{ survey_id }} # 생성된 survey를 조회한다.
+
+HTTP 200
+[Asserts]
+header "Content-type" == "application/json"
+
+jsonpath "$.survey_id" exists
+
+jsonpath "$.target.id" exists
+jsonpath "$.target.nickname" == "cancel_bookmark_survey"
+
+jsonpath "$.question_count" == 2
+jsonpath "$.question.[0].question_id" exists
+jsonpath "$.question.[0].type" == "choice"
+jsonpath "$.question.[0].form_type" == "tendency"
+jsonpath "$.question.[0].title" == "저는 UI, UI, GUI 중에 어떤 분야를 가장 잘하는 것 같나요?"
+jsonpath "$.question.[0].order" == 1
+jsonpath "$.question.[0].max_selectable_count" == 1
+jsonpath "$.question.[0].choices.[0].choice_id" exists
+jsonpath "$.question.[0].choices.[0].content" == "UI"
+jsonpath "$.question.[0].choices.[0].order" == 1
+jsonpath "$.question.[0].choices.[1].choice_id" exists
+jsonpath "$.question.[0].choices.[1].content" == "UX"
+jsonpath "$.question.[0].choices.[1].order" == 2
+jsonpath "$.question.[0].choices.[2].choice_id" exists
+jsonpath "$.question.[0].choices.[2].content" == "GUI"
+jsonpath "$.question.[0].choices.[2].order" == 3
+jsonpath "$.question.[1].question_id" exists
+jsonpath "$.question.[1].type" == "short"
+jsonpath "$.question.[1].form_type" == "strength"
+jsonpath "$.question.[1].title" == "저는 UX, UI, GUI 중에 어떤 분야에 더 강점이 있나요?"
+jsonpath "$.question.[1].order" == 2
+
+[Captures]
+target_id: jsonpath "$.target.id"
+
+##########
+
+POST http://nalab-server:8080/v1/surveys/{{ survey_id }}/bookmarks
+Authorization: {{ token_type }} {{ auth_token }}
+
+HTTP 200
+[Asserts]
+header "Content-type" == "application/json"
+
+jsonpath "$.target_id" == {{ target_id }}
+jsonpath "$.survey_id" == {{ survey_id }}
+jsonpath "$.nickname" == "cancel_bookmark_survey"
+
+##########
+
+POST http://nalab-server:8080/v1/surveys/{{ survey_id }}/bookmarks/cancels
+Authorization: {{ token_type }} {{ auth_token }}
+
+HTTP 200
+[Asserts]
+header "Content-type" == "application/json"
+
+jsonpath "$.survey_id" == {{ survey_id }}

survey/survey-application/src/main/java/me/nalab/survey/application/port/in/web/bookmark/SurveyBookmarkUseCase.java

@@ -6,8 +6,12 @@ public interface SurveyBookmarkUseCase {
 
     /**
      * targetId에 해당하는 유저에게 survey를 북마크합니다.
-     * 이미 북마크되어있다면 북마크를 취소합니다.
      */
     SurveyBookmarkDto bookmark(Long targetId, Long surveyId);
 
+    /**
+     * targetId에 해당하는 유저에게 survey를 북마크 취소합니다. 북마크 되어있지 않다면, 아무동작도 하지 않습니다.
+     */
+    Long cancelBookmark(Long targetId, Long surveyId);
+
 }

survey/survey-application/src/main/java/me/nalab/survey/application/port/out/persistence/bookmark/SurveyBookmarkListenPort.java

@@ -1,6 +1,8 @@
 package me.nalab.survey.application.port.out.persistence.bookmark;
 
+import me.nalab.survey.application.common.survey.dto.TargetDto;
+
 public interface SurveyBookmarkListenPort {
 
-    void listenBookmarked(Long targetId);
+    void listenBookmarked(TargetDto target);
 }

survey/survey-application/src/main/java/me/nalab/survey/application/port/out/persistence/bookmark/SurveyBookmarkPort.java

@@ -4,5 +4,5 @@
 
 public interface SurveyBookmarkPort {
 
-    void bookmark(Target target);
+    void updateBookmark(Target target);
 }

survey/survey-application/src/main/java/me/nalab/survey/application/service/bookmark/SurveyBookmarkService.java

@@ -2,6 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import me.nalab.survey.application.common.survey.dto.SurveyBookmarkDto;
+import me.nalab.survey.application.common.survey.mapper.TargetDtoMapper;
 import me.nalab.survey.application.exception.SurveyDoesNotExistException;
 import me.nalab.survey.application.port.in.web.bookmark.SurveyBookmarkUseCase;
 import me.nalab.survey.application.port.out.persistence.bookmark.SurveyBookmarkListenPort;
@@ -30,10 +31,27 @@ public SurveyBookmarkDto bookmark(Long targetId, Long surveyId) {
         }
 
         target.bookmark(surveyId);
-        surveyBookmarkPort.bookmark(target);
+        surveyBookmarkPort.updateBookmark(target);
 
-        surveyBookmarkListener.listenBookmarked(targetId);
+        surveyBookmarkListener.listenBookmarked(TargetDtoMapper.toTargetDto(target));
 
         return SurveyBookmarkDto.from(surveyId, target);
     }
+
+    @Override
+    @Transactional
+    public Long cancelBookmark(Long targetId, Long surveyId) {
+        var target = targetFindPort.getTargetById(targetId);
+
+        if (!surveyExistCheckPort.isExistSurveyBySurveyId(surveyId)) {
+            throw new SurveyDoesNotExistException(surveyId);
+        }
+
+        target.cancelBookmark(surveyId);
+        surveyBookmarkPort.updateBookmark(target);
+
+        surveyBookmarkListener.listenBookmarked(TargetDtoMapper.toTargetDto(target));
+
+        return surveyId;
+    }
 }

survey/survey-domain/src/main/java/me/nalab/survey/domain/target/Target.java

@@ -2,6 +2,7 @@
 
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.LongSupplier;
 import lombok.Builder;
@@ -45,4 +46,11 @@ public void bookmark(Long surveyId) {
         var bookmark = new SurveyBookmark(surveyId);
         bookmarkedSurveys.add(bookmark);
     }
+
+    public void cancelBookmark(Long surveyId) {
+        bookmarkedSurveys.stream()
+            .filter(surveyBookmark -> Objects.equals(surveyBookmark.surveyId(), surveyId))
+            .findFirst()
+            .ifPresent(bookmarkedSurveys::remove);
+    }
 }

survey/survey-jpa-adaptor/src/main/java/me/nalab/survey/jpa/adaptor/bookmark/SurveyBookmarkAdaptor.java

@@ -15,7 +15,7 @@ public class SurveyBookmarkAdaptor implements SurveyBookmarkPort {
     private final TargetFindRepository targetFindRepository;
 
     @Override
-    public void bookmark(Target target) {
+    public void updateBookmark(Target target) {
         var savedTarget = targetFindRepository.findById(target.getId())
             .orElseThrow(() -> new TargetDoesNotExistException(target.getId()));
 

survey/survey-web-adaptor/src/main/java/me/nalab/survey/web/adaptor/bookmark/SurveyBookmarkReplaceController.java → survey/survey-web-adaptor/src/main/java/me/nalab/survey/web/adaptor/bookmark/SurveyBookmarkController.java

@@ -3,6 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import me.nalab.survey.application.port.in.web.bookmark.SurveyBookmarkUseCase;
 import me.nalab.survey.web.adaptor.bookmark.response.SurveyBookmarkResponse;
+import me.nalab.survey.web.adaptor.bookmark.response.SurveyBookmarkedResponse;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,17 +15,25 @@
 @RestController
 @RequestMapping("/v1")
 @RequiredArgsConstructor
-public class SurveyBookmarkReplaceController {
+public class SurveyBookmarkController {
 
     private final SurveyBookmarkUseCase surveyBookmarkReplaceUseCase;
 
     @ResponseStatus(HttpStatus.OK)
     @PostMapping("/surveys/{survey_id}/bookmarks")
-    public SurveyBookmarkResponse replaceBookmark(@RequestAttribute("logined") Long targetId,
+    public SurveyBookmarkResponse bookmark(@RequestAttribute("logined") Long targetId,
         @PathVariable("survey_id") Long surveyId) {
         var surveyBookmarked = surveyBookmarkReplaceUseCase.bookmark(targetId, surveyId);
 
         return SurveyBookmarkResponse.of(surveyBookmarked);
     }
 
+    @ResponseStatus(HttpStatus.OK)
+    @PostMapping("/surveys/{survey_id}/bookmarks/cancels")
+    public SurveyBookmarkedResponse cancelBookmark(@RequestAttribute("logined") Long targetId,
+        @PathVariable("survey_id") Long surveyId) {
+        var bookmarkedSurveyId = surveyBookmarkReplaceUseCase.cancelBookmark(targetId, surveyId);
+
+        return SurveyBookmarkedResponse.of(bookmarkedSurveyId);
+    }
 }

survey/survey-web-adaptor/src/main/java/me/nalab/survey/web/adaptor/bookmark/response/SurveyBookmarkedResponse.java

@@ -0,0 +1,13 @@
+package me.nalab.survey.web.adaptor.bookmark.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public record SurveyBookmarkedResponse(
+    @JsonProperty("survey_id")
+    String surveyId
+) {
+
+    public static SurveyBookmarkedResponse of(Long surveyId) {
+        return new SurveyBookmarkedResponse(surveyId.toString());
+    }
+}