refact: 컨벤션에 따른 패키지 수정

Author: HuniHuns

src/main/java/targeter/aim/domain/auth/service/AuthService.java

@@ -71,7 +71,7 @@ public UserDto.UserResponse signUp(AuthDto.SignUpRequest request) {
 
     private void saveProfileImage(MultipartFile file, User user) {
         if(file != null && !file.isEmpty()) {
-            ProfileImage profileImage = ProfileImage.from(file);
+            ProfileImage profileImage = ProfileImage.from(file, user);
             if(profileImage == null) return;
             user.setProfileImage(profileImage);
             profileImage.setUser(user);

src/main/java/targeter/aim/domain/file/entity/ProfileImage.java

@@ -25,7 +25,7 @@ public class ProfileImage extends AttachedFile {
     @JoinColumn(name = "user_id")
     private User user;
 
-    public static ProfileImage from(MultipartFile file) {
+    public static ProfileImage from(MultipartFile file, User user) {
         throwIfNotAImageFile(file);
 
         String uuId = UUID.randomUUID().toString();
@@ -37,6 +37,7 @@ public static ProfileImage from(MultipartFile file) {
                 .fileName(safeFilename(file.getOriginalFilename()))
                 .size(file.getSize())
                 .filePath(filePath)
+                .user(user)
                 .build();
     }
 

src/main/java/targeter/aim/domain/file/repository/ProfileImageRepository.java

@@ -2,15 +2,11 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import targeter.aim.domain.user.dto.UserDto;
 import targeter.aim.domain.user.service.UserService;
 import targeter.aim.system.exception.model.ErrorCode;
@@ -72,4 +68,17 @@ public UserDto.ProfileResponse getUserProfile(
     ) {
         return userService.getProfile(userId, userDetails);
     }
+
+    @PatchMapping(value = "/me/profile", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @Operation(summary = "내 프로필 수정", description = "내 프로필(닉네임/관심사/관심분야/프로필사진)을 수정합니다.")
+    public UserDto.ProfileResponse updateMyProfile(
+            @ModelAttribute UserDto.UpdateProfileRequest request,
+            @AuthenticationPrincipal UserDetails userDetails
+    ) {
+        if (userDetails == null) {
+            throw new RestException(ErrorCode.AUTH_LOGIN_REQUIRED);
+        }
+
+        return userService.updateMyProfile(request, userDetails);
+    }
 }

src/main/java/targeter/aim/domain/user/controller/ProfileController.java

@@ -1,7 +1,12 @@
 package targeter.aim.domain.user.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import lombok.*;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.web.multipart.MultipartFile;
 import targeter.aim.domain.file.dto.FileDto;
 import targeter.aim.domain.user.entity.Gender;
 import targeter.aim.domain.user.entity.SocialLogin;
@@ -187,6 +192,61 @@ public static class ChallengeRecord {
 
         @Schema(description = "실패 횟수", example = "10")
         private Long failCount;
+    }
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Schema(description = "챌린지 기록(시도/성공/실패/성공률)")
+    public static class UpdateProfileRequest {
+        @NotBlank(message = "아이디를 입력해주세요.")
+        @Schema(description = "아이디", example = "user1234")
+        @Pattern(regexp = "^(?=.*[a-z])(?=.*[0-9])[a-z0-9]{8,16}$", message = "아이디는 영문 소문자와 숫자를 각각 1자 이상 포함하며, 8~16자여야 합니다.")
+        private String loginId;
+
+        @NotBlank(message = "닉네임을 입력해주세요.")
+        @Schema(description = "닉네임", example = "nickname")
+        @Pattern(regexp = "^[a-zA-Z0-9가-힣]{1,10}$",
+                message = "닉네임은 한글, 영문, 숫자로만 구성되며 1~10자여야 합니다.")
+        private String nickname;
 
+        @NotBlank(message = "비밀번호를 입력해주세요.")
+        @Schema(description = "비밀번호", example = "password123!")
+        @Pattern(regexp = "^(?=.*[a-z])(?=.*[0-9])(?=.*[!@#$%^&*?_])[a-z0-9!@#$%^&*?_]{8,16}$", message = "비밀번호는 영문 소문자, 숫자, 특수문자를 각각 1자 이상 포함하며 8~16자여야 합니다.")
+        private String password;
+
+        @NotNull(message = "생년월일을 입력해주세요.")
+        @Schema(description = "생년월일", example = "yyyy-mm-dd")
+        private LocalDate birthday;
+
+        @Schema(description = "프로필 이미지")
+        private MultipartFile profileImage;
+
+        @NotNull(message = "성별을 입력해주세요.")
+        @Schema(
+                description = "사용자 성별",
+                example = "MALE | FEMALE | OTHER",
+                allowableValues = {"MALE", "FEMALE", "OTHER"}
+        )
+        private Gender gender;
+
+        public void applyTo(User user, PasswordEncoder encoder) {
+            if(loginId != null && !loginId.equals(user.getLoginId())) {
+                user.setLoginId(loginId);
+            }
+            if(nickname != null && !nickname.equals(user.getNickname())) {
+                user.setNickname(nickname);
+            }
+            if(password != null) {
+                user.setPassword(encoder.encode(password));
+            }
+            if(birthday != null) {
+                user.setBirthday(birthday);
+            }
+            if(gender != null) {
+                user.setGender(gender);
+            }
+        }
     }
 }