feat : 가입 요청 생성 및 조회 승인 및 거절 #399
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package com.gamzabat.algohub.feature.group.studygroup.dto; | ||
|
|
||
| import com.gamzabat.algohub.enums.JoinRequestStatus; | ||
|
|
||
| import jakarta.validation.constraints.NotNull; | ||
|
|
||
| public record UpdateJoinRequestStatusRequest(@NotNull(message = "status 는 필수입니다.") JoinRequestStatus status) { | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| package com.gamzabat.algohub.feature.group.studygroup.service; | ||
|
|
||
| import java.time.LocalDate; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
|
|
||
| import org.springframework.http.HttpStatus; | ||
| import org.springframework.stereotype.Service; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
| import com.gamzabat.algohub.enums.JoinRequestStatus; | ||
| import com.gamzabat.algohub.exception.StudyGroupValidationException; | ||
| import com.gamzabat.algohub.feature.group.studygroup.domain.GroupMember; | ||
| import com.gamzabat.algohub.feature.group.studygroup.domain.JoinRequest; | ||
| import com.gamzabat.algohub.feature.group.studygroup.domain.StudyGroup; | ||
| import com.gamzabat.algohub.feature.group.studygroup.dto.UpdateJoinRequestStatusRequest; | ||
| import com.gamzabat.algohub.feature.group.studygroup.etc.RoleOfGroupMember; | ||
| import com.gamzabat.algohub.feature.group.studygroup.exception.GroupMemberValidationException; | ||
| import com.gamzabat.algohub.feature.group.studygroup.exception.JoinRequestException; | ||
| import com.gamzabat.algohub.feature.group.studygroup.repository.GroupMemberRepository; | ||
| import com.gamzabat.algohub.feature.group.studygroup.repository.JoinRequestRepository; | ||
| import com.gamzabat.algohub.feature.group.studygroup.repository.StudyGroupRepository; | ||
| import com.gamzabat.algohub.feature.user.domain.User; | ||
| import com.gamzabat.algohub.feature.user.repository.UserRepository; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.slf4j.Slf4j; | ||
|
|
||
| @Slf4j | ||
| @Service | ||
| @RequiredArgsConstructor | ||
| public class JoinRequestService { | ||
| private final StudyGroupRepository studyGroupRepository; | ||
| private final GroupMemberRepository groupMemberRepository; | ||
| private final UserRepository userRepository; | ||
| private final JoinRequestRepository joinRequestRepository; | ||
|
|
||
| @Transactional | ||
| public void joinRequest(User user, Long groupId) { | ||
| StudyGroup studyGroup = studyGroupRepository.findById(groupId) | ||
| .orElseThrow(() -> new StudyGroupValidationException(HttpStatus.NOT_FOUND.value(), "존재하지 않는 그룹 입니다.")); | ||
| if (groupMemberRepository.existsByUserAndStudyGroup(user, studyGroup)) { | ||
| throw new GroupMemberValidationException(HttpStatus.BAD_REQUEST.value(), "이미 가입한 그룹입니다"); | ||
| } | ||
| if (joinRequestRepository.existsByGroup_IdAndRequester_Id(groupId, user.getId())) { | ||
| throw new JoinRequestException("이미 요청한 그룹입니다."); | ||
| } | ||
|
|
||
| JoinRequest request = new JoinRequest(studyGroup, user); | ||
| joinRequestRepository.save(request); | ||
| log.info("success to join request group = {}", groupId); | ||
| } | ||
|
|
||
| @Transactional(readOnly = true) | ||
| public List<JoinRequest> getAllJoinRequests(User user, Long groupId) { | ||
| StudyGroup studyGroup = studyGroupRepository.findById(groupId) | ||
| .orElseThrow(() -> new StudyGroupValidationException(HttpStatus.NOT_FOUND.value(), "존재하지 않는 그룹 입니다.")); | ||
| Optional<GroupMember> groupMember = groupMemberRepository.findByUserAndStudyGroup(user, studyGroup); | ||
| if (groupMember.isPresent() && RoleOfGroupMember.isParticipant(groupMember.get()) || groupMember.isEmpty()) { | ||
| throw new JoinRequestException("요청 목록을 조회할 권한이 없습니다."); | ||
| } | ||
| return joinRequestRepository.findAllByGroup_Id(groupId); | ||
| } | ||
|
|
||
| @Transactional | ||
| public void updateJoinRequest(User user, Long requestId, Long groupId, UpdateJoinRequestStatusRequest request) { | ||
| JoinRequest joinRequest = joinRequestRepository.findById(requestId) | ||
| .orElseThrow(() -> new JoinRequestException("해당 요청이 존재하지 않습니다")); | ||
| StudyGroup studyGroup = studyGroupRepository.findById(groupId) | ||
| .orElseThrow(() -> new StudyGroupValidationException(HttpStatus.NOT_FOUND.value(), "존재하지 않는 그룹입니다.")); | ||
| GroupMember groupMember = groupMemberRepository.findByUserAndStudyGroup(user, studyGroup) | ||
| .orElseThrow(() -> new GroupMemberValidationException(HttpStatus.NOT_FOUND.value(), "해당 그룹의 멤버가 아닙니다.")); | ||
| if (RoleOfGroupMember.isParticipant(groupMember)) { | ||
| throw new JoinRequestException("승인 권한이 없습니다."); | ||
| } | ||
| if (request.status() == JoinRequestStatus.APPROVE) { | ||
| joinRequest.updateStatus(request.status()); | ||
| GroupMember newGroupMember = GroupMember.builder() | ||
| .user(joinRequest.getRequester()) | ||
| .studyGroup(studyGroup) | ||
| .joinDate(LocalDate.now()) | ||
| .role(RoleOfGroupMember.PARTICIPANT) | ||
| .build(); | ||
| groupMemberRepository.save(newGroupMember); | ||
| joinRequestRepository.delete(joinRequest); | ||
|
Comment on lines
+82
to
+104
Contributor
There was a problem hiding this comment. 가입 후 처리에 누락된 부분이 있습니다! 가입 처리 되면 |
||
| } else if (request.status() == JoinRequestStatus.REJECT) { | ||
| joinRequestRepository.delete(joinRequest); | ||
| } | ||
| log.info("success to approve/reject for join request group = {}", groupId); | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
개인적으로
JoinRequestController가 따로 쪼개져도 괜찮을 것 같다고 생각합니다!사유는.. service 분리 요청 이유와 같습니다.. 너무 커지는 이유..