Skip to content

Commit 97391f0

Browse files
authored
[Release] v2.0.7 릴리즈
[Release] v2.0.7 릴리즈
2 parents 907f578 + 294b960 commit 97391f0

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/main/java/ssu/eatssu/domain/partnership/dto/PartnershipInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static PartnershipInfo fromEntity(Partnership partnership,
2828
.startDate(partnership.getStartDate())
2929
.endDate(partnership.getEndDate())
3030
.collegeName(partnership.getPartnershipCollege() == null && partnership.getPartnershipDepartment() == null
31-
? "총학"
31+
? "총학생회"
3232
: (partnership.getPartnershipCollege() != null ? partnership.getPartnershipCollege().getName() : null))
3333
.departmentName(partnership.getPartnershipDepartment() != null ? partnership.getPartnershipDepartment().getName() : null)
3434
.likeCount(restaurant.getLikes() != null ? restaurant.getLikes().size() : 0)

src/main/java/ssu/eatssu/domain/partnership/persistence/PartnershipRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public interface PartnershipRepository extends JpaRepository<Partnership, Long>
2323
or pd = :department
2424
or (pc is null and pd is null)
2525
)
26-
and p.startDate <= current_date
26+
and p.startDate >= current_date - 7
2727
and (p.endDate is null or p.endDate >= current_date)
2828
""")
2929
List<PartnershipRestaurant> findRestaurantsWithMyPartnerships(

src/main/java/ssu/eatssu/domain/partnership/persistence/PartnershipRestaurantRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ public interface PartnershipRestaurantRepository extends JpaRepository<Partnersh
1212
LEFT JOIN FETCH pr.partnerships p
1313
LEFT JOIN FETCH p.partnershipCollege
1414
LEFT JOIN FETCH p.partnershipDepartment
15-
WHERE p.startDate <= CURRENT_DATE and (p.endDate is null or p.endDate >= CURRENT_DATE)""")
15+
WHERE p.startDate >= current_date - 7 and (p.endDate is null or p.endDate >= CURRENT_DATE)""")
1616
List<PartnershipRestaurant> findAllWithDetails();
1717
}

0 commit comments

Comments
 (0)