🚑[HOTFIX]: hasApplied dto 추가 및 로직수정

Leets-Official · Apr 12, 2024 · cd38bff · cd38bff
1 parent 4a35c91
commit cd38bff
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/main/java/org/example/weneedbe/domain/application/repository/ApplicationRepository.java b/src/main/java/org/example/weneedbe/domain/application/repository/ApplicationRepository.java
@@ -1,6 +1,7 @@
 package org.example.weneedbe.domain.application.repository;
 
 import org.example.weneedbe.domain.application.domain.Application;
+import org.example.weneedbe.domain.application.domain.Recruit;
 import org.example.weneedbe.domain.article.domain.Type;
 import org.example.weneedbe.domain.user.domain.User;
 import org.example.weneedbe.domain.user.domain.UserArticle;
@@ -17,4 +18,5 @@ public interface ApplicationRepository extends JpaRepository<Application, Long>
     Page<Application> findAllByUser(User user, Pageable pageable);
 
     List<Application> findAllByRecruit_RecruitId(Long recruitId);
+    boolean existsByRecruitAndUser(Recruit recruit, User user);
 }
diff --git a/src/main/java/org/example/weneedbe/domain/article/application/ArticleService.java b/src/main/java/org/example/weneedbe/domain/article/application/ArticleService.java
@@ -5,6 +5,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
+import org.example.weneedbe.domain.application.repository.ApplicationRepository;
 import org.example.weneedbe.domain.application.repository.RecruitRepository;
 import org.example.weneedbe.domain.article.domain.Article;
 import org.example.weneedbe.domain.article.domain.ArticleLike;
@@ -51,6 +52,7 @@ public class ArticleService {
     private final BookmarkService bookmarkService;
     private final BookmarkRepository bookmarkRepository;
     private final RecruitRepository recruitRepository;
+    private final ApplicationRepository applicationRepository;
 
     public void createPortfolio(String authorizationHeader, CreateArticleRequest request) {
 
@@ -161,7 +163,9 @@ public DetailRecruitDto getDetailRecruit(String authorizationHeader, Long articl
 
         boolean isRecruiting = recruitRepository.existsByArticle_ArticleId(articleId);
 
-        return new DetailRecruitDto(article, user, heartCount, bookmarkCount, isHearted, isBookmarked, commentResponseDtos, isRecruiting);
+        boolean hasApplied = applicationRepository.existsByRecruitAndUser(article.getRecruit(), user);
+
+        return new DetailRecruitDto(article, user, heartCount, bookmarkCount, isHearted, isBookmarked, commentResponseDtos, isRecruiting, hasApplied);
     }
 
     public static List<CommentResponseDto> mapToResponseDto(List<Comment> commentList) {

diff --git a/src/main/java/org/example/weneedbe/domain/article/dto/response/DetailResponseDto.java b/src/main/java/org/example/weneedbe/domain/article/dto/response/DetailResponseDto.java
@@ -31,7 +31,7 @@ public static class DetailPortfolioDto {
         public DetailPortfolioDto(Article article, User user, int heartCount, int bookmarkCount, List<WorkPortfolioArticleDto> workList,
                                   boolean isHearted, boolean isBookmarked, List<CommentResponseDto> commentList, boolean isRecruiting) {
             this.user = new DetailUserDto(user, user.getUserId().equals(article.getUser().getUserId()), isHearted, isBookmarked);
-            this.portfolio = new DetailArticleDto(article, heartCount, bookmarkCount, isRecruiting);
+            this.portfolio = new DetailArticleDto(article, heartCount, bookmarkCount, isRecruiting, false);
             this.workList = workList;
             this.comments = commentList;
         }
@@ -73,8 +73,10 @@ public static class DetailArticleDto {
         private List<DetailPortfolioContentDto> contents;
         private List<DetailTeamMemberDto> teamMembers;
         private boolean isRecruiting;
+        private boolean hasApplied;
 
-        public DetailArticleDto(Article article, int heartCount, int bookmarkCount, boolean isRecruiting) {
+
+        public DetailArticleDto(Article article, int heartCount, int bookmarkCount, boolean isRecruiting, boolean hasApplied) {
             this.thumbnail = article.getThumbnail();
             this.title = article.getTitle();
             this.createdAt = article.getCreatedAt();
@@ -94,6 +96,8 @@ public DetailArticleDto(Article article, int heartCount, int bookmarkCount, bool
                     .map(userArticle -> new DetailTeamMemberDto(userArticle.getUser()))
                     .collect(Collectors.toList());
             this.isRecruiting = isRecruiting;
+            this.hasApplied = hasApplied;
+
         }
     }
 
@@ -159,9 +163,9 @@ public static class DetailRecruitDto {
         private DetailArticleDto recruit;
         private List<CommentResponseDto> comments;
 
-        public DetailRecruitDto(Article article, User user, int heartCount, int bookmarkCount, boolean isHearted, boolean isBookmarked, List<CommentResponseDto> commentList, boolean isRecruiting) {
+        public DetailRecruitDto(Article article, User user, int heartCount, int bookmarkCount, boolean isHearted, boolean isBookmarked, List<CommentResponseDto> commentList, boolean isRecruiting, boolean hasApplied) {
             this.user = new DetailUserDto(user, user.getUserId().equals(article.getUser().getUserId()), isHearted, isBookmarked);
-            this.recruit = new DetailArticleDto(article, heartCount, bookmarkCount, isRecruiting);
+            this.recruit = new DetailArticleDto(article, heartCount, bookmarkCount, isRecruiting, hasApplied);
             this.comments = commentList;
         }