feat: 졸업요건 검사 API 응답값 생성

- 주전공만 지원 - 주전공 관련 필드만 우선 제공
ICURRICULUM · Nov 19, 2024 · cb3071f · cb3071f
1 parent 1dffca8
commit cb3071f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/src/main/java/icurriculum/domain/graduation/dto/GraduationConverter.java b/src/main/java/icurriculum/domain/graduation/dto/GraduationConverter.java
@@ -13,7 +13,7 @@ public static GraduationResponse.AllDTO toAllDTO(
             List<Object> DTOList,
             final int totalCompletedCredit
     ) {
-        for (Object o : DTOList) {
+/*        for (Object o : DTOList) {
             if (o instanceof GraduationResponse.MainDTO response) {
                 boolean isOverTotalNeedCredit = response.totalNeedCredit() <= totalCompletedCredit;
                 log.info("totalCompletedCredit: {}", totalCompletedCredit);
@@ -33,8 +33,22 @@ public static GraduationResponse.AllDTO toAllDTO(
             if (o instanceof GraduationResponse.MinorDTO) {
 
             }
-        }
-        return new AllDTO();
+        }*/
+
+        GraduationResponse.MainDTO mainDTO = (GraduationResponse.MainDTO) DTOList.get(0);
+        boolean isOverTotalNeedCredit = mainDTO.totalNeedCredit() <= totalCompletedCredit;
+
+        return new AllDTO(
+                mainDTO.swAiDTO(),
+                mainDTO.creativityDTO(),
+                mainDTO.coreDTO(),
+                mainDTO.majorRequiredDTO(),
+                mainDTO.majorSelectDTO(),
+                mainDTO.generalRequiredDTO(),
+                totalCompletedCredit,
+                mainDTO.totalNeedCredit(),
+                isOverTotalNeedCredit
+        );
     }
 
     public static GraduationResponse.MainDTO toMainDTO(

diff --git a/src/main/java/icurriculum/domain/graduation/dto/GraduationResponse.java b/src/main/java/icurriculum/domain/graduation/dto/GraduationResponse.java
@@ -4,7 +4,17 @@
 
 public abstract class GraduationResponse {
 
-    public record AllDTO() {
+    public record AllDTO(
+            ProcessorResponse.SwAiDTO swAiDTO,
+            ProcessorResponse.CreativityDTO creativityDTO,
+            ProcessorResponse.CoreDTO coreDTO,
+            ProcessorResponse.MajorRequiredDTO majorRequiredDTO,
+            ProcessorResponse.MajorSelectDTO majorSelectDTO,
+            ProcessorResponse.GeneralRequiredDTO generalRequiredDTO,
+            int totalCompletedCredit,
+            int totalNeedCredit,
+            boolean isOverTotalNeedCredit
+    ) {
 
     }