Skip to content

Commit 8c06311

Browse files
committed
fix: 프로필 수정 시 profileImage 없어도 되도록 수정
1 parent 11d0449 commit 8c06311

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

src/main/java/targeter/aim/domain/challenge/dto/ChallengeDto.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@
1010
import targeter.aim.domain.label.entity.Field;
1111
import targeter.aim.domain.label.entity.Tag;
1212
import targeter.aim.domain.user.dto.TierDto;
13-
import targeter.aim.domain.user.dto.UserDto;
1413
import targeter.aim.domain.user.entity.User;
1514

1615
import java.time.LocalDate;
17-
import java.time.LocalDateTime;
1816
import java.util.List;
1917
import java.util.Set;
2018
import java.util.stream.Collectors;

src/main/java/targeter/aim/domain/user/dto/UserDto.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,32 +197,27 @@ public static class ChallengeRecord {
197197
@Builder
198198
@NoArgsConstructor
199199
@AllArgsConstructor
200-
@Schema(description = "챌린지 기록(시도/성공/실패/성공률)")
200+
@Schema(description = "프로필 수정 요청 DTO")
201201
public static class UpdateProfileRequest {
202-
@NotBlank(message = "아이디를 입력해주세요.")
203202
@Schema(description = "아이디", example = "user1234")
204203
@Pattern(regexp = "^(?=.*[a-z])(?=.*[0-9])[a-z0-9]{8,16}$", message = "아이디는 영문 소문자와 숫자를 각각 1자 이상 포함하며, 8~16자여야 합니다.")
205204
private String loginId;
206205

207-
@NotBlank(message = "닉네임을 입력해주세요.")
208206
@Schema(description = "닉네임", example = "nickname")
209207
@Pattern(regexp = "^[a-zA-Z0-9가-힣]{1,10}$",
210208
message = "닉네임은 한글, 영문, 숫자로만 구성되며 1~10자여야 합니다.")
211209
private String nickname;
212210

213-
@NotBlank(message = "비밀번호를 입력해주세요.")
214211
@Schema(description = "비밀번호", example = "password123!")
215212
@Pattern(regexp = "^(?=.*[a-z])(?=.*[0-9])(?=.*[!@#$%^&*?_])[a-z0-9!@#$%^&*?_]{8,16}$", message = "비밀번호는 영문 소문자, 숫자, 특수문자를 각각 1자 이상 포함하며 8~16자여야 합니다.")
216213
private String password;
217214

218-
@NotNull(message = "생년월일을 입력해주세요.")
219215
@Schema(description = "생년월일", example = "yyyy-mm-dd")
220216
private LocalDate birthday;
221217

222218
@Schema(description = "프로필 이미지")
223219
private MultipartFile profileImage;
224220

225-
@NotNull(message = "성별을 입력해주세요.")
226221
@Schema(
227222
description = "사용자 성별",
228223
example = "MALE | FEMALE | OTHER",

src/main/java/targeter/aim/domain/user/service/UserService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public UserDto.ProfileResponse updateMyProfile(UserDto.UpdateProfileRequest requ
221221
cannotCreateWithDuplicatedLoginIdOrNickname(request, me);
222222

223223
request.applyTo(me, passwordEncoder);
224-
if(!request.getProfileImage().isEmpty()) {
224+
if(request.getProfileImage() != null && !request.getProfileImage().isEmpty()) {
225225
saveProfileImage(request.getProfileImage(), me);
226226
}
227227

0 commit comments

Comments
 (0)