Skip to content

Fix mentee registration for existing mentees #721

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

Closed
Sowmiya07 wants to merge 2 commits into from
Closed

Fix mentee registration for existing mentees #721

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd5a129
Fix mentee registration for existing mentees
Sowmiya07 Jun 27, 2026
aaf5dc0
Adds cycle update status API
Sowmiya07 Jun 28, 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
19 changes: 14 additions & 5 deletions src/main/java/com/wcc/platform/repository/postgres/mentorship/PostgresMenteeRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,15 @@ public Mentee create(final Mentee mentee) {
memberId = memberMapper.addMember(mentee);
}

if (findById(memberId).isEmpty()) {
final var existing = findById(memberId);
if (existing.isEmpty()) {
insertMenteeDetails(mentee, memberId);
} else {
updateMenteeDetails(mentee, memberId);
final var profileStatus =
mentee.getProfileStatus() != null
? mentee.getProfileStatus()
: existing.get().getProfileStatus();
updateMenteeDetails(mentee, memberId, profileStatus);
}

jdbc.update(SQL_DELETE_TECH_AREAS, memberId);
Expand All @@ -108,7 +113,11 @@ public Mentee update(final Long id, final Mentee mentee) {
validate(mentee);
memberMapper.updateMember(mentee, id);

updateMenteeDetails(mentee, id);
final var profileStatus =
mentee.getProfileStatus() != null
? mentee.getProfileStatus()
: findById(id).map(Mentee::getProfileStatus).orElse(ProfileStatus.PENDING);
updateMenteeDetails(mentee, id, profileStatus);

jdbc.update(SQL_DELETE_TECH_AREAS, id);
jdbc.update(SQL_DELETE_LANGUAGES, id);
Expand Down Expand Up @@ -186,8 +195,8 @@ public Mentee updateProfileStatus(final Long menteeId, final ProfileStatus statu
() -> new MenteeNotSavedException("Mentee not found after status update: " + menteeId));
}

private void updateMenteeDetails(final Mentee mentee, final Long memberId) {
final var profileStatus = mentee.getProfileStatus();
private void updateMenteeDetails(
final Mentee mentee, final Long memberId, final ProfileStatus profileStatus) {
final var skills = mentee.getSkills();
jdbc.update(
SQL_UPDATE_MENTEE,
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/wcc/platform/service/MenteeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,9 @@ private Mentee createOrUpdateMentee(final Mentee mentee) {
}

private Mentee handleMenteeWithId(final Mentee mentee) {
if (menteeRepository.findById(mentee.getId()).isPresent()) {
final var existingMentee = menteeRepository.findById(mentee.getId());
if (existingMentee.isPresent()) {
mentee.setMemberTypes(mergeMemberTypes(existingMentee.get().getMemberTypes()));
return menteeRepository.update(mentee.getId(), mentee);
}

Expand Down
Loading