Skip to content

Commit b3575cb

Browse files
authored
fix: 총학 관련 문제 임시 해결 (#229)
Co-authored-by: 나용준 <141994188+youngJun99@users.noreply.github.com>
1 parent 3080c1c commit b3575cb

2 files changed

Lines changed: 18 additions & 16 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ public static PartnershipInfo fromEntity(Partnership partnership,
2727
.description(partnership.getDescription())
2828
.startDate(partnership.getStartDate())
2929
.endDate(partnership.getEndDate())
30-
.collegeName(partnership.getPartnershipCollege() == null ? null : partnership.getPartnershipCollege()
31-
.getName())
32-
.departmentName(partnership.getPartnershipDepartment() == null ? null : partnership.getPartnershipDepartment()
33-
.getName())
30+
.collegeName(partnership.getPartnershipCollege() == null && partnership.getPartnershipDepartment() == null
31+
? "총학"
32+
: (partnership.getPartnershipCollege() != null ? partnership.getPartnershipCollege().getName() : null))
33+
.departmentName(partnership.getPartnershipDepartment() != null ? partnership.getPartnershipDepartment().getName() : null)
3434
.likeCount(restaurant.getLikes() != null ? restaurant.getLikes().size() : 0)
3535
.isLiked(isLiked)
3636
.build();

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,20 @@
1212

1313
public interface PartnershipRepository extends JpaRepository<Partnership, Long> {
1414
@Query("""
15-
select distinct pr
16-
from PartnershipRestaurant pr
17-
join fetch pr.partnerships p
18-
left join fetch p.partnershipCollege pc
19-
left join fetch p.partnershipDepartment pd
20-
where
21-
(pc = :college
22-
or pd = :department
23-
or (pc is not null and pc.name = '총학'))
24-
and p.startDate <= current_date
25-
and (p.endDate is null or p.endDate >= current_date)
26-
""")
15+
select distinct pr
16+
from PartnershipRestaurant pr
17+
join fetch pr.partnerships p
18+
left join fetch p.partnershipCollege pc
19+
left join fetch p.partnershipDepartment pd
20+
where
21+
(
22+
pc = :college
23+
or pd = :department
24+
or (pc is null and pd is null)
25+
)
26+
and p.startDate <= current_date
27+
and (p.endDate is null or p.endDate >= current_date)
28+
""")
2729
List<PartnershipRestaurant> findRestaurantsWithMyPartnerships(
2830
@Param("college") College college,
2931
@Param("department") Department department

0 commit comments

Comments
 (0)