Merge pull request #43 from INU-Software-Design/NEEIS-91-feature/report

[NEEIS-91[ feat: 학생 보고서 생성

Author: 82everywin

build.gradle

@@ -69,8 +69,11 @@ dependencies {
     // PDF
     implementation 'com.openhtmltopdf:openhtmltopdf-slf4j:1.0.10' // 로그용 (선택)
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-    implementation 'com.itextpdf:itext7-core:7.1.2'
-    implementation 'com.itextpdf:html2pdf:3.0.2'
+
+    implementation 'com.itextpdf:layout:7.2.5'
+    implementation 'com.itextpdf:kernel:7.2.5'
+    implementation 'com.itextpdf:io:7.2.5'
+    implementation 'com.itextpdf:font-asian:7.2.5' // 한글 폰트 지원
 }
 
 

src/main/java/com/neeis/neeis/domain/behavior/service/BehaviorService.java

@@ -13,6 +13,9 @@
 import com.neeis.neeis.domain.classroomStudent.ClassroomStudentRepository;
 import com.neeis.neeis.domain.classroomStudent.ClassroomStudentService;
 import com.neeis.neeis.domain.notification.service.NotificationService;
+import com.neeis.neeis.domain.parent.Parent;
+import com.neeis.neeis.domain.parent.ParentService;
+import com.neeis.neeis.domain.student.Student;
 import com.neeis.neeis.domain.teacher.Teacher;
 import com.neeis.neeis.domain.teacher.service.TeacherService;
 import com.neeis.neeis.domain.user.User;
@@ -27,6 +30,7 @@
 
 import static com.neeis.neeis.domain.user.Role.STUDENT;
 import static com.neeis.neeis.domain.user.Role.TEACHER;
+import static com.neeis.neeis.global.exception.ErrorCode.CLASSROOM_NOT_FOUND;
 import static com.neeis.neeis.global.exception.ErrorCode.HANDLE_ACCESS_DENIED;
 
 @Service
@@ -41,6 +45,7 @@ public class BehaviorService {
     private final NotificationService notificationService;
     private final UserService userService;
     private final ClassroomStudentRepository classroomStudentRepository;
+    private final ParentService parentService;
 
     // [교사] 행동 작성
     @Transactional //false
@@ -112,13 +117,30 @@ private ClassroomStudent checkValidate(String username, int year, int grade, int
             }
 
             case TEACHER -> {
-                Teacher teacher = teacherService.authenticate(username);
-                Classroom classroom = classroomService.findClassroom(year, grade, classNum, teacher.getId());
+                teacherService.authenticate(username);
+                Classroom classroom = classroomService.findClassroom(year, grade, classNum);
 
                 return classroomStudentRepository.findByClassroomAndNumber(classroom, number)
                         .orElseThrow(() -> new CustomException(HANDLE_ACCESS_DENIED));
             }
 
+            case PARENT -> {
+                Parent parent = parentService.getParentByUser(user);
+
+                Student student = parent.getStudent();
+                Classroom classroom = classroomService.findClassroom(year, grade, classNum);
+
+                ClassroomStudent classroomStudent = classroomStudentRepository.findByClassroomAndNumber(classroom, number)
+                        .orElseThrow(() -> new CustomException(CLASSROOM_NOT_FOUND));
+
+                // 자녀가 아니면 접근 불가함.
+                if (!student.getId().equals(classroomStudent.getStudent().getId())) {
+                    throw new CustomException(HANDLE_ACCESS_DENIED);
+                }
+
+                return classroomStudent;
+            }
+
             default -> throw new CustomException(HANDLE_ACCESS_DENIED);
         }
     }

src/main/java/com/neeis/neeis/domain/classroomStudent/ClassroomStudentRepository.java

@@ -30,4 +30,28 @@ public interface ClassroomStudentRepository extends JpaRepository<ClassroomStude
     @Query(value = "SELECT cs FROM ClassroomStudent cs " +
             "WHERE cs.student.user = :user")
     Optional<ClassroomStudent> findByStudentUser(@Param("user") User user);
-}
+
+    /**
+     * 학생 User로 모든 ClassroomStudent 조회 (연도별)
+     */
+    @Query("SELECT cs FROM ClassroomStudent cs WHERE cs.student.user = :user ORDER BY cs.classroom.year DESC")
+    List<ClassroomStudent> findAllByStudentUserOrderByYear(@Param("user") User user);
+
+    /**
+     * 특정 연도, 학년, 반의 모든 학생 조회
+     */
+    @Query("SELECT cs FROM ClassroomStudent cs WHERE cs.classroom.year = :year AND cs.classroom.grade = :grade AND cs.classroom.classNum = :classNum ORDER BY cs.number")
+    List<ClassroomStudent> findByClassroomInfo(@Param("year") int year, @Param("grade") int grade, @Param("classNum") int classNum);
+
+    /**
+     * 학생 ID와 연도로 ClassroomStudent 조회
+     */
+    @Query("SELECT cs FROM ClassroomStudent cs WHERE cs.student.id = :studentId AND cs.classroom.year = :year")
+    Optional<ClassroomStudent> findByStudentIdAndClassroomYear(@Param("studentId") Long studentId, @Param("year") int year);
+
+    /**
+     * 학생 ID로 ClassroomStudent 조회 (연도 내림차순) - 기존에 있던 메서드
+     */
+    @Query("SELECT cs FROM ClassroomStudent cs WHERE cs.student.id = :studentId ORDER BY cs.classroom.year DESC")
+    List<ClassroomStudent> findByStudentIdOrderByClassroomYearDesc(@Param("studentId") Long studentId);
+}

src/main/java/com/neeis/neeis/domain/classroomStudent/ClassroomStudentService.java

@@ -2,12 +2,14 @@
 
 import com.neeis.neeis.domain.classroom.Classroom;
 import com.neeis.neeis.domain.classroom.ClassroomService;
+import com.neeis.neeis.domain.user.User;
 import com.neeis.neeis.global.exception.CustomException;
 import com.neeis.neeis.global.exception.ErrorCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Optional;
 
 @Service
 @RequiredArgsConstructor
@@ -32,4 +34,30 @@ public ClassroomStudent findByClassroomAndNumber(Classroom classroom, int number
     public List<ClassroomStudent> findByClassroom(Classroom classroom) {
         return classroomStudentRepository.findByClassroom(classroom);
     }
+
+    /**
+     * PDF 생성을 위해 추가된 메서드
+     * User 객체로 ClassroomStudent 조회
+     */
+    public Optional<ClassroomStudent> findByStudent(User user) {
+        return classroomStudentRepository.findByStudentUser(user);
+    }
+
+    /**
+     * 학생 ID와 연도로 ClassroomStudent 조회
+     */
+    public Optional<ClassroomStudent> findByStudentIdAndYear(Long studentId, int year) {
+        return classroomStudentRepository.findByStudentIdAndClassroomYear(studentId, year);
+    }
+
+    /**
+     * 학생 ID로 현재 활성 ClassroomStudent 조회 (최신 연도 기준)
+     * @param studentId 학생 ID
+     * @return ClassroomStudent Optional
+     */
+    public Optional<ClassroomStudent> findByStudentId(Long studentId) {
+        return classroomStudentRepository.findByStudentIdOrderByClassroomYearDesc(studentId)
+                .stream()
+                .findFirst();
+    }
 }