Skip to content

Commit

Permalink
refactor: 요청 url에 token을 eventId로 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
@3Juhwan
3Juhwan committed Aug 4, 2024
1 parent 07a53d2 commit 8057a90
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion server/src/test/java/server/haengdong/presentation/ActionControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void getMemberBillReports() throws Exception {

given(actionService.getMemberBillReports(any())).willReturn(memberBillReportAppResponses);

mockMvc.perform(get("/api/events/{token}/actions/reports", "token")
mockMvc.perform(get("/api/events/{eventId}/actions/reports", "망쵸토큰")
.accept(MediaType.APPLICATION_JSON))
.andDo(print())
.andExpect(status().isOk())
Expand Down
20 changes: 10 additions & 10 deletions server/src/test/java/server/haengdong/presentation/BillActionControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ void saveAllBillAction() throws Exception {
)
);
String requestBody = objectMapper.writeValueAsString(request);
String token = "TOKEN";
String eventId = "쿠키토큰";

mockMvc.perform(post("/api/events/{token}/bill-actions", token)
mockMvc.perform(post("/api/events/{eventId}/bill-actions", eventId)
.contentType(MediaType.APPLICATION_JSON)
.content(requestBody))
.andDo(print())
Expand All @@ -65,9 +65,9 @@ void saveAllBillAction1() throws Exception {
)
);
String requestBody = objectMapper.writeValueAsString(request);
String token = "TOKEN";
String eventId = "소하토큰";

mockMvc.perform(post("/api/events/{token}/bill-actions", token)
mockMvc.perform(post("/api/events/{eventId}/bill-actions", eventId)
.contentType(MediaType.APPLICATION_JSON)
.content(requestBody))
.andDo(print())
Expand All @@ -80,9 +80,9 @@ void updateBillAction() throws Exception {
BillActionUpdateRequest request = new BillActionUpdateRequest("뽕족", 10_000L);

String requestBody = objectMapper.writeValueAsString(request);
String token = "TOKEN";
String eventId = "웨디토큰";

mockMvc.perform(put("/api/events/{token}/bill-actions/{actionId}", token, 1L)
mockMvc.perform(put("/api/events/{eventId}/bill-actions/{actionId}", eventId, 1L)
.contentType(MediaType.APPLICATION_JSON)
.content(requestBody))
.andDo(print())
Expand All @@ -92,21 +92,21 @@ void updateBillAction() throws Exception {
@DisplayName("지출 내역을 삭제한다.")
@Test
void deleteBillAction() throws Exception {
String token = "토다리토큰";
String eventId = "토다리토큰";

mockMvc.perform(delete("/api/events/{token}/bill-actions/{actionId}", token, 1))
mockMvc.perform(delete("/api/events/{eventId}/bill-actions/{actionId}", eventId, 1))
.andDo(print())
.andExpect(status().isOk());
}

@DisplayName("존재하지 않는 행사에 대한 지출 내역을 삭제할 수 없다.")
@Test
void deleteBillAction1() throws Exception {
String token = "TOKEN19348";
String eventId = "이상해토큰";
doThrow(new HaengdongException(HaengdongErrorCode.NOT_FOUND_EVENT))
.when(billActionService).deleteBillAction(any(String.class), any(Long.class));

mockMvc.perform(delete("/api/events/{token}/bill-actions/{actionId}", token, 1))
mockMvc.perform(delete("/api/events/{eventId}/bill-actions/{actionId}", eventId, 1))
.andDo(print())
.andExpect(status().isBadRequest());
}
Expand Down
12 changes: 6 additions & 6 deletions server/src/test/java/server/haengdong/presentation/EventControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,26 @@ class EventControllerTest {
void saveEvent() throws Exception {
EventSaveRequest eventSaveRequest = new EventSaveRequest("토다리");
String requestBody = objectMapper.writeValueAsString(eventSaveRequest);
String token = "TOKEN";
EventAppResponse eventAppResponse = new EventAppResponse(token);
String eventId = "망쵸토큰";
EventAppResponse eventAppResponse = new EventAppResponse(eventId);
given(eventService.saveEvent(any(EventAppRequest.class))).willReturn(eventAppResponse);

mockMvc.perform(post("/api/events")
.contentType(MediaType.APPLICATION_JSON)
.content(requestBody))
.andDo(print())
.andExpect(status().isOk())
.andExpect(jsonPath("$.eventId").value("TOKEN"));
.andExpect(jsonPath("$.eventId").value("망쵸토큰"));
}

@DisplayName("토큰으로 행사를 조회한다.")
@Test
void findEventTest() throws Exception {
String token = "TOKEN";
String eventId = "망쵸토큰";
EventDetailAppResponse eventDetailAppResponse = new EventDetailAppResponse("행동대장 회식");
given(eventService.findEvent(token)).willReturn(eventDetailAppResponse);
given(eventService.findEvent(eventId)).willReturn(eventDetailAppResponse);

mockMvc.perform(get("/api/events/" + token))
mockMvc.perform(get("/api/events/{eventId}", eventId))
.andDo(print())
.andExpect(status().isOk())
.andExpect(jsonPath("$.eventName").value("행동대장 회식"));
Expand Down
10 changes: 5 additions & 5 deletions server/src/test/java/server/haengdong/presentation/MemberActionControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ void saveMemberActionTest() throws Exception {

String requestBody = objectMapper.writeValueAsString(memberActionsSaveRequest);

mockMvc.perform(post("/api/events/TOKEN/member-actions")
mockMvc.perform(post("/api/events/{eventId}/member-actions", "망쵸토큰")
.contentType(MediaType.APPLICATION_JSON)
.content(requestBody))
.andDo(print())
Expand All @@ -58,7 +58,7 @@ void getCurrentMembers() throws Exception {

given(memberActionService.getCurrentMembers(any())).willReturn(currentMemberAppResponses);

mockMvc.perform(get("/api/events/{token}/members/current", "token")
mockMvc.perform(get("/api/events/{eventId}/members/current", "망쵸토큰")
.accept(MediaType.APPLICATION_JSON))
.andDo(print())
.andExpect(status().isOk())
Expand All @@ -69,18 +69,18 @@ void getCurrentMembers() throws Exception {
@DisplayName("이벤트에 속한 멤버 액션을 삭제하면 이후에 기록된 해당 참여자의 모든 멤버 액션을 삭제한다.")
@Test
void deleteMemberAction() throws Exception {
String token = "TOKEN";
String eventId = "망쵸토큰";
Long actionId = 2L;

mockMvc.perform(delete("/api/events/{token}/member-actions/{actionId}", token, actionId))
mockMvc.perform(delete("/api/events/{eventId}/member-actions/{actionId}", eventId, actionId))
.andDo(print())
.andExpect(status().isOk());
}

@DisplayName("행사의 전체 참여자 중에서 특정 참여자의 맴버 액션을 전부 삭제한다.")
@Test
void deleteMember() throws Exception {
String eventId = "TOKEN";
String eventId = "망쵸토큰";
String memberName = "행동대장";

mockMvc.perform(delete("/api/events/{eventId}/members/{memberName}", eventId, memberName))
Expand Down

0 comments on commit 8057a90

Please sign in to comment.