Skip to content

feat: 유저의 멘토 지원서 신청 이력 조회 기능 추가 #603

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
sukangpunch merged 7 commits into from
Jan 11, 2026
Merged

feat: 유저의 멘토 지원서 신청 이력 조회 기능 추가 #603

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0994bb9
feat: 유저의 멘토 지원 이력 조회 기능 추가
sukangpunch Dec 30, 2025
8895ee1
refactor: 매개변수 타입 통일
sukangpunch Dec 30, 2025
9e43bc3
test: 멘토 지원서 이력 조회 테스트 추가
sukangpunch Jan 2, 2026
c9ff45f
refactor: 리뷰 사항 적용
sukangpunch Jan 3, 2026
1d44b1e
refactor: 서브모듈 해시값 되돌리기
sukangpunch Jan 4, 2026
814e4da
refactor: applicationOrder 자료형을 long 으로 수정
sukangpunch Jan 7, 2026
f22a424
fix: applicationOrder 를 int 자료형으로 처리하도록 복구
sukangpunch Jan 8, 2026
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
10 changes: 10 additions & 0 deletions ...n/java/com/example/solidconnection/admin/controller/AdminMentorApplicationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@

import com.example.solidconnection.admin.dto.MentorApplicationAssignUniversityRequest;
import com.example.solidconnection.admin.dto.MentorApplicationCountResponse;
import com.example.solidconnection.admin.dto.MentorApplicationHistoryResponse;
import com.example.solidconnection.admin.dto.MentorApplicationRejectRequest;
import com.example.solidconnection.admin.dto.MentorApplicationSearchCondition;
import com.example.solidconnection.admin.dto.MentorApplicationSearchResponse;
import com.example.solidconnection.admin.service.AdminMentorApplicationService;
import com.example.solidconnection.common.response.PageResponse;
import jakarta.validation.Valid;
import java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
Expand Down Expand Up @@ -73,4 +75,12 @@ public ResponseEntity<Void> assignUniversity(
adminMentorApplicationService.assignUniversity(mentorApplicationId, universityId);
return ResponseEntity.ok().build();
}

@GetMapping("/{site-user-id}/mentor-application-history")
Copy link
Member

@whqtker whqtker Jan 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

엔드포인트 이름이 조금 긴 것 같습니다 ! 어차피 prefix가 /admin/mentor-applications이므로 mentor-application-history 대신 history를 사용하면 어떨까요 ?

Copy link
Contributor Author

@sukangpunch sukangpunch Jan 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

수정하겠습니다!

public ResponseEntity<List<MentorApplicationHistoryResponse>> getMentorApplicationHistory(
@PathVariable("site-user-id") Long siteUserId
){
List<MentorApplicationHistoryResponse> response = adminMentorApplicationService.findMentorApplicationHistory(siteUserId);
return ResponseEntity.ok(response);
}
}
14 changes: 14 additions & 0 deletions src/main/java/com/example/solidconnection/admin/dto/MentorApplicationHistoryResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.example.solidconnection.admin.dto;

import com.example.solidconnection.mentor.domain.MentorApplicationStatus;
import java.time.ZonedDateTime;

public record MentorApplicationHistoryResponse(
long id,
MentorApplicationStatus mentorApplicationStatus,
String rejectedReason,
ZonedDateTime createdAt,
int applicationOrder
Copy link
Contributor

@Gyuhyeok99 Gyuhyeok99 Jan 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

id가 1, 2, 3, 4, 5, 6, 7로 생성되었으면
7, 6, 5, 4, 3으로 응답되는 게 맞는거죠?

차라리 slice나 page로 5개씩 조회해오는 게 나을 거 같은데 어떤가요?

Copy link
Contributor Author

@sukangpunch sukangpunch Jan 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

7 6 5 4 3 으로 응답되는게 맞습니다!
디자인으로 봤을 때, 페이징 조회를 염두에 둔 건지 애매해서 한번 제대로 여쭈어 봐야겠네요!

) {

}
31 changes: 30 additions & 1 deletion src/main/java/com/example/solidconnection/admin/service/AdminMentorApplicationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
package com.example.solidconnection.admin.service;

import static com.example.solidconnection.common.exception.ErrorCode.MENTOR_APPLICATION_NOT_FOUND;
import static com.example.solidconnection.common.exception.ErrorCode.USER_NOT_FOUND;

import com.example.solidconnection.admin.dto.MentorApplicationCountResponse;
import com.example.solidconnection.admin.dto.MentorApplicationHistoryResponse;
import com.example.solidconnection.admin.dto.MentorApplicationRejectRequest;
import com.example.solidconnection.admin.dto.MentorApplicationSearchCondition;
import com.example.solidconnection.admin.dto.MentorApplicationSearchResponse;
import com.example.solidconnection.common.exception.CustomException;
import com.example.solidconnection.mentor.domain.MentorApplication;
import com.example.solidconnection.mentor.domain.MentorApplicationStatus;
import com.example.solidconnection.mentor.repository.MentorApplicationRepository;
import com.example.solidconnection.siteuser.domain.SiteUser;
import com.example.solidconnection.siteuser.repository.SiteUserRepository;
import com.example.solidconnection.university.domain.University;
import com.example.solidconnection.university.repository.UniversityRepository;
import java.util.List;
import java.util.stream.IntStream;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
Expand All @@ -24,6 +30,7 @@ public class AdminMentorApplicationService {

private final MentorApplicationRepository mentorApplicationRepository;
private final UniversityRepository universityRepository;
private final SiteUserRepository siteUserRepository;

@Transactional(readOnly = true)
public Page<MentorApplicationSearchResponse> searchMentorApplications(
Expand All @@ -43,7 +50,7 @@ public void approveMentorApplication(Long mentorApplicationId) {

@Transactional
public void rejectMentorApplication(
long mentorApplicationId,
Long mentorApplicationId,
MentorApplicationRejectRequest request
) {
MentorApplication mentorApplication = mentorApplicationRepository.findById(mentorApplicationId)
Expand Down Expand Up @@ -79,4 +86,26 @@ public void assignUniversity(

mentorApplication.assignUniversity(university.getId());
}

@Transactional(readOnly = true)
public List<MentorApplicationHistoryResponse> findMentorApplicationHistory(Long siteUserId) {
SiteUser siteUser = siteUserRepository.findById(siteUserId)
.orElseThrow(() -> new CustomException(USER_NOT_FOUND));

long totalCount = mentorApplicationRepository.countBySiteUserId(siteUserId);

List<MentorApplication> mentorApplications = mentorApplicationRepository.findTop5BySiteUserIdOrderByCreatedAtDesc(siteUser.getId());

return IntStream.range(0, mentorApplications.size())
.mapToObj(index -> {
MentorApplication app = mentorApplications.get(index);
return new MentorApplicationHistoryResponse(
app.getId(),
app.getMentorApplicationStatus(),
app.getRejectedReason(),
app.getCreatedAt(),
(int) totalCount - index
);
}).toList();
}
}
Copy link
Contributor

@Gyuhyeok99 Gyuhyeok99 Jan 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

여기 pr과 관련없지만 보여가지고 ㅎㅎ.. 개행 하나만 지워주실 수 있나요

Copy link
Contributor Author

@sukangpunch sukangpunch Jan 4, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

혹시 95~97 라인 개행 말씀하시는거 맞나요?
@Gyuhyeok99

4 changes: 4 additions & 0 deletions src/main/java/com/example/solidconnection/mentor/repository/MentorApplicationRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,8 @@ public interface MentorApplicationRepository extends JpaRepository<MentorApplica
Optional<MentorApplication> findBySiteUserIdAndMentorApplicationStatus(long siteUserId, MentorApplicationStatus mentorApplicationStatus);

long countByMentorApplicationStatus(MentorApplicationStatus mentorApplicationStatus);

List<MentorApplication> findTop5BySiteUserIdOrderByCreatedAtDesc(long siteUserId);

long countBySiteUserId(long siteUserId);
}
2 changes: 1 addition & 1 deletion src/main/resources/secret
Open in desktop
Copy link
Contributor

@Gyuhyeok99 Gyuhyeok99 Jan 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이 시크릿 해시코드는 현재 최신버전과 다른 거 같습니다.
추가로 현재 yml쪽은 수정하시지 않은 거 같은데 제거 부탁드려요~

Copy link
Contributor Author

@sukangpunch sukangpunch Jan 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

서브모듈 어렵네요... 바로 되돌리겠습니다

Submodule secret updated from 29524e to 8300cd
104 changes: 104 additions & 0 deletions ...est/java/com/example/solidconnection/admin/service/AdminMentorApplicationServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
import static com.example.solidconnection.common.exception.ErrorCode.MENTOR_APPLICATION_NOT_OTHER_STATUS;
import static com.example.solidconnection.common.exception.ErrorCode.MENTOR_APPLICATION_UNIVERSITY_NOT_SELECTED;
import static com.example.solidconnection.common.exception.ErrorCode.UNIVERSITY_NOT_FOUND;
import static com.example.solidconnection.common.exception.ErrorCode.USER_NOT_FOUND;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode;
import static org.junit.jupiter.api.Assertions.assertAll;

import com.example.solidconnection.admin.dto.MentorApplicationCountResponse;
import com.example.solidconnection.admin.dto.MentorApplicationHistoryResponse;
import com.example.solidconnection.admin.dto.MentorApplicationRejectRequest;
import com.example.solidconnection.admin.dto.MentorApplicationSearchCondition;
import com.example.solidconnection.admin.dto.MentorApplicationSearchResponse;
Expand Down Expand Up @@ -509,4 +511,106 @@ class 멘토_지원서에_대학_매핑 {
.hasMessage(UNIVERSITY_NOT_FOUND.getMessage());
}
}

@Nested
class 멘토_지원서_이력_조회 {

@Test
void 사용자의_멘토_지원서_이력을_최신_생성_내림차순으로_조회한다() {
// given
SiteUser user = siteUserFixture.사용자();
University university = universityFixture.메이지_대학();
MentorApplication app1 = mentorApplicationFixture.거절된_멘토신청(user.getId(), UniversitySelectType.CATALOG, university.getId());
MentorApplication app2 = mentorApplicationFixture.거절된_멘토신청(user.getId(), UniversitySelectType.CATALOG, university.getId());
MentorApplication app3 = mentorApplicationFixture.승인된_멘토신청(user.getId(), UniversitySelectType.CATALOG, university.getId());

// when
List<MentorApplicationHistoryResponse> response = adminMentorApplicationService.findMentorApplicationHistory(user.getId());

// then
assertAll(
() -> assertThat(response).hasSize(3),
() -> assertThat(response)
.extracting(MentorApplicationHistoryResponse::id)
.containsExactly(app3.getId(), app2.getId(), app1.getId()),
() -> assertThat(response)
.extracting(MentorApplicationHistoryResponse::applicationOrder)
.containsExactly(3,2,1)
);
}

@Test
void 지원서가_5개를_초과하면_최신_5개만_최신_생성_내림차순으로_조회한다() {
// given
SiteUser user = siteUserFixture.사용자();
University university = universityFixture.메이지_대학();
MentorApplication app1 = mentorApplicationFixture.거절된_멘토신청(user.getId(), UniversitySelectType.CATALOG, university.getId());
MentorApplication app2 = mentorApplicationFixture.거절된_멘토신청(user.getId(), UniversitySelectType.CATALOG, university.getId());
MentorApplication app3 = mentorApplicationFixture.거절된_멘토신청(user.getId(), UniversitySelectType.CATALOG, university.getId());
MentorApplication app4 = mentorApplicationFixture.거절된_멘토신청(user.getId(), UniversitySelectType.CATALOG, university.getId());
MentorApplication app5 = mentorApplicationFixture.거절된_멘토신청(user.getId(), UniversitySelectType.CATALOG, university.getId());
MentorApplication app6 = mentorApplicationFixture.거절된_멘토신청(user.getId(), UniversitySelectType.CATALOG, university.getId());
MentorApplication app7 = mentorApplicationFixture.승인된_멘토신청(user.getId(), UniversitySelectType.CATALOG, university.getId());

// when
List<MentorApplicationHistoryResponse> response = adminMentorApplicationService.findMentorApplicationHistory(user.getId());

// then
assertAll(
() -> assertThat(response).hasSize(5),
() -> assertThat(response)
.extracting(MentorApplicationHistoryResponse::id)
.containsExactly(app7.getId(), app6.getId(), app5.getId(), app4.getId(), app3.getId()),
() -> assertThat(response)
.extracting(MentorApplicationHistoryResponse::applicationOrder)
.containsExactly(7,6,5,4,3)
);
}

@Test
void 지원서_이력이_없으면_빈_목록을_반환한다() {
// given
SiteUser user = siteUserFixture.사용자();

// when
List<MentorApplicationHistoryResponse> response = adminMentorApplicationService.findMentorApplicationHistory(user.getId());

// then
assertThat(response).isEmpty();
}

@Test
void 응답에_지원서_상태와_거절_사유가_포함된다() {
// given
SiteUser user = siteUserFixture.사용자();
University university = universityFixture.메이지_대학();
Copy link
Member

@whqtker whqtker Jan 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

현재 사용자, 메이지 대학 생성이 중복되고 있는데 BeforeEach 에서 생성하도록 해도 좋을 거 같습니다.

Copy link
Contributor Author

@sukangpunch sukangpunch Jan 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

수정하겠습니다!

mentorApplicationFixture.거절된_멘토신청(user.getId(), UniversitySelectType.CATALOG, university.getId());
mentorApplicationFixture.승인된_멘토신청(user.getId(), UniversitySelectType.CATALOG, university.getId());

// when
List<MentorApplicationHistoryResponse> response = adminMentorApplicationService.findMentorApplicationHistory(user.getId());

// then
assertAll(
() -> assertThat(response).hasSize(2),
() -> assertThat(response.get(0).mentorApplicationStatus()).isEqualTo(MentorApplicationStatus.APPROVED),
() -> assertThat(response.get(0).rejectedReason()).isNull(),
() -> assertThat(response.get(0).applicationOrder()).isEqualTo(2),
() -> assertThat(response.get(1).mentorApplicationStatus()).isEqualTo(MentorApplicationStatus.REJECTED),
() -> assertThat(response.get(1).rejectedReason()).isNotNull(),
() -> assertThat(response.get(1).applicationOrder()).isEqualTo(1)
);
}

@Test
void 존재하지_않는_사용자_이력을_조회하면_예외_응답을_반환한다() {
// given
long nonExistentUserId = 99999L;

// when & then
assertThatCode(() -> adminMentorApplicationService.findMentorApplicationHistory(nonExistentUserId))
.isInstanceOf(CustomException.class)
.hasMessage(USER_NOT_FOUND.getMessage());
}
}
}
2 changes: 2 additions & 0 deletions src/test/java/com/example/solidconnection/mentor/fixture/MentorApplicationFixture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public class MentorApplicationFixture {
private static final String DEFAULT_COUNTRY_CODE = "US";
private static final String DEFAULT_PROOF_URL = "/mentor-proof.pdf";
private static final ExchangeStatus DEFAULT_EXCHANGE_STATUS = ExchangeStatus.AFTER_EXCHANGE;
private static final String REJECTED_REASON = "pdf 파일 안열림";

public MentorApplication 대기중_멘토신청(
long siteUserId,
Expand Down Expand Up @@ -64,6 +65,7 @@ public class MentorApplicationFixture {
.universitySelectType(selectType)
.mentorProofUrl(DEFAULT_PROOF_URL)
.termId(termFixture.현재_학기("2025-1").getId())
.rejectedReason(REJECTED_REASON)
.exchangeStatus(DEFAULT_EXCHANGE_STATUS)
.mentorApplicationStatus(MentorApplicationStatus.REJECTED)
.create();
Expand Down
9 changes: 9 additions & 0 deletions ...test/java/com/example/solidconnection/mentor/fixture/MentorApplicationFixtureBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public class MentorApplicationFixtureBuilder {
private UniversitySelectType universitySelectType = UniversitySelectType.OTHER;
private String mentorProofUrl = "/mentor-proof.pdf";
private long termId;
private String rejectedReason = null;
private ExchangeStatus exchangeStatus = ExchangeStatus.AFTER_EXCHANGE;
private MentorApplicationStatus mentorApplicationStatus = MentorApplicationStatus.PENDING;

Expand Down Expand Up @@ -58,6 +59,11 @@ public MentorApplicationFixtureBuilder termId(long termId) {
return this;
}

public MentorApplicationFixtureBuilder rejectedReason(String rejectedReason) {
this.rejectedReason = rejectedReason;
return this;
}

public MentorApplicationFixtureBuilder exchangeStatus(ExchangeStatus exchangeStatus) {
this.exchangeStatus = exchangeStatus;
return this;
Expand All @@ -79,6 +85,9 @@ public MentorApplication create() {
exchangeStatus
);
ReflectionTestUtils.setField(mentorApplication, "mentorApplicationStatus", mentorApplicationStatus);
if(rejectedReason != null) {
ReflectionTestUtils.setField(mentorApplication, "rejectedReason", rejectedReason);
}
return mentorApplicationRepository.save(mentorApplication);
}
}
Loading