Skip to content

fix: 멘토 지원서 승인 시 유저 Role 을 Mentor로 승격 #639

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
Feb 10, 2026
Merged

fix: 멘토 지원서 승인 시 유저 Role 을 Mentor로 승격 #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
faba35c
fix: 멘토 지원서 승인 시 유저 Role 을 Mentor로 승격
sukangpunch Feb 2, 2026
ca98121
fix: 멘토 지원서 승인 시 멘토 생성
sukangpunch Feb 6, 2026
0c380d1
fix: 멘토의 introduction, passTip null 허용하도록 수정
sukangpunch Feb 6, 2026
99b64a1
fix: 사용하지 않는 멘토 생성 api 제거
sukangpunch Feb 6, 2026
828f2a5
feat: 멘토 지원서 승인 예외처리 추가
sukangpunch Feb 6, 2026
3d459bc
refactor: Mentor 생성 시 null 전달 제거
sukangpunch Feb 9, 2026
61faa18
refactor: 멘토 지원서 승낙 시, 검증 후 승격 및 멘토 생성
sukangpunch Feb 9, 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
23 changes: 23 additions & 0 deletions 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,5 +1,6 @@
package com.example.solidconnection.admin.service;

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

Expand All @@ -9,9 +10,11 @@
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.Mentor;
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.mentor.repository.MentorRepository;
import com.example.solidconnection.siteuser.domain.SiteUser;
import com.example.solidconnection.siteuser.repository.SiteUserRepository;
import com.example.solidconnection.university.domain.HostUniversity;
Expand All @@ -31,6 +34,7 @@ public class AdminMentorApplicationService {
private final MentorApplicationRepository mentorApplicationRepository;
private final HostUniversityRepository hostUniversityRepository;
private final SiteUserRepository siteUserRepository;
private final MentorRepository mentorRepository;

@Transactional(readOnly = true)
public Page<MentorApplicationSearchResponse> searchMentorApplications(
Expand All @@ -45,7 +49,26 @@ public void approveMentorApplication(Long mentorApplicationId) {
MentorApplication mentorApplication = mentorApplicationRepository.findById(mentorApplicationId)
.orElseThrow(() -> new CustomException(MENTOR_APPLICATION_NOT_FOUND));

SiteUser siteUser = siteUserRepository.findById(mentorApplication.getSiteUserId())
.orElseThrow(() -> new CustomException(USER_NOT_FOUND));
validateUserCanCreateMentor(siteUser.getId());

mentorApplication.approve();
siteUser.becomeMentor();
Comment on lines 49 to +57
Copy link
Copy Markdown
Contributor

@Gyuhyeok99 Gyuhyeok99 Feb 8, 2026

Choose a reason for hiding this comment

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

어차피 한 트랜잭션 내에서 작동하니 크게 상관은 없을 거 같긴한데 검증이 먼저되는 게 좋을 거 같아서

siteUser = siteUserRepository.findById(...) // 1. 유저 조회
validateUserCanCreateMentor(siteUser.getId()); // 2. 검증

mentorApplication.approve(); // 3. 상태 변경
siteUser.becomeMentor(); // 4. Role 승격
mentorRepository.save(mentor); // 5. 멘토 생성

이런식으로 순서를 바꾸는 건 어떤가요?
사소하긴 합니다

Copy link
Copy Markdown
Contributor Author

@sukangpunch sukangpunch Feb 9, 2026

Choose a reason for hiding this comment

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

해당 방향으로 수정 하겠습니다!


Mentor mentor = new Mentor(
siteUser.getId(),
mentorApplication.getUniversityId(),
mentorApplication.getTermId()
);
Comment on lines +59 to +63
Copy link
Copy Markdown
Contributor

@Gyuhyeok99 Gyuhyeok99 Feb 8, 2026

Choose a reason for hiding this comment

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

이거 null넘기는 것보단 밑에 3개만 받는 생성자나 정적팩토리 메서드 만드는 건 어떤가요?
예전에 형준님이 언급했었던 컨벤션인 거 같긴한데 저희가 잘 지켜지진 않고 있는 거로 압니다..
근데 지금 보니 좀 신경쓰이는 거 같아서 이번거부터 조금씩 고쳐보는 거 어떤가요?

Copy link
Copy Markdown
Contributor Author

@sukangpunch sukangpunch Feb 9, 2026

Choose a reason for hiding this comment

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

좋습니다! 3개만 받는 생성자를 활용 하는 방향으로 수정 해 보겠습니다.


mentorRepository.save(mentor);
}

private void validateUserCanCreateMentor(long siteUserId) {
if (mentorRepository.existsBySiteUserId(siteUserId)) {
throw new CustomException(MENTOR_ALREADY_EXISTS);
}
}
Comment on lines +68 to 72
Copy link
Copy Markdown

@coderabbitai coderabbitai bot Feb 9, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

🧩 Analysis chain

🏁 Script executed:

# Mentor 관련 마이그레이션 파일 찾기
find . -type f -name "*.sql" -o -name "*Mentor*Migration*.java" | head -20

Repository: solid-connection/solid-connect-server

Length of output: 1469

🏁 Script executed:

# site_user_id 유니크 제약 관련 SQL 패턴 검색
rg -i 'unique.*site_user_id|site_user_id.*unique' --type sql -A 2 -B 2

Repository: solid-connection/solid-connect-server

Length of output: 2555

🏁 Script executed:

# Mentor 엔티티 클래스 조회
find . -type f -name "Mentor.java" | grep -E 'entity|domain|model'

Repository: solid-connection/solid-connect-server

Length of output: 150

🏁 Script executed:

# 전체 Mentor 엔티티 파일 위치 찾기
fd -t f "Mentor.java"

Repository: solid-connection/solid-connect-server

Length of output: 148

🏁 Script executed:

# Mentor 엔티티 파일 확인
cat -n ./src/main/java/com/example/solidconnection/mentor/domain/Mentor.java

Repository: solid-connection/solid-connect-server

Length of output: 3974

🏁 Script executed:

# V19 마이그레이션 파일 (Mentor 테이블 생성) 확인
cat -n ./src/main/resources/db/migration/V19__create_mentor_related_tables.sql

Repository: solid-connection/solid-connect-server

Length of output: 2317

🏁 Script executed:

# V26 마이그레이션 파일 (term column 추가) 확인
cat -n ./src/main/resources/db/migration/V26__add_term_column_to_mentor.sql

Repository: solid-connection/solid-connect-server

Length of output: 155

멘토 중복 생성을 방지하기 위해 데이터베이스 레벨 유니크 제약을 추가하세요.

검증 결과, 현재 코드는 다음과 같은 상황입니다:

  1. 애플리케이션 레벨 검증

    • existsBySiteUserId() 체크로 비즈니스 규칙을 지키고 있습니다.

  2. 데이터베이스 레벨 보호 부재 (권장 개선)

    • mentor 테이블에 site_user_id 컬럼에 대한 UNIQUE 제약이 없습니다.
    • Mentor 엔티티에도 @Table(uniqueConstraints) 정의가 없습니다.
    • TOCTOU(Time-of-Check-to-Time-of-Use) 경쟁 조건이 발생할 수 있습니다.

  3. 권장사항

    • 마이그레이션 파일에서 ALTER TABLE mentor ADD CONSTRAINT uk_mentor_site_user_id UNIQUE (site_user_id); 추가
    • 또는 Mentor 엔티티에 @Table(uniqueConstraints = @UniqueConstraint(columnNames = "siteUserId")) 추가

어드민 전용 기능이라 동시 호출 가능성은 낮지만, 데이터 무결성을 위해 DB 레벨 제약을 추가하면 더욱 안전합니다.

🤖 Prompt for AI Agents 
In
`@src/main/java/com/example/solidconnection/admin/service/AdminMentorApplicationService.java`
around lines 68 - 72, Add a DB-level UNIQUE constraint on the
mentor.site_user_id to prevent TOCTOU race conditions in addition to the
existing application check in validateUserCanCreateMentor (which uses
mentorRepository.existsBySiteUserId). Fix this by adding a migration that runs
ALTER TABLE mentor ADD CONSTRAINT uk_mentor_site_user_id UNIQUE (site_user_id)
and/or annotate the Mentor entity with `@Table`(uniqueConstraints =
`@UniqueConstraint`(columnNames = "siteUserId")) (ensure the column name matches
the mapped column, e.g., site_user_id), and keep the existing existsBySiteUserId
check to preserve the friendly CustomException(MENTOR_ALREADY_EXISTS) for
pre-checks.


@Transactional
Expand Down
12 changes: 0 additions & 12 deletions src/main/java/com/example/solidconnection/mentor/controller/MentorMyPageController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.example.solidconnection.mentor.controller;

import com.example.solidconnection.common.resolver.AuthorizedUser;
import com.example.solidconnection.mentor.dto.MentorMyPageCreateRequest;
import com.example.solidconnection.mentor.dto.MentorMyPageResponse;
import com.example.solidconnection.mentor.dto.MentorMyPageUpdateRequest;
import com.example.solidconnection.mentor.service.MentorMyPageService;
Expand All @@ -11,7 +10,6 @@
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
Expand Down Expand Up @@ -42,14 +40,4 @@ public ResponseEntity<Void> updateMentorMyPage(
mentorMyPageService.updateMentorMyPage(siteUserId, mentorMyPageUpdateRequest);
return ResponseEntity.ok().build();
}

@RequireRoleAccess(roles = Role.MENTOR)
@PostMapping
public ResponseEntity<Void> createMentorMyPage(
@AuthorizedUser long siteUserId,
@Valid @RequestBody MentorMyPageCreateRequest request
) {
mentorMyPageService.createMentorMyPage(siteUserId, request);
return ResponseEntity.ok().build();
}
}
21 changes: 12 additions & 9 deletions src/main/java/com/example/solidconnection/mentor/domain/Mentor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ public class Mentor extends BaseEntity {
@Column
private boolean hasBadge = false;

@Column(length = 1000, nullable = false)
@Column(length = 1000)
private String introduction;

@Column(length = 1000, nullable = false)
@Column(length = 1000)
private String passTip;

@Column
Expand Down Expand Up @@ -67,6 +67,16 @@ public Mentor(
this.termId = termId;
}

public Mentor(
long siteUserId,
Long universityId,
long termId
) {
this.siteUserId = siteUserId;
this.universityId = universityId;
this.termId = termId;
}

public void increaseMenteeCount() {
this.menteeCount++;
}
Expand Down Expand Up @@ -96,11 +106,4 @@ public void updateChannels(List<Channel> channels) {
}
}
}

public void createChannels(List<Channel> channels) {
for(Channel channel : channels) {
channel.updateMentor(this);
this.channels.add(channel);
}
}
}
20 changes: 0 additions & 20 deletions src/main/java/com/example/solidconnection/mentor/dto/MentorMyPageCreateRequest.java
View file
Open in desktop

This file was deleted.

40 changes: 1 addition & 39 deletions src/main/java/com/example/solidconnection/mentor/service/MentorMyPageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package com.example.solidconnection.mentor.service;

import static com.example.solidconnection.common.exception.ErrorCode.CHANNEL_REGISTRATION_LIMIT_EXCEEDED;
import static com.example.solidconnection.common.exception.ErrorCode.MENTOR_ALREADY_EXISTS;
import static com.example.solidconnection.common.exception.ErrorCode.MENTOR_APPLICATION_NOT_FOUND;
import static com.example.solidconnection.common.exception.ErrorCode.MENTOR_NOT_FOUND;
import static com.example.solidconnection.common.exception.ErrorCode.TERM_NOT_FOUND;
import static com.example.solidconnection.common.exception.ErrorCode.UNIVERSITY_NOT_FOUND;
Expand All @@ -11,10 +9,7 @@
import com.example.solidconnection.common.exception.CustomException;
import com.example.solidconnection.mentor.domain.Channel;
import com.example.solidconnection.mentor.domain.Mentor;
import com.example.solidconnection.mentor.domain.MentorApplication;
import com.example.solidconnection.mentor.domain.MentorApplicationStatus;
import com.example.solidconnection.mentor.dto.ChannelRequest;
import com.example.solidconnection.mentor.dto.MentorMyPageCreateRequest;
import com.example.solidconnection.mentor.dto.MentorMyPageResponse;
import com.example.solidconnection.mentor.dto.MentorMyPageUpdateRequest;
import com.example.solidconnection.mentor.repository.MentorApplicationRepository;
Expand Down Expand Up @@ -65,50 +60,17 @@ public void updateMentorMyPage(long siteUserId, MentorMyPageUpdateRequest reques

mentor.updateIntroduction(request.introduction());
mentor.updatePassTip(request.passTip());
updateChannel(request.channels(), mentor);
}

private void updateChannel(List<ChannelRequest> channelRequests, Mentor mentor) {
List<Channel> newChannels = buildChannels(channelRequests);
List<Channel> newChannels = buildChannels(request.channels());
mentor.updateChannels(newChannels);
}

@Transactional
public void createMentorMyPage(long siteUserId, MentorMyPageCreateRequest request) {
validateUserCanCreateMentor(siteUserId);
validateChannelRegistrationLimit(request.channels());
MentorApplication mentorApplication = mentorApplicationRepository.findBySiteUserIdAndMentorApplicationStatus(siteUserId, MentorApplicationStatus.APPROVED)
.orElseThrow(() -> new CustomException(MENTOR_APPLICATION_NOT_FOUND));

Mentor mentor = new Mentor(
request.introduction(),
request.passTip(),
siteUserId,
mentorApplication.getUniversityId(),
mentorApplication.getTermId()
);

createChannels(request.channels(), mentor);
mentorRepository.save(mentor);
}

private void validateUserCanCreateMentor(long siteUserId) {
if (mentorRepository.existsBySiteUserId(siteUserId)) {
throw new CustomException(MENTOR_ALREADY_EXISTS);
}
}

private void validateChannelRegistrationLimit(List<ChannelRequest> channelRequests) {
if (channelRequests.size() > CHANNEL_REGISTRATION_LIMIT) {
throw new CustomException(CHANNEL_REGISTRATION_LIMIT_EXCEEDED);
}
}

private void createChannels(List<ChannelRequest> channelRequests, Mentor mentor) {
List<Channel> newChannels = buildChannels(channelRequests);
mentor.createChannels(newChannels);
}

private List<Channel> buildChannels(List<ChannelRequest> channelRequests) {
int sequence = CHANNEL_SEQUENCE_START_NUMBER;
List<Channel> newChannels = new ArrayList<>();
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,8 @@ public void updatePassword(String newEncodedPassword) {
public void updateUserStatus(UserStatus status) {
this.userStatus = status;
}

public void becomeMentor() {
this.role = Role.MENTOR;
}
}
5 changes: 5 additions & 0 deletions src/main/resources/db/migration/V44__modify_mentor_introduction_pass_tip_nullable.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ALTER TABLE mentor
MODIFY introduction VARCHAR(1000) NULL;

ALTER TABLE mentor
MODIFY pass_tip VARCHAR(1000) NULL;
Loading
Loading