Merge pull request #96 from UMC-ON/feat/home

fix: 홈 최근 동행글 내가 쓴 글 제외
UMC-ON · Nov 4, 2024 · a317151 · a317151
2 parents 174d24e + b7b3361
commit a317151
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/main/java/com/on/server/domain/companyPost/domain/repository/CompanyPostRepository.java b/src/main/java/com/on/server/domain/companyPost/domain/repository/CompanyPostRepository.java
@@ -35,8 +35,18 @@ default List<CompanyPost> findTop4ByOrderByCreatedAtDesc() {
         return findAll(pageable).getContent();
     }
 
-    @Query("SELECT c FROM CompanyPost c JOIN c.travelArea t WHERE t LIKE CONCAT('%', :country, '%') AND c.isRecruitCompleted = false ORDER BY c.createdAt DESC")
-    List<CompanyPost> findTop5ByTravelArea(@Param("country") String country, Pageable pageable);
+//    @Query("SELECT c FROM CompanyPost c JOIN c.travelArea t WHERE t LIKE CONCAT('%', :country, '%') AND c.isRecruitCompleted = false ORDER BY c.createdAt DESC")
+//    List<CompanyPost> findTop5ByTravelArea(@Param("country") String country, Pageable pageable);
+
+    /**
+    * 사용자가 작성하지 않은 동행글 중에서,
+    * 특정 국가명을 포함하고 모집이 완료되지 않은 글
+    * 최신순으로 정렬하여 최대 5개 가져오기
+    * @param country: 검색할 국가명
+    * @param user: 현재 로그인한 사용자 (사용자가 작성한 글은 제외)
+    */
+    @Query("SELECT c FROM CompanyPost c JOIN c.travelArea t WHERE t LIKE CONCAT('%', :country, '%') AND c.isRecruitCompleted = false AND c.user <> :user ORDER BY c.createdAt DESC")
+    List<CompanyPost> findTop5ByTravelArea(@Param("country") String country, @Param("user") User user, Pageable pageable);
 
     @Query("SELECT c FROM CompanyPost c JOIN c.travelArea t WHERE t LIKE CONCAT('%', :country, '%') AND c.isRecruitCompleted = false AND c.id <> :companyPostId ORDER BY c.createdAt DESC")
     List<CompanyPost> findTop5ByTravelAreaLike(@Param("country") String country, @Param("companyPostId") Long companyPostId);

diff --git a/src/main/java/com/on/server/domain/home/application/HomeService.java b/src/main/java/com/on/server/domain/home/application/HomeService.java
@@ -93,7 +93,7 @@ public List<CompanyBoardListResponseDto> getCompanyBoardList(User user) {
 
         String country = user.getCountry();
 
-        List<CompanyPost> companyPostList = companyPostRepository.findTop5ByTravelArea(country, PageRequest.of(0, 5));
+        List<CompanyPost> companyPostList = companyPostRepository.findTop5ByTravelArea(country, user, PageRequest.of(0, 5));
 
 
         if (companyPostList.isEmpty()) {