diff --git a/src/main/java/com/asap/server/service/time/UserMeetingScheduleService.java b/src/main/java/com/asap/server/service/time/UserMeetingScheduleService.java index 85acbdb0..b86f9830 100644 --- a/src/main/java/com/asap/server/service/time/UserMeetingScheduleService.java +++ b/src/main/java/com/asap/server/service/time/UserMeetingScheduleService.java @@ -6,8 +6,8 @@ import com.asap.server.persistence.repository.UserMeetingScheduleRepository; import com.asap.server.service.time.dto.UserMeetingScheduleRegisterDto; import com.asap.server.service.time.vo.TimeBlockVo; -import com.asap.server.service.time.vo.UserScheduleByTimeSlot; -import com.asap.server.service.time.vo.UserScheduleByTimeSlot.CompositeKey; +import com.asap.server.service.time.vo.UserScheduleByTimeSlotVo; +import com.asap.server.service.time.vo.UserScheduleByTimeSlotVo.CompositeKey; import java.util.List; import java.util.Map.Entry; import java.util.stream.Collectors; @@ -43,14 +43,14 @@ public List getTimeBlocks(final Long meetingId) { return userMeetingSchedules.stream() .flatMap(this::convertToUserScheduleByTimeSlot) - .collect(Collectors.groupingBy(UserScheduleByTimeSlot::composeKey)) + .collect(Collectors.groupingBy(UserScheduleByTimeSlotVo::composeKey)) .entrySet().stream() .map(this::convertToTimeBlock) .sorted() .toList(); } - private Stream convertToUserScheduleByTimeSlot( + private Stream convertToUserScheduleByTimeSlot( final UserMeetingSchedule userMeetingSchedule ) { return TimeSlot.getTimeSlots( @@ -58,7 +58,7 @@ private Stream convertToUserScheduleByTimeSlot( userMeetingSchedule.getEndTimeSlot().getIndex() ) .stream() - .map(timeSlot -> new UserScheduleByTimeSlot( + .map(timeSlot -> new UserScheduleByTimeSlotVo( userMeetingSchedule.getId(), userMeetingSchedule.getAvailableDate(), userMeetingSchedule.getUserId(), @@ -69,14 +69,14 @@ private Stream convertToUserScheduleByTimeSlot( } private TimeBlockVo convertToTimeBlock( - final Entry> entry + final Entry> entry ) { List userIds = entry.getValue().stream() - .map(UserScheduleByTimeSlot::userId) + .map(UserScheduleByTimeSlotVo::userId) .toList(); int weight = entry.getValue().stream() - .mapToInt(UserScheduleByTimeSlot::weight) + .mapToInt(UserScheduleByTimeSlotVo::weight) .sum(); return new TimeBlockVo(entry.getKey().availableDate(), entry.getKey().time(), weight, userIds); diff --git a/src/main/java/com/asap/server/service/time/vo/UserScheduleByTimeSlot.java b/src/main/java/com/asap/server/service/time/vo/UserScheduleByTimeSlotVo.java similarity index 91% rename from src/main/java/com/asap/server/service/time/vo/UserScheduleByTimeSlot.java rename to src/main/java/com/asap/server/service/time/vo/UserScheduleByTimeSlotVo.java index 16447854..994e2fb5 100644 --- a/src/main/java/com/asap/server/service/time/vo/UserScheduleByTimeSlot.java +++ b/src/main/java/com/asap/server/service/time/vo/UserScheduleByTimeSlotVo.java @@ -3,7 +3,7 @@ import com.asap.server.persistence.domain.enums.TimeSlot; import java.time.LocalDate; -public record UserScheduleByTimeSlot( +public record UserScheduleByTimeSlotVo( Long id, LocalDate availableDate, Long userId,