Skip to content

hotfix: 동아리 지원 승인/거절 운영진 권한도 가능하도록 수정 #342

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
dh2906 wants to merge 1 commit into from
Closed

hotfix: 동아리 지원 승인/거절 운영진 권한도 가능하도록 수정 #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/main/java/gg/agit/konect/domain/club/controller/ClubApplicationApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ ResponseEntity<ClubApplicationAnswersResponse> getClubApplicationAnswers(
);

@Operation(summary = "동아리 가입 신청을 승인한다.", description = """
동아리 회장 또는 부회장만 가입 신청을 승인할 수 있습니다.
동아리 운영진 권한부터 가입 신청을 승인할 수 있습니다.
승인 시 지원자는 일반회원으로 등록되며, 지원 내역은 보관됩니다.

## 에러
Expand All @@ -148,7 +148,7 @@ ResponseEntity<Void> approveClubApplication(
);

@Operation(summary = "동아리 가입 신청을 거절한다.", description = """
동아리 회장 또는 부회장만 가입 신청을 거절할 수 있습니다.
동아리 운영진 권한부터 가입 신청을 거절할 수 있습니다.
거절 시 지원 내역은 삭제됩니다.

## 에러
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/gg/agit/konect/domain/club/service/ClubApplicationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public ClubApplicationAnswersResponse getClubApplicationAnswers(
public void approveClubApplication(Integer clubId, Integer applicationId, Integer userId) {
Club club = clubRepository.getById(clubId);

clubPermissionValidator.validateLeaderAccess(clubId, userId);
clubPermissionValidator.validateManagerAccess(clubId, userId);

ClubApply clubApply = clubApplyRepository.getByIdAndClubId(applicationId, clubId);
User applicant = clubApply.getUser();
Expand Down Expand Up @@ -174,7 +174,7 @@ public void approveClubApplication(Integer clubId, Integer applicationId, Intege
public void rejectClubApplication(Integer clubId, Integer applicationId, Integer userId) {
Club club = clubRepository.getById(clubId);

clubPermissionValidator.validateLeaderAccess(clubId, userId);
clubPermissionValidator.validateManagerAccess(clubId, userId);

ClubApply clubApply = clubApplyRepository.getByIdAndClubId(applicationId, clubId);
User applicant = clubApply.getUser();
Expand Down