diff --git a/src/main/java/com/asap/server/presentation/controller/dto/response/TimeSlotDto.java b/src/main/java/com/asap/server/presentation/controller/dto/response/TimeSlotDto.java index 3c2f967..e29fd09 100644 --- a/src/main/java/com/asap/server/presentation/controller/dto/response/TimeSlotDto.java +++ b/src/main/java/com/asap/server/presentation/controller/dto/response/TimeSlotDto.java @@ -1,6 +1,6 @@ package com.asap.server.presentation.controller.dto.response; -import com.asap.server.service.time.dto.retrieve.TimeSlotRetrieveDto; +import com.asap.server.service.time.dto.retrieve.TimeBlockRetrieveDto; import lombok.Builder; import java.util.List; @@ -11,7 +11,7 @@ public record TimeSlotDto ( List userNames, int colorLevel ) { - public static List of(List retrieveDtos) { + public static List of(List retrieveDtos) { return retrieveDtos.stream().map( dto -> new TimeSlotDto(dto.time(), dto.userNames(), dto.colorLevel()) ).toList(); diff --git a/src/main/java/com/asap/server/service/meeting/MeetingRetrieveService.java b/src/main/java/com/asap/server/service/meeting/MeetingRetrieveService.java index 0083601..dda14ca 100644 --- a/src/main/java/com/asap/server/service/meeting/MeetingRetrieveService.java +++ b/src/main/java/com/asap/server/service/meeting/MeetingRetrieveService.java @@ -14,7 +14,7 @@ import com.asap.server.service.time.MeetingTimeRecommendService; import com.asap.server.service.time.UserMeetingScheduleService; import com.asap.server.service.time.dto.retrieve.AvailableDatesRetrieveDto; -import com.asap.server.service.time.dto.retrieve.TimeSlotRetrieveDto; +import com.asap.server.service.time.dto.retrieve.TimeBlockRetrieveDto; import com.asap.server.service.time.dto.retrieve.TimeTableRetrieveDto; import com.asap.server.service.time.vo.BestMeetingTimeVo; import com.asap.server.service.time.vo.BestMeetingTimeWithUsers; @@ -27,10 +27,12 @@ import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service +@Slf4j @RequiredArgsConstructor public class MeetingRetrieveService { private final MeetingRepository meetingRepository; @@ -110,9 +112,9 @@ public TimeTableRetrieveDto getTimeTable(final Long meetingId, final Long userId private List getAvailableDatesDto(final Long meetingId, final int totalUserCount) { List timeBlockVos = userMeetingScheduleService.getTimeBlocks(meetingId); - - Map> timeSlotDtoMappedByDate = getTimeTableMapFromTimeBlockVo(timeBlockVos, totalUserCount); - + log.info("Query----- Start"); + Map> timeSlotDtoMappedByDate = getTimeTableMapFromTimeBlockVo(timeBlockVos, totalUserCount); + log.info("Query----- Start"); return timeSlotDtoMappedByDate.keySet().stream().map( date -> AvailableDatesRetrieveDto.of( date, @@ -121,11 +123,11 @@ private List getAvailableDatesDto(final Long meetingI ).toList(); } - private Map> getTimeTableMapFromTimeBlockVo(final List timeBlockVo, final int totalUserCount) { + private Map> getTimeTableMapFromTimeBlockVo(final List timeBlockVo, final int totalUserCount) { return timeBlockVo.stream() .collect(Collectors.groupingBy( TimeBlockVo::availableDate, - Collectors.mapping(t -> new TimeSlotRetrieveDto( + Collectors.mapping(t -> new TimeBlockRetrieveDto( t.timeSlot().getTime(), userRetrieveService.getUserNamesFromId(t.userIds()), setColorLevel(totalUserCount, t.userIds().size()) @@ -135,7 +137,7 @@ private Map> getTimeTableMapFromTimeBlockVo )); } - public int setColorLevel(final int memberCount, final int availableUserCount) { + private int setColorLevel(final int memberCount, final int availableUserCount) { double ratio = (double) availableUserCount / memberCount; if (ratio <= 0.2) { diff --git a/src/main/java/com/asap/server/service/time/dto/retrieve/AvailableDatesRetrieveDto.java b/src/main/java/com/asap/server/service/time/dto/retrieve/AvailableDatesRetrieveDto.java index 3530f4d..8dbab20 100644 --- a/src/main/java/com/asap/server/service/time/dto/retrieve/AvailableDatesRetrieveDto.java +++ b/src/main/java/com/asap/server/service/time/dto/retrieve/AvailableDatesRetrieveDto.java @@ -9,9 +9,9 @@ public record AvailableDatesRetrieveDto( String month, String day, String dayOfWeek, - List timeSlots + List timeSlots ) { - public static AvailableDatesRetrieveDto of(final LocalDate date, final List timeSlots) { + public static AvailableDatesRetrieveDto of(final LocalDate date, final List timeSlots) { return new AvailableDatesRetrieveDto( DateUtil.getMonth(date), DateUtil.getDay(date), diff --git a/src/main/java/com/asap/server/service/time/dto/retrieve/TimeSlotRetrieveDto.java b/src/main/java/com/asap/server/service/time/dto/retrieve/TimeBlockRetrieveDto.java similarity index 81% rename from src/main/java/com/asap/server/service/time/dto/retrieve/TimeSlotRetrieveDto.java rename to src/main/java/com/asap/server/service/time/dto/retrieve/TimeBlockRetrieveDto.java index 2f03945..c9008fa 100644 --- a/src/main/java/com/asap/server/service/time/dto/retrieve/TimeSlotRetrieveDto.java +++ b/src/main/java/com/asap/server/service/time/dto/retrieve/TimeBlockRetrieveDto.java @@ -2,7 +2,7 @@ import java.util.List; -public record TimeSlotRetrieveDto( +public record TimeBlockRetrieveDto( String time, List userNames, int colorLevel