feat: ABEEK 영역의 상세보기 모달창 기능 구현

src/main/java/com/example/gimmegonghakauth/completed/service/CompletedCoursesService.java

@@ -148,8 +148,12 @@ public void checkUser(UserDomain userDomain) {
     }
 
     private Long courseIdToLong(String courseIdAsString) {
-        if (courseIdAsString.charAt(0) == 'P') {
-            courseIdAsString = '0' + courseIdAsString.substring(1);
+        if (!Character.isDigit(courseIdAsString.charAt(0))){
+            if (courseIdAsString.charAt(0) == 'P'){
+                courseIdAsString = '0' + courseIdAsString.substring(1);
+            } else{
+                return 0L;
+            }
         }
         return Long.parseLong(courseIdAsString);
     }

src/main/java/com/example/gimmegonghakauth/status/controller/StatusController.java

@@ -1,15 +1,19 @@
 package com.example.gimmegonghakauth.status.controller;
 
 import com.example.gimmegonghakauth.common.constant.AbeekTypeConst;
+import com.example.gimmegonghakauth.status.service.dto.AbeekDetailsDto;
+import com.example.gimmegonghakauth.status.service.dto.CourseDetailsDto;
+import com.example.gimmegonghakauth.status.service.dto.GonghakResultDto;
+import com.example.gimmegonghakauth.status.service.dto.ResultPointDto;
 import com.example.gimmegonghakauth.user.infrastructure.UserRepository;
 import com.example.gimmegonghakauth.user.domain.UserDomain;
-import com.example.gimmegonghakauth.status.service.dto.GonghakResultDto.ResultPointDto;
 import com.example.gimmegonghakauth.status.service.dto.IncompletedCoursesDto;
 import com.example.gimmegonghakauth.status.service.GonghakCalculateService;
 import com.example.gimmegonghakauth.status.service.recommend.GonghakRecommendService;
 import com.example.gimmegonghakauth.status.service.recommend.RecommendServiceSelectManager;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.Authentication;
@@ -38,20 +42,42 @@ public String readGonghakStatusResult(Authentication authentication, Model model
         // 컨트롤러가 UserDomain 객체를 가져오는 역할을 수행하고 있음.
         UserDomain student = userRepository.findByStudentId(studentId).get();
 
-        readUserResultRatio(model, student);
+        readUserResult(model, student);
         readUserRecommendCourses(model, studentId, student);
         return "gonghak/statusForm";
     }
 
     // 사용자의 인증 현황 데이터를 가져온다.
-    private void readUserResultRatio(Model model, UserDomain student) {
-        Map<AbeekTypeConst, ResultPointDto> userResultRatio = gonghakCalculateService.getResultRatio(
+    private void readUserResult(Model model, UserDomain student) {
+        GonghakResultDto userResultRatio = gonghakCalculateService.getResult(
                 student)
-            .get()
-            .getUserResultRatio();
-        model.addAttribute("userResultRatio", userResultRatio);
+            .orElseThrow(IllegalArgumentException::new);
+        addResultPoint(model, userResultRatio);
+        addCoursesDetails(model, userResultRatio);
     }
 
+    private void addResultPoint(Model model, GonghakResultDto result){
+        Map<AbeekTypeConst, AbeekDetailsDto> userResult = result.getUserResult();
+        Map<AbeekTypeConst, ResultPointDto> resultPoint = new ConcurrentHashMap<>();
+        userResult.forEach((abeekTypeConst, abeekDetailsDto) -> {
+            resultPoint.put(abeekTypeConst, abeekDetailsDto.getResultPoint());
+        });
+
+        model.addAttribute("userResultRatio", resultPoint);
+    }
+
+    private void addCoursesDetails(Model model, GonghakResultDto result){
+        Map<AbeekTypeConst, AbeekDetailsDto> userResult = result.getUserResult();
+
+        Map<AbeekTypeConst, List<CourseDetailsDto>> coursesDetails = new ConcurrentHashMap<>();
+        userResult.forEach((abeekTypeConst, abeekDetailsDto) -> {
+            coursesDetails.put(abeekTypeConst, abeekDetailsDto.getCoursesDetails());
+        });
+
+        model.addAttribute("userCourseDetails", coursesDetails);
+    }
+
+
     // 사용자의 공학인증 추천 과목을 가져온다.
     private void readUserRecommendCourses(Model model, Long studentId, UserDomain student) {
         GonghakRecommendService gonghakRecommendService = recommendServiceSelectManager.selectRecommendService(

src/main/java/com/example/gimmegonghakauth/status/infrastructure/GonghakCoursesDao.java

@@ -3,7 +3,7 @@
 import com.example.gimmegonghakauth.common.constant.CourseCategoryConst;
 import com.example.gimmegonghakauth.status.domain.GonghakCoursesDomain;
 import com.example.gimmegonghakauth.common.domain.MajorsDomain;
-import com.example.gimmegonghakauth.status.service.dto.GonghakCoursesByMajorDto;
+import com.example.gimmegonghakauth.status.service.dto.CourseDetailsDto;
 import com.example.gimmegonghakauth.status.service.dto.IncompletedCoursesDto;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -14,10 +14,10 @@
 @Repository
 public interface GonghakCoursesDao extends JpaRepository<GonghakCoursesDomain,Long> {
 
-    @Query("select new com.example.gimmegonghakauth.status.service.dto.GonghakCoursesByMajorDto(GCD.coursesDomain.courseId, GCD.coursesDomain.name, GCD.year, GCD.courseCategory, GCD.passCategory, GCD.designCredit, GCD.coursesDomain.credit) from GonghakCoursesDomain GCD "
+    @Query("select new com.example.gimmegonghakauth.status.service.dto.CourseDetailsDto(GCD.coursesDomain.courseId, GCD.coursesDomain.name, CCD.year, CCD.semester, GCD.courseCategory, GCD.passCategory, GCD.designCredit, GCD.coursesDomain.credit) from GonghakCoursesDomain GCD "
         + "join CompletedCoursesDomain CCD on GCD.coursesDomain = CCD.coursesDomain "
         + "where CCD.userDomain.studentId =:studentId and GCD.majorsDomain.id = :majorsId and GCD.year = :year")
-    List<GonghakCoursesByMajorDto> findUserCompletedCourses(@Param("studentId") Long studentId, @Param("majorsId") Long majorId, @Param("year") Long year);
+    List<CourseDetailsDto> findUserCompletedCourses(@Param("studentId") Long studentId, @Param("majorsId") Long majorId, @Param("year") Long year);
 
     @Query("select new com.example.gimmegonghakauth.status.service.dto.IncompletedCoursesDto(GCD.coursesDomain.name, GCD.courseCategory, GCD.coursesDomain.credit, GCD.designCredit) from GonghakCoursesDomain GCD  "
         + "left join CompletedCoursesDomain CCD on CCD.coursesDomain = GCD.coursesDomain "

src/main/java/com/example/gimmegonghakauth/status/infrastructure/GonghakDao.java

@@ -4,7 +4,7 @@
 import com.example.gimmegonghakauth.common.constant.CourseCategoryConst;
 import com.example.gimmegonghakauth.status.domain.AbeekDomain;
 import com.example.gimmegonghakauth.common.domain.MajorsDomain;
-import com.example.gimmegonghakauth.status.service.dto.GonghakCoursesByMajorDto;
+import com.example.gimmegonghakauth.status.service.dto.CourseDetailsDto;
 import com.example.gimmegonghakauth.status.service.dto.GonghakStandardDto;
 import com.example.gimmegonghakauth.status.service.dto.IncompletedCoursesDto;
 import java.util.List;
@@ -41,7 +41,7 @@ public Optional<GonghakStandardDto> findStandard(MajorsDomain majorsDomain){
 
     // gonghakCourse 중 이수한 과목을 불러온다.
     @Override
-    public List<GonghakCoursesByMajorDto> findUserCompletedCourses(
+    public List<CourseDetailsDto> findUserCompletedCourses(
         Long studentId, MajorsDomain majorsDomain) {
         return gonghakCoursesDao.findUserCompletedCourses(studentId,majorsDomain.getId(), studentId/DIVIDER);
     }

src/main/java/com/example/gimmegonghakauth/status/infrastructure/GonghakRepository.java

@@ -3,7 +3,7 @@
 import com.example.gimmegonghakauth.common.constant.CourseCategoryConst;
 import com.example.gimmegonghakauth.status.domain.AbeekDomain;
 import com.example.gimmegonghakauth.common.domain.MajorsDomain;
-import com.example.gimmegonghakauth.status.service.dto.GonghakCoursesByMajorDto;
+import com.example.gimmegonghakauth.status.service.dto.CourseDetailsDto;
 import com.example.gimmegonghakauth.status.service.dto.GonghakStandardDto;
 import com.example.gimmegonghakauth.status.service.dto.IncompletedCoursesDto;
 import java.util.List;
@@ -17,7 +17,7 @@ public interface GonghakRepository {
 
     Optional<GonghakStandardDto> findStandard(MajorsDomain majorsDomain);
 
-    List<GonghakCoursesByMajorDto> findUserCompletedCourses(Long studentId, MajorsDomain majorsDomain);
+    List<CourseDetailsDto> findUserCompletedCourses(Long studentId, MajorsDomain majorsDomain);
 
     List<IncompletedCoursesDto> findUserIncompletedCourses(
         CourseCategoryConst courseCategory,Long studentId, MajorsDomain majorsDomain);

src/main/java/com/example/gimmegonghakauth/status/service/GonghakCalculateService.java

@@ -2,11 +2,13 @@
 
 import com.example.gimmegonghakauth.common.constant.AbeekTypeConst;
 import com.example.gimmegonghakauth.status.infrastructure.GonghakRepository;
-import com.example.gimmegonghakauth.status.service.dto.GonghakCoursesByMajorDto;
+import com.example.gimmegonghakauth.status.service.dto.AbeekDetailsDto;
+import com.example.gimmegonghakauth.status.service.dto.CourseDetailsDto;
 import com.example.gimmegonghakauth.status.service.dto.GonghakResultDto;
-import com.example.gimmegonghakauth.status.service.dto.GonghakResultDto.ResultPointDto;
 import com.example.gimmegonghakauth.status.service.dto.GonghakStandardDto;
+import com.example.gimmegonghakauth.status.service.dto.ResultPointDto;
 import com.example.gimmegonghakauth.user.domain.UserDomain;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -23,116 +25,112 @@ public class GonghakCalculateService {
     private final GonghakRepository gonghakRepository;
 
     @Transactional(readOnly = true)
-    public Optional<GonghakResultDto> getResultRatio(UserDomain userDomain) {
+    public Optional<GonghakResultDto> getResult(UserDomain userDomain) {
 
         // findStandard -> 학번 입학년도를 기준으로 해당 년도의 abeekType(영역별 구분),minCredit(영역별 인증학점) 불러온다.
         Optional<GonghakStandardDto> standard = gonghakRepository.findStandard(
-                userDomain.getMajorsDomain());
+            userDomain.getMajorsDomain());
 
         // default user abeek 학점 상태 map
-        Map<AbeekTypeConst, Double> userAbeekCredit = getUserAbeekCreditDefault(
-                standard.get().getStandards());
+        Map<AbeekTypeConst, AbeekDetailsDto> userResult = getUserAbeekCreditDefault(
+            standard.get().getStandards());
 
         // user 공학 상태 테이블
         // gonghakCourse 중 이수한 과목을 불러온다.
-        List<GonghakCoursesByMajorDto> userCoursesByMajorByGonghakCoursesWithCompletedCourses = gonghakRepository.findUserCompletedCourses(
-                userDomain.getStudentId(), userDomain.getMajorsDomain());
+        List<CourseDetailsDto> userCompletedCourses = gonghakRepository.findUserCompletedCourses(
+            userDomain.getStudentId(), userDomain.getMajorsDomain());
 
         // user
         // stackUserGonghakCredit -> abeekType에 맞게 이수한 총 학점을 계산한다.
-        stackUserGonghakCredit(userCoursesByMajorByGonghakCoursesWithCompletedCourses,
-                userAbeekCredit);
-
-        // getUserGonghakResultRatio -> 인증 상태(비율)를 계산한다.
-        Map<AbeekTypeConst, ResultPointDto> userResultRatio = getUserGonghakResultRatio(
-                userAbeekCredit, standard);
+        stackUserGonghakCredit(userCompletedCourses,
+            userResult);
 
         // 인증 상태(비율) return
-        return Optional.of(new GonghakResultDto(userResultRatio));
+        return Optional.of(new GonghakResultDto(userResult));
     }
 
+
     // default user abeek 학점 상태 map을 만들어 반환한다.
-    private Map<AbeekTypeConst, Double> getUserAbeekCreditDefault(
-            Map<AbeekTypeConst, Integer> standards) {
-        Map<AbeekTypeConst, Double> userAbeekCredit = new ConcurrentHashMap<>();
+    private Map<AbeekTypeConst, AbeekDetailsDto> getUserAbeekCreditDefault(
+        Map<AbeekTypeConst, Integer> standards) {
+        Map<AbeekTypeConst, AbeekDetailsDto> userAbeekCredit = new ConcurrentHashMap<>();
         Arrays.stream(AbeekTypeConst.values()).forEach(abeekTypeConst -> {
             if (standards.containsKey(abeekTypeConst)) {
-                userAbeekCredit.put(abeekTypeConst, 0.0);
+                ResultPointDto resultPoint = new ResultPointDto(0.0, standards.get(abeekTypeConst));
+                AbeekDetailsDto abeekDetailsDto = new AbeekDetailsDto(resultPoint,
+                    new ArrayList<>());
+                userAbeekCredit.put(abeekTypeConst, abeekDetailsDto);
             }
         });
         return userAbeekCredit;
     }
 
-    // 인증 상태(비율)를 계산한다.
-    private Map<AbeekTypeConst, ResultPointDto> getUserGonghakResultRatio(
-            Map<AbeekTypeConst, Double> userAbeekCredit,
-            Optional<GonghakStandardDto> standard) {
-
-        Map<AbeekTypeConst, ResultPointDto> userResultRatio = new ConcurrentHashMap<>();
-        Arrays.stream(AbeekTypeConst.values()).forEach(abeekTypeConst -> {
-                    if (userAbeekCredit.containsKey(abeekTypeConst)) {
-                        getRatio(userAbeekCredit, standard, abeekTypeConst, userResultRatio);
-                    }
-                }
-        );
-        return userResultRatio;
-    }
-
-    private void getRatio(Map<AbeekTypeConst, Double> userAbeekCredit,
-                          Optional<GonghakStandardDto> standard, AbeekTypeConst abeekTypeConst,
-                          Map<AbeekTypeConst, ResultPointDto> userResultRatio) {
-
-        userResultRatio.put(
-                abeekTypeConst,
-                new ResultPointDto(userAbeekCredit.get(abeekTypeConst), standard.get().getStandards()
-                        .get(abeekTypeConst))
-        );
-    }
 
     // abeekType에 맞게 이수한 총 학점을 계산한다.
-    private void stackUserGonghakCredit(
-            List<GonghakCoursesByMajorDto> userCoursesByMajorByGonghakCoursesWithCompletedCourses,
-            Map<AbeekTypeConst, Double> userAbeekCredit) {
-        userCoursesByMajorByGonghakCoursesWithCompletedCourses.forEach(gonghakCoursesByMajorDto -> {
-            switch (gonghakCoursesByMajorDto.getCourseCategory()) {
-                case 전공:
-                    stackCredit(AbeekTypeConst.MAJOR, gonghakCoursesByMajorDto, userAbeekCredit);
-                    break;
-                case 전문교양:
-                    stackCredit(AbeekTypeConst.PROFESSIONAL_NON_MAJOR, gonghakCoursesByMajorDto,
-                            userAbeekCredit);
-                    break;
-                case 교양:
-                    stackCredit(AbeekTypeConst.NON_MAJOR, gonghakCoursesByMajorDto,
-                            userAbeekCredit);
-                    break;
-                case MSC:
-                    stackCredit(AbeekTypeConst.MSC, gonghakCoursesByMajorDto, userAbeekCredit);
-                    break;
-                case BSM:
-                    stackCredit(AbeekTypeConst.BSM, gonghakCoursesByMajorDto, userAbeekCredit);
-                    break;
+    private void stackUserGonghakCredit(List<CourseDetailsDto> userCoursesByMajor,
+        Map<AbeekTypeConst, AbeekDetailsDto> userResult) {
+        userCoursesByMajor.forEach(courseDetailsDto -> {
+            AbeekTypeConst typeConst = getCourseCategoryType(
+                String.valueOf(courseDetailsDto.getCourseCategory()));
+            if (typeConst != null) {
+                stackCredit(typeConst, courseDetailsDto, userResult);
+                addCourseToDetails(typeConst, courseDetailsDto, userResult);
             }
-            stackCredit(AbeekTypeConst.DESIGN, gonghakCoursesByMajorDto, userAbeekCredit);
-            stackCredit(AbeekTypeConst.MINIMUM_CERTI, gonghakCoursesByMajorDto, userAbeekCredit);
+            stackCredit(AbeekTypeConst.DESIGN, courseDetailsDto, userResult);
+            addCourseToDetails(AbeekTypeConst.DESIGN, courseDetailsDto, userResult);
+            stackCredit(AbeekTypeConst.MINIMUM_CERTI, courseDetailsDto, userResult);
+            addCourseToDetails(AbeekTypeConst.MINIMUM_CERTI, courseDetailsDto, userResult);
         });
     }
 
+    private AbeekTypeConst getCourseCategoryType(String courseCategory) {
+        switch (courseCategory) {
+            case "전공":
+                return AbeekTypeConst.MAJOR;
+            case "전문교양":
+                return AbeekTypeConst.PROFESSIONAL_NON_MAJOR;
+            case "교양":
+                return AbeekTypeConst.NON_MAJOR;
+            case "MSC":
+                return AbeekTypeConst.MSC;
+            case "BSM":
+                return AbeekTypeConst.BSM;
+            default:
+                return null;
+        }
+    }
+
 
-    private void stackCredit(AbeekTypeConst abeekTypeConst,
-                             GonghakCoursesByMajorDto gonghakCoursesByMajorDto,
-                             Map<AbeekTypeConst, Double> userAbeekCredit) {
-        double inputCredit = getInputCredit(abeekTypeConst, gonghakCoursesByMajorDto);
-        userAbeekCredit.put(abeekTypeConst, userAbeekCredit.get(abeekTypeConst) + inputCredit);
+    private void stackCredit(AbeekTypeConst abeekTypeConst, CourseDetailsDto courseDetailsDto,
+        Map<AbeekTypeConst, AbeekDetailsDto> userResult) {
+        double inputCredit = getInputCredit(abeekTypeConst, courseDetailsDto);
+        AbeekDetailsDto currentDetails = userResult.get(abeekTypeConst);
+        if (currentDetails != null) {
+            ResultPointDto currentResultPoint = currentDetails.getResultPoint();
+            double newUserPoint = currentResultPoint.getUserPoint() + inputCredit;
 
+            currentResultPoint.setUserPoint(newUserPoint);
+        }
     }
 
+
     private double getInputCredit(AbeekTypeConst abeekTypeConst,
-                                  GonghakCoursesByMajorDto gonghakCoursesByMajorDto) {
-        if (abeekTypeConst == AbeekTypeConst.DESIGN) {
-            return gonghakCoursesByMajorDto.getDesignCredit();
-        } else {
-            return (double) gonghakCoursesByMajorDto.getCredit();
+        CourseDetailsDto courseDetailsDto) {
+        return (abeekTypeConst == AbeekTypeConst.DESIGN) ? courseDetailsDto.getDesignCredit()
+            : (double) courseDetailsDto.getCredit();
+    }
+
+    private void addCourseToDetails(AbeekTypeConst abeekTypeConst,
+        CourseDetailsDto courseDetailsDto,
+        Map<AbeekTypeConst, AbeekDetailsDto> userAbeekCredit) {
+        if (getInputCredit(abeekTypeConst, courseDetailsDto) == 0) {
+            return;
+        }
+
+        AbeekDetailsDto currentDetails = userAbeekCredit.get(abeekTypeConst);
+        if (currentDetails != null) {
+            List<CourseDetailsDto> updatedCourses = currentDetails.getCoursesDetails();
+            updatedCourses.add(courseDetailsDto);
         }
     }
 

src/main/java/com/example/gimmegonghakauth/status/service/dto/AbeekDetailsDto.java

@@ -0,0 +1,14 @@
+package com.example.gimmegonghakauth.status.service.dto;
+
+
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class AbeekDetailsDto {
+
+    private ResultPointDto resultPoint;
+    private List<CourseDetailsDto> coursesDetails;
+}

src/main/java/com/example/gimmegonghakauth/status/service/dto/GonghakCoursesByMajorDto.java → src/main/java/com/example/gimmegonghakauth/status/service/dto/CourseDetailsDto.java

@@ -1,17 +1,19 @@
-package com.example.gimmegonghakauth.status.service.dto;
-
-import com.example.gimmegonghakauth.common.constant.CourseCategoryConst;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-@Getter
-@RequiredArgsConstructor
-public class GonghakCoursesByMajorDto {
-    private final Long courseId;
-    private final String courseName;
-    private final int year;
-    private final CourseCategoryConst courseCategory;
-    private final String passCategory;
-    private final double designCredit;
-    private final int credit;
-}
+package com.example.gimmegonghakauth.status.service.dto;
+
+import com.example.gimmegonghakauth.common.constant.CourseCategoryConst;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public class CourseDetailsDto {
+
+    private final Long courseId;
+    private final String courseName;
+    private final int year;
+    private final String semester;
+    private final CourseCategoryConst courseCategory;
+    private final String passCategory;
+    private final double designCredit;
+    private final int credit;
+}