Merge remote-tracking branch 'refs/remotes/origin/dev' into feat/63-a…

…uction-bid-check-auction-progress
woowa-techcamp-2024 · Aug 13, 2024 · 8de6a2c · 8de6a2c
2 parents 0d69069 + 8f7ff86
commit 8de6a2c
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 43 deletions.
diff --git a/src/test/java/com/wootecam/luckyvickyauction/core/member/domain/MemberTest.java b/src/test/java/com/wootecam/luckyvickyauction/core/member/domain/MemberTest.java
@@ -150,7 +150,12 @@ class isBuyer_메소드는 {
     @Test
     void 동일한_사용자인지_확인할_수_있다() {
         // given
-        Member member = new Member("testId", "password", Role.BUYER, new Point(100));
+        Member member = Member.builder()
+                .signInId("testId")
+                .password("password")
+                .role(Role.BUYER)
+                .point(new Point(100))
+                .build();
 
         // when
         boolean isSameMember = member.isSameMember("testId");

diff --git a/...tion/documentation/DocumentationTest.java → ...tion/documentation/DocumentationTest.java b/...tion/documentation/DocumentationTest.java → ...tion/documentation/DocumentationTest.java
@@ -1,9 +1,9 @@
-package com.wootecam.luckyvickyauction.documentation.documentation;
+package com.wootecam.luckyvickyauction.documentation;
 
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.documentationConfiguration;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
 
-import com.wootecam.luckyvickyauction.documentation.documentation.errorcode.FakeErrorCodeController;
+import com.wootecam.luckyvickyauction.documentation.errorcode.FakeErrorCodeController;
 import io.restassured.module.mockmvc.RestAssuredMockMvc;
 import io.restassured.module.mockmvc.specification.MockMvcRequestSpecification;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/...tion/documentation/ErrorCodeDocument.java → ...tion/documentation/ErrorCodeDocument.java b/...tion/documentation/ErrorCodeDocument.java → ...tion/documentation/ErrorCodeDocument.java
@@ -1,8 +1,8 @@
-package com.wootecam.luckyvickyauction.documentation.documentation;
+package com.wootecam.luckyvickyauction.documentation;
 
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
 
-import com.wootecam.luckyvickyauction.documentation.documentation.errorcode.ErrorCodeFieldsSnippet;
+import com.wootecam.luckyvickyauction.documentation.errorcode.ErrorCodeFieldsSnippet;
 import org.junit.jupiter.api.Test;
 
 public class ErrorCodeDocument extends DocumentationTest {

diff --git a/...ion/errorcode/ErrorCodeFieldsSnippet.java → ...ion/errorcode/ErrorCodeFieldsSnippet.java b/...ion/errorcode/ErrorCodeFieldsSnippet.java → ...ion/errorcode/ErrorCodeFieldsSnippet.java
@@ -1,4 +1,4 @@
-package com.wootecam.luckyvickyauction.documentation.documentation.errorcode;
+package com.wootecam.luckyvickyauction.documentation.errorcode;
 
 import com.wootecam.luckyvickyauction.global.exception.ErrorCode;
 import java.util.Arrays;

diff --git a/...on/errorcode/FakeErrorCodeController.java → ...on/errorcode/FakeErrorCodeController.java b/...on/errorcode/FakeErrorCodeController.java → ...on/errorcode/FakeErrorCodeController.java
@@ -1,4 +1,4 @@
-package com.wootecam.luckyvickyauction.documentation.documentation.errorcode;
+package com.wootecam.luckyvickyauction.documentation.errorcode;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

diff --git a/src/test/resources/org/springframework/restdocs/templates/error-code-template.snippet b/src/test/resources/org/springframework/restdocs/templates/error-code-template.snippet
@@ -1,9 +1,9 @@
-    |===
-        |코드|코드명
+|===
+|코드|코드명
 
-    {{#fields}}
-        |{{#tableCellContent}}`+{{path}}+`{{/tableCellContent}}
-        |{{#tableCellContent}}{{description}}{{/tableCellContent}}
+{{#fields}}
+|{{#tableCellContent}}`+{{path}}+`{{/tableCellContent}}
+|{{#tableCellContent}}{{description}}{{/tableCellContent}}
 
-    {{/fields}}
-        |===
+{{/fields}}
+|===
diff --git a/src/test/resources/org/springframework/restdocs/templates/request-fields.snippet b/src/test/resources/org/springframework/restdocs/templates/request-fields.snippet
@@ -1,12 +1,12 @@
-    |===
-        |필드명|타입|필수값|설명|제약사항
+|===
+|필드명|타입|필수값|설명|제약사항
 
-    {{#fields}}
-        |{{#tableCellContent}}`+{{path}}+`{{/tableCellContent}}
-        |{{#tableCellContent}}`+{{type}}+`{{/tableCellContent}}
-        |{{#tableCellContent}}{{^optional}}true{{/optional}}{{/tableCellContent}}
-        |{{#tableCellContent}}{{description}}{{/tableCellContent}}
-        |{{#tableCellContent}}{{#constraints}}{{.}}{{/constraints}}{{/tableCellContent}}
+{{#fields}}
+|{{#tableCellContent}}`+{{path}}+`{{/tableCellContent}}
+|{{#tableCellContent}}`+{{type}}+`{{/tableCellContent}}
+|{{#tableCellContent}}{{^optional}}true{{/optional}}{{/tableCellContent}}
+|{{#tableCellContent}}{{description}}{{/tableCellContent}}
+|{{#tableCellContent}}{{#constraints}}{{.}}{{/constraints}}{{/tableCellContent}}
 
-    {{/fields}}
-        |===
+{{/fields}}
+|===
diff --git a/src/test/resources/org/springframework/restdocs/templates/request-parameters.snippet b/src/test/resources/org/springframework/restdocs/templates/request-parameters.snippet
@@ -1,11 +1,11 @@
-    |===
-        |파라미터|필수값|설명|제약사항
+|===
+|파라미터|필수값|설명|제약사항
 
-    {{#parameters}}
-        |{{#tableCellContent}}`+{{name}}+`{{/tableCellContent}}
-        |{{#tableCellContent}}{{^optional}}true{{/optional}}{{/tableCellContent}}
-        |{{#tableCellContent}}{{description}}{{/tableCellContent}}
-        |{{#tableCellContent}}{{#constraints}}{{.}}{{/constraints}}{{/tableCellContent}}
+{{#parameters}}
+|{{#tableCellContent}}`+{{name}}+`{{/tableCellContent}}
+|{{#tableCellContent}}{{^optional}}true{{/optional}}{{/tableCellContent}}
+|{{#tableCellContent}}{{description}}{{/tableCellContent}}
+|{{#tableCellContent}}{{#constraints}}{{.}}{{/constraints}}{{/tableCellContent}}
 
-    {{/parameters}}
-        |===
+{{/parameters}}
+|===
diff --git a/src/test/resources/org/springframework/restdocs/templates/response-fields.snippet b/src/test/resources/org/springframework/restdocs/templates/response-fields.snippet
@@ -1,12 +1,12 @@
-    |===
-        |필드명|타입|필수값|양식|설명
+|===
+|필드명|타입|필수값|양식|설명
 
-    {{#fields}}
-        |{{#tableCellContent}}`+{{path}}+`{{/tableCellContent}}
-        |{{#tableCellContent}}`+{{type}}+`{{/tableCellContent}}
-        |{{#tableCellContent}}{{^optional}}true{{/optional}}{{/tableCellContent}}
-        |{{#tableCellContent}}{{#format}}{{.}}{{/format}}{{/tableCellContent}}
-        |{{#tableCellContent}}{{description}}{{/tableCellContent}}
+{{#fields}}
+|{{#tableCellContent}}`+{{path}}+`{{/tableCellContent}}
+|{{#tableCellContent}}`+{{type}}+`{{/tableCellContent}}
+|{{#tableCellContent}}{{^optional}}true{{/optional}}{{/tableCellContent}}
+|{{#tableCellContent}}{{#format}}{{.}}{{/format}}{{/tableCellContent}}
+|{{#tableCellContent}}{{description}}{{/tableCellContent}}
 
-    {{/fields}}
-        |===
+{{/fields}}
+|===