Merge pull request #181 from SMU-SATTO/feature/#180

feat: 친구와 시간표 비교 기능 추가

Author: rlJzr

src/main/java/com/example/satto/domain/timeTable/controller/TimeTableController.java

@@ -64,6 +64,11 @@ public  BaseResponse<List<TimeTableResponseDTO.timeTableListDTO>> getOtherTimeTa
         return BaseResponse.onSuccess(timeTableService.getOtherTimeTableList(studentId, users));
     }
 
+    @PostMapping("/compare")
+    public BaseResponse<List<List<String>>> compareTimeTable(@RequestBody CompareTimeTableRequestDTO compare){
+        return  BaseResponse.onSuccess(timeTableService.compareTimeTable(compare));
+    }
+
     @PatchMapping("/{timeTableId}")
     public BaseResponse<String> updateTimeTable(@PathVariable(name = "timeTableId") Long timeTableId,@RequestBody UpdateTimeTableLectRequestDTO updateDTO){
         timeTableLectureService.deleteAll(timeTableId);

src/main/java/com/example/satto/domain/timeTable/dto/CompareTimeTableRequestDTO.java

@@ -0,0 +1,8 @@
+package com.example.satto.domain.timeTable.dto;
+
+import java.util.List;
+
+public record CompareTimeTableRequestDTO(
+        List<String> studentIds
+) {
+}

src/main/java/com/example/satto/domain/timeTable/repository/TimeTableRepository.java

@@ -26,4 +26,7 @@ public interface TimeTableRepository extends JpaRepository<TimeTable, Long> {
     TimeTable findLatestRepresentedTimeTableByUserId(@Param("userId") Long userId);
 
     void deleteAllByUsers(Users users);
+
+    @Query("SELECT t.timetableId FROM TimeTable t WHERE t.users.studentId = :studentId AND t.isRepresented = true ORDER BY t.createdAt DESC")
+    Long findLatestRepresentedTimeTableIdByUserId(@Param("studentId") String studentId);
 }

src/main/java/com/example/satto/domain/timeTable/service/TimeTableService.java

@@ -381,17 +381,32 @@ public List<TimeTableResponseDTO.timeTableListDTO> getOtherTimeTableList(String
         Users target = usersRepository.findByStudentId(studentId).orElseThrow();
         List<TimeTable> timeTables = new ArrayList<>();
 
-        //1차 배포시 공개, 비공개 사용자 구분x
-//        if(!target.isPublic()){
-//            if(!followRepository.existsByFollowerIdStudentIdAndFollowingIdStudentId(users.getStudentId(), studentId)){
-//                throw new IllegalStateException("볼 수 있는 시간표가 존재하지 않습니다.");
-//            }
-//        }
+
+        if(!target.isPublic()){
+            if(!followRepository.existsByFollowerIdStudentIdAndFollowingIdStudentId(users.getStudentId(), studentId)){
+                throw new IllegalStateException("볼 수 있는 시간표가 존재하지 않습니다.");
+            }
+        }
         timeTables = timeTableRepository.findTimeTableByStudentId(studentId);
 
         return TimeTableResponseDTO.timeTableListDTO.fromList(timeTables);
     }
 
+    public List<List<String>> compareTimeTable(CompareTimeTableRequestDTO compare){
+
+        List<Long> timeTableIds = new ArrayList<>();
+        List<String> result = new ArrayList<>();
+        List<List<String>> codeSectionLists = new ArrayList<>();
+        for( String studentId : compare.studentIds()){
+            timeTableIds.add(timeTableRepository.findLatestRepresentedTimeTableIdByUserId(studentId));
+        }
+        for( Long tinmeTableId : timeTableIds) {
+            result = timeTableLectureRepository.findTimeTableLecturesCodeSectionByTimeTableId(tinmeTableId);
+            codeSectionLists.add(result);
+        }
+
+        return codeSectionLists;
+    }
     public void updateTimeTableIsPublic(Long timeTableId, UpdateTimeTableRequestDTO isPublic){
 
         TimeTable timeTable = timeTableRepository.findById(timeTableId).orElseThrow();

src/main/java/com/example/satto/domain/timeTableLecture/repository/TimeTableLectureRepository.java

@@ -23,6 +23,9 @@ TimeTableLecture findTimeTableLectureByTimeTableIdAndCodeSection(@Param("timeTab
     @Query("select l from TimeTableLecture l where l.timeTable.timetableId = :timeTableId")
     List<TimeTableLecture> findTimeTableLecturesByTimeTableId(@Param("timeTableId")Long timeTableId);
 
+    @Query("select l.currentLecture.codeSection from TimeTableLecture l where l.timeTable.timetableId = :timeTableId")
+    List<String> findTimeTableLecturesCodeSectionByTimeTableId(@Param("timeTableId")Long timeTableId);
+
     @Transactional
     @Modifying
     @Query("delete from TimeTableLecture l where l.timeTable.timetableId = :timeTableId")