Skip to content

Commit

Permalink
#322 [feat] 불필요한 함수 제거
Browse files Browse the repository at this point in the history
  • Loading branch information
KWY0218 committed Aug 23, 2024
1 parent c2a181b commit 5673bd3
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 63 deletions.
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
package com.asap.server.persistence.repository.user;

import com.asap.server.persistence.domain.Meeting;
import com.asap.server.persistence.domain.enums.TimeSlot;
import com.asap.server.service.meeting.dto.UserDto;

import java.time.LocalDate;
import java.util.List;

public interface UserRepositoryCustom {
void updateUserIsFixedByMeeting(final Meeting meeting, final List<Long> users);

List<UserDto> findByAvailableDateAndTimeSlots(Long meetingId, LocalDate availableDate, List<TimeSlot> timeSlots);
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
package com.asap.server.persistence.repository.user;

import static com.asap.server.persistence.domain.QAvailableDate.availableDate;
import static com.asap.server.persistence.domain.QTimeBlock.timeBlock;
import static com.asap.server.persistence.domain.QTimeBlockUser.timeBlockUser;
import static com.asap.server.persistence.domain.user.QUser.user;

import com.asap.server.persistence.domain.Meeting;
import com.asap.server.persistence.domain.enums.TimeSlot;
import com.asap.server.service.meeting.dto.UserDto;
import com.asap.server.service.vo.QUserVo;
import com.querydsl.jpa.impl.JPAQueryFactory;
import java.time.LocalDate;
import java.util.List;
import lombok.RequiredArgsConstructor;

Expand All @@ -28,28 +21,4 @@ public void updateUserIsFixedByMeeting(Meeting meeting, List<Long> users) {
)
.execute();
}

@Override
public List<UserDto> findByAvailableDateAndTimeSlots(
Long meetingId,
LocalDate date,
List<TimeSlot> timeSlots
) {
return queryFactory.select(
new QUserVo(
user.id,
user.name.value
)
).from(timeBlockUser)
.innerJoin(timeBlock).on(timeBlockUser.timeBlock.id.eq(timeBlock.id))
.innerJoin(user).on(timeBlockUser.user.id.eq(user.id))
.innerJoin(availableDate).on(timeBlock.availableDate.id.eq(availableDate.id))
.where(
availableDate.date.eq(date)
.and(availableDate.meeting.id.eq(meetingId))
.and(timeBlock.timeSlot.in(timeSlots))
)
.groupBy(user.id)
.fetch();
}
}
26 changes: 0 additions & 26 deletions src/main/java/com/asap/server/service/UserService.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
import com.asap.server.service.time.UserMeetingScheduleService;
import com.asap.server.service.time.dto.UserMeetingScheduleRegisterDto;
import com.asap.server.service.time.dto.UserTimeRegisterDto;
import com.asap.server.service.time.vo.BestMeetingTimeVo;
import com.asap.server.service.time.vo.BestMeetingTimeWithUsers;
import com.asap.server.service.meeting.dto.UserDto;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -146,27 +143,4 @@ public void setFixedUsers(final Meeting meeting, final List<UserRequestDto> user
.collect(Collectors.toList());
userRepository.updateUserIsFixedByMeeting(meeting, userIds);
}

public List<BestMeetingTimeWithUsers> getBestMeetingInUsers(
final Long meetingId,
final List<BestMeetingTimeVo> bestMeetingTimes
) {
return bestMeetingTimes.stream()
.map(bestMeetingTime -> getBestMeetingTimeInUsers(meetingId, bestMeetingTime))
.collect(Collectors.toList());
}

private BestMeetingTimeWithUsers getBestMeetingTimeInUsers(
final Long meetingId,
final BestMeetingTimeVo bestMeetingTime
) {
if (bestMeetingTime == null) {
return null;
}
List<TimeSlot> timeSlots = TimeSlot.getTimeSlots(bestMeetingTime.startTime().ordinal(),
bestMeetingTime.endTime().ordinal() - 1);
List<UserDto> users = userRepository.findByAvailableDateAndTimeSlots(meetingId, bestMeetingTime.date(),
timeSlots);
return BestMeetingTimeWithUsers.of(bestMeetingTime, users);
}
}

0 comments on commit 5673bd3

Please sign in to comment.