Skip to content

refactor: ClubService 분리(ClubRecruitmentService, ClubApplyService 추가) #145

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
JanooGwan wants to merge 2 commits into from
Closed

refactor: ClubService 분리(ClubRecruitmentService, ClubApplyService 추가) #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ffbeb8
refactor: ClubService의 모집 관련 부분 분리
JanooGwan Jan 25, 2026
aee2cef
refactor: ClubService의 동아리 신청 관련 부분 분리
JanooGwan Jan 26, 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
20 changes: 12 additions & 8 deletions src/main/java/gg/agit/konect/domain/club/controller/ClubController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@
import gg.agit.konect.domain.club.dto.MemberPositionChangeRequest;
import gg.agit.konect.domain.club.dto.PresidentTransferRequest;
import gg.agit.konect.domain.club.dto.VicePresidentChangeRequest;
import gg.agit.konect.domain.club.service.ClubApplyService;
import gg.agit.konect.domain.club.service.ClubMemberManagementService;
import gg.agit.konect.domain.club.service.ClubPositionService;
import gg.agit.konect.domain.club.service.ClubRecruitmentService;
import gg.agit.konect.domain.club.service.ClubService;
import gg.agit.konect.global.auth.annotation.UserId;
import jakarta.validation.Valid;
Expand All @@ -49,6 +51,8 @@ public class ClubController implements ClubApi {
private final ClubService clubService;
private final ClubPositionService clubPositionService;
private final ClubMemberManagementService clubMemberManagementService;
private final ClubRecruitmentService clubRecruitmentService;
private final ClubApplyService clubApplyService;

@Override
public ResponseEntity<ClubsResponse> getClubs(
Expand Down Expand Up @@ -114,7 +118,7 @@ public ResponseEntity<ClubApplicationsResponse> getClubApplications(
@PathVariable(name = "clubId") Integer clubId,
@UserId Integer userId
) {
ClubApplicationsResponse response = clubService.getClubApplications(clubId, userId);
ClubApplicationsResponse response = clubApplyService.getClubApplications(clubId, userId);
return ResponseEntity.ok(response);
}

Expand All @@ -124,7 +128,7 @@ public ResponseEntity<ClubApplicationAnswersResponse> getClubApplicationAnswers(
@PathVariable(name = "applicationId") Integer applicationId,
@UserId Integer userId
) {
ClubApplicationAnswersResponse response = clubService.getClubApplicationAnswers(
ClubApplicationAnswersResponse response = clubApplyService.getClubApplicationAnswers(
clubId,
applicationId,
userId
Expand All @@ -149,7 +153,7 @@ public ResponseEntity<ClubFeeInfoResponse> applyClub(
@Valid @RequestBody ClubApplyRequest request,
@UserId Integer userId
) {
ClubFeeInfoResponse response = clubService.applyClub(clubId, userId, request);
ClubFeeInfoResponse response = clubApplyService.applyClub(clubId, userId, request);
return ResponseEntity.ok(response);
}

Expand Down Expand Up @@ -177,7 +181,7 @@ public ResponseEntity<ClubApplyQuestionsResponse> getApplyQuestions(
@PathVariable(name = "clubId") Integer clubId,
@UserId Integer userId
) {
ClubApplyQuestionsResponse response = clubService.getApplyQuestions(clubId, userId);
ClubApplyQuestionsResponse response = clubApplyService.getApplyQuestions(clubId, userId);
return ResponseEntity.ok(response);
}

Expand All @@ -187,7 +191,7 @@ public ResponseEntity<ClubApplyQuestionsResponse> replaceApplyQuestions(
@Valid @RequestBody ClubApplyQuestionsReplaceRequest request,
@UserId Integer userId
) {
ClubApplyQuestionsResponse response = clubService.replaceApplyQuestions(clubId, userId, request);
ClubApplyQuestionsResponse response = clubApplyService.replaceApplyQuestions(clubId, userId, request);
return ResponseEntity.ok(response);
}

Expand All @@ -196,7 +200,7 @@ public ResponseEntity<ClubRecruitmentResponse> getRecruitments(
@PathVariable(name = "clubId") Integer clubId,
@UserId Integer userId
) {
ClubRecruitmentResponse response = clubService.getRecruitment(clubId, userId);
ClubRecruitmentResponse response = clubRecruitmentService.getRecruitment(clubId, userId);
return ResponseEntity.ok(response);
}

Expand All @@ -206,7 +210,7 @@ public ResponseEntity<Void> createRecruitment(
@PathVariable(name = "clubId") Integer clubId,
@UserId Integer userId
) {
clubService.createRecruitment(clubId, userId, request);
clubRecruitmentService.createRecruitment(clubId, userId, request);
return ResponseEntity.ok().build();
}

Expand All @@ -216,7 +220,7 @@ public ResponseEntity<Void> updateRecruitment(
@PathVariable(name = "clubId") Integer clubId,
@UserId Integer userId
) {
clubService.updateRecruitment(clubId, userId, request);
clubRecruitmentService.updateRecruitment(clubId, userId, request);
return ResponseEntity.noContent().build();
}

Expand Down
252 changes: 252 additions & 0 deletions src/main/java/gg/agit/konect/domain/club/service/ClubApplyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,252 @@
package gg.agit.konect.domain.club.service;

import static gg.agit.konect.global.code.ApiResponseCode.ALREADY_APPLIED_CLUB;
import static gg.agit.konect.global.code.ApiResponseCode.DUPLICATE_CLUB_APPLY_QUESTION;
import static gg.agit.konect.global.code.ApiResponseCode.FORBIDDEN_CLUB_MANAGER_ACCESS;
import static gg.agit.konect.global.code.ApiResponseCode.NOT_FOUND_CLUB_APPLY_QUESTION;

import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import gg.agit.konect.domain.club.dto.ClubApplicationAnswersResponse;
import gg.agit.konect.domain.club.dto.ClubApplicationsResponse;
import gg.agit.konect.domain.club.dto.ClubApplyQuestionsReplaceRequest;
import gg.agit.konect.domain.club.dto.ClubApplyQuestionsResponse;
import gg.agit.konect.domain.club.dto.ClubApplyRequest;
import gg.agit.konect.domain.club.dto.ClubFeeInfoResponse;
import gg.agit.konect.domain.club.enums.ClubPositionGroup;
import gg.agit.konect.domain.club.model.Club;
import gg.agit.konect.domain.club.model.ClubApply;
import gg.agit.konect.domain.club.model.ClubApplyAnswer;
import gg.agit.konect.domain.club.model.ClubApplyQuestion;
import gg.agit.konect.domain.club.model.ClubApplyQuestionAnswers;
import gg.agit.konect.domain.club.model.ClubRecruitment;
import gg.agit.konect.domain.club.repository.ClubApplyAnswerRepository;
import gg.agit.konect.domain.club.repository.ClubApplyQuestionRepository;
import gg.agit.konect.domain.club.repository.ClubApplyRepository;
import gg.agit.konect.domain.club.repository.ClubMemberRepository;
import gg.agit.konect.domain.club.repository.ClubRecruitmentRepository;
import gg.agit.konect.domain.club.repository.ClubRepository;
import gg.agit.konect.domain.user.model.User;
import gg.agit.konect.domain.user.repository.UserRepository;
import gg.agit.konect.global.exception.CustomException;
import lombok.RequiredArgsConstructor;

@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class ClubApplyService {

private static final Set<ClubPositionGroup> MANAGER_ALLOWED_GROUPS =
EnumSet.of(ClubPositionGroup.PRESIDENT, ClubPositionGroup.VICE_PRESIDENT);

private final ClubRepository clubRepository;
private final UserRepository userRepository;
private final ClubMemberRepository clubMemberRepository;
private final ClubApplyRepository clubApplyRepository;
private final ClubApplyQuestionRepository clubApplyQuestionRepository;
private final ClubApplyAnswerRepository clubApplyAnswerRepository;
private final ClubRecruitmentRepository clubRecruitmentRepository;

public ClubApplicationsResponse getClubApplications(Integer clubId, Integer userId) {
clubRepository.getById(clubId);

if (!hasClubManageAccess(clubId, userId, MANAGER_ALLOWED_GROUPS)) {
throw CustomException.of(FORBIDDEN_CLUB_MANAGER_ACCESS);
}

ClubRecruitment recruitment = clubRecruitmentRepository.getByClubId(clubId);
List<ClubApply> clubApplies = findApplicationsByRecruitmentPeriod(clubId, recruitment);

return ClubApplicationsResponse.from(clubApplies);
}

public ClubApplicationAnswersResponse getClubApplicationAnswers(
Integer clubId,
Integer applicationId,
Integer userId
) {
clubRepository.getById(clubId);

if (!hasClubManageAccess(clubId, userId, MANAGER_ALLOWED_GROUPS)) {
throw CustomException.of(FORBIDDEN_CLUB_MANAGER_ACCESS);
}

ClubApply clubApply = clubApplyRepository.getByIdAndClubId(applicationId, clubId);
List<ClubApplyQuestion> questions =
clubApplyQuestionRepository.findAllByClubIdOrderByIdAsc(clubId);
List<ClubApplyAnswer> answers = clubApplyAnswerRepository.findAllByApplyIdWithQuestion(applicationId);

return ClubApplicationAnswersResponse.of(clubApply, questions, answers);
}

public ClubApplyQuestionsResponse getApplyQuestions(Integer clubId, Integer userId) {
userRepository.getById(userId);
List<ClubApplyQuestion> questions =
clubApplyQuestionRepository.findAllByClubIdOrderByIdAsc(clubId);

return ClubApplyQuestionsResponse.from(questions);
}

@Transactional
public ClubApplyQuestionsResponse replaceApplyQuestions(
Integer clubId,
Integer userId,
ClubApplyQuestionsReplaceRequest request
) {
Club club = clubRepository.getById(clubId);

if (!hasClubManageAccess(clubId, userId, MANAGER_ALLOWED_GROUPS)) {
throw CustomException.of(FORBIDDEN_CLUB_MANAGER_ACCESS);
}

List<ClubApplyQuestionsReplaceRequest.ApplyQuestionRequest> questionRequests = request.questions();
Set<Integer> requestedQuestionIds = new HashSet<>();

List<ClubApplyQuestion> existingQuestions =
clubApplyQuestionRepository.findAllByClubIdOrderByIdAsc(clubId);
Map<Integer, ClubApplyQuestion> existingQuestionMap = existingQuestions.stream()
.collect(Collectors.toMap(ClubApplyQuestion::getId, question -> question));

updateQuestions(existingQuestionMap, questionRequests, requestedQuestionIds);

List<ClubApplyQuestion> questionsToCreate = createQuestions(club, questionRequests);

deleteQuestions(existingQuestions, requestedQuestionIds);

if (!questionsToCreate.isEmpty()) {
clubApplyQuestionRepository.saveAll(questionsToCreate);
}

List<ClubApplyQuestion> questions =
clubApplyQuestionRepository.findAllByClubIdOrderByIdAsc(clubId);

return ClubApplyQuestionsResponse.from(questions);
}

@Transactional
public ClubFeeInfoResponse applyClub(Integer clubId, Integer userId, ClubApplyRequest request) {
Club club = clubRepository.getById(clubId);
User user = userRepository.getById(userId);

if (clubApplyRepository.existsByClubIdAndUserId(clubId, userId)) {
throw CustomException.of(ALREADY_APPLIED_CLUB);
}

List<ClubApplyQuestion> questions =
clubApplyQuestionRepository.findAllByClubIdOrderByIdAsc(clubId);
ClubApplyQuestionAnswers answers = ClubApplyQuestionAnswers.of(questions, request.toAnswerMap());

ClubApply apply = clubApplyRepository.save(ClubApply.of(club, user));

List<ClubApplyAnswer> applyAnswers = answers.toEntities(apply);

if (!applyAnswers.isEmpty()) {
clubApplyAnswerRepository.saveAll(applyAnswers);
}

return ClubFeeInfoResponse.from(club);
}

private List<ClubApply> findApplicationsByRecruitmentPeriod(
Integer clubId,
ClubRecruitment recruitment
) {
if (recruitment.getIsAlwaysRecruiting()) {
return clubApplyRepository.findAllByClubIdWithUser(clubId);
}

LocalDateTime startDateTime = recruitment.getStartDate().atStartOfDay();
LocalDateTime endDateTime = recruitment.getEndDate().atTime(LocalTime.MAX);

return clubApplyRepository.findAllByClubIdAndCreatedAtBetweenWithUser(
clubId,
startDateTime,
endDateTime
);
}

private List<ClubApplyQuestion> createQuestions(
Club club,
List<ClubApplyQuestionsReplaceRequest.ApplyQuestionRequest> questionRequests
) {
List<ClubApplyQuestion> questionsToCreate = new ArrayList<>();

for (ClubApplyQuestionsReplaceRequest.ApplyQuestionRequest questionRequest : questionRequests) {
if (questionRequest.questionId() != null) {
continue;
}

questionsToCreate.add(ClubApplyQuestion.of(
club,
questionRequest.question(),
questionRequest.isRequired())
);
}
return questionsToCreate;
}

private void updateQuestions(
Map<Integer, ClubApplyQuestion> existingQuestionMap,
List<ClubApplyQuestionsReplaceRequest.ApplyQuestionRequest> questionRequests,
Set<Integer> requestedQuestionIds
) {
for (ClubApplyQuestionsReplaceRequest.ApplyQuestionRequest questionRequest : questionRequests) {
Integer questionId = questionRequest.questionId();

if (questionId == null) {
continue;
}

if (!requestedQuestionIds.add(questionId)) {
throw CustomException.of(DUPLICATE_CLUB_APPLY_QUESTION);
}

ClubApplyQuestion existingQuestion = existingQuestionMap.get(questionId);

if (existingQuestion == null) {
throw CustomException.of(NOT_FOUND_CLUB_APPLY_QUESTION);
}

existingQuestion.update(
questionRequest.question(),
questionRequest.isRequired()
);
}
}

private void deleteQuestions(
List<ClubApplyQuestion> existingQuestions,
Set<Integer> requestedQuestionIds
) {
List<ClubApplyQuestion> questionsToDelete = existingQuestions.stream()
.filter(question -> !requestedQuestionIds.contains(question.getId()))
.toList();

if (!questionsToDelete.isEmpty()) {
clubApplyQuestionRepository.deleteAll(questionsToDelete);
}
}

private boolean hasClubManageAccess(
Integer clubId,
Integer userId,
Set<ClubPositionGroup> allowedGroups
) {
return clubMemberRepository.existsByClubIdAndUserIdAndPositionGroupIn(
clubId,
userId,
allowedGroups
);
}
}
Loading
Loading