Skip to content

Commit df5cd1b

Browse files
authored
Merge pull request #232 from prgrms-web-devcourse-final-project/ajh/group/fix-schedule
🐛 fix 본인이 포함되지 않은 일정에 대한 조회 블로킹
2 parents d57e703 + a18d0f9 commit df5cd1b

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

src/main/java/com/grepp/spring/app/model/group/service/GroupQueryService.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ public ShowGroupScheduleResponse displayGroupSchedule(Long groupId) {
8585
if(!schedule.getStatus().equals(ScheduleStatus.FIXED) && !schedule.getStatus().equals(ScheduleStatus.COMPLETE)) {
8686
continue;
8787
}
88+
if(!scheduleMemberQueryRepository.existsByScheduleIdAndMemberId(schedule.getId(), member.getId())){
89+
continue;
90+
}
8891
ScheduleDetails scheduleDetails1 = ScheduleDetails.builder()
8992
.scheduleId(schedule.getId())
9093
.scheduleName(schedule.getScheduleName())

src/main/java/com/grepp/spring/app/model/schedule/repository/ScheduleMemberQueryRepository.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@ ScheduleMember findScheduleMember(@Param("memberId") String memberId,
2222
@Param("scheduleId") Long scheduleId);
2323

2424
ArrayList<ScheduleMember> findBySchedule(Schedule schedule);
25+
26+
boolean existsByScheduleIdAndMemberId(Long id, String memberId);
2527
}

0 commit comments

Comments
 (0)