Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix : (졸학계) F학점 수업 처리 추가 #1358

Merged
merged 3 commits into from
Mar 9, 2025
Merged

fix : (졸학계) F학점 수업 처리 추가 #1358

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd9ad8c
fix : F학점 수업 안 뜨게 처리
duehee Mar 8, 2025
60b6173
fix : 재수강 Y인 경우 제외
duehee Mar 8, 2025
26d7856
chore : 라인포맷팅 진행
duehee Mar 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/main/java/in/koreatech/koin/domain/graduation/service/GraduationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public class GraduationService {

private static final String MIDDLE_TOTAL = "소 계";
private static final String TOTAL = "합 계";
private static final String RETAKE = "Y";
private static final String FAIL = "F";
private static final String UNSATISFACTORY = "U";
private static final String DEFAULT_COURSER_TYPE = "이수구분선택";
private static final String GENERAL_EDUCATION_COURSE_TYPE = "교양선택";
Expand Down Expand Up @@ -133,7 +133,7 @@ private void validateStudentField(Object field, String message) {
@Transactional
public void resetStudentCourseCalculation(Student student, Major newMajor) {
// 기존 학생 졸업요건 계산 정보 삭제
if(!studentCourseCalculationRepository.findAllByUserId(student.getUser().getId()).isEmpty()) {
if (!studentCourseCalculationRepository.findAllByUserId(student.getUser().getId()).isEmpty()) {
studentCourseCalculationRepository.deleteAllByUserId(student.getUser().getId());
entityManager.flush();
entityManager.clear();
Expand Down Expand Up @@ -474,8 +474,8 @@ private GradeExcelData extractExcelData(Row row) {

private boolean skipRow(GradeExcelData gradeExcelData) {
return gradeExcelData.classTitle().equals(MIDDLE_TOTAL) ||
gradeExcelData.retakeStatus().equals(RETAKE) ||
gradeExcelData.grade().equals(UNSATISFACTORY);
gradeExcelData.grade().equals(FAIL) ||
gradeExcelData.grade().equals(UNSATISFACTORY);
}

// 분반 문제를 해결하기 위해서, 강의들을 전부 가져오도록 했음
Expand Down Expand Up @@ -655,7 +655,8 @@ private List<GeneralEducationLectureResponse.GeneralEducationArea> getSelectiveE
List<TimetableLecture> selectiveEducationTimetableLectures = timetableFrames.stream()
.flatMap(frame -> frame.getTimetableLectures().stream())
.filter(lecture -> lecture.getGeneralEducationArea() == null
&& lecture.getCourseType() == courseTypeRepository.getByName(GENERAL_EDUCATION_COURSE_TYPE))
&& lecture.getCourseType() == courseTypeRepository.getByName(
GENERAL_EDUCATION_COURSE_TYPE))
.toList();

Integer requiredCredit = SELECTIVE_EDUCATION_REQUIRED_CREDIT;
Expand Down
Loading