Merge pull request #45 from LikeLion-12th-SKHU/develop

Develop -> main push

src/main/java/org/likelion/likelion_12th_team05/common/advice/CustomExceptionAdvice.java

@@ -1,21 +1,28 @@
 package org.likelion.likelion_12th_team05.common.advice;
 
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.likelion.likelion_12th_team05.common.error.ErrorCode;
 import org.likelion.likelion_12th_team05.common.exception.CustomException;
 import org.likelion.likelion_12th_team05.common.exception.NotFoundException;
 import org.likelion.likelion_12th_team05.config.ApiResponseTemplate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-@ControllerAdvice
-public class CustomExceptionAdvice {
+import java.util.HashMap;
+import java.util.Map;
 
-    private static final Logger log = LoggerFactory.getLogger(CustomExceptionAdvice.class);
+@RestControllerAdvice
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class CustomExceptionAdvice {
 
     // 엔티티 not found 에러 처리 핸들러
     @ExceptionHandler(NotFoundException.class)
@@ -32,10 +39,37 @@ public ApiResponseTemplate handleCustomException(CustomException exception) {
     }
 
     // 원인 모를 이유의 예외 발생 시
-    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
     @ExceptionHandler(Exception.class)
     public ApiResponseTemplate handleServerException(final Exception e) {
         log.error("Internal Server Error: {}", e.getMessage(), e);
         return ApiResponseTemplate.errorResponse(ErrorCode.INTERNAL_SERVER_ERROR);
     }
+
+    /**
+     * 400 BAD REQUEST validation
+     */
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ApiResponseTemplate<String> handleValidationExceptions(MethodArgumentNotValidException e) {
+        log.error("Validation error: {}", e.getMessage(), e); // 수정: 로그 추가
+
+        // 에러 메시지 생성
+        Map<String, String> errorMap = new HashMap<>();
+        for (FieldError fieldError : e.getBindingResult().getFieldErrors()) {
+            errorMap.put(fieldError.getField(), fieldError.getDefaultMessage());
+        }
+        // 응답 생성
+        return ApiResponseTemplate.errorResponse(ErrorCode.VALIDATION_ERROR, convertMapToString(errorMap));
+    }
+
+    private String convertMapToString(Map<String, String> map) {
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, String> entry : map.entrySet()) {
+            sb.append(entry.getKey()).append(" : ").append(entry.getValue()).append(", ");
+        }
+        if (sb.length() > 0) {
+            sb.setLength(sb.length() - 2); // 마지막 쉼표와 띄어쓰기를 제거
+        }
+        return sb.toString();
+    }
 }

src/main/java/org/likelion/likelion_12th_team05/common/error/SuccessCode.java

@@ -19,6 +19,7 @@ public enum SuccessCode {   // Success 상태와 메세지, 코드를 정의
     LIKE_DELETE_SUCCESS("좋아요가 성공적으로 삭제되었습니다."),
     USER_SIGNUP_SUCCESS("회원가입에 성공하였습니다."),
     USER_LOGIN_SUCCESS("로그인에 성공하였습니다."),
+    USER_INFO_UPDATE_SUCCESS("사용자의 정보가 성공적으로 변경되었습니다."),
     /**
      * 201 CREATED (POST의 결과 상태
      */

src/main/java/org/likelion/likelion_12th_team05/curation/api/dto/response/CurationInfoResDto.java

@@ -2,17 +2,19 @@
 
 import lombok.Builder;
 import org.likelion.likelion_12th_team05.curation.domain.Curation;
-
-import java.time.LocalDate;
+import org.likelion.likelion_12th_team05.location.api.dto.response.LocationInfoResDto;
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @Builder
 public record CurationInfoResDto(
         Long id,
         String name,
         String content,
         LocalDateTime createDate,
-        Integer likeCount
+        Integer likeCount,
+        List<LocationInfoResDto> locations
 ) {
     public static CurationInfoResDto from(Curation curation) {
         return CurationInfoResDto.builder()
@@ -21,6 +23,9 @@ public static CurationInfoResDto from(Curation curation) {
                 .content(curation.getContent())
                 .createDate(curation.getCreateDate())
                 .likeCount(curation.getLikeCount())
+                .locations(curation.getLocations().stream()
+                        .map(LocationInfoResDto::from)
+                        .collect(Collectors.toList()))
                 .build();
     }
 }

src/main/java/org/likelion/likelion_12th_team05/location/api/LocationController.java

@@ -50,14 +50,14 @@ public ApiResponseTemplate<LocationListResDto> locationFindAll(Principal princip
     @PostMapping(value = "/{curationId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @ResponseStatus(HttpStatus.OK)
     public ApiResponseTemplate<LocationInfoResDto> locationSave(@RequestPart("location") LocationSaveReqDto locationSaveReqDto,
-                                                                @RequestPart("locationImage") MultipartFile locationImage,
+                                                                @RequestParam(value = "locationImage", required=false) MultipartFile locationImage,
                                                                 @PathVariable("curationId") Long curationId,
                                                                 Principal principal) throws IOException {
         LocationInfoResDto locationInfoResDto = locationService.locationSave(locationSaveReqDto, locationImage, curationId, principal);
         return ApiResponseTemplate.successResponse(locationInfoResDto, SuccessCode.LOCATION_SAVE_SUCCESS);
     }
 
-    @Operation(summary = "인증된 사용자가 위치 수정", description = "인증된 사용자가 위치를 수정(위치 이름, 이미지)합니다.")
+    @Operation(summary = "인증된 사용자가 위치 수정", description = "인증된 사용자가 위치를 수정(위치 이름, 이미지(선택), 주소)합니다.")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "응답 생성에 성공하였습니다."),
             @ApiResponse(responseCode = "400", description = "잘못된 요청입니다."),
@@ -67,7 +67,7 @@ public ApiResponseTemplate<LocationInfoResDto> locationSave(@RequestPart("locati
     @ResponseStatus(HttpStatus.OK)
     public ApiResponseTemplate<LocationInfoResDto> locationUpdate(@PathVariable("locationId") Long locationId,
                                                                   @RequestPart("location") LocationUpdateReqDto locationUpdateReqDto,
-                                                                  @RequestPart("locationImage") MultipartFile locationImage,
+                                                                  @RequestParam(value = "locationImage", required = false) MultipartFile locationImage,
                                                                   Principal principal) throws IOException {
         LocationInfoResDto locationInfoResDto = locationService.locationUpdate(locationId, locationUpdateReqDto, locationImage, principal);
         return ApiResponseTemplate.successResponse(locationInfoResDto, SuccessCode.LOCATION_UPDATE_SUCCESS);

src/main/java/org/likelion/likelion_12th_team05/location/api/dto/request/LocationSaveReqDto.java

@@ -10,11 +10,14 @@ public record LocationSaveReqDto(
         String address
 ) {
     public Location toEntity(String locationImage, Curation curation, User user) {
+        // 위치 저장 시 이미지를 선택으로 수정/ 이미지가 비어있지 않다면 이미지 저장, 비어있다면 빈 문자열로 locationImage 저장 => location 엔티티에서 locationImage nullable 지워줌
+        String image = (locationImage != null) ? locationImage : "";
+
         return Location.builder()
                 .name(name)
                 .description(description)
                 .address(address)
-                .locationImage(locationImage)
+                .locationImage(image)
                 .curation(curation)
                 .user(user)
                 .build();

src/main/java/org/likelion/likelion_12th_team05/location/application/LocationService.java

@@ -47,7 +47,11 @@ public LocationInfoResDto locationSave(LocationSaveReqDto locationSaveReqDto, Mu
                     , ErrorCode.NO_AUTHORIZATION_EXCEPTION.getMessage());
         }
 
-        String locationImage = s3Service.upload(multipartFile, "location");
+        // 이미지 업로드를 선택적으로 넘기면서 이미지가 있을 경우에만 업로드
+        String locationImage = null; // 이미지 URL을 저장할 변수
+        if (multipartFile != null && !multipartFile.isEmpty()) {
+            locationImage = s3Service.upload(multipartFile, "location");
+        }
 
         Location location = locationSaveReqDto.toEntity(locationImage, curation, user);
         locationRepository.save(location);

src/main/java/org/likelion/likelion_12th_team05/location/domain/Location.java

@@ -26,7 +26,7 @@ public class Location {
     private String description;
 
     @JsonIgnore
-    @Column(name = "location_image", nullable = false)
+    @Column(name = "location_image")
     private String locationImage;
 
     @JsonIgnore

src/main/java/org/likelion/likelion_12th_team05/user/api/UserController.java

@@ -8,13 +8,16 @@
 import org.likelion.likelion_12th_team05.config.ApiResponseTemplate;
 import org.likelion.likelion_12th_team05.global.auth.googleAuth.AuthLoginService;
 import org.likelion.likelion_12th_team05.global.auth.googleAuth.GoogleToken;
-import org.likelion.likelion_12th_team05.global.auth.jwt.JwtTokenProvider;
+import org.likelion.likelion_12th_team05.user.api.dto.request.UserInfoUpdateReqDto;
 import org.likelion.likelion_12th_team05.user.api.dto.request.UserSignInReqDto;
 import org.likelion.likelion_12th_team05.user.api.dto.request.UserSignUpReqDto;
+import org.likelion.likelion_12th_team05.user.api.dto.response.UserInfoResDto;
 import org.likelion.likelion_12th_team05.user.api.dto.response.UserSignInResDto;
 import org.likelion.likelion_12th_team05.user.application.UserService;
 import org.springframework.web.bind.annotation.*;
 
+import java.security.Principal;
+
 @RestController
 public class UserController {
     private final UserService userService;
@@ -64,4 +67,16 @@ private ApiResponseTemplate<UserSignInResDto> userSignIn(@RequestBody @Valid Use
         UserSignInResDto userSignInResDto = userService.userSignIn(userSignInReqDto);
         return ApiResponseTemplate.successResponse(userSignInResDto, SuccessCode.USER_LOGIN_SUCCESS);
     }
+
+    @Operation(summary = "사용자 정보 수정", description = "사용자의 정보(이름, 이메일, 비밀번호)를 수정합니다.")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "응답 생성에 성공하였습니다."),
+            @ApiResponse(responseCode = "400", description = "잘못된 요청입니다."),
+            @ApiResponse(responseCode = "401", description = "인증이 필요합니다.")
+    })
+    @PatchMapping("/user/info")
+    private ApiResponseTemplate<UserInfoResDto> userInfoUpdate(@RequestBody @Valid UserInfoUpdateReqDto userInfoUpdateReqDto, Principal principal) {
+        UserInfoResDto userInfoResDto = userService.userInfoUpdate(userInfoUpdateReqDto, principal);
+        return ApiResponseTemplate.successResponse(userInfoResDto, SuccessCode.USER_INFO_UPDATE_SUCCESS);
+    }
 }

src/main/java/org/likelion/likelion_12th_team05/user/api/dto/request/UserInfoUpdateReqDto.java

@@ -0,0 +1,20 @@
+package org.likelion.likelion_12th_team05.user.api.dto.request;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+
+public record UserInfoUpdateReqDto(
+        @NotBlank(message = "이름을 필수로 입력해야 합니다.")
+        @Size(min = 2, max = 15, message = "2자 이상, 15자 이하로 입력하세요.")
+        String name,
+
+        @NotBlank(message = "비밀번호를 필수로 입력해야 합니다.")
+        @Size(min = 8, message = "8자 이상 입력하세요.")
+        String password,
+
+        @NotBlank(message = "이메일을 필수로 입력해야 합니다.")
+        @Pattern(regexp = "^[A-Za-z0-9+_.-]+@[A-Za-z0-9.-]+.[A-Za-z]{2,6}$", message = "이메일 형식이 맞지 않습니다.")
+        String email
+) {
+}

src/main/java/org/likelion/likelion_12th_team05/user/api/dto/response/UserInfoResDto.java

@@ -0,0 +1,19 @@
+package org.likelion.likelion_12th_team05.user.api.dto.response;
+
+import lombok.Builder;
+import org.likelion.likelion_12th_team05.user.domain.User;
+
+@Builder
+public record UserInfoResDto(
+        Long userId,
+        String name,
+        String email
+) {
+    public static UserInfoResDto from(User user) {
+        return UserInfoResDto.builder()
+                .name(user.getName())
+                .email(user.getEmail())
+                .userId(user.getId())
+                .build();
+    }
+}

src/main/java/org/likelion/likelion_12th_team05/user/application/UserService.java

@@ -1,9 +1,13 @@
 package org.likelion.likelion_12th_team05.user.application;
 
 import lombok.extern.slf4j.Slf4j;
+import org.likelion.likelion_12th_team05.common.EntityFinder;
+import org.likelion.likelion_12th_team05.common.error.ErrorCode;
 import org.likelion.likelion_12th_team05.global.auth.jwt.JwtTokenProvider;
+import org.likelion.likelion_12th_team05.user.api.dto.request.UserInfoUpdateReqDto;
 import org.likelion.likelion_12th_team05.user.api.dto.request.UserSignInReqDto;
 import org.likelion.likelion_12th_team05.user.api.dto.request.UserSignUpReqDto;
+import org.likelion.likelion_12th_team05.user.api.dto.response.UserInfoResDto;
 import org.likelion.likelion_12th_team05.user.api.dto.response.UserSignInResDto;
 import org.likelion.likelion_12th_team05.user.domain.Role;
 import org.likelion.likelion_12th_team05.user.domain.User;
@@ -12,6 +16,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.security.Principal;
+
 @Slf4j
 @Service
 @Transactional(readOnly = true)
@@ -57,4 +63,26 @@ public UserSignInResDto userSignIn(UserSignInReqDto userSignUpReqDto) {
 
         return UserSignInResDto.of(user, accessToken, refreshToken);
     }
+
+    @Transactional
+    public UserInfoResDto userInfoUpdate(UserInfoUpdateReqDto userInfoUpdateReqDto, Principal principal) {
+        String email = principal.getName();
+        User user = getUserByEmail(email);
+
+        user.update(userInfoUpdateReqDto);
+
+        // 비밀번호 수정할 경우에도 암호화 설정이 들어가도록(없으면 user 테이블에서 비밀번호가 그대로 보임)
+        if (userInfoUpdateReqDto.password() != null && !userInfoUpdateReqDto.password().isEmpty()) {
+            String newEncodedPassword = passwordEncoder.encode(userInfoUpdateReqDto.password());
+            user.setPassword(newEncodedPassword);
+        }
+
+        userRepository.save(user);
+        return UserInfoResDto.from(user);
+    }
+
+    private User getUserByEmail(String email) {
+        return EntityFinder.findByEmailOrThrow(userRepository.findByEmail(email)
+                , ErrorCode.USER_NOT_FOUND_EXCEPTION);
+    }
 }

src/main/java/org/likelion/likelion_12th_team05/user/domain/User.java

@@ -1,19 +1,18 @@
 package org.likelion.likelion_12th_team05.user.domain;
 
 import jakarta.persistence.*;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import org.likelion.likelion_12th_team05.curation.domain.Curation;
 import org.likelion.likelion_12th_team05.like.domain.Like;
 import org.likelion.likelion_12th_team05.location.domain.Location;
+import org.likelion.likelion_12th_team05.user.api.dto.request.UserInfoUpdateReqDto;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @Entity
 @Getter
+@Setter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class User {
     @Id
@@ -49,4 +48,12 @@ private User(String name, String email, String password, String accessToken, Str
         this.refreshToken = refreshToken;
         this.role = role;
     }
+
+    public void update(UserInfoUpdateReqDto userInfoUpdateReqDto) {
+        this.name = userInfoUpdateReqDto.name();
+        this.email = userInfoUpdateReqDto.email();
+        // 구글 로그인은 password가 null이라 따로 처리해줘야함
+        if (userInfoUpdateReqDto.password() != null & !userInfoUpdateReqDto.email().isEmpty())
+            this.password = userInfoUpdateReqDto.password();
+    }
 }