Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@
@Builder
public class RestaurantResponse {

private Long id;
private String name;
private RestaurantType restaurantType;
private String location;

public static RestaurantResponse toDto(Restaurant restaurant) {
return RestaurantResponse.builder()
.id(restaurant.getId())
.name(restaurant.getName())
.restaurantType(restaurant.getRestaurantType())
.location(restaurant.getLocation())
Expand Down
14 changes: 13 additions & 1 deletion src/main/resources/static/docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -863,6 +863,7 @@ <h5 id="_요청_4_http_request">HTTP request</h5>
<div class="listingblock">
<div class="content">
<pre class="highlightjs highlight nowrap"><code class="language-http hljs" data-lang="http">POST /api/member?_csrf=pZ25SF_D7mKw0dsGee1kXmL8WR_Yu2nru0qP64U_vwS7vPnDlquILDv0i1Od4bkxH8BQOlGddCa6iAjG2im_ieYKjGffiJv0 HTTP/1.1

Content-Type: application/json;charset=UTF-8
Content-Length: 246
Host: localhost:8080
Expand Down Expand Up @@ -1048,21 +1049,24 @@ <h5 id="_응답_5_http_response">HTTP response</h5>
Pragma: no-cache
Expires: 0
X-Frame-Options: DENY
Content-Length: 549
Content-Length: 597

{
"success" : true,
"message" : "요청이 성공적으로 처리되었습니다.",
"data" : {
"content" : [ {
"id" : 1,
"name" : "가식당",
"restaurantType" : "KOREAN_FOOD",
"location" : "서울"
}, {
"id" : 2,
"name" : "나식당",
"restaurantType" : "WESTERN_FOOD",
"location" : "부산"
}, {
"id" : 3,
"name" : "다식당",
"restaurantType" : "JAPANESE_FOOD",
"location" : "울산"
Expand Down Expand Up @@ -1109,6 +1113,11 @@ <h5 id="_응답_5_response_fields">Response fields</h5>
<td class="tableblock halign-left valign-top"><p class="tableblock">처리 결과</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data.content[].id</code></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Number</code></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">식당 ID값</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data.content[].name</code></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">식당 이름</p></td>
Expand Down Expand Up @@ -1510,6 +1519,7 @@ <h5 id="_요청_9_http_request">HTTP request</h5>
<div class="listingblock">
<div class="content">
<pre class="highlightjs highlight nowrap"><code class="language-http hljs" data-lang="http">PATCH /api/credits/plus?_csrf=FTufPolFbnQWgcjDW8jT-Zkka5uhtYIsfBvR-8aKTSGi-mnJJQuoCbgjChI7sK6lY-Xnz6oTRvnHgbABSCrnmv--ekKRzFys HTTP/1.1

Content-Type: application/json;charset=UTF-8
Content-Length: 47
Host: localhost:8080
Expand Down Expand Up @@ -1633,6 +1643,7 @@ <h5 id="_요청_10_http_request">HTTP request</h5>
<div class="listingblock">
<div class="content">
<pre class="highlightjs highlight nowrap"><code class="language-http hljs" data-lang="http">PATCH /api/credits/minus?_csrf=RIhdRhgUX7s9SaRUFcBJ4rkdcDr5ESnv0ZSbEQORawtiuuyFJ-xrdSAjbd0Qe5E2Ie19gY4qXQOaIBrC5_etJzuoXmhRgoq8 HTTP/1.1

Content-Type: application/json;charset=UTF-8
Content-Length: 47
Host: localhost:8080
Expand Down Expand Up @@ -2030,6 +2041,7 @@ <h5 id="_요청_13_http_request">HTTP request</h5>
<div class="listingblock">
<div class="content">
<pre class="highlightjs highlight nowrap"><code class="language-http hljs" data-lang="http">POST /api/works-join?_csrf=aLTWfYjPQd7xySlQdXuyQQ-JWy5_zEjlcqFBU1-hVLp8xZ2lUdLmTun_cunc_hBoEFaGcWztdk9N-ivIF5YkZm_EMo9Fof6c HTTP/1.1

Content-Type: application/json;charset=UTF-8
Content-Length: 44
Host: localhost:8080
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ class RestaurantControllerTest {
void findAllByPage() throws Exception {
// Given
Pageable pageable = PageRequest.of(1, 3);
RestaurantResponse r1 = new RestaurantResponse("가식당", RestaurantType.KOREAN_FOOD, "서울");
RestaurantResponse r2 = new RestaurantResponse("나식당", RestaurantType.WESTERN_FOOD, "부산");
RestaurantResponse r3 = new RestaurantResponse("다식당", RestaurantType.JAPANESE_FOOD, "울산");
RestaurantResponse r1 = new RestaurantResponse(1L, "가식당", RestaurantType.KOREAN_FOOD, "서울");
RestaurantResponse r2 = new RestaurantResponse(2L, "나식당", RestaurantType.WESTERN_FOOD, "부산");
RestaurantResponse r3 = new RestaurantResponse(3L, "다식당", RestaurantType.JAPANESE_FOOD, "울산");
PageResponse<RestaurantResponse> response = new PageResponse<>(List.of(r1, r2, r3));
given(restaurantService.findRestaurant(any())).willReturn(response);

Expand All @@ -92,6 +92,7 @@ void findAllByPage() throws Exception {
fieldWithPath("success").description("성공여부"),
fieldWithPath("message").description("응답 메시지"),
fieldWithPath("data").description("처리 결과"),
fieldWithPath("data.content[].id").description("식당 ID값"),
fieldWithPath("data.content[].name").description("식당 이름"),
fieldWithPath("data.content[].restaurantType").description(
"식당 종류 (KOREAN_FOOD, WESTERN_FOOD, JAPANESE_FOOD 등)"),
Expand Down
Loading