Merge branch 'main' into feature/#73-edit-profile-image

Author: tinon1004

src/main/java/com/ajou/hertz/domain/user/controller/UserController.java

@@ -21,6 +21,7 @@
 import com.ajou.hertz.common.validator.PhoneNumber;
 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.UserEmailResponse;
 import com.ajou.hertz.domain.user.dto.response.UserExistenceResponse;
 import com.ajou.hertz.domain.user.dto.response.UserResponse;
@@ -136,3 +137,20 @@ public UserResponse updateProfileImageUrlV1(
 		return UserResponse.from(userUpdated);
 	}
 }
+                
+	@Operation(
+		summary = "연락 수단 변경",
+		description = "연락 수단을 변경합니다.",
+		security = @SecurityRequirement(name = "access-token")
+	)
+	@PutMapping(value = "/me/contact-link", headers = API_VERSION_HEADER_NAME + "=" + 1)
+	public UserResponse updateContactLinkV1(
+		@RequestBody @Valid UpdateContactLinkRequest updateContactLinkRequest,
+		@AuthenticationPrincipal UserPrincipal userPrincipal
+	) {
+		UserDto userUpdated = userCommandService.updateContactLink(userPrincipal.getUserId(),
+			updateContactLinkRequest.getContactLink());
+		return UserResponse.from(userUpdated);
+	}
+}
+

src/main/java/com/ajou/hertz/domain/user/dto/request/UpdateContactLinkRequest.java

@@ -0,0 +1,19 @@
+package com.ajou.hertz.domain.user.dto.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class UpdateContactLinkRequest {
+
+	@Schema(description = "연락 수단", example = "https://new-contack-link")
+	@NotBlank
+	private String contactLink;
+
+}

src/main/java/com/ajou/hertz/domain/user/entity/User.java

@@ -101,12 +101,16 @@ public static User create(
 		);
 	}
 
+
 	public void changeProfileImageUrl(String profileImageUrl) {
 		this.profileImageUrl = profileImageUrl;
 	}
 
 	public UserProfileImage getProfileImage() {
 		return UserProfileImage.of(profileImageUrl);
+
+	public void changeContactLink(String contactLink) {
+		this.contactLink = contactLink;
 	}
 
 }

src/main/java/com/ajou/hertz/domain/user/service/UserCommandService.java

@@ -137,8 +137,9 @@ private String generateRandom16CharString() {
 	/**
 	 * 유저의 프로필 이미지를 업데이트한다.
 	 *
-	 * @param userId         유저 id
+	 * @param userId 유저 id
 	 * @param newProfileImage 새로운 프로필 이미지
+   *
 	 * @return 업데이트된 유저 정보
 	 */
 	public UserDto updateProfileImageUrl(Long userId, MultipartFile newProfileImage) {
@@ -155,6 +156,20 @@ public UserDto updateProfileImageUrl(Long userId, MultipartFile newProfileImage)
 		fileService.deleteFile(fullPathToDelete);
 
 		user.changeProfileImageUrl(newProfileImageUrl);
+    return UserDto.from(user);
+   }
+
+  /**
+	 *연락 수단을 변경합니다.
+	 *
+	 * @param userId 유저의 ID
+	 * @param contactLink 변경할 연락 수단
+	 *
+	 *@return 변경된 유저 정보
+	 */
+	public UserDto updateContactLink(Long userId, String contactLink) {
+		User user = userQueryService.getById(userId);
+		user.changeContactLink(contactLink);
 		return UserDto.from(user);
 	}
 

src/test/java/com/ajou/hertz/unit/domain/user/controller/UserControllerTest.java

@@ -241,6 +241,29 @@ public void securitySetUp() throws Exception {
 			.andExpect(status().isOk())
 			.andExpect(jsonPath("$.profileImageUrl").value(expectedResult.getProfileImageUrl()));
 		then(userCommandService).should().updateProfileImageUrl(userId, profileImage);
+    verifyEveryMocksShouldHaveNoMoreInteractions();
+	}
+  
+  
+	void 주어진_연락수단을_새로운_연락수단으로_변경한다() throws Exception {
+		// given
+		long userId = 1L;
+		String newContactLink = "https://new-contact-link.com";
+		UserDto expectedResult = createUserDto(userId);
+		UserDetails testUser = createTestUser(userId);
+		given(userCommandService.updateContactLink(userId, newContactLink)).willReturn(expectedResult);
+
+		// when & then
+		mvc.perform(
+				put("/api/users/me/contact-link")
+					.header(API_VERSION_HEADER_NAME, 1)
+					.contentType(MediaType.APPLICATION_JSON)
+					.content(objectMapper.writeValueAsString(newContactLink))
+					.with(user(testUser))
+			)
+			.andExpect(status().isOk())
+			.andExpect(jsonPath("$.contactLink").value(expectedResult.getContactLink()));
+		then(userCommandService).should().updateContactLink(userId, newContactLink);
 		verifyEveryMocksShouldHaveNoMoreInteractions();
 	}
 
@@ -278,7 +301,7 @@ private UserDto createUserDto(long id) throws Exception {
 			LocalDate.of(2024, 1, 1),
 			Gender.ETC,
 			"01012345678",
-			"https://contack-link",
+			"https://contact-link",
 			LocalDateTime.of(2024, 1, 1, 0, 0)
 		);
 	}
@@ -290,4 +313,5 @@ private UserDto createUserDto() throws Exception {
 	private UserDetails createTestUser(Long userId) throws Exception {
 		return new UserPrincipal(createUserDto(userId));
 	}
+
 }

src/test/java/com/ajou/hertz/unit/domain/user/service/UserCommandServiceTest.java

@@ -218,6 +218,39 @@ static Stream<Arguments> testDataForCreateNewUserWithKakao() throws Exception {
 
 		// when
 		Throwable t = catchThrowable(() -> sut.updateProfileImageUrl(userId, newProfileImage));
+    
+    // then
+		then(userQueryService).should().getById(userId);
+		verifyEveryMocksShouldHaveNoMoreInteractions();
+		assertThat(t).isInstanceOf(UserNotFoundByIdException.class);
+	}
+  
+  
+	void 주어진_유저_ID와_연락_수단으로_연락_수단을_변경한다() throws Exception {
+		// given
+		Long userId = 1L;
+		String contactLink = "https://new-contactLink";
+		User user = createUser(userId, "$2a$abc123", "12345");
+		given(userQueryService.getById(userId)).willReturn(user);
+
+		// when
+		UserDto updatedUserDto = sut.updateContactLink(userId, contactLink);
+
+		// then
+		then(userQueryService).should().getById(userId);
+		verifyEveryMocksShouldHaveNoMoreInteractions();
+		assertThat(updatedUserDto.getContactLink()).isEqualTo(contactLink);
+	}
+
+	@Test
+	void 주어진_유저_ID와_연락_수단으로_연락_수단을_변경한다_존재하지_않는_유저라면_예외가_발생한다() throws Exception {
+		// given
+		Long userId = 1L;
+		String contactLink = "https://new-contactLink";
+		given(userQueryService.getById(userId)).willThrow(UserNotFoundByIdException.class);
+
+		// when
+		Throwable t = catchThrowable(() -> sut.updateContactLink(userId, contactLink));
 
 		// then
 		then(userQueryService).should().getById(userId);
@@ -243,7 +276,7 @@ private static User createUser(Long id, String password, String kakaoUid, Gender
 			LocalDate.of(2024, 1, 1),
 			gender,
 			"010-1234-5678",
-			null
+			"https://contactLink"
 		);
 	}