diff --git a/.gitignore b/.gitignore index 66ffcb90..fc20edef 100644 --- a/.gitignore +++ b/.gitignore @@ -37,7 +37,9 @@ out/ .vscode/ ### Application.yaml ### -**/*.yaml + +### Test Application.yaml ### +**/test/resources/application.yaml ### REST Docs Html ### **/*.html diff --git a/README.md b/README.md index 55cfc011..2f640d95 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,109 @@ ## 멀버 -- πŸ‘©πŸ»β€πŸ’» [μ •μ˜μ •](https://github.com/JeongUijeong) -- πŸ‘©πŸ»β€πŸ’» [μ‹¬μž¬μ² ](https://github.com/wocjf0513) -- πŸ‘©πŸ»β€πŸ’» [이주연](https://github.com/jo0oy) + + + + + + + + + + + + +
+ + μ •μ˜μ • ν”„λ‘œν•„ + + + + μ‹¬μž¬μ²  ν”„λ‘œν•„ + + + + 이주연 ν”„λ‘œν•„ + +
+ + μ •μ˜μ •
+ Backend + + 		+ + μ‹¬μž¬μ² 
+ Backend + + 		+ + 이주연
+ Backend + +
+ + + + + + + + + + + + + + + +
+ + 졜우혁 ν”„λ‘œν•„ + + + + μ •μ§€μ˜€ ν”„λ‘œν•„ + + + + 백상원 ν”„λ‘œν•„ + + + + μž₯수빈 ν”„λ‘œν•„ + + + + μ†Œμœ λ‚˜ ν”„λ‘œν•„ + +
+ + 졜우혁
+ Frontend + + 		+ + μ •μ§€μ˜€
+ Frontend + + 		+ + 백상원
+ Frontend + + 		+ + μž₯수빈
+ Frontend + + 		+ + μ†Œμœ λ‚˜
+ Frontend + +
+
+ --- diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 74559710..12e3355b 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -1,3 +1,3 @@ spring: profiles: - default: local + default: prod diff --git a/src/main/resources/image/reservation-docs.png b/src/main/resources/image/reservation-docs.png index ab1374b2..1183fb08 100644 Binary files a/src/main/resources/image/reservation-docs.png and b/src/main/resources/image/reservation-docs.png differ diff --git a/src/main/resources/image/star-docs.png b/src/main/resources/image/star-docs.png index bae6b3a5..92a3f61e 100644 Binary files a/src/main/resources/image/star-docs.png and b/src/main/resources/image/star-docs.png differ diff --git a/src/test/java/com/fc/shimpyo_be/domain/reservation/docs/ReservationRestControllerDocsTest.java b/src/test/java/com/fc/shimpyo_be/domain/reservation/docs/ReservationRestControllerDocsTest.java index bfe5be8c..35cdd980 100644 --- a/src/test/java/com/fc/shimpyo_be/domain/reservation/docs/ReservationRestControllerDocsTest.java +++ b/src/test/java/com/fc/shimpyo_be/domain/reservation/docs/ReservationRestControllerDocsTest.java @@ -115,16 +115,16 @@ void saveReservation() throws Exception { fieldWithPath("reservationProducts[].roomId").type(JsonFieldType.NUMBER).description("μ˜ˆμ•½ν•  객싀 μ‹λ³„μž") .attributes(key("constraints").value( reservationProductDescriptions.descriptionsForProperty("roomId"))), - fieldWithPath("reservationProducts[].productName").type(JsonFieldType.STRING).description("μ˜ˆμ•½ν•  객싀 μ‹λ³„μž") + fieldWithPath("reservationProducts[].productName").type(JsonFieldType.STRING).description("μ˜ˆμ•½ν•  μˆ™μ†Œλͺ…") .attributes(key("constraints").value( reservationProductDescriptions.descriptionsForProperty("productName"))), - fieldWithPath("reservationProducts[].roomName").type(JsonFieldType.STRING).description("μ˜ˆμ•½ν•  객싀 μ‹λ³„μž") + fieldWithPath("reservationProducts[].roomName").type(JsonFieldType.STRING).description("μ˜ˆμ•½ν•  객싀λͺ…") .attributes(key("constraints").value( reservationProductDescriptions.descriptionsForProperty("roomName"))), - fieldWithPath("reservationProducts[].standard").type(JsonFieldType.NUMBER).description("μ˜ˆμ•½ν•  객싀 μ‹λ³„μž") + fieldWithPath("reservationProducts[].standard").type(JsonFieldType.NUMBER).description("객싀 κΈ°μ€€ 인원") .attributes(key("constraints").value( reservationProductDescriptions.descriptionsForProperty("standard"))), - fieldWithPath("reservationProducts[].max").type(JsonFieldType.NUMBER).description("μ˜ˆμ•½ν•  객싀 μ‹λ³„μž") + fieldWithPath("reservationProducts[].max").type(JsonFieldType.NUMBER).description("객싀 μ΅œλŒ€ 인원") .attributes(key("constraints").value( reservationProductDescriptions.descriptionsForProperty("max"))), fieldWithPath("reservationProducts[].startDate").type(JsonFieldType.STRING).description("μˆ™λ°• μ‹œμž‘μΌ") @@ -133,19 +133,19 @@ void saveReservation() throws Exception { fieldWithPath("reservationProducts[].endDate").type(JsonFieldType.STRING).description("μˆ™λ°• λ§ˆμ§€λ§‰μΌ") .attributes(key("constraints").value( reservationProductDescriptions.descriptionsForProperty("endDate"))), - fieldWithPath("reservationProducts[].checkIn").type(JsonFieldType.STRING).description("μ˜ˆμ•½ν•  객싀 μ‹λ³„μž") + fieldWithPath("reservationProducts[].checkIn").type(JsonFieldType.STRING).description("체크인 μ‹œκ°„") .attributes(key("constraints").value( reservationProductDescriptions.descriptionsForProperty("checkIn"))), - fieldWithPath("reservationProducts[].checkOut").type(JsonFieldType.STRING).description("μ˜ˆμ•½ν•  객싀 μ‹λ³„μž") + fieldWithPath("reservationProducts[].checkOut").type(JsonFieldType.STRING).description("체크아웃 μ‹œκ°„") .attributes(key("constraints").value( reservationProductDescriptions.descriptionsForProperty("checkOut"))), - fieldWithPath("reservationProducts[].visitorName").type(JsonFieldType.STRING).description("μ˜ˆμ•½ν•  객싀 μ‹λ³„μž") + fieldWithPath("reservationProducts[].visitorName").type(JsonFieldType.STRING).description("방문자λͺ…") .attributes(key("constraints").value( reservationProductDescriptions.descriptionsForProperty("visitorName"))), - fieldWithPath("reservationProducts[].visitorPhone").type(JsonFieldType.STRING).description("μ˜ˆμ•½ν•  객싀 μ‹λ³„μž") + fieldWithPath("reservationProducts[].visitorPhone").type(JsonFieldType.STRING).description("방문자 μ „ν™”λ²ˆν˜Έ") .attributes(key("constraints").value( reservationProductDescriptions.descriptionsForProperty("visitorPhone"))), - fieldWithPath("reservationProducts[].price").type(JsonFieldType.NUMBER).description("μ˜ˆμ•½ν•  객싀 μ‹λ³„μž") + fieldWithPath("reservationProducts[].price").type(JsonFieldType.NUMBER).description("객싀 이용 가격") .attributes(key("constraints").value( reservationProductDescriptions.descriptionsForProperty("price"))), fieldWithPath("payMethod").type(JsonFieldType.STRING).description("결제 μˆ˜λ‹¨") @@ -158,9 +158,9 @@ void saveReservation() throws Exception { ), responseFields(responseCommon()).and( fieldWithPath("data").type(JsonFieldType.OBJECT).description("응닡 데이터"), - fieldWithPath("data.reservationId").type(JsonFieldType.NUMBER).description("μ˜ˆμ•½ μ£Όλ¬Έ μ‹λ³„μž"), + fieldWithPath("data.reservationId").type(JsonFieldType.NUMBER).description("μ˜ˆμ•½ μ‹λ³„μž"), fieldWithPath("data.reservationProducts").type(JsonFieldType.ARRAY).description("μ˜ˆμ•½ μƒν’ˆ 리슀트"), - fieldWithPath("data.reservationProducts[].roomId").type(JsonFieldType.NUMBER).description("μ˜ˆμ•½ μƒν’ˆ 리슀트"), + fieldWithPath("data.reservationProducts[].roomId").type(JsonFieldType.NUMBER).description("객싀 μ‹λ³„μž"), fieldWithPath("data.reservationProducts[].productName").type(JsonFieldType.STRING).description("μˆ™μ†Œλͺ…"), fieldWithPath("data.reservationProducts[].roomName").type(JsonFieldType.STRING).description("객싀λͺ…"), fieldWithPath("data.reservationProducts[].standard").type(JsonFieldType.NUMBER).description("κΈ°μ€€ 인원"), @@ -239,8 +239,8 @@ void getReservationInfoList() throws Exception { fieldWithPath("data.content.[].productAddress").type(JsonFieldType.STRING).description("μˆ™μ†Œ μ£Όμ†Œ"), fieldWithPath("data.content.[].roomId").type(JsonFieldType.NUMBER).description("μ˜ˆμ•½ν•œ 객싀 μ‹λ³„μž"), fieldWithPath("data.content.[].roomName").type(JsonFieldType.STRING).description("객싀λͺ…"), - fieldWithPath("data.content.[].startDate").type(JsonFieldType.STRING).description("체크인 λ‚ μ§œ"), - fieldWithPath("data.content.[].endDate").type(JsonFieldType.STRING).description("체크아웃 λ‚ μ§œ"), + fieldWithPath("data.content.[].startDate").type(JsonFieldType.STRING).description("μˆ™λ°• μ‹œμž‘μΌ"), + fieldWithPath("data.content.[].endDate").type(JsonFieldType.STRING).description("μˆ™λ°• λ§ˆμ§€λ§‰μΌ"), fieldWithPath("data.content.[].checkIn").type(JsonFieldType.STRING).description("체크인 μ‹œκ°„"), fieldWithPath("data.content.[].checkOut").type(JsonFieldType.STRING).description("체크아웃 μ‹œκ°„"), fieldWithPath("data.content.[].price").type(JsonFieldType.NUMBER).description("결제 κΈˆμ•‘"), diff --git a/src/test/resources/application.yaml b/src/test/resources/application.yaml deleted file mode 100644 index f4b064bf..00000000 --- a/src/test/resources/application.yaml +++ /dev/null @@ -1,19 +0,0 @@ -spring: - profiles: - include: test - datasource: - driver-class-name: org.h2.Driver - data: - redis: - host: localhost - port: 6379 - jpa: - show-sql: true - properties: - hibernate: - default_batch_fetch_size: 100 - format_sql: true -jwt: - secret: 7Yyo7Iqk7Yq47Lqg7Y287IqkIOuvuOuLiO2UhOuhnOygne2KuCAxMeyhsCDsibztkZwgSldUIOyLnO2BrOumvyDtgqQ= - access-token-expire-time: 1800000 - refresh-token-expire-time: 604800000