Skip to content

Fix/274 (#283) #284

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 2 commits into from
Oct 13, 2025
Merged

Fix/274 (#283) #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10f8867
Fix/274 (#283)
dooongdaeng Oct 13, 2025
25df2ee
Feat : url 복구 (#285)
tlswltjq 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
2 changes: 1 addition & 1 deletion back/src/main/java/com/back/domain/file/video/controller/VideoController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public RsData<UploadUrlGetResponse> getUploadUrl(@RequestParam String filename)
uuid = matcher.group(1);
}

UploadUrlGetResponse response = new UploadUrlGetResponse(uuid, uploadUrl.expiresAt());
UploadUrlGetResponse response = new UploadUrlGetResponse(uploadUrl.url().toString(), uuid, uploadUrl.expiresAt());
return new RsData<>("200", "업로드용 URL 요청완료", response);
}

Expand Down
1 change: 1 addition & 0 deletions back/src/main/java/com/back/domain/file/video/dto/controller/UploadUrlGetResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.time.LocalDateTime;

public record UploadUrlGetResponse(
String url,
String uuid,
LocalDateTime expiresAt
) {
Expand Down
8 changes: 5 additions & 3 deletions back/src/main/java/com/back/domain/member/member/dto/MemberMeResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ public record MemberMeResponse(
String nickname,
String role,
Long mentorId,
Long menteeId
Long menteeId,
String job // 직업명 추가
) {
public static MemberMeResponse of(Member member, Long mentorId, Long menteeId) {
public static MemberMeResponse of(Member member, Long mentorId, Long menteeId, String job) {
return new MemberMeResponse(
member.getId(),
member.getPublicId(),
Expand All @@ -21,7 +22,8 @@ public static MemberMeResponse of(Member member, Long mentorId, Long menteeId) {
member.getNickname(),
member.getRole().name(),
mentorId,
menteeId
menteeId,
job
);
}
}
23 changes: 14 additions & 9 deletions back/src/main/java/com/back/domain/member/member/service/MemberService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,18 +162,23 @@ public MemberMeResponse getMemberMe(Member actor) {

Long mentorId = null;
Long menteeId = null;
String job = null;

if (actor.getRole() == Member.Role.MENTOR) {
mentorId = mentorRepository.findByMemberId(actor.getId())
.map(Mentor::getId)
.orElse(null);
Mentor mentor = mentorRepository.findByMemberIdWithMember(actor.getId()).orElse(null);
if (mentor != null) {
mentorId = mentor.getId();
job = mentor.getJob() != null ? mentor.getJob().getName() : null;
}
} else if (actor.getRole() == Member.Role.MENTEE) {
menteeId = menteeRepository.findByMemberId(actor.getId())
.map(Mentee::getId)
.orElse(null);
Mentee mentee = menteeRepository.findByMemberId(actor.getId()).orElse(null);
if (mentee != null) {
menteeId = mentee.getId();
job = mentee.getJob() != null ? mentee.getJob().getName() : null;
}
}

return MemberMeResponse.of(actor, mentorId, menteeId);
return MemberMeResponse.of(actor, mentorId, menteeId, job);
}

public Member refreshAccessToken(String refreshToken) {
Expand Down Expand Up @@ -203,7 +208,7 @@ public Member refreshAccessToken(String refreshToken) {
}

public MenteeMyPageResponse getMenteeMyPage(Member currentUser) {
Mentee mentee = menteeRepository.findByMemberId(currentUser.getId())
Mentee mentee = menteeRepository.findByMemberIdWithMember(currentUser.getId())
.orElseThrow(() -> new ServiceException("404-2", "멘티 정보를 찾을 수 없습니다."));

return MenteeMyPageResponse.from(currentUser, mentee);
Expand All @@ -223,7 +228,7 @@ public void updateMentee(Member currentUser, MenteeUpdateRequest request) {

// Mentee 정보 업데이트 (interestedField)
if (request.interestedField() != null) {
Mentee mentee = menteeRepository.findByMemberId(currentUser.getId())
Mentee mentee = menteeRepository.findByMemberIdWithMember(currentUser.getId())
.orElseThrow(() -> new ServiceException("404-2", "멘티 정보를 찾을 수 없습니다."));

Job job = jobRepository.findByName(request.interestedField())
Expand Down
2 changes: 1 addition & 1 deletion back/src/main/java/com/back/domain/member/mentee/repository/MenteeRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public interface MenteeRepository extends JpaRepository<Mentee, Long> {
@Query("SELECT m FROM Mentee m WHERE m.member.id = :memberId AND m.isDeleted = false")
Optional<Mentee> findByMemberId(@Param("memberId") Long memberId);

@Query("SELECT m FROM Mentee m JOIN FETCH m.member WHERE m.member.id = :memberId AND m.isDeleted = false")
@Query("SELECT m FROM Mentee m JOIN FETCH m.member LEFT JOIN FETCH m.job WHERE m.member.id = :memberId AND m.isDeleted = false")
Optional<Mentee> findByMemberIdWithMember(@Param("memberId") Long memberId);

@Query("SELECT m FROM Mentee m WHERE m.id = :id AND m.isDeleted = false")
Expand Down
8 changes: 6 additions & 2 deletions back/src/test/java/com/back/domain/member/member/controller/MemberAuthControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,9 @@ void t5() throws Exception {
.andExpect(jsonPath("$.data.email").value(email))
.andExpect(jsonPath("$.data.nickname").value("멘티닉네임"))
.andExpect(jsonPath("$.data.mentorId").isEmpty())
.andExpect(jsonPath("$.data.menteeId").isNotEmpty());
.andExpect(jsonPath("$.data.menteeId").isNotEmpty())
.andExpect(jsonPath("$.data.job").isNotEmpty());

}

@Test
Expand Down Expand Up @@ -320,7 +322,9 @@ void t5_1() throws Exception {
.andExpect(jsonPath("$.data.email").value(email))
.andExpect(jsonPath("$.data.nickname").value("멘토닉네임"))
.andExpect(jsonPath("$.data.mentorId").isNotEmpty())
.andExpect(jsonPath("$.data.menteeId").isEmpty());
.andExpect(jsonPath("$.data.menteeId").isEmpty())
.andExpect(jsonPath("$.data.job").isNotEmpty());

}

@Test
Expand Down