[Refactor] countQuery 조건 변경 #142

src/main/java/com/gamja/tiggle/exchange/adapter/out/persistence/ExchangePersistenceAdapter.java

@@ -76,6 +76,6 @@ public List<ExchangeEntity> readExchangeOfferForMe(User user,Integer page, Integ
 
     @Override
     public Long readExchangeOfferCnt(Long userId) {
-        return exchangeRepository.countReservationsByUserId(userId);
+        return exchangeRepository.countExchangeByUserId(userId);
     }
 }

src/main/java/com/gamja/tiggle/exchange/adapter/out/persistence/JpaExchangeRepository.java

@@ -22,8 +22,9 @@ public interface JpaExchangeRepository extends JpaRepository<ExchangeEntity,Long
         )
         List<ExchangeEntity> findExchangeByUser (Long userId, Pageable page);
 
-        @Query("SELECT COUNT(r) FROM ReservationEntity r " +
+        @Query("SELECT COUNT(e) FROM ExchangeEntity e "+
+                "JOIN e.reservation2 r " +
                 "JOIN r.user u " +
-                "WHERE u.id = :userId")
-        Long countReservationsByUserId(@Param("userId") Long userId);
+                "WHERE u.id = :userId AND e.isWatch = false")
+        Long countExchangeByUserId(@Param("userId") Long userId);
 }

src/main/java/com/gamja/tiggle/reservation/adapter/out/persistence/repositroy/ReservationRepository.java

@@ -33,6 +33,6 @@ public interface ReservationRepository extends JpaRepository<ReservationEntity,
 
     @Query("SELECT COUNT(r) FROM ReservationEntity r " +
             "JOIN r.user u " +
-            "WHERE u.id = :userId")
+            "WHERE u.id = :userId AND r.status='COMPLETED'")
     Long countReservationsByUserId(@Param("userId") Long userId);
 }