Skip to content

[Refactor] 멘토링 응답에 memberId 필드 추가 #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 13, 2025
Merged

[Refactor] 멘토링 응답에 memberId 필드 추가 #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
821cba7
Refactor: 응답에 memberId 추가
sso0om Oct 13, 2025
6e06a42
Refactor: 멘티는 현재일 이후 슬롯만 조회 가능
sso0om Oct 13, 2025
e3b464f
Refactor: 나의 슬롯은 현재일 이전이고 예약 이력이 없을 경우 expired 로 세팅
sso0om Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions back/src/main/java/com/back/domain/member/mentee/dto/MenteeDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@
public record MenteeDto(
@Schema(description = "멘티 ID")
Long menteeId,
@Schema(description = "멘티 회원 ID")
Long menteeMemberId,
@Schema(description = "멘티 닉네임")
String nickname
) {
public static MenteeDto from(Mentee mentee) {
return new MenteeDto(
mentee.getId(),
mentee.getMember().getId(),
mentee.getMember().getNickname()
);
}
Expand Down
3 changes: 3 additions & 0 deletions back/src/main/java/com/back/domain/member/mentor/dto/MentorDetailDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
public record MentorDetailDto(
@Schema(description = "멘토 ID")
Long mentorId,
@Schema(description = "멘토 회원 ID")
Long mentorMemberId,
@Schema(description = "멘토 닉네임")
String nickname,
@Schema(description = "평점")
Expand All @@ -17,6 +19,7 @@ public record MentorDetailDto(
public static MentorDetailDto from(Mentor mentor) {
return new MentorDetailDto(
mentor.getId(),
mentor.getMember().getId(),
mentor.getMember().getNickname(),
mentor.getRate(),
mentor.getCareerYears()
Expand Down
3 changes: 3 additions & 0 deletions back/src/main/java/com/back/domain/member/mentor/dto/MentorDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@
public record MentorDto(
@Schema(description = "멘토 ID")
Long mentorId,
@Schema(description = "멘토 회원 ID")
Long mentorMemberId,
@Schema(description = "멘토 닉네임")
String nickname
) {
public static MentorDto from(Mentor mentor) {
return new MentorDto(
mentor.getId(),
mentor.getMember().getId(),
mentor.getMember().getNickname()
);
}
Expand Down
3 changes: 3 additions & 0 deletions back/src/main/java/com/back/domain/mentoring/mentoring/dto/MentoringWithTagsDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ public record MentoringWithTagsDto(
List<String> tags,
@Schema(description = "멘토 ID")
Long mentorId,
@Schema(description = "멘토 회원 ID")
Long mentorMemberId,
@Schema(description = "멘토 닉네임")
String nickname
) {
Expand All @@ -23,6 +25,7 @@ public static MentoringWithTagsDto from(Mentoring mentoring) {
mentoring.getTitle(),
mentoring.getTagNames(),
mentoring.getMentor().getId(),
mentoring.getMentor().getMember().getId(),
mentoring.getMentor().getMember().getNickname()
);
}
Expand Down
3 changes: 3 additions & 0 deletions back/src/main/java/com/back/domain/mentoring/mentoring/dto/response/ReviewResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ public record ReviewResponse(

@Schema(description = "멘티 ID")
Long menteeId,
@Schema(description = "멘티 회원 ID")
Long menteeMemberId,
@Schema(description = "멘티 닉네임")
String menteeNickname
) {
Expand All @@ -30,6 +32,7 @@ public static ReviewResponse from(Review review) {
review.getCreateDate(),
review.getModifyDate(),
review.getMentee().getId(),
review.getMentee().getMember().getId(),
review.getMentee().getMember().getNickname()
);
}
Expand Down
3 changes: 2 additions & 1 deletion back/src/main/java/com/back/domain/mentoring/slot/constant/MentorSlotStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ public enum MentorSlotStatus {
AVAILABLE, // 예약 가능
PENDING, // 예약 승인 대기
APPROVED, // 예약 승인됨(확정)
COMPLETED // 멘토링 완료
COMPLETED, // 멘토링 완료
EXPIRED // 만료
}
2 changes: 2 additions & 0 deletions back/src/main/java/com/back/domain/mentoring/slot/dto/response/MentorSlotDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ public record MentorSlotDto(
Long mentorSlotId,
@Schema(description = "멘토 ID")
Long mentorId,
@Schema(description = "멘토 회원 ID")
Long mentorMemberId,
@Schema(description = "시작 일시")
LocalDateTime startDateTime,
@Schema(description = "종료 일시")
Expand Down
10 changes: 9 additions & 1 deletion back/src/main/java/com/back/domain/mentoring/slot/repository/MentorSlotRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,15 @@ public interface MentorSlotRepository extends JpaRepository<MentorSlot, Long> {
SELECT new com.back.domain.mentoring.slot.dto.response.MentorSlotDto(
ms.id,
ms.mentor.id,
ms.mentor.member.id,
ms.startDateTime,
ms.endDateTime,
ms.status,
CASE
WHEN ms.startDateTime < CURRENT_TIMESTAMP
AND ms.status = com.back.domain.mentoring.slot.constant.MentorSlotStatus.AVAILABLE
THEN com.back.domain.mentoring.slot.constant.MentorSlotStatus.EXPIRED
ELSE ms.status
END,
r.id
)
FROM MentorSlot ms
Expand All @@ -45,6 +51,7 @@ List<MentorSlotDto> findMySlots(
SELECT new com.back.domain.mentoring.slot.dto.response.MentorSlotDto(
ms.id,
ms.mentor.id,
ms.mentor.member.id,
ms.startDateTime,
ms.endDateTime,
ms.status,
Expand All @@ -53,6 +60,7 @@ List<MentorSlotDto> findMySlots(
FROM MentorSlot ms
WHERE ms.mentor.id = :mentorId
AND ms.status = 'AVAILABLE'
AND ms.startDateTime >= CURRENT_TIMESTAMP
AND ms.startDateTime < :end
AND ms.endDateTime >= :start
ORDER BY ms.startDateTime ASC
Expand Down
12 changes: 7 additions & 5 deletions back/src/test/java/com/back/domain/mentoring/slot/service/MentorSlotServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,23 +88,24 @@ void getMyMentorSlots() {
LocalDate base = LocalDate.now().plusMonths(1);
LocalDateTime startDate = base.atStartOfDay();
LocalDateTime endDate = base.withDayOfMonth(base.lengthOfMonth()).atTime(23, 59);
Long memberId = mentor1.getMember().getId();

MentorSlotDto slotDto1 = new MentorSlotDto(
1L, mentor1.getId(),
1L, mentor1.getId(), memberId,
mentorSlot1.getStartDateTime(),
mentorSlot1.getEndDateTime(),
MentorSlotStatus.AVAILABLE,
null
);
MentorSlotDto slotDto2 = new MentorSlotDto(
2L, mentor1.getId(),
2L, mentor1.getId(), memberId,
base.withDayOfMonth(2).atTime(10, 0),
base.withDayOfMonth(2).atTime(11, 0),
MentorSlotStatus.AVAILABLE,
null
);
MentorSlotDto slotDto3 = new MentorSlotDto(
3L, mentor1.getId(),
3L, mentor1.getId(), memberId,
base.withDayOfMonth(15).atTime(14, 0),
base.withDayOfMonth(15).atTime(15, 0),
MentorSlotStatus.AVAILABLE,
Expand Down Expand Up @@ -155,16 +156,17 @@ void getAvailableMentorSlots() {
LocalDate base = LocalDate.now().plusMonths(1);
LocalDateTime startDate = base.atStartOfDay();
LocalDateTime endDate = base.withDayOfMonth(base.lengthOfMonth()).atTime(23, 59);
Long memberId = mentor1.getMember().getId();

MentorSlotDto slotDto1 = new MentorSlotDto(
1L, mentor1.getId(),
1L, mentor1.getId(), memberId,
mentorSlot1.getStartDateTime(),
mentorSlot1.getEndDateTime(),
MentorSlotStatus.AVAILABLE,
null
);
MentorSlotDto slotDto2 = new MentorSlotDto(
2L, mentor1.getId(),
2L, mentor1.getId(), memberId,
base.withDayOfMonth(2).atTime(10, 0),
base.withDayOfMonth(2).atTime(11, 0),
MentorSlotStatus.AVAILABLE,
Expand Down