diff --git a/src/main/java/ceos/backend/domain/application/mapper/ApplicationMapper.java b/src/main/java/ceos/backend/domain/application/mapper/ApplicationMapper.java index c3c6a7bc..0a8ae1f4 100644 --- a/src/main/java/ceos/backend/domain/application/mapper/ApplicationMapper.java +++ b/src/main/java/ceos/backend/domain/application/mapper/ApplicationMapper.java @@ -16,14 +16,13 @@ import ceos.backend.global.util.ParsedDurationConvertor; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; import org.springframework.data.domain.Page; import org.springframework.stereotype.Component; +import static java.util.Map.*; + @Component public class ApplicationMapper { public Application toEntity(CreateApplicationRequest request, int generation, String UUID) { @@ -196,6 +195,9 @@ public GetApplicationQuestion toGetApplicationQuestion( .toList(); final Set dateSets = parsedDurations.stream().map(ParsedDuration::getDate).collect(Collectors.toSet()); + + final Comparator order = Comparator.comparing(InterviewDateTimesVo::getDate); + final List interviewDateTimesVos = dateSets.stream() .map( @@ -210,6 +212,7 @@ public GetApplicationQuestion toGetApplicationQuestion( .equals(dateSet)) .map(ParsedDuration::getDuration) .toList())) + .sorted(order) .toList(); return GetApplicationQuestion.of(