-
Notifications
You must be signed in to change notification settings - Fork 15
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.
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
RestDocs 적용 #25
RestDocs 적용 #25
Changes from 5 commits
e91e5b0
8d10135
c5455b6
f02a73a
2038986
458b21b
5f32465
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,38 +1,62 @@ | ||
plugins { | ||
id 'java' | ||
id 'org.springframework.boot' version '3.1.1' | ||
id 'io.spring.dependency-management' version '1.1.0' | ||
id 'java' | ||
id 'org.springframework.boot' version '3.1.1' | ||
id 'io.spring.dependency-management' version '1.1.0' | ||
id "org.asciidoctor.jvm.convert" version "3.3.2" | ||
} | ||
|
||
group = 'hanglog' | ||
version = '0.0.1-SNAPSHOT' | ||
|
||
java { | ||
sourceCompatibility = '17' | ||
sourceCompatibility = '17' | ||
} | ||
|
||
configurations { | ||
compileOnly { | ||
extendsFrom annotationProcessor | ||
} | ||
asciidoctorExt | ||
compileOnly { | ||
extendsFrom annotationProcessor | ||
} | ||
} | ||
|
||
repositories { | ||
mavenCentral() | ||
mavenCentral() | ||
} | ||
|
||
dependencies { | ||
implementation 'org.springframework.boot:spring-boot-starter-data-jpa' | ||
implementation 'org.springframework.boot:spring-boot-starter-validation' | ||
implementation 'org.springframework.boot:spring-boot-starter-web' | ||
implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.9.0' | ||
implementation 'org.springframework.boot:spring-boot-starter-data-jpa' | ||
implementation 'org.springframework.boot:spring-boot-starter-validation' | ||
implementation 'org.springframework.boot:spring-boot-starter-web' | ||
implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.9.0' | ||
|
||
compileOnly 'org.projectlombok:lombok' | ||
runtimeOnly 'com.h2database:h2' | ||
annotationProcessor 'org.projectlombok:lombok' | ||
testImplementation 'org.springframework.boot:spring-boot-starter-test' | ||
testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc' | ||
asciidoctorExt 'org.springframework.restdocs:spring-restdocs-asciidoctor' | ||
|
||
compileOnly 'org.projectlombok:lombok' | ||
runtimeOnly 'com.h2database:h2' | ||
annotationProcessor 'org.projectlombok:lombok' | ||
testImplementation 'org.springframework.boot:spring-boot-starter-test' | ||
} | ||
|
||
tasks.named('test') { | ||
useJUnitPlatform() | ||
useJUnitPlatform() | ||
} | ||
|
||
asciidoctor { | ||
dependsOn test | ||
configurations 'asciidoctorExt' | ||
} | ||
|
||
tasks.register('copyApiDocument', Copy) { | ||
dependsOn asciidoctor | ||
doFirst { | ||
delete file("src/main/resources/static/docs") | ||
} | ||
from asciidoctor.outputDir | ||
into file("src/main/resources/static/docs") | ||
} | ||
|
||
build { | ||
dependsOn copyApiDocument | ||
} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
= HangLog | ||
:toc: left | ||
:source-highlighter: highlightjs | ||
:sectlinks: | ||
|
||
[[overview-http-status-codes]] | ||
=== HTTP status codes | ||
|
||
|=== | ||
| 상태 코드 | 설명 | ||
|
||
| `200 OK` | ||
| 성공 | ||
|
||
| `201 Created` | ||
| 리소스 생성 | ||
|
||
| `204 NO_CONTENT` | ||
| 성공 후 반환 값 없음 | ||
|
||
| `400 Bad Request` | ||
| 잘못된 요청 | ||
|
||
| `401 Unauthorized` | ||
| 비인증 상태 | ||
|
||
| `403 Forbidden` | ||
| 권한 거부 | ||
|
||
| `404 Not Found` | ||
| 존재하지 않는 요청 리소스 | ||
|
||
| `500 Internal Server Error` | ||
| 서버 에러 | ||
|=== | ||
|
||
|
||
== 여행 API | ||
|
||
=== 단일 여행 생성 | ||
|
||
==== 요청 | ||
include::{snippets}/trip-controller-test/create-trip/http-request.adoc[] | ||
include::{snippets}/trip-controller-test/create-trip/request-fields.adoc[] | ||
|
||
==== 응답 | ||
include::{snippets}/trip-controller-test/create-trip/http-response.adoc[] | ||
include::{snippets}/trip-controller-test/create-trip/response-headers.adoc[] |
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
@@ -1,39 +1,44 @@ | ||||||||||||||||||||||||
package hanglog.trip.presentation; | ||||||||||||||||||||||||
|
||||||||||||||||||||||||
import static org.mockito.ArgumentMatchers.any; | ||||||||||||||||||||||||
import static org.mockito.BDDMockito.given; | ||||||||||||||||||||||||
import static org.springframework.http.HttpHeaders.LOCATION; | ||||||||||||||||||||||||
import static org.springframework.http.MediaType.APPLICATION_JSON; | ||||||||||||||||||||||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; | ||||||||||||||||||||||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; | ||||||||||||||||||||||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; | ||||||||||||||||||||||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; | ||||||||||||||||||||||||
|
||||||||||||||||||||||||
import com.fasterxml.jackson.databind.ObjectMapper; | ||||||||||||||||||||||||
import hanglog.trip.presentation.dto.request.TripRequest; | ||||||||||||||||||||||||
import hanglog.trip.restdocs.RestDocsConfiguration; | ||||||||||||||||||||||||
import hanglog.trip.restdocs.RestDocsTest; | ||||||||||||||||||||||||
import hanglog.trip.service.TripService; | ||||||||||||||||||||||||
import java.time.LocalDate; | ||||||||||||||||||||||||
import java.util.Collections; | ||||||||||||||||||||||||
import java.util.List; | ||||||||||||||||||||||||
import java.util.regex.Matcher; | ||||||||||||||||||||||||
import org.junit.jupiter.api.DisplayName; | ||||||||||||||||||||||||
import org.junit.jupiter.api.Test; | ||||||||||||||||||||||||
import org.springframework.beans.factory.annotation.Autowired; | ||||||||||||||||||||||||
import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs; | ||||||||||||||||||||||||
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; | ||||||||||||||||||||||||
import org.springframework.boot.test.mock.mockito.MockBean; | ||||||||||||||||||||||||
import org.springframework.context.annotation.Import; | ||||||||||||||||||||||||
import org.springframework.data.jpa.mapping.JpaMetamodelMappingContext; | ||||||||||||||||||||||||
import org.springframework.test.web.servlet.MockMvc; | ||||||||||||||||||||||||
import org.springframework.restdocs.payload.JsonFieldType; | ||||||||||||||||||||||||
|
||||||||||||||||||||||||
import java.time.LocalDate; | ||||||||||||||||||||||||
import java.util.Collections; | ||||||||||||||||||||||||
import java.util.List; | ||||||||||||||||||||||||
|
||||||||||||||||||||||||
import static hanglog.trip.restdocs.RestDocsConfiguration.field; | ||||||||||||||||||||||||
import static org.mockito.ArgumentMatchers.any; | ||||||||||||||||||||||||
import static org.mockito.BDDMockito.given; | ||||||||||||||||||||||||
import static org.springframework.http.HttpHeaders.LOCATION; | ||||||||||||||||||||||||
import static org.springframework.http.MediaType.APPLICATION_JSON; | ||||||||||||||||||||||||
import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName; | ||||||||||||||||||||||||
import static org.springframework.restdocs.headers.HeaderDocumentation.responseHeaders; | ||||||||||||||||||||||||
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; | ||||||||||||||||||||||||
import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; | ||||||||||||||||||||||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; | ||||||||||||||||||||||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; | ||||||||||||||||||||||||
|
||||||||||||||||||||||||
@WebMvcTest(TripController.class) | ||||||||||||||||||||||||
@MockBean(JpaMetamodelMappingContext.class) | ||||||||||||||||||||||||
class TripControllerTest { | ||||||||||||||||||||||||
|
||||||||||||||||||||||||
@Autowired | ||||||||||||||||||||||||
private MockMvc mockMvc; | ||||||||||||||||||||||||
@AutoConfigureRestDocs | ||||||||||||||||||||||||
@Import(RestDocsConfiguration.class) | ||||||||||||||||||||||||
class TripControllerTest extends RestDocsTest { | ||||||||||||||||||||||||
|
||||||||||||||||||||||||
@Autowired | ||||||||||||||||||||||||
private ObjectMapper objectMapper; | ||||||||||||||||||||||||
|
||||||||||||||||||||||||
@MockBean | ||||||||||||||||||||||||
private TripService tripService; | ||||||||||||||||||||||||
|
||||||||||||||||||||||||
|
@@ -53,7 +58,19 @@ void createTrip() throws Exception { | |||||||||||||||||||||||
.contentType(APPLICATION_JSON) | ||||||||||||||||||||||||
.content(objectMapper.writeValueAsString(tripRequest))) | ||||||||||||||||||||||||
.andExpect(status().isCreated()) | ||||||||||||||||||||||||
.andExpect(header().string(LOCATION, "/trips/1")); | ||||||||||||||||||||||||
.andExpect(header().string(LOCATION, "/trips/1")) | ||||||||||||||||||||||||
.andDo( | ||||||||||||||||||||||||
restDocs.document( | ||||||||||||||||||||||||
requestFields( | ||||||||||||||||||||||||
fieldWithPath("startDate").type(JsonFieldType.STRING).description("여행 시작 날짜").attributes(field("constraint", "yyyy-MM-dd")), | ||||||||||||||||||||||||
fieldWithPath("endDate").type(JsonFieldType.STRING).description("여행 종료 날짜").attributes(field("constraint", "yyyy-MM-dd")), | ||||||||||||||||||||||||
fieldWithPath("cityIds").type(JsonFieldType.ARRAY).description("도시 ID 목록").attributes(field("constraint", "1개 이상의 양의 정수")) | ||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
여기도 가로줄 제한을 넘겨서 정렬하면 이렇게 바뀌는데 type과 description도 줄바꿈 하는 방법도 좋아 보입니다.! There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 적용하였습니다 :) |
||||||||||||||||||||||||
), | ||||||||||||||||||||||||
responseHeaders( | ||||||||||||||||||||||||
headerWithName(LOCATION).description("생성된 여행 URL") | ||||||||||||||||||||||||
) | ||||||||||||||||||||||||
) | ||||||||||||||||||||||||
); | ||||||||||||||||||||||||
} | ||||||||||||||||||||||||
|
||||||||||||||||||||||||
@DisplayName("여행 시작 날짜를 입력하지 않으면 예외가 발생한다.") | ||||||||||||||||||||||||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
package hanglog.trip.restdocs; | ||
|
||
import org.springframework.context.annotation.Bean; | ||
import org.springframework.context.annotation.Configuration; | ||
import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation; | ||
import org.springframework.restdocs.mockmvc.RestDocumentationResultHandler; | ||
import org.springframework.restdocs.operation.preprocess.Preprocessors; | ||
import org.springframework.restdocs.snippet.Attributes.Attribute; | ||
|
||
|
||
@Configuration | ||
public class RestDocsConfiguration { | ||
|
||
public static final Attribute field(final String key, final String value) { | ||
return new Attribute(key, value); | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
||
@Bean | ||
public RestDocumentationResultHandler write() { | ||
return MockMvcRestDocumentation.document( | ||
"{class-name}/{method-name}", | ||
Preprocessors.preprocessRequest( | ||
Preprocessors.removeHeaders("Content-Length", "Host"), | ||
Preprocessors.prettyPrint() | ||
), | ||
Preprocessors.preprocessResponse( | ||
Preprocessors.removeHeaders("Transfer-Encoding", "Date", "Keep-Alive", "Connection"), | ||
Preprocessors.prettyPrint() | ||
) | ||
); | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
package hanglog.trip.restdocs; | ||
|
||
import org.junit.jupiter.api.BeforeEach; | ||
import org.junit.jupiter.api.extension.ExtendWith; | ||
import org.springframework.beans.factory.annotation.Autowired; | ||
import org.springframework.context.annotation.Import; | ||
import org.springframework.restdocs.RestDocumentationContextProvider; | ||
import org.springframework.restdocs.RestDocumentationExtension; | ||
import org.springframework.restdocs.mockmvc.RestDocumentationResultHandler; | ||
import org.springframework.test.web.servlet.MockMvc; | ||
import org.springframework.test.web.servlet.setup.MockMvcBuilders; | ||
import org.springframework.web.context.WebApplicationContext; | ||
import org.springframework.web.filter.CharacterEncodingFilter; | ||
|
||
import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.documentationConfiguration; | ||
|
||
@Import(RestDocsConfiguration.class) | ||
@ExtendWith(RestDocumentationExtension.class) | ||
public abstract class RestDocsTest { | ||
|
||
@Autowired | ||
protected RestDocumentationResultHandler restDocs; | ||
@Autowired | ||
protected MockMvc mockMvc; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 필드 사이에 띄우나요 안띄우나요? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 일반 필드 사이에는 띄우지 않고, 어노테이션이 붙은 필드는 띄우는 것으로 결정되었습니다 🔨 |
||
|
||
@BeforeEach | ||
void setUp( | ||
final WebApplicationContext context, | ||
final RestDocumentationContextProvider restDocumentation) { | ||
this.mockMvc = MockMvcBuilders.webAppContextSetup(context) | ||
.apply(documentationConfiguration(restDocumentation)) | ||
.alwaysDo(restDocs) | ||
.addFilters(new CharacterEncodingFilter("UTF-8", true)) | ||
.build(); | ||
} | ||
} |
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.
teco-style이 적용되어 있지 않은 것 같아요.! option+cmd+L 로 정렬하면 static import가 최상단으로 와야 합니다..!