diff --git a/src/main/java/org/kkumulkkum/server/api/promise/service/PromiseService.java b/src/main/java/org/kkumulkkum/server/api/promise/service/PromiseService.java index 6be190a..a05c917 100644 --- a/src/main/java/org/kkumulkkum/server/api/promise/service/PromiseService.java +++ b/src/main/java/org/kkumulkkum/server/api/promise/service/PromiseService.java @@ -100,20 +100,6 @@ public PromisesDto getPromises( final Boolean done, final Boolean isParticipant ) { -// List allPromises = promiseRetriever.findAllByMeetingId(meetingId); -// List userPromises = promiseRetriever.findPromiseByUserIdAndMeetingId(userId, meetingId); -// List promises; -// -// if (Boolean.TRUE.equals(isParticipant)) { -// promises = userPromises; -// } else if (Boolean.FALSE.equals(isParticipant)) { -// promises = allPromises.stream() -// .filter(promise -> !userPromises.contains(promise)) -// .collect(Collectors.toList()); -// } else { -// promises = allPromises; -// } - List promises = promiseRetriever.findPromisesByConditions(userId, meetingId, done, isParticipant); return PromisesDto.of(promises); diff --git a/src/main/java/org/kkumulkkum/server/domain/promise/repository/custom/PromiseRepositoryCustomImpl.java b/src/main/java/org/kkumulkkum/server/domain/promise/repository/custom/PromiseRepositoryCustomImpl.java index 90ef383..faac51a 100644 --- a/src/main/java/org/kkumulkkum/server/domain/promise/repository/custom/PromiseRepositoryCustomImpl.java +++ b/src/main/java/org/kkumulkkum/server/domain/promise/repository/custom/PromiseRepositoryCustomImpl.java @@ -23,8 +23,8 @@ public class PromiseRepositoryCustomImpl implements PromiseRepositoryCustom { public List findPromiseByConditions(Long userId, Long meetingId, Boolean done, Boolean isParticipant) { return queryFactory .selectFrom(promise) - .join(promise.participants, participant).fetchJoin() - .join(participant.member, member).fetchJoin() + .leftJoin(promise.participants, participant).fetchJoin() + .leftJoin(participant.member, member).fetchJoin() .where( meetingIdEq(meetingId), isParticipantEq(userId, meetingId, isParticipant),