Merge branch 'feature/#27' into develop

dnd-side-project · Feb 16, 2024 · 58ed21e · 58ed21e
2 parents edcc826 + 0256af5
commit 58ed21e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/src/docs/asciidoc/api/auth.adoc b/src/docs/asciidoc/api/auth.adoc
@@ -13,8 +13,8 @@ include::{snippets}/login-kakao-success/http-request.adoc[]
 include::{snippets}/login-kakao-success/query-parameters.adoc[]
 
 ==== HTTP Response
-- Response body
 include::{snippets}/login-kakao-success/http-response.adoc[]
+- Response body
 include::{snippets}/login-kakao-success/response-fields.adoc[]
 
 
@@ -30,8 +30,8 @@ include::{snippets}/login-kakao-failure/query-parameters.adoc[]
 
 
 ==== HTTP Response
-- Response body
 include::{snippets}/login-kakao-failure/http-response.adoc[]
+- Response body
 include::{snippets}/login-kakao-failure/response-fields.adoc[]
 
 '''

diff --git a/src/docs/asciidoc/api/feedback.adoc b/src/docs/asciidoc/api/feedback.adoc
@@ -13,6 +13,7 @@ include::{snippets}/feedback/detail/path-parameters.adoc[]
 
 ==== HTTP Response
 include::{snippets}/feedback/detail/http-response.adoc[]
+- Response body
 include::{snippets}/feedback/detail/response-fields.adoc[]
 
 '''
@@ -24,10 +25,12 @@ include::{snippets}/feedback/detail/response-fields.adoc[]
 
 ==== HTTP Requests
 include::{snippets}/feedback/save/http-request.adoc[]
+- Path parameters +
 include::{snippets}/feedback/save/path-parameters.adoc[]
 
 ==== HTTP Response
 include::{snippets}/feedback/save/http-response.adoc[]
+- Response body
 include::{snippets}/feedback/save/response-fields.adoc[]
 
 '''
@@ -39,9 +42,11 @@ include::{snippets}/feedback/save/response-fields.adoc[]
 
 ==== HTTP Requests
 include::{snippets}/feedback/submit/http-request.adoc[]
+- Path parameters +
 include::{snippets}/feedback/submit/path-parameters.adoc[]
 
 ==== HTTP Response
 include::{snippets}/feedback/submit/http-response.adoc[]
+- Response body
 include::{snippets}/feedback/submit/response-fields.adoc[]
 
diff --git a/src/test/java/com/sendback/domain/auth/controller/AuthControllerTest.java b/src/test/java/com/sendback/domain/auth/controller/AuthControllerTest.java
@@ -227,7 +227,7 @@ void reissueToken_success() throws Exception {
             ResultActions resultActions = mockMvc.perform(
                             post("/api/auth/reissue")
                                     .contentType(MediaType.APPLICATION_JSON)
-                                    .content(content).with(csrf()))
+                                    .content(content).with(csrf().asHeader()))
                     .andExpect(status().isOk())
                     .andExpect(jsonPath("$.code").value("200"))
                     .andExpect(jsonPath("$.message").value("성공"))

diff --git a/src/test/java/com/sendback/domain/feedback/fixture/FeedbackFixture.java b/src/test/java/com/sendback/domain/feedback/fixture/FeedbackFixture.java
@@ -11,6 +11,9 @@
 
 import java.time.LocalDate;
 
+import static com.sendback.domain.project.entity.Progress.PLANNING;
+import static com.sendback.global.common.constants.FieldName.ART;
+
 public class FeedbackFixture {
 
     private static final String TITLE = "title";
@@ -27,7 +30,7 @@ public class FeedbackFixture {
     public static final FeedbackDetailResponseDto MOCK_FEEDBACK_DETAIL_RESPONSE = new FeedbackDetailResponseDto(
             1L, "유저 닉네임", Level.ONE.getName(), "프로필 이미지 url", 1L, "피드백 제목", "피드백 링크",
             "피드백 내용", "추가 리워드 메시지", "yyyy-MM-dd HH:mm", LocalDate.of(2024, 1, 12).toString(),
-            LocalDate.of(2024, 1, 15).toString(),1L, "프로젝트 ID", "art", "PLANNING");
+            LocalDate.of(2024, 1, 15).toString(),1L, "프로젝트 ID", ART.getName(), PLANNING.getValue());
 
     public static final SubmitFeedbackResponseDto MOCK_SUBMIT_FEEDBACK_RESPONSE = new SubmitFeedbackResponseDto(
             Level.ONE.getName(), false, 4L);