Skip to content

Commit e05d956

Browse files
committed
chore: #73 issue #72와 발생한 머지 충돌 해결
1 parent 64de72a commit e05d956

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,7 @@ public UserResponse updateProfileImageUrlV1(
136136
UserDto userUpdated = userCommandService.updateProfileImageUrl(userPrincipal.getUserId(), profileImage);
137137
return UserResponse.from(userUpdated);
138138
}
139-
}
140-
139+
141140
@Operation(
142141
summary = "연락 수단 변경",
143142
description = "연락 수단을 변경합니다.",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@ public static User create(
101101
);
102102
}
103103

104-
105104
public void changeProfileImageUrl(String profileImageUrl) {
106105
this.profileImageUrl = profileImageUrl;
107106
}
108107

109108
public UserProfileImage getProfileImage() {
110109
return UserProfileImage.of(profileImageUrl);
110+
}
111111

112112
public void changeContactLink(String contactLink) {
113113
this.contactLink = contactLink;

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -241,10 +241,10 @@ public void securitySetUp() throws Exception {
241241
.andExpect(status().isOk())
242242
.andExpect(jsonPath("$.profileImageUrl").value(expectedResult.getProfileImageUrl()));
243243
then(userCommandService).should().updateProfileImageUrl(userId, profileImage);
244-
verifyEveryMocksShouldHaveNoMoreInteractions();
244+
verifyEveryMocksShouldHaveNoMoreInteractions();
245245
}
246-
247-
246+
247+
@Test
248248
void 주어진_연락수단을_새로운_연락수단으로_변경한다() throws Exception {
249249
// given
250250
long userId = 1L;

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -218,14 +218,14 @@ static Stream<Arguments> testDataForCreateNewUserWithKakao() throws Exception {
218218

219219
// when
220220
Throwable t = catchThrowable(() -> sut.updateProfileImageUrl(userId, newProfileImage));
221-
222-
// then
221+
222+
// then
223223
then(userQueryService).should().getById(userId);
224224
verifyEveryMocksShouldHaveNoMoreInteractions();
225225
assertThat(t).isInstanceOf(UserNotFoundByIdException.class);
226226
}
227-
228-
227+
228+
@Test
229229
void 주어진_유저_ID와_연락_수단으로_연락_수단을_변경한다() throws Exception {
230230
// given
231231
Long userId = 1L;

0 commit comments

Comments
 (0)