Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[refactor] : login된 유저 조회 api가 email을 함께 반환하도록 수정 #406

Merged
merged 4 commits into from
Mar 17, 2024
Merged

[refactor] : login된 유저 조회 api가 email을 함께 반환하도록 수정 #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7802fe
fix: JWT decrypt 예외시 AuthException을 던지도록하고, 전역 Advice를 등록 (#403)
devxb Mar 8, 2024
1ffe225
[refactor] : login된 유저 조회 api가 email을 함께 반환하도록 수정 (#401)
devxb Mar 8, 2024
38990cb
feat: User 삭제 API 개발 (#405)
devxb Mar 10, 2024
3988ace
refactor: TokenInfo를 record로 변경하고 token-value 부분을 받도록 수정한다 (#407)
devxb Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion api/acceptance-test/src/test/java/me/nalab/luffy/api/acceptance/test/UserInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import me.nalab.core.data.user.UserOAuthInfoEntity;
import me.nalab.core.idgenerator.idcore.IdGenerator;
import me.nalab.user.domain.user.Provider;
import me.nalab.user.domain.user.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
Expand All @@ -22,7 +23,7 @@ public class UserInitializer {
private IdGenerator idGenerator;

@Transactional
public void saveUserWithOAuth(Provider provider, String name, String email, Instant date) {
public Long saveUserWithOAuth(Provider provider, String name, String email, Instant date) {
var userEntity = UserEntity.builder()
.id(idGenerator.generate())
.nickname(name)
Expand All @@ -42,6 +43,7 @@ public void saveUserWithOAuth(Provider provider, String name, String email, Inst

entityManager.persist(userEntity);
entityManager.persist(userOauthInfoEntity);
return userEntity.getId();
}

}
2 changes: 1 addition & 1 deletion ...a/me/nalab/luffy/api/acceptance/test/feedback/bookmark/BookmarkReplaceAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void REPLACE_BOOKMARK_SUCCESS_TEST() throws Exception {

// given
Long targetId = targetInitializer.saveTargetAndGetId("target", Instant.now());
String token = "token";
String token = "bearer token";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

토큰 만드는 책임을 넘기거나 Authentication Type을 public static 으로 풀면 좋을 것 같음!

applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedId(targetId)
.expectedToken(token)
Expand Down
4 changes: 2 additions & 2 deletions ...java/me/nalab/luffy/api/acceptance/test/feedback/create/FeedbackCreateAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class FeedbackCreateAcceptanceTest extends AbstractFeedbackTestSupporter {
void CREATE_FEEDBACK_TO_SURVEY_SUCCESS() throws Exception {
// given
Long targetId = targetInitializer.saveTargetAndGetId("nalab", Instant.now());
String token = "nalab-token";
String token = "bearer nalab-token";
applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedToken(token)
.expectedId(targetId)
Expand All @@ -88,7 +88,7 @@ void CREATE_FEEDBACK_TO_SURVEY_SUCCESS() throws Exception {
void CREATE_MULTIPLE_FEEDBACK_TO_SURVEY_SUCCESS() throws Exception {
// given
Long targetId = targetInitializer.saveTargetAndGetId("hello", Instant.now());
String token = "hello-token";
String token = "bearer hello-token";
applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedToken(token)
.expectedId(targetId)
Expand Down
8 changes: 4 additions & 4 deletions ...est/java/me/nalab/luffy/api/acceptance/test/feedback/find/FeedbackFindAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class FeedbackFindAcceptanceTest extends AbstractFeedbackTestSupporter {
void FIND_FEED_BACK_SUCCESS() throws Exception {
// given
Long targetId = targetInitializer.saveTargetAndGetId("hello world", Instant.now());
String token = "mock token";
String token = "bearer token";
applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedId(targetId)
.expectedToken(token)
Expand All @@ -79,7 +79,7 @@ void FIND_FEED_BACK_SUCCESS() throws Exception {
void FIND_FEED_BACK_SUCCESS_ANY_FEEDBACK() throws Exception {
// given
Long targetId = targetInitializer.saveTargetAndGetId("hello world", Instant.now());
String token = "mock token";
String token = "bearer token";
applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedId(targetId)
.expectedToken(token)
Expand Down Expand Up @@ -112,7 +112,7 @@ void FIND_BOOKMARKED_FEED_BACK_SUCCESS() throws Exception {
void FIND_BOOKMARKED_FEED_BACK_SUCCESS_ANY_FEEDBACK() throws Exception {
// given
Long targetId = targetInitializer.saveTargetAndGetId("hello world", Instant.now());
String token = "mock token";
String token = "bearer token";
applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedId(targetId)
.expectedToken(token)
Expand All @@ -130,7 +130,7 @@ void FIND_BOOKMARKED_FEED_BACK_SUCCESS_ANY_FEEDBACK() throws Exception {
private Long setUpSurveyAndFeedbackAndBookmark() throws Exception {
// 유저 생성
Long targetId = targetInitializer.saveTargetAndGetId("hello world", Instant.now());
String token = "mock token";
String token = "bearer token";
applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedId(targetId)
.expectedToken(token)
Expand Down
8 changes: 4 additions & 4 deletions ...va/me/nalab/luffy/api/acceptance/test/feedback/find/FeedbackFindByTypeAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class FeedbackFindByTypeAcceptanceTest extends AbstractFeedbackTestSupporter {
void FIND_FEEDBACK_BY_FORM_TYPE_TENDENCY() throws Exception {
// given
Long targetId = targetInitializer.saveTargetAndGetId("hello world", Instant.now());
String token = "mock token";
String token = "bearer token";
applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedId(targetId)
.expectedToken(token)
Expand All @@ -86,7 +86,7 @@ void FIND_FEEDBACK_BY_FORM_TYPE_TENDENCY() throws Exception {
void FIND_FEEDBACK_BY_FORM_TYPE_CUSTOM() throws Exception {
// given
Long targetId = targetInitializer.saveTargetAndGetId("hello world", Instant.now());
String token = "mock token";
String token = "bearer token";
applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedId(targetId)
.expectedToken(token)
Expand All @@ -109,7 +109,7 @@ void FIND_FEEDBACK_BY_FORM_TYPE_CUSTOM() throws Exception {
void FIND_FEEDBACK_BY_TYPE_TENDENCY_WITH_NO_FEEDBACK() throws Exception {
// given
Long targetId = targetInitializer.saveTargetAndGetId("hello world", Instant.now());
String token = "mock token";
String token = "bearer token";
applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedId(targetId)
.expectedToken(token)
Expand All @@ -129,7 +129,7 @@ void FIND_FEEDBACK_BY_TYPE_TENDENCY_WITH_NO_FEEDBACK() throws Exception {
void FIND_FEEDBACK_BY_TYPE_CUSTOM_WITH_NO_FEEDBACK() throws Exception {
// given
Long targetId = targetInitializer.saveTargetAndGetId("hello world", Instant.now());
String token = "mock token";
String token = "bearer token";
applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedId(targetId)
.expectedToken(token)
Expand Down
4 changes: 2 additions & 2 deletions ...e/nalab/luffy/api/acceptance/test/feedback/findreviewers/ReviewersFindAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class ReviewersFindAcceptanceTest extends AbstractFeedbackTestSupporter {
void FEEDBACKS_WITH_NO_REVIEWER_TEST() throws Exception {

// given
String token = "token";
String token = "bearer token";
Long targetId = targetInitializer.saveTargetAndGetId("sujin", Instant.now());
applicationEventPublisher.publishEvent(
MockUserRegisterEvent.builder().expectedToken(token).expectedId(targetId).build());
Expand All @@ -84,7 +84,7 @@ void FEEDBACKS_WITH_NO_REVIEWER_TEST() throws Exception {
void FEEDBACKS_WITH_REVIEWERS_TEST() throws Exception {

// given
String token = "token";
String token = "bearer token";
Long targetId = targetInitializer.saveTargetAndGetId("sujin", Instant.now());
applicationEventPublisher.publishEvent(
MockUserRegisterEvent.builder().expectedToken(token).expectedId(targetId).build());
Expand Down
2 changes: 1 addition & 1 deletion .../me/nalab/luffy/api/acceptance/test/feedback/findspecific/SpecificFindAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public class SpecificFindAcceptanceTest extends AbstractFeedbackTestSupporter {
void FIND_SPECIFIC_FEEDBACK_SUCCESS_TEST() throws Exception {

// given
String token = "token";
String token = "bearer token";
Long targetId = targetInitializer.saveTargetAndGetId("sujin", Instant.now());
applicationEventPublisher.publishEvent(
MockUserRegisterEvent.builder().expectedToken(token).expectedId(targetId).build());
Expand Down
4 changes: 2 additions & 2 deletions ...lab/luffy/api/acceptance/test/feedback/findsummary/FeedbackFindSummaryAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class FeedbackFindSummaryAcceptanceTest extends AbstractFeedbackTestSupporter {
void FEEFBACK_SUMMARY_FIND_SUCCESS_TEST_WITH_NO_FEEDBACK() throws Exception {

// given
String token = "token";
String token = "bearer token";
Long targetId = targetInitializer.saveTargetAndGetId("sujin", Instant.now());
applicationEventPublisher.publishEvent(
MockUserRegisterEvent.builder().expectedToken(token).expectedId(targetId).build());
Expand All @@ -81,7 +81,7 @@ void FEEFBACK_SUMMARY_FIND_SUCCESS_TEST_WITH_NO_FEEDBACK() throws Exception {
void FEEFBACK_SUMMARY_FIND_SUCCESS_TEST_WITH_FEEDBACK() throws Exception {

// given
String token = "token";
String token = "bearer token";
Long targetId = targetInitializer.saveTargetAndGetId("sujin", Instant.now());
applicationEventPublisher.publishEvent(
MockUserRegisterEvent.builder().expectedToken(token).expectedId(targetId).build());
Expand Down
2 changes: 1 addition & 1 deletion .../luffy/api/acceptance/test/feedback/reviewer/summary/ReviewerSummarizeAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ void FIND_REVIEWER_SUMMARY_SUCCESS() throws Exception {

private String saveTargetAndGetToken(String name) {
Long targetId = targetInitializer.saveTargetAndGetId("nalab", Instant.now());
String token = "nalab-token";
String token = "bearer nalab-token";
applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedToken(token)
.expectedId(targetId)
Expand Down
2 changes: 1 addition & 1 deletion ...java/me/nalab/luffy/api/acceptance/test/survey/bookmark/SurveyBookmarkAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ void BOOKMARK_SURVEY_TO_TOKEN_OWNER() throws Exception {
// given
var targetId = targetInitializer.saveTargetAndGetId("luffy",
LocalDateTime.now().minusYears(24).toInstant(ZoneOffset.UTC));
var token = "luffy's-double-token";
var token = "bearer luffy's-double-token";
applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedToken(token)
.expectedId(targetId)
Expand Down
6 changes: 3 additions & 3 deletions ...est/java/me/nalab/luffy/api/acceptance/test/survey/create/SurveyCreateAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void CREATE_NEW_SURVEY_SUCCESS_DEFAULT() throws Exception {
// given
Long targetId = targetInitializer.saveTargetAndGetId("luffy",
LocalDateTime.now().minusYears(24).toInstant(ZoneOffset.UTC));
String token = "luffy's-double-token";
String token = "bearer luffy's-double-token";
applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedToken(token)
.expectedId(targetId)
Expand All @@ -68,7 +68,7 @@ void CREATE_NEW_SURVEY_SUCCESS_SUCCESS_CUSTOM() throws Exception {
// given
Long targetId = targetInitializer.saveTargetAndGetId("luffy",
LocalDateTime.now().minusYears(24).toInstant(ZoneOffset.UTC));
String token = "luffy's-double-token";
String token = "bearer luffy's-double-token";
applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedToken(token)
.expectedId(targetId)
Expand All @@ -86,7 +86,7 @@ void CREATE_NEW_SURVEY_SUCCESS_SUCCESS_CUSTOM() throws Exception {
void CREATE_NEW_SURVEY_WITH_FAIL() throws Exception {
// given
Long targetId = targetInitializer.saveTargetAndGetId("luffy", LocalDateTime.now().minusYears(24).toInstant(ZoneOffset.UTC));
String token = "luffy's-double-token";
String token = "bearer luffy's-double-token";
applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedToken(token)
.expectedId(targetId)
Expand Down
4 changes: 2 additions & 2 deletions ...est/java/me/nalab/luffy/api/acceptance/test/survey/exists/SurveyExistsAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class SurveyExistsAcceptanceTest extends AbstractSurveyTestSupporter {
@DisplayName("token에 해당하는 survey가 존재한다면, true를 반환한다.")
void RETURN_TRUE_IF_SURVEY_EXISTS() throws Exception {
// given
String token = "luffy's-double-token";
String token = "bearer luffy's-double-token";
Long targetId = targetInitializer.saveTargetAndGetId("devxb", Instant.now());
applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedToken(token)
Expand All @@ -59,7 +59,7 @@ void RETURN_TRUE_IF_SURVEY_EXISTS() throws Exception {
@DisplayName("token에 해당하는 survey가 존재하지 않는다면, false를 반환한다.")
void RETURN_FALSE_IF_SURVEY_DOES_NOT_EXISTS() throws Exception {
// given
String token = "luffy's-double-token";
String token = "bearer luffy's-double-token";
Long targetId = targetInitializer.saveTargetAndGetId("devxb", Instant.now());
applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedToken(token)
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/java/me/nalab/luffy/api/acceptance/test/survey/find/SurveyFindAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class SurveyFindAcceptanceTest extends AbstractSurveyTestSupporter {
@Test
void SURVEY_FIND_SUCCESS_TEST() throws Exception {

String token = "luffy's-double-token";
String token = "bearer luffy's-double-token";
Long targetId = targetInitializer.saveTargetAndGetId("sujin", Instant.now());
applicationEventPublisher.publishEvent(
MockUserRegisterEvent.builder().expectedToken(token).expectedId(targetId).build());
Expand Down
4 changes: 2 additions & 2 deletions ...est/java/me/nalab/luffy/api/acceptance/test/survey/findid/SurveyFindidAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class SurveyFindidAcceptanceTest extends AbstractSurveyTestSupporter {
void GET_LOGINED_SURVEY_ID_SUCCESS() throws Exception {
// given
Long targetId = targetInitializer.saveTargetAndGetId("nalab", Instant.now());
String token = "nalab-token";
String token = "bearer nalab-token";
applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedToken(token)
.expectedId(targetId)
Expand All @@ -60,7 +60,7 @@ void GET_LOGINED_SURVEY_ID_SUCCESS() throws Exception {
void GET_LOGINED_SURVEY_ID_FAIL_NO_SURVEY() throws Exception {
// given
Long targetId = targetInitializer.saveTargetAndGetId("nalab", Instant.now());
String token = "nalab-token";
String token = "bearer nalab-token";
applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedToken(token)
.expectedId(targetId)
Expand Down
2 changes: 1 addition & 1 deletion ...t/java/me/nalab/luffy/api/acceptance/test/survey/findtarget/TargetFindAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class TargetFindAcceptanceTest extends AbstractSurveyTestSupporter {
void FIND_TARGET_BY_SURVEY_ID_WITH_NO_AUTHORIZATION() throws Exception {
// given
Long targetId = targetInitializer.saveTargetAndGetId("target", Instant.now());
String token = "token";
String token = "bearer token";
applicationEventPublisher.publishEvent(MockUserRegisterEvent.builder()
.expectedToken(token)
.expectedId(targetId)
Expand Down
8 changes: 7 additions & 1 deletion ...st/src/test/java/me/nalab/luffy/api/acceptance/test/user/UserAcceptanceTestSupporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class UserAcceptanceTestSupporter {

protected ResultActions getLoginedUser(String token) throws Exception {
return mockMvc.perform(MockMvcRequestBuilders
.get(API_VERSION + "/users/logined")
.get(API_VERSION + "/users/logins")
.accept(MediaType.APPLICATION_JSON)
.header(HttpHeaders.AUTHORIZATION, token)
);
Expand All @@ -33,6 +33,12 @@ protected ResultActions updateTargetPosition(String token, String content) throw
);
}

protected ResultActions deleteUser(String token) throws Exception {
return mockMvc.perform(MockMvcRequestBuilders
.delete(API_VERSION + "/users")
.header(HttpHeaders.AUTHORIZATION, token));
}

@Autowired
final void setMockMvc(MockMvc mockMvc) {
this.mockMvc = mockMvc;
Expand Down
5 changes: 3 additions & 2 deletions ...e-test/src/test/java/me/nalab/luffy/api/acceptance/test/user/UserAcceptanceValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@

public class UserAcceptanceValidator {

public static void assertIsLogined(ResultActions resultActions, Long targetId, String nickname) throws Exception {
public static void assertIsLogined(ResultActions resultActions, Long targetId, String nickname, String email) throws Exception {
resultActions.andExpectAll(
status().isOk(),
jsonPath("$.target_id").value(targetId),
jsonPath("$.nickname").value(nickname)
jsonPath("$.nickname").value(nickname),
jsonPath("$.email").value(email)
);
}

Expand Down
73 changes: 73 additions & 0 deletions ...rc/test/java/me/nalab/luffy/api/acceptance/test/user/delete/UserDeleteAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
package me.nalab.luffy.api.acceptance.test.user.delete;

import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

import java.time.Instant;
import java.util.Set;
import me.nalab.auth.application.common.dto.Payload;
import me.nalab.auth.application.common.utils.JwtUtils;
import me.nalab.auth.mock.api.MockUserRegisterEvent;
import me.nalab.luffy.api.acceptance.test.TargetInitializer;
import me.nalab.luffy.api.acceptance.test.UserInitializer;
import me.nalab.luffy.api.acceptance.test.user.UserAcceptanceTestSupporter;
import me.nalab.user.domain.user.Provider;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.test.context.TestPropertySource;

@SpringBootTest
@AutoConfigureMockMvc
@TestPropertySource("classpath:h2.properties")
@ComponentScan("me.nalab")
@EnableJpaRepositories(basePackages = {"me.nalab"})
@EntityScan(basePackages = {"me.nalab"})
class UserDeleteAcceptanceTest extends UserAcceptanceTestSupporter {

@Autowired
private ApplicationEventPublisher applicationEventPublisher;

@Autowired
private TargetInitializer targetInitializer;

@Autowired
private JwtUtils jwtUtils;

@Autowired
private UserInitializer userInitializer;

@Test
@DisplayName("DELETE /v1/users API는 token에 해당하는 유저가 삭제되면 200 OK를 반환한다.")
void DELETE_USER_SUCCESS() throws Exception {
// given
String nickname = "delete_user_success";
String email = "delete_user_success";

var token = "bearer " + createUserAndSetToken(nickname, email);

// when
var result = deleteUser(token);

// then
result.andExpect(status().isOk());
}

private String createUserAndSetToken(String nickname, String email) {
Long userId = userInitializer.saveUserWithOAuth(Provider.DEFAULT, nickname, email, Instant.now());
Long targetId = targetInitializer.saveTargetAndGetId(nickname, Instant.now());

var token = jwtUtils.createAccessToken(Set.of(new Payload(Payload.Key.USER_ID, String.valueOf(userId)),
new Payload(Payload.Key.TARGET_ID, String.valueOf(targetId))));

applicationEventPublisher.publishEvent(
MockUserRegisterEvent.builder().expectedToken("bearer " + token).expectedId(targetId).build());

return token;
}
}
Loading
Loading