Skip to content

[FIX] 봉사자 특정 모집글 지원 상태 조회 API 수정 #330

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

Merged
merged 2 commits into from
Jan 23, 2025
Merged

[FIX] 봉사자 특정 모집글 지원 상태 조회 API 수정 #330

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
f3f110d
fix(volunteer-apply): 특정 게시글 봉사 지원 조회 수정
leebs0521 Jan 23, 2025
bfff16c
test(volunteer-apply): 특정 게시글 봉사 지원 조회 수정 테스트
leebs0521 Jan 23, 2025
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
18 changes: 8 additions & 10 deletions ...java/com/somemore/domains/volunteerapply/controller/VolunteerApplyQueryApiController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import com.somemore.domains.volunteerapply.usecase.VolunteerApplyQueryFacadeUseCase;
import com.somemore.domains.volunteerapply.usecase.VolunteerApplyQueryUseCase;
import com.somemore.global.auth.annotation.CurrentUser;
import com.somemore.global.auth.annotation.RoleId;
import com.somemore.global.common.response.ApiResponse;
import com.somemore.global.exception.NoSuchElementException;
import io.swagger.v3.oas.annotations.Operation;
Expand All @@ -18,11 +19,7 @@
import org.springframework.data.domain.Pageable;
import org.springframework.data.web.PageableDefault;
import org.springframework.security.access.annotation.Secured;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.UUID;

Expand All @@ -37,17 +34,18 @@ public class VolunteerApplyQueryApiController {
private final VolunteerApplyQueryUseCase volunteerApplyQueryUseCase;
private final VolunteerApplyQueryFacadeUseCase volunteerApplyQueryFacadeUseCase;

@Operation(summary = "특정 모집글 봉사자 지원 단건 조회", description = "특정 모집글에 대한 봉사자 지원을 조회합니다.")
@GetMapping("/volunteer-apply/recruit-board/{recruitBoardId}/volunteer/{volunteerId}")
public ApiResponse<VolunteerApplyWithReviewStatusResponseDto> getVolunteerApplyByRecruitIdAndVolunteerId(
@Secured("ROLE_VOLUNTEER")
@Operation(summary = "특정 모집글 봉사 지원 단건 조회", description = "특정 모집글에 대한 봉사 지원을 조회합니다.")
@GetMapping("/volunteer-apply/recruit-board/{recruitBoardId}")
public ApiResponse<VolunteerApplyWithReviewStatusResponseDto> getVolunteerApplyByRecruitBoardId(
@PathVariable Long recruitBoardId,
@PathVariable UUID volunteerId
@RoleId UUID volunteerId
) {
try {
return ApiResponse.ok(
200,
volunteerApplyQueryFacadeUseCase.getVolunteerApplyByRecruitIdAndVolunteerId(recruitBoardId, volunteerId),
"특정 모집글에 대한 봉사자 지원 단건 조회 성공"
"특정 모집글에 대한 봉사 지원 단건 조회 성공"
);
} catch (NoSuchElementException e) {
return ApiResponse.ok(210, null, "지원 내역이 없습니다.");
Expand Down
32 changes: 15 additions & 17 deletions .../com/somemore/domains/volunteerapply/controller/VolunteerApplyQueryApiControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@

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.VolunteerApplySummaryResponseDto;
import com.somemore.domains.volunteerapply.dto.response.VolunteerApplyVolunteerInfoResponseDto;
import com.somemore.domains.volunteerapply.dto.response.VolunteerApplyWithReviewStatusResponseDto;
import com.somemore.domains.volunteerapply.usecase.VolunteerApplyQueryFacadeUseCase;
import com.somemore.domains.volunteerapply.usecase.VolunteerApplyQueryUseCase;
import com.somemore.global.exception.NoSuchElementException;
import com.somemore.support.ControllerTestSupport;
import com.somemore.support.annotation.MockUser;
import com.somemore.support.annotation.WithMockCustomUser;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -37,12 +38,13 @@ class VolunteerApplyQueryApiControllerTest extends ControllerTestSupport {
private VolunteerApplyQueryFacadeUseCase volunteerApplyQueryFacadeUseCase;


@DisplayName("특정 모집글 봉사자 지원 단건 조회 성공 테스트")
@MockUser
@DisplayName("특정 모집글 봉사 지원 단건 조회 성공 테스트")
@Test
void getVolunteerApplyByRecruitIdAndVolunteerId() throws Exception {
void getVolunteerApplyByRecruitBoardId() throws Exception {
// given
Long recruitBoardId = 1L;
UUID volunteerId = UUID.randomUUID();
UUID volunteerId = UUID.fromString("123e4567-e89b-12d3-a456-426614174000");

VolunteerApplyWithReviewStatusResponseDto response = VolunteerApplyWithReviewStatusResponseDto.builder()
.id(1L)
Expand All @@ -52,40 +54,36 @@ void getVolunteerApplyByRecruitIdAndVolunteerId() throws Exception {
.attended(false)
.build();

given(volunteerApplyQueryFacadeUseCase.getVolunteerApplyByRecruitIdAndVolunteerId(recruitBoardId,
volunteerId))
given(volunteerApplyQueryFacadeUseCase.getVolunteerApplyByRecruitIdAndVolunteerId(recruitBoardId, volunteerId))
.willReturn(response);

// when & then
mockMvc.perform(
get("/api/volunteer-apply/recruit-board/{recruitBoardId}/volunteer/{volunteerId}",
recruitBoardId, volunteerId)
.accept(APPLICATION_JSON))
mockMvc.perform(get("/api/volunteer-apply/recruit-board/{recruitBoardId}", recruitBoardId)
.accept(APPLICATION_JSON))
.andExpect(status().isOk())
.andExpect(jsonPath("$.code").value(200))
.andExpect(jsonPath("$.message").value("특정 모집글에 대한 봉사자 지원 단건 조회 성공"))
.andExpect(jsonPath("$.message").value("특정 모집글에 대한 봉사 지원 단건 조회 성공"))
.andExpect(jsonPath("$.data.id").value(1))
.andExpect(jsonPath("$.data.volunteer_id").value(volunteerId.toString()))
.andExpect(jsonPath("$.data.recruit_board_id").value(recruitBoardId))
.andExpect(jsonPath("$.data.status").value("WAITING"))
.andExpect(jsonPath("$.data.attended").value(false));
}

@MockUser
@DisplayName("특정 모집글 봉사자 지원 단건 조회 성공 테스트 - 지원 내역이 없는 경우")
@Test
void getVolunteerApplyByRecruitIdAndVolunteerIdWhenDoesNotExist() throws Exception {
void getVolunteerApplyByRecruitBoardIdWhenDoesNotExist() throws Exception {
// given
Long recruitBoardId = 1L;
UUID volunteerId = UUID.randomUUID();
UUID volunteerId = UUID.fromString("123e4567-e89b-12d3-a456-426614174000");

given(volunteerApplyQueryFacadeUseCase.getVolunteerApplyByRecruitIdAndVolunteerId(recruitBoardId,
volunteerId))
given(volunteerApplyQueryFacadeUseCase.getVolunteerApplyByRecruitIdAndVolunteerId(recruitBoardId, volunteerId))
.willThrow(new NoSuchElementException(NOT_EXISTS_VOLUNTEER_APPLY));

// when & then
mockMvc.perform(
get("/api/volunteer-apply/recruit-board/{recruitBoardId}/volunteer/{volunteerId}",
recruitBoardId, volunteerId)
get("/api/volunteer-apply/recruit-board/{recruitBoardId}", recruitBoardId)
.accept(APPLICATION_JSON))
.andExpect(status().isOk())
.andExpect(jsonPath("$.code").value(210))
Expand Down
Loading