diff --git a/src/main/java/com/example/letscareer/schedule/domain/dto/StageDTO.java b/src/main/java/com/example/letscareer/schedule/domain/dto/ScheduleDTO.java similarity index 68% rename from src/main/java/com/example/letscareer/schedule/domain/dto/StageDTO.java rename to src/main/java/com/example/letscareer/schedule/domain/dto/ScheduleDTO.java index 9440d8f..804fe29 100644 --- a/src/main/java/com/example/letscareer/schedule/domain/dto/StageDTO.java +++ b/src/main/java/com/example/letscareer/schedule/domain/dto/ScheduleDTO.java @@ -1,10 +1,10 @@ package com.example.letscareer.schedule.domain.dto; -import com.example.letscareer.schedule.domain.model.Progress; +import com.example.letscareer.stage.domain.model.Status; import java.time.LocalDate; -public record StageDTO( +public record ScheduleDTO( Long scheduleId, Long stageId, String company, @@ -12,5 +12,5 @@ public record StageDTO( String type, LocalDate deadline, int dday, - Progress progress){ + String status){ } diff --git a/src/main/java/com/example/letscareer/schedule/domain/dto/response/CalendarResponse.java b/src/main/java/com/example/letscareer/schedule/domain/dto/response/CalendarResponse.java index 840ef74..71fe5e4 100644 --- a/src/main/java/com/example/letscareer/schedule/domain/dto/response/CalendarResponse.java +++ b/src/main/java/com/example/letscareer/schedule/domain/dto/response/CalendarResponse.java @@ -1,6 +1,6 @@ package com.example.letscareer.schedule.domain.dto.response; -import com.example.letscareer.schedule.domain.dto.StageDTO; +import com.example.letscareer.schedule.domain.dto.ScheduleDTO; import java.util.List; @@ -8,6 +8,6 @@ public record CalendarResponse( Integer docCount, Integer midCount, Integer interviewCount, - List schedules + List schedules ) { } diff --git a/src/main/java/com/example/letscareer/schedule/domain/dto/response/ScheduleResponse.java b/src/main/java/com/example/letscareer/schedule/domain/dto/response/ScheduleResponse.java index 7d334c9..5d39bd4 100644 --- a/src/main/java/com/example/letscareer/schedule/domain/dto/response/ScheduleResponse.java +++ b/src/main/java/com/example/letscareer/schedule/domain/dto/response/ScheduleResponse.java @@ -1,6 +1,6 @@ package com.example.letscareer.schedule.domain.dto.response; -import com.example.letscareer.schedule.domain.dto.StageDTO; +import com.example.letscareer.schedule.domain.dto.ScheduleDTO; import java.util.List; @@ -8,7 +8,7 @@ public record ScheduleResponse( Integer page, Integer size, Long total, - List schedules + List schedules ) { } diff --git a/src/main/java/com/example/letscareer/schedule/service/ScheduleService.java b/src/main/java/com/example/letscareer/schedule/service/ScheduleService.java index 56f7cde..b036eb2 100644 --- a/src/main/java/com/example/letscareer/schedule/service/ScheduleService.java +++ b/src/main/java/com/example/letscareer/schedule/service/ScheduleService.java @@ -51,7 +51,7 @@ public ScheduleResponse getSchedulesComing(final Long userId, final int month, f Page stagePage = stageRepository.findAllByUserIdAndMonth(userId, month, pageable); long total = stagePage.getTotalElements(); - List schedules = new ArrayList<>(); + List schedules = new ArrayList<>(); for (Stage stage : stagePage) { Schedule schedule = stage.getSchedule(); @@ -59,11 +59,12 @@ public ScheduleResponse getSchedulesComing(final Long userId, final int month, f Long scheduleId = schedule.getScheduleId(); Long stageId = stage.getStageId(); String type = stage.getType().getValue(); + String status = stage.getStatus().getValue(); LocalDate deadline = stage.getDate(); Integer dday = (deadline != null) ? stage.calculateDday() : null; - schedules.add(new StageDTO( + schedules.add(new ScheduleDTO( scheduleId, stageId, schedule.getCompany(), @@ -71,14 +72,14 @@ public ScheduleResponse getSchedulesComing(final Long userId, final int month, f type, deadline, dday, - schedule.getProgress() + status )); } } //sort -1, -3, +1 schedules.sort( - Comparator.comparingInt(dto -> (dto.dday() < 0 ? -1 : 1)) // 음수 dday 우선 정렬 + Comparator.comparingInt(dto -> (dto.dday() < 0 ? -1 : 1)) // 음수 dday 우선 정렬 .thenComparingInt(dto -> Math.abs(dto.dday())) // 절대값 기준 정렬 ); return new ScheduleResponse( @@ -102,7 +103,7 @@ public CalendarResponse getSchedulesCalendar(final Long userId, final int month) int midCount = 0; int interviewCount = 0; - List schedules = new ArrayList<>(); + List schedules = new ArrayList<>(); for (Stage stage : stages) { Schedule schedule = stage.getSchedule(); @@ -110,6 +111,7 @@ public CalendarResponse getSchedulesCalendar(final Long userId, final int month) Long scheduleId = schedule.getScheduleId(); Long stageId = stage.getStageId(); String type = stage.getType().getValue(); + String status = stage.getStatus().getValue(); LocalDate deadline = stage.getDate(); switch (stage.getType()) { @@ -125,7 +127,7 @@ public CalendarResponse getSchedulesCalendar(final Long userId, final int month) } Integer dday = (deadline != null) ? stage.calculateDday() : null; - schedules.add(new StageDTO( + schedules.add(new ScheduleDTO( scheduleId, stageId, schedule.getCompany(), @@ -133,7 +135,7 @@ public CalendarResponse getSchedulesCalendar(final Long userId, final int month) type, deadline, dday, - schedule.getProgress() + status )); } } @@ -174,7 +176,7 @@ public DateClickScheduleResponse getDateSchedules(final Long userId, final Local Integer dday = (stage.getDate() != null) ? stage.calculateDday() : null; // 진행 상태 - String progress = schedule.getProgress().getValue(); + String progress = stage.getStatus().getValue(); // DTO로 변환하여 리스트에 추가 schedules.add(new DateScheduleDTO( @@ -236,10 +238,6 @@ public FastReviewListResponse getFastReviews(final Long userId, final int page, // 먼저 userId로 Schedule 목록을 가져옴 List schedules = scheduleRepository.findAllByUserUserId(userId); - if (schedules.isEmpty()) { - return new FastReviewListResponse(page, size, 0, new ArrayList<>()); - } - // QueryDSL로 Stage 조회 Page stagePage = stageRepository.findAllByScheduleInAndDateBetweenAndIntReviewNotExistsAndMidReviewNotExists( schedules, threeDaysPrevious, today, pageable);