diff --git a/src/main/java/ssu/eatssu/domain/partnership/dto/PartnershipInfo.java b/src/main/java/ssu/eatssu/domain/partnership/dto/PartnershipInfo.java index f510ec2b..bbf39d36 100644 --- a/src/main/java/ssu/eatssu/domain/partnership/dto/PartnershipInfo.java +++ b/src/main/java/ssu/eatssu/domain/partnership/dto/PartnershipInfo.java @@ -28,7 +28,7 @@ public static PartnershipInfo fromEntity(Partnership partnership, .startDate(partnership.getStartDate()) .endDate(partnership.getEndDate()) .collegeName(partnership.getPartnershipCollege() == null && partnership.getPartnershipDepartment() == null - ? "총학" + ? "총학생회" : (partnership.getPartnershipCollege() != null ? partnership.getPartnershipCollege().getName() : null)) .departmentName(partnership.getPartnershipDepartment() != null ? partnership.getPartnershipDepartment().getName() : null) .likeCount(restaurant.getLikes() != null ? restaurant.getLikes().size() : 0) diff --git a/src/main/java/ssu/eatssu/domain/partnership/persistence/PartnershipRepository.java b/src/main/java/ssu/eatssu/domain/partnership/persistence/PartnershipRepository.java index 15799202..418fd8bb 100644 --- a/src/main/java/ssu/eatssu/domain/partnership/persistence/PartnershipRepository.java +++ b/src/main/java/ssu/eatssu/domain/partnership/persistence/PartnershipRepository.java @@ -23,7 +23,7 @@ public interface PartnershipRepository extends JpaRepository or pd = :department or (pc is null and pd is null) ) - and p.startDate <= current_date + and p.startDate >= current_date - 7 and (p.endDate is null or p.endDate >= current_date) """) List findRestaurantsWithMyPartnerships( diff --git a/src/main/java/ssu/eatssu/domain/partnership/persistence/PartnershipRestaurantRepository.java b/src/main/java/ssu/eatssu/domain/partnership/persistence/PartnershipRestaurantRepository.java index f21e1956..bd17a82a 100644 --- a/src/main/java/ssu/eatssu/domain/partnership/persistence/PartnershipRestaurantRepository.java +++ b/src/main/java/ssu/eatssu/domain/partnership/persistence/PartnershipRestaurantRepository.java @@ -12,6 +12,6 @@ public interface PartnershipRestaurantRepository extends JpaRepository= CURRENT_DATE)""") + WHERE p.startDate >= current_date - 7 and (p.endDate is null or p.endDate >= CURRENT_DATE)""") List findAllWithDetails(); }