Merge pull request #143 from TravelLaboratory/feature/application-lay…

…er-test

Application/Service - Comment, Review 테스트 작성 및 comment, review의 update 시 id만 반환하는 걸 관련된 수정된 응답값들도 전부 보내도록 수정

src/main/java/site/travellaboratory/be/article/application/port/ArticleRepository.java

@@ -0,0 +1,12 @@
+package site.travellaboratory.be.article.application.port;
+
+import java.util.List;
+import java.util.Optional;
+import site.travellaboratory.be.article.domain.Article;
+import site.travellaboratory.be.article.domain.enums.ArticleStatus;
+
+public interface ArticleRepository {
+
+    Optional<Article> findByIdAndStatusIn(final Long articleId, List<ArticleStatus> Status);
+    Article save(Article article);
+}

src/main/java/site/travellaboratory/be/article/application/ArticleLikeService.java → src/main/java/site/travellaboratory/be/article/application/service/ArticleLikeService.java

@@ -1,4 +1,4 @@
-package site.travellaboratory.be.article.application;
+package site.travellaboratory.be.article.application.service;
 
 import java.util.List;
 import lombok.RequiredArgsConstructor;

src/main/java/site/travellaboratory/be/article/application/ArticleReaderService.java → src/main/java/site/travellaboratory/be/article/application/service/ArticleReaderService.java

@@ -1,4 +1,4 @@
-package site.travellaboratory.be.article.application;
+package site.travellaboratory.be.article.application.service;
 
 import java.util.Collections;
 import java.util.List;

src/main/java/site/travellaboratory/be/article/application/ArticleWriterService.java → src/main/java/site/travellaboratory/be/article/application/service/ArticleWriterService.java

@@ -1,4 +1,4 @@
-package site.travellaboratory.be.article.application;
+package site.travellaboratory.be.article.application.service;
 
 import java.util.List;
 import lombok.RequiredArgsConstructor;

src/main/java/site/travellaboratory/be/article/application/_schedule/ArticleScheduleReaderService.java → src/main/java/site/travellaboratory/be/article/application/service/_schedule/ArticleScheduleReaderService.java

@@ -1,4 +1,4 @@
-package site.travellaboratory.be.article.application._schedule;
+package site.travellaboratory.be.article.application.service._schedule;
 
 import java.util.Comparator;
 import java.util.LinkedHashMap;

src/main/java/site/travellaboratory/be/article/application/_schedule/ArticleScheduleWriterService.java → src/main/java/site/travellaboratory/be/article/application/service/_schedule/ArticleScheduleWriterService.java

@@ -1,4 +1,4 @@
-package site.travellaboratory.be.article.application._schedule;
+package site.travellaboratory.be.article.application.service._schedule;
 
 import java.util.List;
 import java.util.Map;

src/main/java/site/travellaboratory/be/article/domain/Article.java

@@ -29,13 +29,11 @@ public class Article {
     private final LocalDate startAt;
     private final LocalDate endAt;
     private final String expense;
-    // todo: 체크한번
     private final TravelCompanion travelCompanion;
-    // todo: 체크한번
     @Builder.Default
     private final List<TravelStyle> travelStyles  = new ArrayList<>();
-    private final ArticleStatus status;
     private final String coverImgUrl;
+    private final ArticleStatus status;
 
     public static Article create(User user, ArticleRegisterRequest registerRequest) {
         return Article.builder()
@@ -47,8 +45,8 @@ public static Article create(User user, ArticleRegisterRequest registerRequest)
             .expense(registerRequest.expense())
             .travelCompanion(TravelCompanion.from(registerRequest.travelCompanion()))
             .travelStyles(TravelStyle.from(registerRequest.travelStyles()))
-            .status(ArticleStatus.ACTIVE) // 기본 상태를 ACTIVE로 설정
             .coverImgUrl(null) // 여행 생성 시에는 coverImgUrl 받지 않음
+            .status(ArticleStatus.ACTIVE) // 기본 상태를 ACTIVE로 설정
             .build();
     }
 
@@ -65,8 +63,8 @@ public Article update(User user, ArticleUpdateRequest updateRequest) {
             .expense(updateRequest.expense())
             .travelCompanion(TravelCompanion.from(updateRequest.travelCompanion()))
             .travelStyles(TravelStyle.from(updateRequest.travelStyles()))
-            .status(this.status) // 기본 상태를 ACTIVE로 설정
             .coverImgUrl(this.coverImgUrl)
+            .status(this.status) // 기본 상태를 ACTIVE로 설정
             .build();
     }
 
@@ -83,8 +81,8 @@ public Article delete(User user) {
             .expense(this.expense)
             .travelCompanion(this.travelCompanion)
             .travelStyles(this.travelStyles)
-            .status(ArticleStatus.INACTIVE)
             .coverImgUrl(this.coverImgUrl)
+            .status(ArticleStatus.INACTIVE)
             .build();
     }
 

src/main/java/site/travellaboratory/be/article/infrastructure/persistence/repository/ArticleRepositoryImpl.java

@@ -0,0 +1,28 @@
+package site.travellaboratory.be.article.infrastructure.persistence.repository;
+
+import java.util.List;
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+import site.travellaboratory.be.article.application.port.ArticleRepository;
+import site.travellaboratory.be.article.domain.Article;
+import site.travellaboratory.be.article.domain.enums.ArticleStatus;
+import site.travellaboratory.be.article.infrastructure.persistence.entity.ArticleEntity;
+
+@Repository
+@RequiredArgsConstructor
+public class ArticleRepositoryImpl implements ArticleRepository {
+
+    private final ArticleJpaRepository articleJpaRepository;
+
+    @Override
+    public Optional<Article> findByIdAndStatusIn(Long articleId, List<ArticleStatus> Status) {
+        return articleJpaRepository.findByIdAndStatusIn(articleId, Status)
+            .map(ArticleEntity::toModel);
+    }
+
+    @Override
+    public Article save(Article article) {
+        return articleJpaRepository.save(ArticleEntity.from(article)).toModel();
+    }
+}

src/main/java/site/travellaboratory/be/article/presentation/controller/ArticleLikeController.java

@@ -6,7 +6,7 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import site.travellaboratory.be.article.application.ArticleLikeService;
+import site.travellaboratory.be.article.application.service.ArticleLikeService;
 import site.travellaboratory.be.common.annotation.UserId;
 import site.travellaboratory.be.article.presentation.response.like.BookmarkSaveResponse;
 

src/main/java/site/travellaboratory/be/article/presentation/controller/ArticleReaderController.java

@@ -10,7 +10,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import site.travellaboratory.be.article.application.ArticleReaderService;
+import site.travellaboratory.be.article.application.service.ArticleReaderService;
 import site.travellaboratory.be.common.annotation.UserId;
 import site.travellaboratory.be.article.presentation.response.like.BookmarkResponse;
 import site.travellaboratory.be.article.presentation.response.reader.ArticleOneResponse;

src/main/java/site/travellaboratory/be/article/presentation/controller/ArticleWriterController.java

@@ -12,7 +12,7 @@
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-import site.travellaboratory.be.article.application.ArticleWriterService;
+import site.travellaboratory.be.article.application.service.ArticleWriterService;
 import site.travellaboratory.be.common.annotation.UserId;
 import site.travellaboratory.be.article.domain.Article;
 import site.travellaboratory.be.article.presentation.response.writer.ArticleDeleteResponse;

src/main/java/site/travellaboratory/be/article/presentation/controller/_schedule/ArticleScheduleReaderController.java

@@ -6,7 +6,7 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import site.travellaboratory.be.article.application._schedule.ArticleScheduleReaderService;
+import site.travellaboratory.be.article.application.service._schedule.ArticleScheduleReaderService;
 import site.travellaboratory.be.common.annotation.UserId;
 import site.travellaboratory.be.article.presentation.response._schedule.reader.ArticleScheduleReadPlacesResponse;
 import site.travellaboratory.be.article.presentation.response._schedule.reader.ArticleScheduleReadDetailResponse;

src/main/java/site/travellaboratory/be/article/presentation/controller/_schedule/ArticleScheduleWriterController.java

@@ -8,7 +8,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import site.travellaboratory.be.article.application._schedule.ArticleScheduleWriterService;
+import site.travellaboratory.be.article.application.service._schedule.ArticleScheduleWriterService;
 import site.travellaboratory.be.common.annotation.UserId;
 import site.travellaboratory.be.article.presentation.response._schedule.writer.ArticleScheduleDeleteResponse;
 import site.travellaboratory.be.article.domain._schedule.request.ArticleScheduleUpdateRequest;

src/main/java/site/travellaboratory/be/comment/application/port/CommentRepository.java

@@ -0,0 +1,12 @@
+package site.travellaboratory.be.comment.application.port;
+
+import java.util.List;
+import java.util.Optional;
+import site.travellaboratory.be.comment.domain.Comment;
+import site.travellaboratory.be.comment.domain.enums.CommentStatus;
+
+public interface CommentRepository {
+    Optional<Comment> findByIdAndStatusIn(Long commentId, List<CommentStatus> status);
+
+    Comment save(Comment comment);
+}

src/main/java/site/travellaboratory/be/comment/application/CommentLikeService.java → src/main/java/site/travellaboratory/be/comment/application/service/CommentLikeService.java

@@ -1,4 +1,4 @@
-package site.travellaboratory.be.comment.application;
+package site.travellaboratory.be.comment.application.service;
 
 import java.util.List;
 import lombok.RequiredArgsConstructor;

src/main/java/site/travellaboratory/be/comment/application/CommentReaderService.java → src/main/java/site/travellaboratory/be/comment/application/service/CommentReaderService.java

@@ -1,4 +1,4 @@
-package site.travellaboratory.be.comment.application;
+package site.travellaboratory.be.comment.application.service;
 
 import java.util.List;
 import java.util.Map;

src/main/java/site/travellaboratory/be/comment/application/service/CommentWriterService.java

@@ -0,0 +1,73 @@
+package site.travellaboratory.be.comment.application.service;
+
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import site.travellaboratory.be.comment.application.port.CommentRepository;
+import site.travellaboratory.be.comment.domain.Comment;
+import site.travellaboratory.be.comment.domain.enums.CommentStatus;
+import site.travellaboratory.be.comment.domain.request.CommentSaveRequest;
+import site.travellaboratory.be.comment.domain.request.CommentUpdateRequest;
+import site.travellaboratory.be.common.exception.BeApplicationException;
+import site.travellaboratory.be.common.exception.ErrorCodes;
+import site.travellaboratory.be.review.application.port.ReviewRepository;
+import site.travellaboratory.be.review.domain.Review;
+import site.travellaboratory.be.review.domain.enums.ReviewStatus;
+import site.travellaboratory.be.user.application.port.UserRepository;
+import site.travellaboratory.be.user.domain.User;
+import site.travellaboratory.be.user.domain.enums.UserStatus;
+
+@Service
+@RequiredArgsConstructor
+public class CommentWriterService {
+
+    private final CommentRepository commentRepository;
+    private final ReviewRepository reviewRepository;
+    private final UserRepository userRepository;
+
+    @Transactional
+    public Comment save(Long userId, CommentSaveRequest request) {
+        Review review = getReviewById(request.reviewId());
+        User user = getUserById(userId);
+
+        Comment saveComment = Comment.create(user, review, request);
+        return commentRepository.save(saveComment);
+    }
+
+    @Transactional
+    public Comment update(Long userId, Long commentId, CommentUpdateRequest request) {
+        Comment comment = getCommentById(commentId);
+        User user = getUserById(userId);
+
+        Comment updateComment = comment.withUpdatedReplyContent(user, request);
+        return commentRepository.save(updateComment);
+    }
+
+    @Transactional
+    public Comment delete(final Long userId, final Long commentId) {
+        Comment comment = getCommentById(commentId);
+        User user = getUserById(userId);
+
+        Comment deletedComment = comment.withInactiveStatus(user);
+        return commentRepository.save(deletedComment);
+    }
+
+    private Review getReviewById(Long reviewId) {
+        return reviewRepository.findByIdAndStatusIn(reviewId, List.of(ReviewStatus.ACTIVE, ReviewStatus.PRIVATE))
+            .orElseThrow(() -> new BeApplicationException(ErrorCodes.COMMENT_INVALID_REVIEW_ID,
+                HttpStatus.NOT_FOUND));
+    }
+
+    private User getUserById(Long userId) {
+        return userRepository.getByIdAndStatus(userId, UserStatus.ACTIVE);
+    }
+
+    private Comment getCommentById(Long commentId) {
+        return commentRepository.findByIdAndStatusIn(commentId,
+                List.of(CommentStatus.ACTIVE))
+            .orElseThrow(() -> new BeApplicationException(ErrorCodes.COMMENT_INVALID_COMMENT_ID,
+                HttpStatus.NOT_FOUND));
+    }
+}

src/main/java/site/travellaboratory/be/comment/infrastructure/persistence/repository/CommentRepositoryImpl.java

@@ -0,0 +1,27 @@
+package site.travellaboratory.be.comment.infrastructure.persistence.repository;
+
+import java.util.List;
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+import site.travellaboratory.be.comment.application.port.CommentRepository;
+import site.travellaboratory.be.comment.domain.Comment;
+import site.travellaboratory.be.comment.domain.enums.CommentStatus;
+import site.travellaboratory.be.comment.infrastructure.persistence.entity.CommentEntity;
+
+@Repository
+@RequiredArgsConstructor
+public class CommentRepositoryImpl implements CommentRepository {
+
+    private final CommentJpaRepository commentJpaRepository;
+
+    @Override
+    public Optional<Comment> findByIdAndStatusIn(Long commentId, List<CommentStatus> status) {
+        return commentJpaRepository.findByIdAndStatusIn(commentId, status).map(CommentEntity::toModel);
+    }
+
+    @Override
+    public Comment save(Comment comment) {
+        return commentJpaRepository.save(CommentEntity.from(comment)).toModel();
+    }
+}

src/main/java/site/travellaboratory/be/comment/presentation/controller/CommentLikeController.java

@@ -6,7 +6,7 @@
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import site.travellaboratory.be.comment.application.CommentLikeService;
+import site.travellaboratory.be.comment.application.service.CommentLikeService;
 import site.travellaboratory.be.common.annotation.UserId;
 import site.travellaboratory.be.comment.domain.enums.CommentLikeStatus;
 import site.travellaboratory.be.comment.presentation.response.like.CommentToggleLikeResponse;

src/main/java/site/travellaboratory/be/comment/presentation/controller/CommentReaderController.java

@@ -7,7 +7,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import site.travellaboratory.be.comment.application.CommentReaderService;
+import site.travellaboratory.be.comment.application.service.CommentReaderService;
 import site.travellaboratory.be.comment.presentation.response.reader.CommentReadPaginationResponse;
 import site.travellaboratory.be.common.annotation.UserId;