fix: 수강 이력 조회 시 studyId를 이용하도록 수정

GDSC-Hongik · Nov 6, 2024 · acbcfdf · acbcfdf
1 parent f9dc1c3
commit acbcfdf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/main/java/com/gdschongik/gdsc/domain/study/application/MentorStudyHistoryService.java b/src/main/java/com/gdschongik/gdsc/domain/study/application/MentorStudyHistoryService.java
@@ -33,7 +33,8 @@ public class MentorStudyHistoryService {
     public void completeStudy(Long studyId, StudyCompletionRequest request) {
         Member currentMember = memberUtil.getCurrentMember();
         Study study = studyRepository.findById(studyId).orElseThrow(() -> new CustomException(STUDY_NOT_FOUND));
-        List<StudyHistory> studyHistories = studyHistoryRepository.findAllById(request.studentIds());
+        List<StudyHistory> studyHistories =
+                studyHistoryRepository.findAllByStudyIdAndStudentIds(studyId, request.studentIds());
 
         studyValidator.validateStudyMentor(currentMember, study);
         studyHistoryValidator.validateAppliedToStudy(
@@ -48,7 +49,8 @@ public void completeStudy(Long studyId, StudyCompletionRequest request) {
     public void withdrawStudyCompletion(Long studyId, StudyCompletionRequest request) {
         Member currentMember = memberUtil.getCurrentMember();
         Study study = studyRepository.findById(studyId).orElseThrow(() -> new CustomException(STUDY_NOT_FOUND));
-        List<StudyHistory> studyHistories = studyHistoryRepository.findAllById(request.studentIds());
+        List<StudyHistory> studyHistories =
+                studyHistoryRepository.findAllByStudyIdAndStudentIds(studyId, request.studentIds());
 
         studyValidator.validateStudyMentor(currentMember, study);
         studyHistoryValidator.validateAppliedToStudy(

diff --git a/src/main/java/com/gdschongik/gdsc/domain/study/dao/StudyHistoryCustomRepository.java b/src/main/java/com/gdschongik/gdsc/domain/study/dao/StudyHistoryCustomRepository.java
@@ -1,8 +1,11 @@
 package com.gdschongik.gdsc.domain.study.dao;
 
+import com.gdschongik.gdsc.domain.study.domain.StudyHistory;
 import java.util.List;
 
 public interface StudyHistoryCustomRepository {
 
     long countByStudyIdAndStudentIds(Long studyId, List<Long> studentIds);
+
+    List<StudyHistory> findAllByStudyIdAndStudentIds(Long studyId, List<Long> studentIds);
 }
diff --git a/src/main/java/com/gdschongik/gdsc/domain/study/dao/StudyHistoryCustomRepositoryImpl.java b/src/main/java/com/gdschongik/gdsc/domain/study/dao/StudyHistoryCustomRepositoryImpl.java
@@ -2,6 +2,7 @@
 
 import static com.gdschongik.gdsc.domain.study.domain.QStudyHistory.*;
 
+import com.gdschongik.gdsc.domain.study.domain.StudyHistory;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.util.List;
@@ -21,6 +22,14 @@ public long countByStudyIdAndStudentIds(Long studyId, List<Long> studentIds) {
                 .fetchOne();
     }
 
+    @Override
+    public List<StudyHistory> findAllByStudyIdAndStudentIds(Long studyId, List<Long> studentIds) {
+        return queryFactory
+                .selectFrom(studyHistory)
+                .where(eqStudyId(studyId), studyHistory.student.id.in(studentIds))
+                .fetch();
+    }
+
     private BooleanExpression eqStudyId(Long studyId) {
         return studyHistory.study.id.eq(studyId);
     }