Feat/#148 user update

src/main/java/io/oeid/mogakgo/common/swagger/template/UserSwagger.java

@@ -3,10 +3,12 @@
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
 import io.oeid.mogakgo.core.properties.swagger.error.SwaggerUserErrorExamples;
-import io.oeid.mogakgo.domain.user.presentation.dto.req.UserSignUpApiRequest;
+import io.oeid.mogakgo.domain.user.presentation.dto.req.UserSignUpApiReq;
+import io.oeid.mogakgo.domain.user.presentation.dto.req.UserUpdateApiReq;
 import io.oeid.mogakgo.domain.user.presentation.dto.res.UserDevelopLanguageApiRes;
 import io.oeid.mogakgo.domain.user.presentation.dto.res.UserPublicApiResponse;
 import io.oeid.mogakgo.domain.user.presentation.dto.res.UserSignUpApiResponse;
+import io.oeid.mogakgo.domain.user.presentation.dto.res.UserUpdateApiRes;
 import io.oeid.mogakgo.exception.dto.ErrorResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -43,7 +45,7 @@ public interface UserSwagger {
     })
     ResponseEntity<UserSignUpApiResponse> userSignUpApi(
         @Parameter(hidden = true) Long userId,
-        UserSignUpApiRequest apiRequest);
+        UserSignUpApiReq apiRequest);
 
     @Operation(summary = "회원 삭제", description = "회원을 삭제할 때 사용하는 API")
     @ApiResponses(value = {
@@ -80,4 +82,27 @@ ResponseEntity<UserSignUpApiResponse> userSignUpApi(
     })
     ResponseEntity<List<UserDevelopLanguageApiRes>> userDevelopLanguageApi(
         @Parameter(hidden = true) Long userId);
+
+
+    @Operation(summary = "회원 정보 수정", description = "회원 정보를 수정할 때 사용하는 API")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "회원 정보 수정 성공",
+            content = @Content(schema = @Schema(implementation = UserUpdateApiRes.class))),
+        @ApiResponse(responseCode = "400", description = "요청한 데이터가 유효하지 않음",
+            content = @Content(
+                mediaType = APPLICATION_JSON_VALUE,
+                schema = @Schema(implementation = ErrorResponse.class),
+                examples = {
+                    @ExampleObject(name = "E020103", value = SwaggerUserErrorExamples.INVALID_USER_NAME),
+                    @ExampleObject(name = "E020105", value = SwaggerUserErrorExamples.USER_WANTED_JOB_DUPLICATE),
+                    @ExampleObject(name = "E020109", value = SwaggerUserErrorExamples.USER_AVATAR_URL_NOT_NULL)
+                })),
+        @ApiResponse(responseCode = "404", description = "해당 유저가 존재하지 않음",
+            content = @Content(
+                mediaType = APPLICATION_JSON_VALUE,
+                schema = @Schema(implementation = ErrorResponse.class),
+                examples = @ExampleObject(name = "E020301", value = SwaggerUserErrorExamples.USER_NOT_FOUND))),
+    })
+    ResponseEntity<UserUpdateApiRes> userUpdateApi(@Parameter(hidden = true) Long userId,
+        UserUpdateApiReq request);
 }

src/main/java/io/oeid/mogakgo/core/properties/swagger/error/SwaggerUserErrorExamples.java

@@ -7,7 +7,7 @@ public class SwaggerUserErrorExamples {
     public static final String INVALID_USER_NAME = "{\"timestamp\":\"2024-02-17T10:07:31.404Z\",\"statusCode\":400,\"code\":\"E020103\",\"message\":\"유저 이름은 비어있을 수 없습니다.\"}";
     public static final String USER_AVAILABLE_LIKE_COUNT_IS_ZERO = "{\"timestamp\":\"2024-02-17T10:07:31.404Z\",\"statusCode\":400,\"code\":\"E020107\",\"message\":\"당일 사용 가능한 찔러보기 요청을 모두 소진했습니다.\"}";
     public static final String USER_AVAILABLE_LIKE_COUNT_IS_FULL = "{\"timestamp\":\"2024-02-17T10:07:31.404Z\",\"statusCode\":400,\"code\":\"E020108\",\"message\":\"당일 사용 가능한 찔러보기 최대 요청 횟수를 초과활 수 없습니다.\"}";
-
+    public static final String USER_AVATAR_URL_NOT_NULL = "{\"timestamp\":\"2024-02-17T10:07:31.404Z\",\"statusCode\":400,\"code\":\"E020109\",\"message\":\"유저 프로필 이미지는 비어있을 수 없습니다.\"}";
     private SwaggerUserErrorExamples() {
     }
 

src/main/java/io/oeid/mogakgo/domain/achievement/infrastructure/AchievementJpaRepository.java

@@ -0,0 +1,10 @@
+package io.oeid.mogakgo.domain.achievement.infrastructure;
+
+import io.oeid.mogakgo.domain.achievement.domain.Achievement;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface AchievementJpaRepository extends JpaRepository<Achievement, Long> {
+
+}

src/main/java/io/oeid/mogakgo/domain/notification/presentation/dto/req/FCMTokenApiRequest.java

@@ -2,16 +2,17 @@
 
 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;
 
 @Schema(description = "FCM 토큰 등록 요청")
 @Getter
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor
+@NoArgsConstructor
 public class FCMTokenApiRequest {
 
     @Schema(description = "FCM 토큰", example = "d4774fVVUuS3wdHHnGMYEj:APA91bFjQD6WXu8z5B0bliub661jwRshGvoCafMTYkm0cX9bZCbaUIa6ybycBT8WqkEN9j-qIYgFGB2zNnNosluquDhatUZmpbst87qo0oT8P2Id39xtWV0jhXpwSdIoLyZtdD0G9s5f", implementation = String.class, type = "string")
     @NotBlank(message = "FCM 토큰은 필수입니다.")
-    private final String fcmToken;
+    private String fcmToken;
 }

src/main/java/io/oeid/mogakgo/domain/user/application/UserService.java

@@ -1,11 +1,15 @@
 package io.oeid.mogakgo.domain.user.application;
 
+import io.oeid.mogakgo.domain.achievement.domain.Achievement;
+import io.oeid.mogakgo.domain.achievement.infrastructure.AchievementJpaRepository;
 import io.oeid.mogakgo.domain.profile.application.ProfileCardService;
 import io.oeid.mogakgo.domain.profile.application.dto.req.UserProfileCardReq;
 import io.oeid.mogakgo.domain.user.application.dto.req.UserSignUpRequest;
+import io.oeid.mogakgo.domain.user.application.dto.req.UserUpdateReq;
 import io.oeid.mogakgo.domain.user.application.dto.res.UserDevelopLanguageRes;
 import io.oeid.mogakgo.domain.user.application.dto.res.UserProfileResponse;
 import io.oeid.mogakgo.domain.user.application.dto.res.UserSignUpResponse;
+import io.oeid.mogakgo.domain.user.application.dto.res.UserUpdateRes;
 import io.oeid.mogakgo.domain.user.domain.User;
 import io.oeid.mogakgo.domain.user.domain.UserDevelopLanguageTag;
 import io.oeid.mogakgo.domain.user.domain.UserWantedJobTag;
@@ -34,6 +38,7 @@ public class UserService {
     private final UserWantedJobTagJpaRepository userWantedJobTagRepository;
     private final UserDevelopLanguageTagJpaRepository userDevelopLanguageTagRepository;
     private final UserGithubUtil userGithubUtil;
+    private final AchievementJpaRepository achievementRepository;
 
     @Transactional
     public UserSignUpResponse userSignUp(UserSignUpRequest userSignUpRequest) {
@@ -76,6 +81,24 @@ public UserProfileResponse getUserProfile(Long userId) {
         return UserProfileResponse.from(user);
     }
 
+    // TODO: 이후 AchievementException 구현 시 추가 필요!
+    public UserUpdateRes updateUserInfos(Long userId, UserUpdateReq request) {
+        User user = userCommonService.getUserById(userId);
+        Achievement achievement = achievementRepository.findById(request.getAchievementId())
+            .orElseThrow();
+        user.updateUserInfos(request.getUsername(), request.getAvatarUrl(), request.getBio(),
+            achievement);
+        validateWantedJobDuplicate(request.getWantedJobs());
+        for (WantedJob wantedJob : request.getWantedJobs()) {
+            userWantedJobTagRepository.save(UserWantedJobTag.builder()
+                .user(user)
+                .wantedJob(wantedJob)
+                .build());
+        }
+        profileCardService.create(UserProfileCardReq.of(user));
+        return UserUpdateRes.from(user);
+    }
+
     @Transactional
     public void deleteUser(Long userId) {
         User user = userCommonService.getUserById(userId);
@@ -89,11 +112,5 @@ private void validateWantedJobDuplicate(List<WantedJob> wantedJobs) {
         }
     }
 
-    private void validateDevelopLanguageDuplicate(List<DevelopLanguage> developLanguages) {
-        Set<DevelopLanguage> developLanguageSet = new HashSet<>(developLanguages);
-        if (developLanguageSet.size() != developLanguages.size()) {
-            throw new UserException(ErrorCode400.USER_DEVELOP_LANGUAGE_DUPLICATE);
-        }
-    }
 
 }

src/main/java/io/oeid/mogakgo/domain/user/application/dto/req/UserUpdateReq.java

@@ -0,0 +1,29 @@
+package io.oeid.mogakgo.domain.user.application.dto.req;
+
+import io.oeid.mogakgo.domain.user.domain.enums.WantedJob;
+import io.oeid.mogakgo.domain.user.presentation.dto.req.UserUpdateApiReq;
+import java.util.List;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class UserUpdateReq {
+
+    private final String username;
+    private final String bio;
+    private final String avatarUrl;
+    private List<WantedJob> wantedJobs;
+    private final Long achievementId;
+
+    public static UserUpdateReq from(UserUpdateApiReq request) {
+        return new UserUpdateReq(
+            request.getUsername(),
+            request.getBio(),
+            request.getAvatarUrl(),
+            request.getWantedJobs().stream().map(WantedJob::valueOf).toList(),
+            request.getAchievementId()
+        );
+    }
+}

src/main/java/io/oeid/mogakgo/domain/user/application/dto/res/UserUpdateRes.java

@@ -0,0 +1,29 @@
+package io.oeid.mogakgo.domain.user.application.dto.res;
+
+import io.oeid.mogakgo.domain.user.domain.User;
+import io.oeid.mogakgo.domain.user.domain.UserWantedJobTag;
+import io.oeid.mogakgo.domain.user.domain.enums.WantedJob;
+import java.util.List;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class UserUpdateRes {
+    private String username;
+    private String bio;
+    private String avatarUrl;
+    private List<WantedJob> wantedJobs;
+    private Long achievementId;
+
+    public static UserUpdateRes from(User user){
+        return new UserUpdateRes(
+            user.getUsername(),
+            user.getBio(),
+            user.getAvatarUrl(),
+            user.getUserWantedJobTags().stream().map(UserWantedJobTag::getWantedJob).toList(),
+            user.getAchievement().getId()
+        );
+    }
+}

src/main/java/io/oeid/mogakgo/domain/user/domain/User.java

@@ -200,6 +200,14 @@ public void updateRegion(Region region) {
         }
     }
 
+    public void updateUserInfos(String username, String avatarUrl, String bio, Achievement achievement) {
+        updateUsername(username);
+        this.avatarUrl = verifyAvatarUrl(avatarUrl);
+        this.bio = bio;
+        this.achievement = achievement;
+        deleteAllWantJobTags();
+    }
+
     //TODO : 추후 구현 필요
     public void decreaseJandiRate() {
         return;
@@ -208,4 +216,15 @@ public void decreaseJandiRate() {
     private boolean validateAvailableRegionUpdate(Region region) {
         return this.region == null || !this.region.equals(region);
     }
+
+    private String verifyAvatarUrl(String avatarUrl) {
+        if (avatarUrl == null || avatarUrl.isBlank()) {
+            throw new UserException(ErrorCode400.USER_AVATAR_URL_NOT_NULL);
+        }
+        return avatarUrl;
+    }
+
+
+
+
 }

src/main/java/io/oeid/mogakgo/domain/user/presentation/UserController.java

@@ -3,10 +3,13 @@
 import io.oeid.mogakgo.common.annotation.UserId;
 import io.oeid.mogakgo.common.swagger.template.UserSwagger;
 import io.oeid.mogakgo.domain.user.application.UserService;
-import io.oeid.mogakgo.domain.user.presentation.dto.req.UserSignUpApiRequest;
+import io.oeid.mogakgo.domain.user.application.dto.req.UserUpdateReq;
+import io.oeid.mogakgo.domain.user.presentation.dto.req.UserSignUpApiReq;
+import io.oeid.mogakgo.domain.user.presentation.dto.req.UserUpdateApiReq;
 import io.oeid.mogakgo.domain.user.presentation.dto.res.UserDevelopLanguageApiRes;
 import io.oeid.mogakgo.domain.user.presentation.dto.res.UserPublicApiResponse;
 import io.oeid.mogakgo.domain.user.presentation.dto.res.UserSignUpApiResponse;
+import io.oeid.mogakgo.domain.user.presentation.dto.res.UserUpdateApiRes;
 import jakarta.validation.Valid;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -31,20 +34,27 @@ public ResponseEntity<UserPublicApiResponse> userGetApi(@UserId Long userId) {
         return ResponseEntity.ok(UserPublicApiResponse.fromByUserProfile(response));
     }
 
-    @PatchMapping("/sign")
-    public ResponseEntity<UserSignUpApiResponse> userSignUpApi(@UserId Long userId,
-        @RequestBody @Valid UserSignUpApiRequest apiRequest) {
-        var response = userService.userSignUp(apiRequest.toRequest(userId));
-        return ResponseEntity.ok(UserSignUpApiResponse.from(response));
-    }
-
     @GetMapping("/develop-language")
     public ResponseEntity<List<UserDevelopLanguageApiRes>> userDevelopLanguageApi(
         @UserId Long userId) {
         var response = userService.updateUserDevelopLanguages(userId);
         return ResponseEntity.ok(response.stream().map(UserDevelopLanguageApiRes::from).toList());
     }
 
+    @PatchMapping
+    public ResponseEntity<UserUpdateApiRes> userUpdateApi(@UserId Long userId,
+        @RequestBody @Valid UserUpdateApiReq request) {
+        var result = userService.updateUserInfos(userId, UserUpdateReq.from(request));
+        return ResponseEntity.ok(UserUpdateApiRes.from(result));
+    }
+
+    @PatchMapping("/sign")
+    public ResponseEntity<UserSignUpApiResponse> userSignUpApi(@UserId Long userId,
+        @RequestBody @Valid UserSignUpApiReq apiRequest) {
+        var response = userService.userSignUp(apiRequest.toRequest(userId));
+        return ResponseEntity.ok(UserSignUpApiResponse.from(response));
+    }
+
     @DeleteMapping
     public ResponseEntity<Void> userDeleteApi(@UserId Long userId) {
         userService.deleteUser(userId);

src/main/java/io/oeid/mogakgo/domain/user/presentation/dto/req/UserSignUpApiRequest.java → src/main/java/io/oeid/mogakgo/domain/user/presentation/dto/req/UserSignUpApiReq.java

@@ -15,7 +15,7 @@
 @Getter
 @AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class UserSignUpApiRequest {
+public class UserSignUpApiReq {
 
     @Schema(description = "회원명", example = "거루", implementation = String.class)
     @NotBlank(message = "username은 필수입니다.")

src/main/java/io/oeid/mogakgo/domain/user/presentation/dto/req/UserUpdateApiReq.java

@@ -0,0 +1,33 @@
+package io.oeid.mogakgo.domain.user.presentation.dto.req;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.URL;
+
+@Schema(description = "유저 정보 수정 요청")
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserUpdateApiReq {
+
+    @Schema(description = "유저 이름", example = "tidavid1")
+    @NotBlank
+    private String username;
+    @Schema(description = "유저 소개", example = "안녕하세요", nullable = true)
+    private String bio;
+    @Schema(description = "유저 프로필 이미지 URL", example = "https://avatars.githubusercontent.com/u/12345678?v=4")
+    @URL
+    private String avatarUrl;
+    @Schema(description = "선호하는 직군", example = "[\"BACKEND\", \"FRONTEND\"]")
+    @Size(min = 1, max = 3)
+    private List<String> wantedJobs;
+    @Schema(description = "업적 ID", example = "1")
+    @NotNull
+    private Long achievementId;
+}

src/main/java/io/oeid/mogakgo/domain/user/presentation/dto/res/UserSignUpApiResponse.java

@@ -13,7 +13,7 @@
 public class UserSignUpApiResponse {
 
     @Schema(description = "회원 ID", example = "1")
-    private Long userId;
+    private Long id;
     @Schema(description = "회원 이름", example = "거루")
     private String username;
     @Schema(description = "깃허브 ID", example = "tidavid1")

src/main/java/io/oeid/mogakgo/domain/user/presentation/dto/res/UserUpdateApiRes.java

@@ -0,0 +1,38 @@
+package io.oeid.mogakgo.domain.user.presentation.dto.res;
+
+import io.oeid.mogakgo.domain.user.application.dto.res.UserUpdateRes;
+import io.oeid.mogakgo.domain.user.domain.enums.WantedJob;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.List;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Schema(description = "유저 정보 수정 응답")
+@Getter
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@NoArgsConstructor
+public class UserUpdateApiRes {
+
+    @Schema(description = "유저 이름", example = "tidavid1")
+    private String username;
+    @Schema(description = "유저 소개", example = "안녕하세요")
+    private String bio;
+    @Schema(description = "유저 프로필 이미지 URL", example = "https://avatars.githubusercontent.com/u/1?v=4")
+    private String avatarUrl;
+    @Schema(description = "유저가 원하는 직군", example = "[\"BACKEND\", \"FRONTEND\"]")
+    private List<String> wantedJobs;
+    @Schema(description = "유저의 업적 ID", example = "1")
+    private Long achievementId;
+
+    public static UserUpdateApiRes from(UserUpdateRes userUpdateRes) {
+        return new UserUpdateApiRes(
+            userUpdateRes.getUsername(),
+            userUpdateRes.getBio(),
+            userUpdateRes.getAvatarUrl(),
+            userUpdateRes.getWantedJobs().stream().map(WantedJob::getJobName).toList(),
+            userUpdateRes.getAchievementId()
+        );
+    }
+}

src/main/java/io/oeid/mogakgo/exception/code/ErrorCode400.java

@@ -34,6 +34,7 @@ public enum ErrorCode400 implements ErrorCode {
     USER_AVAILABLE_LIKE_COUNT_IS_ZERO("E020107", "당일 사용할 수 있는 찔러보기 요청을 모두 소진했습니다."),
     USER_AVAILABLE_LIKE_AMOUNT_IS_FULL("E020108", "프로필 카드의 찔러보기 요청의 최대 횟수를 넘을 수 없습니다."),
     USER_ID_NOT_NULL("E020001", "유저 아이디는 필수값입니다."),
+    USER_AVATAR_URL_NOT_NULL("E020109", "유저 프로필 이미지는 필수값입니다."),
 
     PROFILE_CARD_LIKE_ALREADY_EXIST("E040102", "이미 찔러보기 요청을 전송한 프로필 카드에 찔러보기 요청을 전송할 수 없습니다."),
     INVALID_PROFILE_CARD_LIKE_RECEIVER_INFO("E040103", "찔러보기 요청의 사용자가 존재하지 않습니다."),