[FEATURE] 특정 모집글 봉사자 지원 조회 필드 추가 #280
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 |
|---|---|---|
| @@ -1,16 +1,18 @@ | ||
| package com.somemore.domains.volunteerapply.service; | ||
|
|
||
| import com.somemore.domains.recruitboard.domain.RecruitBoard; | ||
| import com.somemore.domains.recruitboard.service.validator.RecruitBoardValidator; | ||
| import com.somemore.domains.recruitboard.usecase.RecruitBoardQueryUseCase; | ||
| import com.somemore.domains.review.usecase.ReviewQueryUseCase; | ||
| import com.somemore.domains.volunteer.repository.mapper.VolunteerSimpleInfo; | ||
| import com.somemore.domains.volunteer.usecase.VolunteerQueryUseCase; | ||
| import com.somemore.domains.volunteerapply.domain.VolunteerApply; | ||
| import com.somemore.domains.volunteerapply.dto.condition.VolunteerApplySearchCondition; | ||
| import com.somemore.domains.volunteerapply.dto.response.VolunteerApplyRecruitInfoResponseDto; | ||
| import com.somemore.domains.volunteerapply.dto.response.VolunteerApplyWithReviewStatusResponseDto; | ||
| import com.somemore.domains.volunteerapply.dto.response.VolunteerApplyVolunteerInfoResponseDto; | ||
| import com.somemore.domains.volunteerapply.usecase.VolunteerApplyQueryFacadeUseCase; | ||
| import com.somemore.domains.volunteerapply.usecase.VolunteerApplyQueryUseCase; | ||
| import lombok.RequiredArgsConstructor; | ||
| import org.springframework.data.domain.Page; | ||
| import org.springframework.stereotype.Service; | ||
|
|
@@ -21,8 +23,6 @@ | |
| import java.util.UUID; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| @RequiredArgsConstructor | ||
| @Transactional(readOnly = true) | ||
| @Service | ||
|
|
@@ -31,52 +31,49 @@ public class VolunteerApplyQueryFacadeService implements VolunteerApplyQueryFaca | |
| private final VolunteerApplyQueryUseCase volunteerApplyQueryUseCase; | ||
| private final RecruitBoardQueryUseCase recruitBoardQueryUseCase; | ||
| private final VolunteerQueryUseCase volunteerQueryUseCase; | ||
| private final ReviewQueryUseCase reviewQueryUseCase; | ||
| private final RecruitBoardValidator recruitBoardValidator; | ||
|
|
||
| @Override | ||
| public VolunteerApplyWithReviewStatusResponseDto getVolunteerApplyByRecruitIdAndVolunteerId(Long recruitId, UUID volunteerId) { | ||
| VolunteerApply apply = volunteerApplyQueryUseCase.getByRecruitIdAndVolunteerId(recruitId, volunteerId); | ||
| boolean isReviewed = checkIfReviewed(apply); | ||
|
Collaborator
There was a problem hiding this comment. 리뷰가 작성되어있을 때, 체크한다 이런 느낌인가요?
Collaborator
Author
There was a problem hiding this comment. 음.. 봉사 지원과 리뷰의 관계를 생각해봤을때, 봉사지원(상태가 APPROVED이고 참석여부가 TRUE일때)일때, 리뷰가 있을수도(작성했을 수도)없을 수도 있어서 위 메서드로 빼놨습니다. 즉, 리뷰 작성 가능성이 있을때, ReviewQueryUseCase로 조회하도록 했습니다. |
||
|
|
||
| return VolunteerApplyWithReviewStatusResponseDto.of(apply, isReviewed); | ||
| } | ||
|
|
||
| @Override | ||
| public Page<VolunteerApplyVolunteerInfoResponseDto> getVolunteerAppliesByRecruitIdAndCenterId( | ||
| Long recruitId, UUID centerId, VolunteerApplySearchCondition condition) { | ||
| RecruitBoard recruitBoard = recruitBoardQueryUseCase.getById(recruitId); | ||
| recruitBoardValidator.validateWriter(recruitBoard, centerId); | ||
|
|
||
| Page<VolunteerApply> applies = volunteerApplyQueryUseCase.getAllByRecruitId(recruitId, condition); | ||
| Map<UUID, VolunteerSimpleInfo> volunteerMap = getVolunteerInfoMap(applies); | ||
|
|
||
| return applies.map( | ||
| apply -> VolunteerApplyVolunteerInfoResponseDto.of(apply, volunteerMap.getOrDefault(apply.getVolunteerId(), null))); | ||
| } | ||
|
|
||
| @Override | ||
| public Page<VolunteerApplyRecruitInfoResponseDto> getVolunteerAppliesByVolunteerId( | ||
| UUID volunteerId, VolunteerApplySearchCondition condition) { | ||
|
|
||
| Page<VolunteerApply> applies = volunteerApplyQueryUseCase.getAllByVolunteerId(volunteerId, condition); | ||
| Map<Long, RecruitBoard> boardMap = getRecruitBoardMap(applies); | ||
|
|
||
| return applies.map( | ||
| apply -> VolunteerApplyRecruitInfoResponseDto.of(apply, boardMap.getOrDefault(apply.getRecruitBoardId(), null))); | ||
| } | ||
|
|
||
| private boolean checkIfReviewed(VolunteerApply apply) { | ||
| return apply.isVolunteerActivityCompleted() | ||
| && reviewQueryUseCase.existsByVolunteerApplyId(apply.getId()); | ||
|
Collaborator
Author
There was a problem hiding this comment. @m-a-king 반대로 전자가 false면 후자는 실행을 안하니까 조회 한번을 아낄수 있어요 |
||
| } | ||
|
|
||
| private Map<Long, RecruitBoard> getRecruitBoardMap(Page<VolunteerApply> applies) { | ||
| List<Long> boardIds = applies.getContent().stream() | ||
| .map(VolunteerApply::getRecruitBoardId) | ||
| .toList(); | ||
| List<RecruitBoard> boards = recruitBoardQueryUseCase.getAllByIds(boardIds); | ||
|
|
||
|
|
@@ -86,15 +83,14 @@ private Map<Long, RecruitBoard> getRecruitBoardMap(Page<VolunteerApply> applies) | |
| } | ||
|
|
||
| private Map<UUID, VolunteerSimpleInfo> getVolunteerInfoMap(Page<VolunteerApply> applies) { | ||
| List<UUID> volunteerIds = applies.getContent().stream() | ||
| .map(VolunteerApply::getVolunteerId) | ||
| .toList(); | ||
|
|
||
| List<VolunteerSimpleInfo> volunteers = volunteerQueryUseCase.getVolunteerSimpleInfosByIds(volunteerIds); | ||
|
|
||
| return volunteers.stream() | ||
| .collect(Collectors.toMap(VolunteerSimpleInfo::id, volunteer -> volunteer)); | ||
| } | ||
|
|
||
| } | ||
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
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
Oops, something went wrong.
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.
제가 이겼군요...