Skip to content

Commit 91f8123

Browse files
devxbdevxb
authored
[feat] : 로그인한 유저가 북마크한 survey 조회 기능을 추가한다 (#390)
1 parent e30d96a commit 91f8123

File tree

9 files changed

+344
-2
lines changed

9 files changed

+344
-2
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public class JwtDecryptInterceptorConfigurer implements WebMvcConfigurer {
3232
"/v1/surveys/*/bookmarks/cancels",
3333
"/v1/gallerys/logins",
3434
"/v1/gallerys",
35+
"/v1/surveys/bookmarks*",
3536
};
3637

3738
@Override

‎support/e2e/v1_12_find_bookmarked_survey.hurl

+180
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
POST http://nalab-server:8080/v1/oauth/default # Default provider를 통해서 로그인 진행
2+
{
3+
"nickname": "find_bookmakred_survey1",
4+
"email": "find_bookmakred_survey1@12345"
5+
}
6+
7+
HTTP 200
8+
[Asserts]
9+
header "Content-type" == "application/json"
10+
11+
jsonpath "$.access_token" exists
12+
jsonpath "$.token_type" exists
13+
14+
[Captures]
15+
token_type_1: jsonpath "$.token_type"
16+
auth_token_1: jsonpath "$.access_token"
17+
18+
##########
19+
20+
POST http://nalab-server:8080/v1/surveys # 발급받은 토큰으로 survey를 생성한다.
21+
Authorization: {{ token_type_1 }} {{ auth_token_1 }}
22+
{
23+
"question_count": 2,
24+
"question": [
25+
{
26+
"type": "choice",
27+
"form_type": "tendency",
28+
"title": "저는 UI, UI, GUI 중에 어떤 분야를 가장 잘하는 것 같나요?",
29+
"choices": [
30+
{
31+
"content": "UI",
32+
"order": 1
33+
},
34+
{
35+
"content": "UX",
36+
"order": 2
37+
},
38+
{
39+
"content": "GUI",
40+
"order": 3
41+
}
42+
],
43+
"max_selectable_count": 1,
44+
"order": 1
45+
},
46+
{
47+
"type": "short",
48+
"form_type": "strength",
49+
"title": "저는 UX, UI, GUI 중에 어떤 분야에 더 강점이 있나요?",
50+
"order": 2
51+
}
52+
]
53+
}
54+
55+
HTTP 201
56+
[Asserts]
57+
header "Content-type" == "application/json"
58+
59+
jsonpath "$.survey_id" exists
60+
61+
[Captures]
62+
survey_id_1: jsonpath "$.survey_id"
63+
64+
##########
65+
66+
POST http://nalab-server:8080/v1/oauth/default # Default provider를 통해서 로그인 진행
67+
{
68+
"nickname": "find_bookmakred_survey2",
69+
"email": "find_bookmakred_survey2@12345"
70+
}
71+
72+
HTTP 200
73+
[Asserts]
74+
header "Content-type" == "application/json"
75+
76+
jsonpath "$.access_token" exists
77+
jsonpath "$.token_type" exists
78+
79+
[Captures]
80+
token_type_2: jsonpath "$.token_type"
81+
auth_token_2: jsonpath "$.access_token"
82+
83+
##########
84+
85+
POST http://nalab-server:8080/v1/surveys # 발급받은 토큰으로 survey를 생성한다.
86+
Authorization: {{ token_type_2 }} {{ auth_token_2 }}
87+
{
88+
"question_count": 2,
89+
"question": [
90+
{
91+
"type": "choice",
92+
"form_type": "tendency",
93+
"title": "저는 UI, UI, GUI 중에 어떤 분야를 가장 잘하는 것 같나요?",
94+
"choices": [
95+
{
96+
"content": "UI",
97+
"order": 1
98+
},
99+
{
100+
"content": "UX",
101+
"order": 2
102+
},
103+
{
104+
"content": "GUI",
105+
"order": 3
106+
}
107+
],
108+
"max_selectable_count": 1,
109+
"order": 1
110+
},
111+
{
112+
"type": "short",
113+
"form_type": "strength",
114+
"title": "저는 UX, UI, GUI 중에 어떤 분야에 더 강점이 있나요?",
115+
"order": 2
116+
}
117+
]
118+
}
119+
120+
HTTP 201
121+
[Asserts]
122+
header "Content-type" == "application/json"
123+
124+
jsonpath "$.survey_id" exists
125+
126+
[Captures]
127+
survey_id_2: jsonpath "$.survey_id"
128+
129+
##########
130+
131+
POST http://nalab-server:8080/v1/surveys/{{ survey_id_1 }}/bookmarks
132+
Authorization: {{ token_type_1 }} {{ auth_token_1 }}
133+
134+
HTTP 200
135+
[Asserts]
136+
header "Content-type" == "application/json"
137+
138+
jsonpath "$.survey_id" == {{ survey_id_1 }}
139+
140+
##########
141+
142+
POST http://nalab-server:8080/v1/surveys/{{ survey_id_2 }}/bookmarks
143+
Authorization: {{ token_type_1 }} {{ auth_token_1 }}
144+
145+
HTTP 200
146+
[Asserts]
147+
header "Content-type" == "application/json"
148+
149+
jsonpath "$.survey_id" == {{ survey_id_2 }}
150+
151+
##########
152+
153+
GET http://nalab-server:8080/v1/surveys/bookmarks
154+
Authorization: {{ token_type_1 }} {{ auth_token_1 }}
155+
156+
HTTP 200
157+
[Asserts]
158+
header "Content-type" == "application/json"
159+
160+
jsonpath "$.bookmarked_surveys.[0].survey_id" == {{ survey_id_1 }}
161+
jsonpath "$.bookmarked_surveys.[0].nickname" == "find_bookmakred_survey1"
162+
163+
jsonpath "$.bookmarked_surveys.[1].survey_id" == {{ survey_id_2 }}
164+
jsonpath "$.bookmarked_surveys.[1].nickname" == "find_bookmakred_survey2"
165+
166+
##########
167+
168+
GET http://nalab-server:8080/v1/surveys/bookmarks
169+
Authorization: {{ token_type_1 }} {{ auth_token_1 }}
170+
171+
[QueryStringParams]
172+
last-survey-id: {{ survey_id_1 }}
173+
count: 1
174+
175+
HTTP 200
176+
[Asserts]
177+
header "Content-type" == "application/json"
178+
179+
jsonpath "$.bookmarked_surveys.[0].survey_id" == {{ survey_id_2 }}
180+
jsonpath "$.bookmarked_surveys.[0].nickname" == "find_bookmakred_survey2"

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

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package me.nalab.survey.application.port.in.web.bookmark;
2+
3+
import java.util.List;
4+
import me.nalab.survey.application.common.survey.dto.SurveyBookmarkDto;
5+
6+
public interface BookmarkedSurveyFindUseCase {
7+
8+
/**
9+
* targetId를 입력받아 SurveyBookmarkDto를 반환합니다.
10+
*/
11+
List<SurveyBookmarkDto> findBookmarkedSurveysByTargetId(Long targetId, Long lastSurveyId, Integer count);
12+
13+
}

‎survey/survey-application/src/main/java/me/nalab/survey/application/port/out/persistence/findtarget/TargetFindPort.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package me.nalab.survey.application.port.out.persistence.findtarget;
22

3+
import java.util.List;
34
import java.util.Optional;
4-
5+
import java.util.Set;
56
import me.nalab.survey.domain.target.Target;
67

78
/**
@@ -23,4 +24,8 @@ public interface TargetFindPort {
2324
*/
2425
Target getTargetById(Long targetId);
2526

27+
/**
28+
* surveyId 들로 Target들을 조회합니다.
29+
*/
30+
List<Target> findAllTargetBySurveyIds(Set<Long> surveyIds);
2631
}

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

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
package me.nalab.survey.application.service.bookmark;
2+
3+
import java.util.List;
4+
import java.util.Set;
5+
import java.util.stream.Collectors;
6+
import lombok.RequiredArgsConstructor;
7+
import me.nalab.survey.application.common.survey.dto.SurveyBookmarkDto;
8+
import me.nalab.survey.application.port.in.web.bookmark.BookmarkedSurveyFindUseCase;
9+
import me.nalab.survey.application.port.out.persistence.findtarget.TargetFindPort;
10+
import me.nalab.survey.application.port.out.persistence.survey.find.SurveyFindPort;
11+
import me.nalab.survey.domain.target.SurveyBookmark;
12+
import me.nalab.survey.domain.target.Target;
13+
import org.springframework.stereotype.Service;
14+
import org.springframework.transaction.annotation.Transactional;
15+
16+
@Service
17+
@RequiredArgsConstructor
18+
public class BookmarkedSurveyFindService implements BookmarkedSurveyFindUseCase {
19+
20+
private final TargetFindPort targetFindPort;
21+
private final SurveyFindPort surveyFindPort;
22+
23+
@Override
24+
@Transactional(readOnly = true)
25+
public List<SurveyBookmarkDto> findBookmarkedSurveysByTargetId(Long targetId, Long lastSurveyId, Integer count) {
26+
var target = targetFindPort.getTargetById(targetId);
27+
var bookmarkedTargets = targetFindPort.findAllTargetBySurveyIds(getSurveyIds(target, lastSurveyId, count));
28+
29+
return bookmarkedTargets.stream()
30+
.map(bookmarkedTarget -> {
31+
var surveyId = bookmarkedTarget.getSurveyList().get(0).getId();
32+
return SurveyBookmarkDto.from(surveyId, bookmarkedTarget);
33+
})
34+
.toList();
35+
}
36+
37+
private Set<Long> getSurveyIds(Target target, Long lastSurveyId, Integer count) {
38+
return target.getBookmarkedSurveys().stream()
39+
.map(SurveyBookmark::surveyId)
40+
.filter(aLong -> aLong > lastSurveyId)
41+
.limit(count)
42+
.collect(Collectors.toSet());
43+
}
44+
}

‎survey/survey-jpa-adaptor/src/main/java/me/nalab/survey/jpa/adaptor/common/mapper/TargetEntityMapper.java

+13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package me.nalab.survey.jpa.adaptor.common.mapper;
22

3+
import java.util.List;
34
import java.util.Set;
45
import java.util.stream.Collectors;
6+
import me.nalab.core.data.survey.SurveyEntity;
57
import me.nalab.core.data.target.SurveyBookmarkEntity;
68
import me.nalab.core.data.target.TargetEntity;
79
import me.nalab.survey.domain.target.SurveyBookmark;
@@ -40,6 +42,17 @@ public static Target toTarget(TargetEntity targetEntity) {
4042
.build();
4143
}
4244

45+
public static Target toTargetWithSurvey(TargetEntity targetEntity, SurveyEntity surveyEntity) {
46+
return Target.builder()
47+
.id(targetEntity.getId())
48+
.surveyList(List.of(SurveyEntityMapper.toSurvey(surveyEntity)))
49+
.nickname(targetEntity.getNickname())
50+
.position(targetEntity.getPosition())
51+
.job(targetEntity.getJob())
52+
.bookmarkedSurveys(toSurveyBookmark(targetEntity.getBookmarkedSurveys()))
53+
.build();
54+
}
55+
4356
public static Set<SurveyBookmark> toSurveyBookmark(Set<SurveyBookmarkEntity> surveyBookmarkEntities) {
4457
return surveyBookmarkEntities.stream()
4558
.map(surveyBookmarkEntity -> new SurveyBookmark(surveyBookmarkEntity.getSurveyId()))

‎survey/survey-jpa-adaptor/src/main/java/me/nalab/survey/jpa/adaptor/findtarget/TargetFindAdaptor.java

+34-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
package me.nalab.survey.jpa.adaptor.findtarget;
22

3+
import java.util.List;
4+
import java.util.Objects;
35
import java.util.Optional;
46

7+
import java.util.Set;
8+
import me.nalab.core.data.survey.SurveyEntity;
59
import me.nalab.survey.application.exception.TargetDoesNotExistException;
10+
import me.nalab.survey.jpa.adaptor.findtarget.repository.TargetIdFindJpaRepository;
611
import org.springframework.beans.factory.annotation.Autowired;
712
import org.springframework.beans.factory.annotation.Qualifier;
813
import org.springframework.stereotype.Repository;
@@ -17,11 +22,14 @@
1722
public class TargetFindAdaptor implements TargetFindPort {
1823

1924
private final TargetFindJpaRepository targetFindJpaRepository;
25+
private final TargetIdFindJpaRepository targetIdFindJpaRepository;
2026

2127
@Autowired
2228
TargetFindAdaptor(
23-
@Qualifier("findtarget.TargetFindJpaRepository") TargetFindJpaRepository targetFindJpaRepository) {
29+
@Qualifier("findtarget.TargetFindJpaRepository") TargetFindJpaRepository targetFindJpaRepository,
30+
@Qualifier("findtarget.TargetIdFindJpaRepository") TargetIdFindJpaRepository targetIdFindJpaRepository) {
2431
this.targetFindJpaRepository = targetFindJpaRepository;
32+
this.targetIdFindJpaRepository = targetIdFindJpaRepository;
2533
}
2634

2735
@Override
@@ -37,4 +45,29 @@ public Target getTargetById(Long targetId) {
3745

3846
return TargetEntityMapper.toTarget(targetEntity);
3947
}
48+
49+
@Override
50+
public List<Target> findAllTargetBySurveyIds(Set<Long> surveyIds) {
51+
var surveys = targetIdFindJpaRepository.findAllById(surveyIds);
52+
var targetIds = surveys
53+
.stream()
54+
.map(SurveyEntity::getTargetId)
55+
.toList();
56+
57+
return targetFindJpaRepository.findAllById(targetIds)
58+
.stream()
59+
.map(targetEntity -> {
60+
var surveyEntity = getSurveyEntityByTargetId(targetEntity.getId(), surveys);
61+
return TargetEntityMapper.toTargetWithSurvey(targetEntity, surveyEntity);
62+
})
63+
.toList();
64+
}
65+
66+
private SurveyEntity getSurveyEntityByTargetId(Long targetId, List<SurveyEntity> surveyEntities) {
67+
return surveyEntities.stream()
68+
.filter(entity -> Objects.equals(entity.getTargetId(), targetId))
69+
.findFirst().orElseThrow(
70+
() -> new IllegalStateException("Cannot find exist survey")
71+
);
72+
}
4073
}

‎survey/survey-web-adaptor/src/main/java/me/nalab/survey/web/adaptor/bookmark/BookmarkedSurveyFindController.java

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package me.nalab.survey.web.adaptor.bookmark;
2+
3+
import lombok.RequiredArgsConstructor;
4+
import me.nalab.survey.application.port.in.web.bookmark.BookmarkedSurveyFindUseCase;
5+
import me.nalab.survey.web.adaptor.bookmark.response.SurveyBookmarksResponse;
6+
import org.springframework.http.HttpStatus;
7+
import org.springframework.web.bind.annotation.GetMapping;
8+
import org.springframework.web.bind.annotation.RequestAttribute;
9+
import org.springframework.web.bind.annotation.RequestMapping;
10+
import org.springframework.web.bind.annotation.RequestParam;
11+
import org.springframework.web.bind.annotation.ResponseStatus;
12+
import org.springframework.web.bind.annotation.RestController;
13+
14+
@RestController
15+
@RequestMapping("/v1")
16+
@RequiredArgsConstructor
17+
public class BookmarkedSurveyFindController {
18+
19+
private final BookmarkedSurveyFindUseCase bookmarkedSurveyFindUseCase;
20+
21+
@GetMapping("/surveys/bookmarks")
22+
@ResponseStatus(HttpStatus.OK)
23+
public SurveyBookmarksResponse findBookmarkedSurveys(
24+
@RequestAttribute("logined") Long loginedTargetId,
25+
@RequestParam(value = "last-survey-id", defaultValue = "0") Long lastSurveyId,
26+
@RequestParam(value = "count", defaultValue = "20") Integer count
27+
) {
28+
var bookmarkedSurveys = bookmarkedSurveyFindUseCase.findBookmarkedSurveysByTargetId(loginedTargetId,
29+
lastSurveyId, count);
30+
return SurveyBookmarksResponse.of(bookmarkedSurveys);
31+
}
32+
33+
}

0 commit comments

Comments
 (0)