From 0c8b8334f93ff78946d0384c643281f4fdc0b3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EA=B4=80=EA=B7=9C?= Date: Sat, 28 Feb 2026 00:18:40 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=EC=8B=A0=EC=84=A4=20=EC=A0=84?= =?UTF-8?q?=EA=B3=B5/=ED=95=99=EB=B6=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../in/koreatech/koin/domain/dept/model/Dept.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/java/in/koreatech/koin/domain/dept/model/Dept.java b/src/main/java/in/koreatech/koin/domain/dept/model/Dept.java index bd570fc7fc..9b1c9d382f 100644 --- a/src/main/java/in/koreatech/koin/domain/dept/model/Dept.java +++ b/src/main/java/in/koreatech/koin/domain/dept/model/Dept.java @@ -40,6 +40,21 @@ public enum Dept { ENERGY_MATERIALS_ENGINEERING( "에너지신소재공학부", List.of("N/A"), "https://www.koreatech.ac.kr/board.es?mid=b40301000000&bid=0128"), + SEMICONDUCTOR_DISPLAY_ENGINEERING( + "반도체·디스플레이공학과", List.of("N/A"), + "https://www.koreatech.ac.kr/menu.es?mid=a10201000000"), + FUTURE_CONVERGENCE( + "미래융합학부", List.of("N/A"), + "https://www.koreatech.ac.kr/menu.es?mid=a10201000000"), + ENGINEERING_CONVERGENCE_AUTONOMOUS_MAJOR( + "공학융합자율전공", List.of("N/A"), + "https://www.koreatech.ac.kr/menu.es?mid=a10201000000"), + ICT_CONVERGENCE_AUTONOMOUS_MAJOR( + "ICT융합자율전공", List.of("N/A"), + "https://www.koreatech.ac.kr/menu.es?mid=a10201000000"), + SOCIAL_CONVERGENCE_AUTONOMOUS_MAJOR( + "사회융합자율전공", List.of("N/A"), + "https://www.koreatech.ac.kr/menu.es?mid=a10201000000"), // 없어진 과(고 학번을 위해 유지) NEW_ENERGY_MATERIALS_CHEMICAL_ENGINEERING( From 60c0e5edd5deffa0d4eb03638eca3b58e597f1d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EA=B4=80=EA=B7=9C?= Date: Sat, 28 Feb 2026 00:25:11 +0900 Subject: [PATCH 2/3] =?UTF-8?q?chore:=20=EC=BD=94=EB=93=9C=20=ED=8F=AC?= =?UTF-8?q?=EB=A9=A7=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../koreatech/koin/domain/dept/service/DeptService.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/in/koreatech/koin/domain/dept/service/DeptService.java b/src/main/java/in/koreatech/koin/domain/dept/service/DeptService.java index a81c5f9c62..aaab7223d4 100644 --- a/src/main/java/in/koreatech/koin/domain/dept/service/DeptService.java +++ b/src/main/java/in/koreatech/koin/domain/dept/service/DeptService.java @@ -4,7 +4,6 @@ import java.util.Collections; import java.util.List; -import java.util.Objects; import java.util.Optional; import org.springframework.stereotype.Service; @@ -43,10 +42,10 @@ public List getAllDepartmentsWithMajors() { List departments = departmentRepository.findAll().orElse(Collections.emptyList()); return departments.stream().map(department -> { List majors = majorRepository.findAllByDepartmentId(department.getId()) - .orElse(Collections.emptyList()) - .stream() - .filter(major -> major.getName() != null) - .toList(); + .orElse(Collections.emptyList()) + .stream() + .filter(major -> major.getName() != null) + .toList(); return DepartmentAndMajorResponse.of(department, majors); }).toList(); } From 14bd0712ca760b8d7c3e2d99f29eef60b8607835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EA=B4=80=EA=B7=9C?= Date: Sat, 28 Feb 2026 00:30:25 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=EC=8B=A0=EA=B7=9C=20=EC=A0=84?= =?UTF-8?q?=EA=B3=B5/=ED=95=99=EB=B6=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../koin/domain/student/model/StudentDepartment.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/in/koreatech/koin/domain/student/model/StudentDepartment.java b/src/main/java/in/koreatech/koin/domain/student/model/StudentDepartment.java index 4a15ad1c74..c784411cb1 100644 --- a/src/main/java/in/koreatech/koin/domain/student/model/StudentDepartment.java +++ b/src/main/java/in/koreatech/koin/domain/student/model/StudentDepartment.java @@ -15,6 +15,11 @@ public enum StudentDepartment { INDUSTRIAL("산업경영학부"), EMPLOYMENT("고용서비스정책학과"), APPLIED_CHEMICAL("응용화학공학부"), + SEMICONDUCTOR_DISPLAY_ENGINEERING("반도체·디스플레이공학과"), + FUTURE_CONVERGENCE("미래융합학부"), + ENGINEERING_CONVERGENCE_AUTONOMOUS_MAJOR("공학융합자율전공"), + ICT_CONVERGENCE_AUTONOMOUS_MAJOR("ICT융합자율전공"), + SOCIAL_CONVERGENCE_AUTONOMOUS_MAJOR("사회융합자율전공"), ; private final String value;