diff --git a/backend/emm-sale/src/docs/asciidoc/index.adoc b/backend/emm-sale/src/docs/asciidoc/index.adoc index d6d7cf96f..bfbc83f39 100644 --- a/backend/emm-sale/src/docs/asciidoc/index.adoc +++ b/backend/emm-sale/src/docs/asciidoc/index.adoc @@ -138,6 +138,9 @@ include::{snippets}/participate-event/http-response.adoc[] .HTTP request include::{snippets}/participate-event-cancel/http-request.adoc[] +.HTTP request 설명 +include::{snippets}/participate-event-cancel/request-parameters.adoc[] + .HTTP response include::{snippets}/participate-event-cancel/http-response.adoc[] diff --git a/backend/emm-sale/src/main/java/com/emmsale/event/api/EventApi.java b/backend/emm-sale/src/main/java/com/emmsale/event/api/EventApi.java index f345bb04a..f36c06c38 100644 --- a/backend/emm-sale/src/main/java/com/emmsale/event/api/EventApi.java +++ b/backend/emm-sale/src/main/java/com/emmsale/event/api/EventApi.java @@ -56,10 +56,10 @@ public ResponseEntity participateEvent( @DeleteMapping("/{eventId}/participants") public ResponseEntity cancelParticipateEvent( @PathVariable final Long eventId, - @RequestBody final EventParticipateRequest request, + @RequestParam(name = "member-id") final Long memberId, final Member member ) { - eventService.cancelParticipate(eventId, request.getMemberId(), member); + eventService.cancelParticipate(eventId, memberId, member); return ResponseEntity.noContent().build(); } diff --git a/backend/emm-sale/src/main/resources/http/event.http b/backend/emm-sale/src/main/resources/http/event.http index 25509f4b6..817d743af 100644 --- a/backend/emm-sale/src/main/resources/http/event.http +++ b/backend/emm-sale/src/main/resources/http/event.http @@ -36,14 +36,10 @@ Authorization: bearer eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxIiwiaWF0IjoxNjkwMTk2OTY5L } ### Event 참여자 목록에서 멤버 삭제 -DELETE http://localhost:8080/events/1/participants +DELETE http://localhost:8080/events/1/participants?member-id=1 Content-Type: application/json Authorization: bearer eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxIiwiaWF0IjoxNjkwMTk2OTY5LCJleHAiOjE2OTM3OTY5Njl9.yahaEBvKBA7xelNuykx8TROhemnzJAsu1Sv5rrSfCM0 -{ - "memberId": 1 -} - ### 행사 참여자 목록 조회 GET http://localhost:8080/events/1/participants diff --git a/backend/emm-sale/src/test/java/com/emmsale/event/api/EventApiTest.java b/backend/emm-sale/src/test/java/com/emmsale/event/api/EventApiTest.java index 0f580c32d..719bf8b38 100644 --- a/backend/emm-sale/src/test/java/com/emmsale/event/api/EventApiTest.java +++ b/backend/emm-sale/src/test/java/com/emmsale/event/api/EventApiTest.java @@ -127,17 +127,17 @@ void cancelParticipateEvent() throws Exception { final EventParticipateRequest request = new EventParticipateRequest(memberId); final String fakeAccessToken = "Bearer accessToken"; - final RequestFieldsSnippet requestFields = requestFields( - fieldWithPath("memberId").type(JsonFieldType.NUMBER).description("멤버 식별자") + final RequestParametersSnippet requestParameters = requestParameters( + parameterWithName("member-id").description("멤버 식별자") ); //when - mockMvc.perform(delete(format("/events/%s/participants", eventId)) + mockMvc.perform(delete(format("/events/%s/participants?member-id=%s", eventId, memberId)) .header("Authorization", fakeAccessToken) .contentType(MediaType.APPLICATION_JSON) .content(objectMapper.writeValueAsString(request))) .andExpect(status().isNoContent()) - .andDo(document("participate-event-cancel", requestFields)); + .andDo(document("participate-event-cancel", requestParameters)); } @Test @@ -463,6 +463,7 @@ void isAlreadyParticipate() throws Exception { get("/events/{eventId}/participants/already-participate?member-id={memberId}" , eventId, memberId) ) + .andExpect(status().isOk()) .andDo(document("check-already-participate")); } }