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

내 연락수단 변경 API 구현 #85

Merged
merged 12 commits into from
Mar 21, 2024
Merged

내 연락수단 변경 API 구현 #85

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4fbe1eb
feat: #72 연락수단 변경 API 구현
tinon1004 Mar 16, 2024
a5185ba
refactor: #72 연락수단 변경 API 코드 수정
tinon1004 Mar 16, 2024
dc72858
feat: #72 UpdateContactLinkRequest 추가
tinon1004 Mar 16, 2024
888042e
feat: #72 UserContactLinkResponse 추가
tinon1004 Mar 17, 2024
3d8c227
refactor: #72 코드 수정
tinon1004 Mar 17, 2024
7b0d6f5
refactor: #72 Userresponse로 변경
tinon1004 Mar 18, 2024
ab9f56f
refactor: #72 필요없는 코드 삭제 및 수정
tinon1004 Mar 19, 2024
ac41304
refactor: #72 UserCommandServiceTest 수정
tinon1004 Mar 19, 2024
951456f
refactor: #72 403 에러 추가 및 코드 수정
tinon1004 Mar 20, 2024
060c726
Merge branch 'main' into feature/#72-edit-contact-link
Wo-ogie Mar 21, 2024
7582212
refactor: #72 403 에러 검증 로직 제거
tinon1004 Mar 21, 2024
7a1d76a
refactor: #72 불필요한 코드 제거 및 테스트 코드 수정
tinon1004 Mar 21, 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
10 changes: 5 additions & 5 deletions src/main/java/com/ajou/hertz/domain/user/controller/UserController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import com.ajou.hertz.domain.user.dto.UserDto;
import com.ajou.hertz.domain.user.dto.request.SignUpRequest;
import com.ajou.hertz.domain.user.dto.request.UpdateContactLinkRequest;
import com.ajou.hertz.domain.user.dto.response.UserContactLinkResponse;
import com.ajou.hertz.domain.user.dto.response.UserEmailResponse;
import com.ajou.hertz.domain.user.dto.response.UserExistenceResponse;
import com.ajou.hertz.domain.user.dto.response.UserResponse;
Expand Down Expand Up @@ -124,12 +123,13 @@ public ResponseEntity<UserResponse> signUpV1(
security = @SecurityRequirement(name = "access-token")
)
@PutMapping(value = "/me/contact-link", headers = API_VERSION_HEADER_NAME + "=" + 1)
public ResponseEntity<UserContactLinkResponse> updateContactLinkV1(
public UserResponse updateContactLinkV1(
@RequestBody @Valid UpdateContactLinkRequest updateContactLinkRequest,
@AuthenticationPrincipal UserPrincipal userPrincipal
) {
userCommandService.updateContactLink(userPrincipal.getUserId(), updateContactLinkRequest.getContactLink());
UserContactLinkResponse response = new UserContactLinkResponse(updateContactLinkRequest.getContactLink());
return ResponseEntity.ok(response);
UserDto userUpdated = userCommandService.updateContactLink(userPrincipal.getUserId(),
updateContactLinkRequest.getContactLink());
UserDto userDto = userQueryService.getDtoById(userPrincipal.getUserId());
return UserResponse.from(userUpdated);
}
}
17 changes: 0 additions & 17 deletions src/main/java/com/ajou/hertz/domain/user/dto/response/UserContactLinkResponse.java
View file
Open in desktop

This file was deleted.

11 changes: 7 additions & 4 deletions src/main/java/com/ajou/hertz/domain/user/service/UserCommandService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,17 @@ private String generateRandom16CharString() {
}

/**
* 연락 수단을 변경합니다.
*연락 수단을 변경합니다.
*
* @param userId 유저 ID
* @param contactLink 변경할 연락 수단
*@param userId 유저ID
*@param contactLink 변경할 연락 수단
*
*@return 변경된 유저 정보
*/
public void updateContactLink(Long userId, String contactLink) {
public UserDto updateContactLink(Long userId, String contactLink) {
User user = userQueryService.getById(userId);
user.changeContactLink(contactLink);
return UserDto.from(user);
}

}
7 changes: 5 additions & 2 deletions src/test/java/com/ajou/hertz/unit/domain/user/controller/UserControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,9 @@ public void securitySetUp() throws Exception {
String newContactLink = "https://new-contact-link.com";
UpdateContactLinkRequest updateContactLinkRequest = new UpdateContactLinkRequest(newContactLink);
UserDetails userDetails = createTestUser(userId);
willDoNothing().given(userCommandService).updateContactLink(userId, newContactLink);
UserDto updatedUserDto = createUserDto(userId);
given(userCommandService.updateContactLink(userId, newContactLink)).willReturn(updatedUserDto);
given(userQueryService.getDtoById(userId)).willReturn(updatedUserDto);

// when & then
mvc.perform(
Expand All @@ -232,9 +234,10 @@ public void securitySetUp() throws Exception {
)
.andExpect(status().isOk())
.andExpect(content().contentType(MediaType.APPLICATION_JSON))
.andExpect(jsonPath("$.contactLink").value(newContactLink));
.andExpect(jsonPath("$.contactLink").value(updatedUserDto.getContactLink()));

then(userCommandService).should().updateContactLink(userId, newContactLink);
then(userQueryService).should().getDtoById(userId);
verifyEveryMocksShouldHaveNoMoreInteractions();
}

Expand Down
Loading