Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions src/main/java/in/koreatech/koin/domain/dept/model/Dept.java
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -43,10 +42,10 @@ public List<DepartmentAndMajorResponse> getAllDepartmentsWithMajors() {
List<Department> departments = departmentRepository.findAll().orElse(Collections.emptyList());
return departments.stream().map(department -> {
List<Major> 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();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading