diff --git a/src/main/java/be/dash/dashserver/api/core/member/MemberFacade.java b/src/main/java/be/dash/dashserver/api/core/member/MemberFacade.java index 1ecfaa2..0ba9390 100644 --- a/src/main/java/be/dash/dashserver/api/core/member/MemberFacade.java +++ b/src/main/java/be/dash/dashserver/api/core/member/MemberFacade.java @@ -4,7 +4,6 @@ import java.util.List; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; - import be.dash.dashserver.api.core.member.dto.MyLessonResponse; import be.dash.dashserver.api.core.member.dto.MyLessonsResponse; import be.dash.dashserver.api.core.member.dto.ReservationDetailedResponse; @@ -55,7 +54,7 @@ public MyLessonDetailedResponse getMyLesson(long memberId, long lessonId) { .map(Student::getId) .toList(); List reservationDateTimes = reservations.getCreatedAt(); - List members = memberService.findAllByIds(studentIds); + List members = memberService.findAllByStudentIds(studentIds); return MyLessonDetailedResponse.from(lesson, members, reservationDateTimes); } } diff --git a/src/main/java/be/dash/dashserver/core/domain/lesson/service/LessonService.java b/src/main/java/be/dash/dashserver/core/domain/lesson/service/LessonService.java index ca13e6b..eb93e5e 100644 --- a/src/main/java/be/dash/dashserver/core/domain/lesson/service/LessonService.java +++ b/src/main/java/be/dash/dashserver/core/domain/lesson/service/LessonService.java @@ -16,9 +16,9 @@ import be.dash.dashserver.core.domain.member.service.MemberRepository; import be.dash.dashserver.core.domain.teacher.Teacher; import be.dash.dashserver.core.domain.teacher.service.TeacherRepository; -import be.dash.dashserver.core.log.annotation.Trace; import be.dash.dashserver.core.exception.ForbiddenException; import be.dash.dashserver.core.exception.NotFoundException; +import be.dash.dashserver.core.log.annotation.Trace; import lombok.RequiredArgsConstructor; @Trace @@ -47,7 +47,7 @@ public void createLesson(CreateLessonCommand command) { lessonRepository.save(lesson); } - public Lessons getRecommendationLessons(long memberId, LessonSortOption lessonSortOption) { + public Lessons getRecommendationLessons(Long memberId, LessonSortOption lessonSortOption) { if (isGuest(memberId)) { Lessons lessons = new Lessons(lessonRepository.findActiveLessons(LocalDateTime.now())); return lessons.sort(lessonSortOption); @@ -59,7 +59,7 @@ public Lessons getRecommendationLessons(long memberId, LessonSortOption lessonSo return lessons.sort(lessonSortOption); } - private boolean isGuest(long memberId) { + private boolean isGuest(Long memberId) { return Objects.isNull(memberId); } diff --git a/src/main/java/be/dash/dashserver/core/domain/member/service/MemberRepository.java b/src/main/java/be/dash/dashserver/core/domain/member/service/MemberRepository.java index 01702b7..2451c2b 100644 --- a/src/main/java/be/dash/dashserver/core/domain/member/service/MemberRepository.java +++ b/src/main/java/be/dash/dashserver/core/domain/member/service/MemberRepository.java @@ -26,5 +26,5 @@ public interface MemberRepository { void updateRole(Long id, Role role); - List findAllByIds(List memberIds); + List findAllByStudentIds(List studentIds); } diff --git a/src/main/java/be/dash/dashserver/core/domain/member/service/MemberService.java b/src/main/java/be/dash/dashserver/core/domain/member/service/MemberService.java index 1fdea8d..02dcc29 100644 --- a/src/main/java/be/dash/dashserver/core/domain/member/service/MemberService.java +++ b/src/main/java/be/dash/dashserver/core/domain/member/service/MemberService.java @@ -74,7 +74,7 @@ public Teacher findTeacherByMemberId(Long memberId) { .orElseThrow(() -> new ForbiddenException("해당하는 선생님을 찾을 수 없습니다.")); } - public List findAllByIds(List memberIds) { - return memberRepository.findAllByIds(memberIds); + public List findAllByStudentIds(List studentIds) { + return memberRepository.findAllByStudentIds(studentIds); } } diff --git a/src/main/java/be/dash/dashserver/database/core/member/MemberRepositoryAdapter.java b/src/main/java/be/dash/dashserver/database/core/member/MemberRepositoryAdapter.java index 24aaffd..23bc810 100644 --- a/src/main/java/be/dash/dashserver/database/core/member/MemberRepositoryAdapter.java +++ b/src/main/java/be/dash/dashserver/database/core/member/MemberRepositoryAdapter.java @@ -102,7 +102,10 @@ public void updateRole(Long id, Role role) { } @Override - public List findAllByIds(List memberIds) { + public List findAllByStudentIds(List studentIds) { + List memberIds = studentJpaRepository.findAllById(studentIds).stream() + .map(studentJpaEntity -> studentJpaEntity.getMember().getId()) + .toList(); return memberJpaRepository.findAllById(memberIds).stream().map(MemberJpaEntity::toDomain).toList(); } }