diff --git a/support/e2e/v1_11_cancel_bookmark_survey.hurl b/support/e2e/v1_11_cancel_bookmark_survey.hurl index 3f04eb4a..93c766fd 100644 --- a/support/e2e/v1_11_cancel_bookmark_survey.hurl +++ b/support/e2e/v1_11_cancel_bookmark_survey.hurl @@ -121,6 +121,4 @@ HTTP 200 [Asserts] header "Content-type" == "application/json" -jsonpath "$.target_id" == {{ target_id }} jsonpath "$.survey_id" == {{ survey_id }} -jsonpath "$.nickname" == "cancel_bookmark_survey" diff --git a/survey/survey-application/src/main/java/me/nalab/survey/application/port/in/web/bookmark/SurveyBookmarkUseCase.java b/survey/survey-application/src/main/java/me/nalab/survey/application/port/in/web/bookmark/SurveyBookmarkUseCase.java index 5bbd79ae..13aa6598 100644 --- a/survey/survey-application/src/main/java/me/nalab/survey/application/port/in/web/bookmark/SurveyBookmarkUseCase.java +++ b/survey/survey-application/src/main/java/me/nalab/survey/application/port/in/web/bookmark/SurveyBookmarkUseCase.java @@ -6,14 +6,12 @@ public interface SurveyBookmarkUseCase { /** * targetId에 해당하는 유저에게 survey를 북마크합니다. - * 이미 북마크되어있다면 북마크를 취소합니다. */ SurveyBookmarkDto bookmark(Long targetId, Long surveyId); /** - * targetId에 해당하는 유저에게 survey를 북마크 취소합니다. - * 북마크 되어있지 않다면, 아무동작도 하지 않습니다. + * targetId에 해당하는 유저에게 survey를 북마크 취소합니다. 북마크 되어있지 않다면, 아무동작도 하지 않습니다. */ - SurveyBookmarkDto cancelBookmark(Long targetId, Long surveyId); + Long cancelBookmark(Long targetId, Long surveyId); } diff --git a/survey/survey-application/src/main/java/me/nalab/survey/application/service/bookmark/SurveyBookmarkService.java b/survey/survey-application/src/main/java/me/nalab/survey/application/service/bookmark/SurveyBookmarkService.java index 00b52b03..d3013c01 100644 --- a/survey/survey-application/src/main/java/me/nalab/survey/application/service/bookmark/SurveyBookmarkService.java +++ b/survey/survey-application/src/main/java/me/nalab/survey/application/service/bookmark/SurveyBookmarkService.java @@ -40,7 +40,7 @@ public SurveyBookmarkDto bookmark(Long targetId, Long surveyId) { @Override @Transactional - public SurveyBookmarkDto cancelBookmark(Long targetId, Long surveyId) { + public Long cancelBookmark(Long targetId, Long surveyId) { var target = targetFindPort.getTargetById(targetId); if (!surveyExistCheckPort.isExistSurveyBySurveyId(surveyId)) { @@ -52,6 +52,6 @@ public SurveyBookmarkDto cancelBookmark(Long targetId, Long surveyId) { surveyBookmarkListener.listenBookmarked(TargetDtoMapper.toTargetDto(target)); - return SurveyBookmarkDto.from(surveyId, target); + return surveyId; } } diff --git a/survey/survey-web-adaptor/src/main/java/me/nalab/survey/web/adaptor/bookmark/SurveyBookmarkController.java b/survey/survey-web-adaptor/src/main/java/me/nalab/survey/web/adaptor/bookmark/SurveyBookmarkController.java index bcc0c812..28c33015 100644 --- a/survey/survey-web-adaptor/src/main/java/me/nalab/survey/web/adaptor/bookmark/SurveyBookmarkController.java +++ b/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; @@ -29,10 +30,10 @@ public SurveyBookmarkResponse bookmark(@RequestAttribute("logined") Long targetI @ResponseStatus(HttpStatus.OK) @PostMapping("/surveys/{survey_id}/bookmarks/cancels") - public SurveyBookmarkResponse cancelBookmark(@RequestAttribute("logined") Long targetId, + public SurveyBookmarkedResponse cancelBookmark(@RequestAttribute("logined") Long targetId, @PathVariable("survey_id") Long surveyId) { - var surveyBookmarked = surveyBookmarkReplaceUseCase.cancelBookmark(targetId, surveyId); + var bookmarkedSurveyId = surveyBookmarkReplaceUseCase.cancelBookmark(targetId, surveyId); - return SurveyBookmarkResponse.of(surveyBookmarked); + return SurveyBookmarkedResponse.of(bookmarkedSurveyId); } } diff --git a/survey/survey-web-adaptor/src/main/java/me/nalab/survey/web/adaptor/bookmark/response/SurveyBookmarkedResponse.java b/survey/survey-web-adaptor/src/main/java/me/nalab/survey/web/adaptor/bookmark/response/SurveyBookmarkedResponse.java new file mode 100644 index 00000000..73f5d831 --- /dev/null +++ b/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") + Long surveyId +) { + + public static SurveyBookmarkedResponse of(Long surveyId) { + return new SurveyBookmarkedResponse(surveyId); + } +}