release-1.0 <- main

src/main/java/kr/allcll/backend/domain/graduation/certification/GraduationCertCriteriaService.java

@@ -27,7 +27,6 @@ public class GraduationCertCriteriaService {
     private final GraduationCertRuleRepository graduationCertRuleRepository;
     private final CodingCertCriterionRepository codingCertCriterionRepository;
     private final GraduationDepartmentInfoRepository departmentInfoRepository;
-    private final ClassicCertCriterionRepository classicCertCriterionRepository;
     private final EnglishCertCriterionRepository englishCertCriterionRepository;
 
 
@@ -49,11 +48,11 @@ public GraduationCertCriteriaResponse getGraduationCertCriteria(Long userId) {
         GraduationCertPolicyResponse certPolicy =
             buildCertPolicy(graduationCertRule.getGraduationCertRuleType(), englishTargetType, codingTargetType);
         EnglishCertCriteriaResponse englishCriteria = buildEnglishCriteria(admissionYear, englishTargetType);
-        ClassicCertCriteriaResponse classicCriteria = buildClassicCriteria(admissionYear);
+        ClassicCertCriteriaResponse classicCriteria = buildClassicCriteria();
         CodingCertCriteriaResponse codingCriteria = buildCodingCriteria(admissionYear, codingTargetType);
 
-        return GraduationCertCriteriaResponse.of(criteriaTarget, certPolicy, englishCriteria, classicCriteria,
-            codingCriteria);
+        return GraduationCertCriteriaResponse.of(criteriaTarget, certPolicy, englishCriteria,
+            classicCriteria, codingCriteria);
     }
 
     private GraduationDepartmentInfo findDepartment(int admissionYear, String deptCd) {
@@ -151,17 +150,8 @@ private EnglishCertCriteriaResponse buildEnglishCriteria(int admissionYear, Engl
         );
     }
 
-    private ClassicCertCriteriaResponse buildClassicCriteria(int admissionYear) {
-        ClassicCertCriterion classicCertCriterion = classicCertCriterionRepository.findByAdmissionYear(admissionYear)
-            .orElseThrow(() -> new AllcllException(AllcllErrorCode.CLASSIC_CERT_CRITERIA_NOT_FOUND));
-
-        return ClassicCertCriteriaResponse.of(
-            classicCertCriterion.getTotalRequiredCount(),
-            classicCertCriterion.getRequiredCountWestern(),
-            classicCertCriterion.getRequiredCountEastern(),
-            classicCertCriterion.getRequiredCountEasternAndWestern(),
-            classicCertCriterion.getRequiredCountScience()
-        );
+    private ClassicCertCriteriaResponse buildClassicCriteria() {
+        return ClassicCertCriteriaResponse.fromEnum();
     }
 
     private CodingCertCriteriaResponse buildCodingCriteria(int admissionYear, CodingTargetType codingTargetType) {

src/main/java/kr/allcll/backend/domain/graduation/certification/dto/ClassicCertCriteriaResponse.java

@@ -1,5 +1,7 @@
 package kr.allcll.backend.domain.graduation.certification.dto;
 
+import kr.allcll.backend.domain.graduation.check.cert.ClassicsArea;
+
 public record ClassicCertCriteriaResponse(
     Integer totalRequiredCount,
     Integer requiredCountWestern,
@@ -23,4 +25,14 @@ public static ClassicCertCriteriaResponse of(
             requiredCountScience
         );
     }
+
+    public static ClassicCertCriteriaResponse fromEnum() {
+        return new ClassicCertCriteriaResponse(
+            ClassicsArea.getTotalRequiredCount(),
+            ClassicsArea.WESTERN.getMaxRecognizedCount(),
+            ClassicsArea.EASTERN.getMaxRecognizedCount(),
+            ClassicsArea.EASTERN_AND_WESTERN.getMaxRecognizedCount(),
+            ClassicsArea.SCIENCE.getMaxRecognizedCount()
+        );
+    }
 }

src/main/java/kr/allcll/backend/domain/graduation/check/cert/ClassicsArea.java

@@ -0,0 +1,35 @@
+package kr.allcll.backend.domain.graduation.check.cert;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+@Getter
+@RequiredArgsConstructor
+public enum ClassicsArea {
+    WESTERN("서양의 역사와 사상", 4),
+    EASTERN("동양의 역사와 사상", 2),
+    EASTERN_AND_WESTERN("동·서양의 문학", 3),
+    SCIENCE("과학 사상", 1);
+
+    private final String koreanName;
+    private final int maxRecognizedCount;
+
+    public static Optional<ClassicsArea> findByLabel(String label) {
+        return Arrays.stream(values())
+            .filter(area -> label.contains(area.koreanName))
+            .findFirst();
+    }
+
+    public static int getTotalRequiredCount() {
+        return Arrays.stream(values())
+            .mapToInt(ClassicsArea::getMaxRecognizedCount)
+            .sum();
+    }
+
+    public int getRecognizedCount(int actualCount) {
+        return Math.min(actualCount, maxRecognizedCount);
+    }
+}

src/main/java/kr/allcll/backend/domain/graduation/check/cert/GraduationCertService.java

@@ -1,8 +1,6 @@
 package kr.allcll.backend.domain.graduation.check.cert;
 
 import jakarta.persistence.EntityManager;
-import kr.allcll.backend.domain.graduation.certification.ClassicCertCriterion;
-import kr.allcll.backend.domain.graduation.certification.ClassicCertCriterionRepository;
 import kr.allcll.backend.domain.graduation.certification.GraduationCertRule;
 import kr.allcll.backend.domain.graduation.certification.GraduationCertRuleRepository;
 import kr.allcll.backend.domain.graduation.certification.GraduationCertRuleType;
@@ -21,7 +19,6 @@ public class GraduationCertService {
 
     private final EntityManager entityManager;
     private final GraduationCertRuleRepository graduationCertRuleRepository;
-    private final ClassicCertCriterionRepository classicCertCriterionRepository;
     private final GraduationCheckCertResultRepository graduationCheckCertResultRepository;
 
     @Transactional
@@ -39,17 +36,12 @@ public void createOrUpdate(User user, GraduationCertInfo certInfo) {
         int requiredPassCount = certRuleType.getRequiredPassCount();
         boolean isSatisfied = certRuleType.isSatisfied(passedCount);
 
-        // 고전독서 기준 데이터 DB에서 조회
-        ClassicCertCriterion classicCriteria = classicCertCriterionRepository
-            .findByAdmissionYear(user.getAdmissionYear())
-            .orElseThrow(
-                () -> new AllcllException(AllcllErrorCode.GRADUATION_CERT_RULE_NOT_FOUND, user.getAdmissionYear()));
-
-        int requiredCountWestern = classicCriteria.getRequiredCountWestern();
-        int requiredCountEastern = classicCriteria.getRequiredCountEastern();
-        int requiredCountEasternAndWestern = classicCriteria.getRequiredCountEasternAndWestern();
-        int requiredCountScience = classicCriteria.getRequiredCountScience();
-        int classicsTotalRequiredCount = classicCriteria.getTotalRequiredCount();
+        // 고전독서 기준 데이터 enum에서 조회
+        int classicsTotalRequiredCount = ClassicsArea.getTotalRequiredCount();
+        int requiredCountWestern = ClassicsArea.WESTERN.getMaxRecognizedCount();
+        int requiredCountEastern = ClassicsArea.EASTERN.getMaxRecognizedCount();
+        int requiredCountEasternAndWestern = ClassicsArea.EASTERN_AND_WESTERN.getMaxRecognizedCount();
+        int requiredCountScience = ClassicsArea.SCIENCE.getMaxRecognizedCount();
 
         boolean isWesternSatisfied = certInfo.myCountWestern() >= requiredCountWestern;
         boolean isEasternSatisfied = certInfo.myCountEastern() >= requiredCountEastern;

src/main/java/kr/allcll/backend/domain/graduation/check/cert/GraduationClassicsCertFetcher.java

@@ -13,10 +13,15 @@
 import org.jsoup.select.Elements;
 import org.springframework.stereotype.Service;
 
+import java.util.EnumMap;
+import java.util.Map;
+
 @Service
 @RequiredArgsConstructor
 public class GraduationClassicsCertFetcher {
 
+    private static final int PASS_STATUS_INDEX = 0;
+
     private final LoginProperties properties;
     private final GraduationHtmlParser parser;
     private final GraduationCertDocumentFetcher documentFetcher;
@@ -33,8 +38,9 @@ public ClassicsResult fetchClassics(OkHttpClient client) {
     }
 
     private boolean parsePass(Document document) {
-        String approvalText = parser.selectClassicsPassText(document).trim();
-        return !approvalText.equals("아니오");
+        String[] passTextParts = parser.selectClassicsPassText(document);
+        String passText = passTextParts[PASS_STATUS_INDEX];
+        return !passText.equals("아니오");
     }
 
     private ClassicsCounts parseCounts(Document document) {
@@ -43,10 +49,7 @@ private ClassicsCounts parseCounts(Document document) {
             throw new AllcllException(AllcllErrorCode.CLASSIC_DETAIL_INFO_FETCH_FAIL);
         }
 
-        int westernCompleted = 0;
-        int easternCompleted = 0;
-        int literatureCompleted = 0;
-        int scienceCompleted = 0;
+        Map<ClassicsArea, Integer> countMap = new EnumMap<>(ClassicsArea.class);
 
         for (Element row : table.select("tbody tr")) {
             Element th = row.selectFirst("th");
@@ -58,28 +61,24 @@ private ClassicsCounts parseCounts(Document document) {
             Elements tds = row.select("td");
             if (tds.isEmpty()) continue;
 
-            int completedCount = extractCount(tds.get(0));
-
-            if (label.contains("서양의 역사와 사상")) {
-                westernCompleted = completedCount;
-            }
-            else if (label.contains("동양의 역사와 사상")) {
-                easternCompleted = completedCount;
-            }
-            else if (label.contains("동·서양의 문학")) {
-                literatureCompleted = completedCount;
-            }
-            else if (label.contains("과학 사상")) {
-                scienceCompleted = completedCount;
-            }
+            ClassicsArea.findByLabel(label).ifPresent(area -> {
+                int actualCount = extractCompletedCount(tds.getFirst());
+                countMap.put(area, actualCount);
+            });
         }
 
-        return new ClassicsCounts(westernCompleted, easternCompleted, literatureCompleted, scienceCompleted);
+        return new ClassicsCounts(
+            countMap.getOrDefault(ClassicsArea.WESTERN, 0),
+            countMap.getOrDefault(ClassicsArea.EASTERN, 0),
+            countMap.getOrDefault(ClassicsArea.EASTERN_AND_WESTERN, 0),
+            countMap.getOrDefault(ClassicsArea.SCIENCE, 0)
+        );
     }
 
-    private int extractCount(Element value) {
+    private int extractCompletedCount(Element value) {
         try {
-            return Integer.parseInt(value.text().replace("권", "").trim());
+            String text = value.text().replace("권", "").trim();
+            return Integer.parseInt(text);
         } catch (NumberFormatException e) {
             return 0;
         }

src/main/java/kr/allcll/backend/domain/graduation/check/cert/dto/ClassicsCounts.java

@@ -1,5 +1,6 @@
 package kr.allcll.backend.domain.graduation.check.cert.dto;
 
+import kr.allcll.backend.domain.graduation.check.cert.ClassicsArea;
 import kr.allcll.backend.domain.graduation.check.cert.GraduationCheckCertResult;
 
 public record ClassicsCounts(
@@ -10,7 +11,10 @@ public record ClassicsCounts(
 ) {
 
     public int totalMyCount() {
-        return myCountWestern + myCountEastern + myCountEasternAndWestern + myCountScience;
+        return ClassicsArea.WESTERN.getRecognizedCount(myCountWestern)
+            + ClassicsArea.EASTERN.getRecognizedCount(myCountEastern)
+            + ClassicsArea.EASTERN_AND_WESTERN.getRecognizedCount(myCountEasternAndWestern)
+            + ClassicsArea.SCIENCE.getRecognizedCount(myCountScience);
     }
 
     public static ClassicsCounts fallback(GraduationCheckCertResult certResult) {

src/main/java/kr/allcll/backend/domain/graduation/check/excel/CompletedCourseDto.java

@@ -9,7 +9,7 @@
 public record CompletedCourseDto(
     String curiNo,             // 학수번호
     String curiNm,             // 교과목명
-    CategoryType categoryType, // 이수구분 (변환됨)
+    String categoryTypeRaw, // 이수구분 (변환됨)
     String selectedArea,       // 선택영역 (균형교양 영역)
     Double credits,            // 학점
     String grade,              // 등급 (성적)
@@ -29,20 +29,20 @@ public static CompletedCourseDto of(
         return new CompletedCourseDto(
             curiNo,
             curiNm,
-            convertCategoryType(categoryTypeRaw),
+            categoryTypeRaw,
             selectedArea,
             credits,
             grade,
             determineMajorScope(categoryTypeRaw)
         );
     }
 
-    public CompletedCourse toEntity(Long userId) {
+    public CompletedCourse toEntity(Long userId, int admissionYear) {
         return new CompletedCourse(
             userId,
             curiNo,
             curiNm,
-            categoryType,
+            CategoryType.fromRaw(categoryTypeRaw, admissionYear),
             selectedArea,
             credits,
             grade,
@@ -51,44 +51,11 @@ public CompletedCourse toEntity(Long userId) {
         );
     }
 
-    public CompletedCourseDto toAcademicBasic() {
-        return new CompletedCourseDto(
-            this.curiNo,
-            this.curiNm,
-            CategoryType.ACADEMIC_BASIC,
-            this.selectedArea,
-            this.credits,
-            this.grade,
-            this.majorScope
-        );
-    }
-
     // grade 기준 학점 인정 판별 메서드
     public boolean isCreditEarned() {
-        if (grade == null || grade.isEmpty()) {
-            return true;
-        }
         return !NOT_EARNED_GRADES.contains(grade);
     }
 
-    private static CategoryType convertCategoryType(String raw) {
-        if (raw == null) {
-            return null;
-        }
-        String stripped = raw.strip();
-        return switch (stripped) {
-            case "교필", "공필" -> CategoryType.COMMON_REQUIRED;
-            case "균필" -> CategoryType.BALANCE_REQUIRED;
-            case "기교", "기필" -> CategoryType.ACADEMIC_BASIC;
-            case "교선", "교선1", "교선2" -> CategoryType.GENERAL_ELECTIVE;
-            case "교양" -> CategoryType.GENERAL;
-            case "전필", "복필" -> CategoryType.MAJOR_REQUIRED;
-            case "전선", "복선" -> CategoryType.MAJOR_ELECTIVE;
-            case "전기" -> CategoryType.MAJOR_BASIC;
-            default -> null;
-        };
-    }
-
     private static MajorScope determineMajorScope(String categoryTypeRaw) {
         if (categoryTypeRaw == null) {
             throw new AllcllException(AllcllErrorCode.EMPTY_REQUIRED_COLUMN);

src/main/java/kr/allcll/backend/domain/graduation/check/excel/CompletedCoursePersistenceService.java

@@ -1,6 +1,10 @@
 package kr.allcll.backend.domain.graduation.check.excel;
 
 import java.util.List;
+import kr.allcll.backend.domain.user.User;
+import kr.allcll.backend.domain.user.UserRepository;
+import kr.allcll.backend.support.exception.AllcllErrorCode;
+import kr.allcll.backend.support.exception.AllcllException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -10,16 +14,21 @@
 @RequiredArgsConstructor
 public class CompletedCoursePersistenceService {
 
+    private final UserRepository userRepository;
     private final CompletedCourseRepository completedCourseRepository;
 
     @Transactional
-    public List<CompletedCourse> saveAllCompletedCourse(Long userId, List<CompletedCourseDto> parsedCourses) {
-        completedCourseRepository.deleteByUserId(userId);
+    public List<CompletedCourse> saveAllCompletedCourse(
+        Long userId,
+        List<CompletedCourseDto> parsedCourses
+    ) {
+        User user = userRepository.findById(userId)
+            .orElseThrow(() -> new AllcllException(AllcllErrorCode.USER_NOT_FOUND));
 
+        completedCourseRepository.deleteByUserId(userId);
         List<CompletedCourse> completedCourses = parsedCourses.stream()
-            .map(parsedCourse -> parsedCourse.toEntity(userId))
+            .map(parsedCourse -> parsedCourse.toEntity(user.getId(), user.getAdmissionYear()))
             .toList();
-
         return completedCourseRepository.saveAll(completedCourses);
     }