fix: 학교버스 시간표 저장과 교통편 조회 오류 수정

src/main/java/in/koreatech/koin/admin/bus/TimetableValidator.java

@@ -0,0 +1,54 @@
+package in.koreatech.koin.admin.bus;
+
+import static in.koreatech.koin.global.code.ApiResponseCode.INVALID_REQUEST_BODY;
+import static in.koreatech.koin.global.code.ApiResponseCode.REQUIRED_SHUTTLE_RUNNING_DAYS;
+
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import in.koreatech.koin.domain.bus.service.shuttle.model.ShuttleBusRoute;
+import in.koreatech.koin.domain.bus.service.shuttle.model.ShuttleBusRoute.NodeInfo;
+import in.koreatech.koin.domain.bus.service.shuttle.model.ShuttleBusRoute.RouteInfo;
+import in.koreatech.koin.global.exception.CustomException;
+
+public final class TimetableValidator {
+
+    private static final Set<String> VALID_RUNNING_DAYS = Set.of(
+        "MON", "TUE", "WED", "THU", "FRI", "SAT", "SUN"
+    );
+
+    private TimetableValidator() {
+    }
+
+    public static void validateTimetable(
+        String region, String routeType, String routeName, List<?> nodes, List<?> routes
+    ) {
+        if (!StringUtils.hasText(region) || !StringUtils.hasText(routeType) || !StringUtils.hasText(routeName)
+            || CollectionUtils.isEmpty(nodes) || CollectionUtils.isEmpty(routes)) {
+            throw CustomException.of(INVALID_REQUEST_BODY, "노선과 정류장, 회차 정보는 필수입니다.");
+        }
+        if (nodes.stream().anyMatch(node -> node == null)) {
+            throw CustomException.of(INVALID_REQUEST_BODY, "정류장 정보는 비어 있을 수 없습니다.");
+        }
+        if (routes.stream().anyMatch(route -> route == null)) {
+            throw CustomException.of(INVALID_REQUEST_BODY, "회차 정보는 비어 있을 수 없습니다.");
+        }
+    }
+
+    public static void validateRoutes(List<NodeInfo> nodes, List<RouteInfo> routes, boolean requireRunningDays) {
+        ShuttleBusRoute.validateRouteShape(nodes, routes);
+        for (RouteInfo route : routes) {
+            List<String> days = route.getRunningDays();
+            if (CollectionUtils.isEmpty(days)) {
+                if (requireRunningDays) {
+                    throw CustomException.of(REQUIRED_SHUTTLE_RUNNING_DAYS);
+                }
+            } else if (days.stream().anyMatch(day -> day == null || !VALID_RUNNING_DAYS.contains(day))) {
+                throw CustomException.of(INVALID_REQUEST_BODY, "운행 요일 코드가 올바르지 않습니다.");
+            }
+        }
+    }
+}

src/main/java/in/koreatech/koin/admin/bus/commuting/dto/AdminCommutingBusUpdateRequest.java

@@ -13,6 +13,7 @@
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.Pattern;
 
 @JsonNaming(value = SnakeCaseStrategy.class)
 public record AdminCommutingBusUpdateRequest(
@@ -71,10 +72,21 @@ public record InnerRouteInfo(
             @Schema(description = "노선 세부 정보", example = "null", requiredMode = NOT_REQUIRED)
             String detail,
 
+            @Schema(
+                description = "운행 요일 목록",
+                example = "[\"MON\", \"TUE\", \"WED\", \"THU\", \"FRI\"]",
+                requiredMode = NOT_REQUIRED
+            )
+            List<@NotBlank @Pattern(regexp = "MON|TUE|WED|THU|FRI|SAT|SUN") String> runningDays,
+
             @Schema(description = "도착 시간 목록", example = "[\"08:00\", \"09:00\"]", requiredMode = REQUIRED)
             @NotEmpty(message = "도착 시간 목록은 필수 입력값입니다.")
             List<String> arrivalTime
         ) {
+            public InnerRouteInfo(String name, String detail, List<String> arrivalTime) {
+                this(name, detail, null, arrivalTime);
+            }
+
             public static ShuttleBusRoute.RouteInfo toEntity(
                 String name,
                 String detail,
@@ -97,11 +109,18 @@ public List<ShuttleBusRoute.NodeInfo> toNodeInfoEntity() {
                 .toList();
         }
 
-        public List<ShuttleBusRoute.RouteInfo> toRouteInfoEntity(List<String> runningDays) {
+        public List<ShuttleBusRoute.RouteInfo> toRouteInfoEntity() {
+            return toRouteInfoEntity(null);
+        }
+
+        public List<ShuttleBusRoute.RouteInfo> toRouteInfoEntity(List<String> fallbackRunningDays) {
             return routeInfo.stream()
                 .map(innerRouteInfoRequest ->
                     InnerRouteInfo.toEntity(innerRouteInfoRequest.name, innerRouteInfoRequest.detail,
-                        runningDays, innerRouteInfoRequest.arrivalTime)
+                        innerRouteInfoRequest.runningDays == null || innerRouteInfoRequest.runningDays.isEmpty()
+                            ? fallbackRunningDays
+                            : innerRouteInfoRequest.runningDays,
+                        innerRouteInfoRequest.arrivalTime)
                 )
                 .toList();
         }

src/main/java/in/koreatech/koin/admin/bus/commuting/service/AdminCommutingBusService.java

@@ -1,68 +1,105 @@
 package in.koreatech.koin.admin.bus.commuting.service;
 
 import static in.koreatech.koin.admin.bus.commuting.dto.AdminCommutingBusUpdateRequest.InnerAdminCommutingBusUpdateRequest;
+import static in.koreatech.koin.global.code.ApiResponseCode.INVALID_REQUEST_BODY;
 
+import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Optional;
+import java.util.Map;
 
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
+import in.koreatech.koin.admin.bus.TimetableValidator;
 import in.koreatech.koin.admin.bus.commuting.dto.AdminCommutingBusUpdateRequest;
 import in.koreatech.koin.admin.bus.commuting.enums.SemesterType;
 import in.koreatech.koin.admin.bus.commuting.repository.AdminCommutingBusRepository;
-import in.koreatech.koin.admin.bus.shuttle.enums.RunningDays;
 import in.koreatech.koin.domain.bus.enums.ShuttleBusRegion;
 import in.koreatech.koin.domain.bus.enums.ShuttleRouteType;
 import in.koreatech.koin.domain.bus.service.shuttle.model.ShuttleBusRoute;
+import in.koreatech.koin.domain.bus.service.shuttle.model.ShuttleBusRoute.NodeInfo;
+import in.koreatech.koin.domain.bus.service.shuttle.model.ShuttleBusRoute.RouteInfo;
+import in.koreatech.koin.global.exception.CustomException;
 import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor
 public class AdminCommutingBusService {
 
+    private static final List<String> WEEKDAYS = List.of("MON", "TUE", "WED", "THU", "FRI");
+
     private final AdminCommutingBusRepository adminCommutingBusRepository;
 
     @Transactional
     public void updateCommutingBusTimetable(
         SemesterType semesterType,
         AdminCommutingBusUpdateRequest request
     ) {
-        for (InnerAdminCommutingBusUpdateRequest commutingBusUpdateRequest : request.commutingBusTimetables()) {
-            ShuttleBusRegion region = ShuttleBusRegion.convertFrom(commutingBusUpdateRequest.region());
-            ShuttleRouteType routeType = ShuttleRouteType.convertFrom(commutingBusUpdateRequest.routeType());
-            routeType.validateCommuting();
-
-            // 등하교 버스는 validateCommuting() 으로 주중 노선만 허용되므로 운행 요일이 주중으로 결정된다.
-            List<String> runningDays = RunningDays.WEEKDAYS.getDays();
+        validateRequestBatch(request);
+        Map<TimetableKey, ShuttleBusRoute> preparedTimetables = new LinkedHashMap<>();
 
-            Optional<ShuttleBusRoute> shuttleBusRoute = adminCommutingBusRepository
-                .findBySemesterTypeAndRegionAndRouteTypeAndRouteNameAndSubName(
-                    semesterType.getDescription(),
-                    region,
-                    routeType,
-                    commutingBusUpdateRequest.routeName(),
-                    commutingBusUpdateRequest.subName()
-                );
-
-            if (shuttleBusRoute.isPresent()) {
-                ShuttleBusRoute route = shuttleBusRoute.get();
-                route.updateCommutingBusRoute(
-                    commutingBusUpdateRequest.toNodeInfoEntity(),
-                    commutingBusUpdateRequest.toRouteInfoEntity(runningDays)
-                );
-                adminCommutingBusRepository.save(route);
-            } else {
-                adminCommutingBusRepository.save(ShuttleBusRoute.builder()
+        for (InnerAdminCommutingBusUpdateRequest timetableRequest : request.commutingBusTimetables()) {
+            ShuttleBusRegion region = ShuttleBusRegion.convertFrom(timetableRequest.region());
+            ShuttleRouteType routeType = ShuttleRouteType.convertFrom(timetableRequest.routeType());
+            routeType.validateCommuting();
+            TimetableKey key = new TimetableKey(
+                region,
+                routeType,
+                timetableRequest.routeName(),
+                timetableRequest.subName()
+            );
+            List<NodeInfo> nodeInfos = timetableRequest.toNodeInfoEntity();
+            ShuttleBusRoute prepared = preparedTimetables.get(key);
+            if (prepared == null) {
+                prepared = adminCommutingBusRepository.findBySemesterTypeAndRegionAndRouteTypeAndRouteNameAndSubName(
+                        semesterType.getDescription(), region, routeType, key.routeName(), key.subName())
+                    .map(ShuttleBusRoute::copy).orElse(null);
+            }
+            List<RouteInfo> routeInfos = timetableRequest.toRouteInfoEntity(prepared == null ? WEEKDAYS : null);
+            TimetableValidator.validateRoutes(nodeInfos, routeInfos, false);
+            if (prepared == null) {
+                prepared = ShuttleBusRoute.builder()
                     .semesterType(semesterType.getDescription())
                     .region(region)
                     .routeType(routeType)
-                    .routeName(commutingBusUpdateRequest.routeName())
-                    .subName(commutingBusUpdateRequest.subName())
-                    .nodeInfo(commutingBusUpdateRequest.toNodeInfoEntity())
-                    .routeInfo(commutingBusUpdateRequest.toRouteInfoEntity(runningDays))
-                    .build());
+                    .routeName(key.routeName())
+                    .subName(key.subName())
+                    .nodeInfo(nodeInfos)
+                    .routeInfo(routeInfos)
+                    .build();
+            } else {
+                prepared.updateCommutingBusRoute(nodeInfos, routeInfos);
             }
+            preparedTimetables.put(key, prepared);
         }
+
+        preparedTimetables.values().forEach(adminCommutingBusRepository::save);
+    }
+
+    private void validateRequestBatch(AdminCommutingBusUpdateRequest request) {
+        if (request == null || CollectionUtils.isEmpty(request.commutingBusTimetables())) {
+            throw invalidRequest("버스 노선 정보 목록은 비어 있을 수 없습니다.");
+        }
+        for (InnerAdminCommutingBusUpdateRequest timetableRequest : request.commutingBusTimetables()) {
+            if (timetableRequest == null) {
+                throw invalidRequest("노선과 정류장, 회차 정보는 필수입니다.");
+            }
+            TimetableValidator.validateTimetable(
+                timetableRequest.region(), timetableRequest.routeType(), timetableRequest.routeName(),
+                timetableRequest.nodeInfo(), timetableRequest.routeInfo());
+        }
+    }
+
+    private static CustomException invalidRequest(String detail) {
+        return CustomException.of(INVALID_REQUEST_BODY, detail);
+    }
+
+    private record TimetableKey(
+        ShuttleBusRegion region,
+        ShuttleRouteType routeType,
+        String routeName,
+        String subName
+    ) {
     }
 }

src/main/java/in/koreatech/koin/admin/bus/shuttle/controller/AdminShuttleBusTimetableApi.java

@@ -16,6 +16,7 @@
 import in.koreatech.koin.admin.bus.commuting.enums.SemesterType;
 import in.koreatech.koin.admin.bus.shuttle.dto.request.AdminShuttleBusUpdateRequest;
 import in.koreatech.koin.admin.bus.shuttle.dto.response.AdminShuttleBusTimetableResponse;
+import in.koreatech.koin.admin.bus.shuttle.enums.UpdateMode;
 import in.koreatech.koin.admin.history.aop.AdminActivityLogging;
 import in.koreatech.koin.global.auth.Auth;
 import in.koreatech.koin.global.code.ApiResponseCodes;
@@ -51,6 +52,7 @@ ResponseEntity<AdminShuttleBusTimetableResponse> uploadTimetableExcelForPreview(
     @PutMapping
     ResponseEntity<Void> updateShuttleBusTimetable(
         @RequestParam(name = "semester_type") SemesterType semesterType,
+        @RequestParam(name = "update_mode", defaultValue = "PARTIAL") UpdateMode updateMode,
         @Valid @RequestBody AdminShuttleBusUpdateRequest request,
         @Auth(permit = {ADMIN}) Integer adminId
     );

src/main/java/in/koreatech/koin/admin/bus/shuttle/controller/AdminShuttleBusTimetableController.java

@@ -16,6 +16,7 @@
 import in.koreatech.koin.admin.bus.commuting.enums.SemesterType;
 import in.koreatech.koin.admin.bus.shuttle.dto.request.AdminShuttleBusUpdateRequest;
 import in.koreatech.koin.admin.bus.shuttle.dto.response.AdminShuttleBusTimetableResponse;
+import in.koreatech.koin.admin.bus.shuttle.enums.UpdateMode;
 import in.koreatech.koin.admin.bus.shuttle.service.AdminShuttleBusExcelService;
 import in.koreatech.koin.admin.bus.shuttle.service.AdminShuttleBusService;
 import in.koreatech.koin.admin.history.aop.AdminActivityLogging;
@@ -46,10 +47,11 @@ public ResponseEntity<AdminShuttleBusTimetableResponse> uploadTimetableExcelForP
     @PutMapping
     public ResponseEntity<Void> updateShuttleBusTimetable(
         @RequestParam(name = "semester_type") SemesterType semesterType,
+        @RequestParam(name = "update_mode", defaultValue = "PARTIAL") UpdateMode updateMode,
         @Valid @RequestBody AdminShuttleBusUpdateRequest request,
         @Auth(permit = {ADMIN}) Integer adminId
     ) {
-        adminShuttleBusService.updateShuttleBusTimetable(request, semesterType);
+        adminShuttleBusService.updateShuttleBusTimetable(request, semesterType, updateMode);
 
         return ResponseEntity.ok().build();
     }

src/main/java/in/koreatech/koin/admin/bus/shuttle/enums/RunningDays.java

@@ -1,8 +1,13 @@
 package in.koreatech.koin.admin.bus.shuttle.enums;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
+import java.util.regex.Pattern;
 
 import in.koreatech.koin.admin.bus.shuttle.model.ShuttleBusTimetable.RouteInfo.InnerNameDetail;
+import in.koreatech.koin.global.code.ApiResponseCode;
+import in.koreatech.koin.global.exception.CustomException;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
@@ -12,22 +17,66 @@ public enum RunningDays {
     WEEKDAYS("주중", List.of("MON", "TUE", "WED", "THU", "FRI")),
     THURSDAY_FRIDAY("목금", List.of("THU", "FRI")),
     SATURDAY("토요일", List.of("SAT")),
-    SUNDAY("일요일", List.of("SUN"));
+    SUNDAY("일요일", List.of("SUN")),
+    MONDAY("월요일", List.of("MON")),
+    FRIDAY("금요일", List.of("FRI")),
+    TUESDAY("화요일", List.of("TUE")),
+    WEDNESDAY("수요일", List.of("WED")),
+    THURSDAY("목요일", List.of("THU"));
 
+    private static final Pattern THURSDAY_FRIDAY_PATTERN = Pattern.compile(
+        "(?<![가-힣])목(?:요일)?(?:[\\s·・,，/／\\-~]+)?금(?:요일)?(?=추가|[^가-힣]|$)"
+    );
     private final String description;
     private final List<String> days;
 
     public static RunningDays from(InnerNameDetail innerNameDetail) {
-        String name = innerNameDetail.getName();
+        if (innerNameDetail == null) {
+            return WEEKDAYS;
+        }
+
+        String description = String.join(" ",
+            valueOrEmpty(innerNameDetail.getName()),
+            valueOrEmpty(innerNameDetail.getDetail())
+        ).trim();
 
-        if (name.contains("목") && name.contains("금")) {
+        Set<RunningDays> explicitDays = findExplicitDays(description);
+        if (THURSDAY_FRIDAY_PATTERN.matcher(description).find()) {
+            boolean hasConflict = explicitDays.stream()
+                .anyMatch(day -> day != THURSDAY && day != FRIDAY);
+            if (hasConflict) {
+                throw conflictingDays(description);
+            }
             return THURSDAY_FRIDAY;
-        } else if (name.contains("토")) {
-            return SATURDAY;
-        } else if (name.contains("일")) {
-            return SUNDAY;
+        }
+
+        if (explicitDays.size() == 1) {
+            return explicitDays.iterator().next();
+        }
+
+        if (explicitDays.size() > 1) {
+            throw conflictingDays(description);
         }
 
         return WEEKDAYS;
     }
+
+    private static Set<RunningDays> findExplicitDays(String description) {
+        Set<RunningDays> explicitDays = EnumSet.noneOf(RunningDays.class);
+        for (RunningDays day : values()) {
+            if (day.days.size() == 1 && description.contains(day.description)) {
+                explicitDays.add(day);
+            }
+        }
+        return explicitDays;
+    }
+
+    private static CustomException conflictingDays(String description) {
+        return CustomException.of(ApiResponseCode.INVALID_REQUEST_BODY,
+            "운행 요일이 서로 충돌합니다: " + description);
+    }
+
+    private static String valueOrEmpty(String value) {
+        return value == null ? "" : value;
+    }
 }

src/main/java/in/koreatech/koin/admin/bus/shuttle/enums/UpdateMode.java

@@ -0,0 +1,6 @@
+package in.koreatech.koin.admin.bus.shuttle.enums;
+
+public enum UpdateMode {
+    PARTIAL,
+    REPLACE
+}