Merge remote-tracking branch 'origin/dev' into dev

Author: Coen90

src/main/java/com/codeit/side/common/adapter/ExceptionController.java

@@ -14,6 +14,16 @@
 @Slf4j
 @RestControllerAdvice
 public class ExceptionController {
+    @ExceptionHandler(RuntimeException.class)
+    public ResponseEntity<ExceptionResponse> runtimeExceptionHandler(HttpServletRequest request, RuntimeException e) {
+        ErrorCode errorCode = ErrorCode.INTERNAL_SERVER_ERROR;
+
+        log.error("Request URL: {}, Error Message: {}", request.getRequestURL(), e.getMessage());
+
+        return ResponseEntity.status(500)
+                .body(new ExceptionResponse(errorCode.getCode(), errorCode.getMessage()));
+    }
+
     @ExceptionHandler(BusinessException.class)
     public ResponseEntity<ExceptionResponse> businessExceptionHandler(HttpServletRequest request, BusinessException e) {
         ErrorCode errorCode = e.getErrorCode();

src/main/java/com/codeit/side/lightening/adapter/out/persistence/LighteningCommandRepositoryImpl.java

@@ -29,7 +29,7 @@ public Lightening save(String email, Lightening lightening) {
 
     @Override
     public void like(String email, Long lighteningId) {
-        lighteningLikeJpaEntityRepository.findByIdAndEmail(lighteningId, email)
+        lighteningLikeJpaEntityRepository.findByLighteningIdAndEmail(lighteningId, email)
                 .ifPresentOrElse(
                         LighteningLikeEntity::update,
                         () -> lighteningLikeJpaEntityRepository.save(LighteningLikeEntity.of(lighteningId, email))

src/main/java/com/codeit/side/lightening/adapter/out/persistence/jpa/LighteningLikeJpaEntityRepository.java

@@ -6,5 +6,5 @@
 import java.util.Optional;
 
 public interface LighteningLikeJpaEntityRepository extends JpaRepository<LighteningLikeEntity, Long> {
-    Optional<LighteningLikeEntity> findByIdAndEmail(Long id, String email);
+    Optional<LighteningLikeEntity> findByLighteningIdAndEmail(Long id, String email);
 }

src/main/java/com/codeit/side/user/adapter/in/web/UserController.java

@@ -34,9 +34,9 @@ public ResponseEntity<UserResponse> getUser() {
     }
 
     @PostMapping("/user")
-    public ResponseEntity<UserResponse> updateUser(@RequestPart(required = false) MultipartFile image, @RequestPart String description) {
+    public ResponseEntity<UserResponse> updateUser(@RequestPart(required = false) MultipartFile image, @RequestPart(required = false) String description, @RequestPart(required = false) String nickname) {
         String email = getEmail();
-        User updatedUser = userUseCase.updateUser(image, email, description);
+        User updatedUser = userUseCase.updateUser(image, email, description, nickname);
         return ResponseEntity.ok(UserResponse.from(updatedUser));
     }
 

src/main/java/com/codeit/side/user/adapter/in/web/response/ReviewInfoResponse.java

@@ -14,8 +14,10 @@ public record ReviewInfoResponse(
         LocalDateTime createdAt,
         Long lighteningId,
         String title,
+        String city,
         String town,
         String lighteningImageUrl,
+        LocalDateTime targetAt,
         Long userId,
         String nickname,
         String userImageUrl
@@ -32,8 +34,10 @@ public static ReviewInfoResponse from(ReviewInfo reviewInfo) {
                 review.getCreatedAt(),
                 lightening.getId(),
                 lightening.getTitle(),
+                lightening.getCity(),
                 lightening.getTown(),
                 lightening.getHasImage() ? "https://codeit-doit.s3.ap-northeast-2.amazonaws.com/lightening/%s/image.jpg".formatted(lightening.getId()) : "",
+                lightening.getTargetAt(),
                 user.getId(),
                 user.getNickname(),
                 user.isHasImage() ? "https://codeit-doit.s3.ap-northeast-2.amazonaws.com/user/%s/image.jpg".formatted(user.getId()) : ""

src/main/java/com/codeit/side/user/adapter/out/persistence/UserCommandRepositoryImpl.java

@@ -20,10 +20,10 @@ public User saveUser(User user) {
     }
 
     @Override
-    public User updateUser(String email, String description, boolean hasImage) {
+    public User updateUser(String email, String description, String nickname, boolean hasImage) {
         return userJpaRepository.findByEmail(email)
                 .orElseThrow(UserNotFoundException::new)
-                .update(description, hasImage)
+                .update(description, nickname, hasImage)
                 .toDomain();
     }
 

src/main/java/com/codeit/side/user/adapter/out/persistence/entity/UserEntity.java

@@ -48,15 +48,21 @@ public static UserEntity from(User user) {
                 .nickname(user.getNickname())
                 .name(user.getName())
                 .birth(user.getBirth())
+                .hasImage(user.isHasImage())
                 .build();
     }
 
     public User toDomain() {
         return User.of(id, email, password, name, nickname, birth, description, hasImage);
     }
 
-    public UserEntity update(String description, boolean hasImage) {
-        this.description = description;
+    public UserEntity update(String description, String nickname, boolean hasImage) {
+        if (description != null) {
+            this.description = description;
+        }
+        if (nickname != null) {
+            this.nickname = nickname;
+        }
         if (hasImage) {
             this.hasImage = true;
         }

src/main/java/com/codeit/side/user/application/port/in/UserUseCase.java

@@ -9,5 +9,5 @@ public interface UserUseCase {
 
     User getUser(String email);
 
-    User updateUser(MultipartFile image, String email, String description);
+    User updateUser(MultipartFile image, String email, String description, String nickname);
 }

src/main/java/com/codeit/side/user/application/port/out/UserCommandRepository.java

@@ -5,5 +5,5 @@
 public interface UserCommandRepository {
     User saveUser(User user);
 
-    User updateUser(String email, String description, boolean hasImage);
+    User updateUser(String email, String description, String nickname, boolean hasImage);
 }

src/main/java/com/codeit/side/user/application/service/UserService.java

@@ -42,9 +42,9 @@ public User getUser(String email) {
 
     @Override
     @Transactional
-    public User updateUser(MultipartFile image, String email, String description) {
+    public User updateUser(MultipartFile image, String email, String description, String nickname) {
         fileUploader.validateImage(image);
-        User user = userCommandRepository.updateUser(email, description, image != null);
+        User user = userCommandRepository.updateUser(email, description, nickname, image != null);
         fileUploader.uploadImageToS3(image, "user/" + user.getId(), "image.jpg", "jpg");
         return user;
     }