-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: dev2의 멀티모듈에 적용되지 않은 dev 변경사항들을 적용한다. (#326)
* remove: test 모듈 삭제 - 기존 test 모듈에서 공통으로 참조하고 있는 context, fixture들을 중복을 상관하지 않고 옮긴다. * fix: 모듈 의존성 및 테스트 정리 * docs: api docs 업데이트 * feat: dev 브랜치 918b31d 커밋 적용 * feat: 1dbe550, a2771af 커밋 재적용 * feat: dev 브랜치 63eebfb 커밋 적용 * �front: 잘못된 정보 표현 수정 및 사용자 경험 개선 (#320) * feat: 경매 가격 경신 로직 수정 * fix: 경매 가격 하락 로직 수정 * feat: 재고 수량을 폴링하는 로직 추가 (시연용) * feat: 정말로 로그아웃할까요? 문구 추가 * feat: 경매 입찰 성공을 시각적으로 표시. 및 따닥 방지 * style: list 미리보기 이미지 수정 * style: 목록에서는 현재가격을 추정할 수 없으므로 '시작 가격'으로 문구 변경 * feat: 타이머를 통해 다음 가격 변동 시점을 노출 * feat: 회원가입 시 아이디, 패스워드 규격을 사용자에게 안내한다. * feat: API 요청 실패 시, 일부 케이스에서 서버가 전달한 메세지를 표시 * feat: 활성항목을 리스트에 표시 * refactor: 진행 중인 경매에 색상을 표시한다. * feat: 회원가입 성공시 성공 멘트 표시 * refactor: 거래내역에서 생성일과 수정일을 표시하지 않습니다. (서버에서 생성하지 않음) * refactor: 판매자 가입 기능 제거 * fix: 경매 상세페이지에서 가격을 갱신하는 타이머 오류 수정 * fix: 종료된 경매에서 입찰버튼이 활성화되던 문제 수정 --------- Co-authored-by: MinSeok Oh <[email protected]> * chore: scp로 api, consumer 모듈 말아서 전송하도록 스크립트 수정 * chore: dev2 배포 스크립트 추가 * feat: 정적 리소스 필터링 컨트롤러도 그냥 pass하도록 설정 추가 * �front: 초 단위 가격 갱신 적용 및 재고 부족 시 응답이 200으로 오는 부분에 맞게 수정 (#325) * feat: 경매 상품의 초단위 가격 하락 지원 * refactor: 경매 재고 부족시 200응답 + A012 조합을 가져와 Fail 상황으로 처리한다. * feat: ver2를 위한 로직 추가 --------- Co-authored-by: HyeonSik Choi <[email protected]> Co-authored-by: MinSeok Oh <[email protected]>
- Loading branch information
1 parent
6198c4b
commit 084d1b2
Showing
215 changed files
with
5,698 additions
and
1,593 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -37,6 +37,3 @@ out/ | |
.vscode/ | ||
|
||
.DS_Store | ||
|
||
# front 빌드 이후 배포 공간 | ||
src/main/resources/static/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
# Team7-ELEVEN | ||
|
||
[API-DOCS](https://woowa-techcamp-2024.github.io/Team7-ELEVEN/src/main/resources/static/index.html) | ||
[API-DOCS](https://woowa-techcamp-2024.github.io/Team7-ELEVEN/api/src/main/resources/docs/index.html) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,3 +35,6 @@ out/ | |
|
||
### VS Code ### | ||
.vscode/ | ||
|
||
# front 빌드 이후 배포 공간 | ||
src/main/resources/static/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
[[Auth]] | ||
== 사용자 가입 및 로그인(비로그인 가능) | ||
|
||
=== 회원가입 | ||
|
||
operation::auth/signup/success[snippets='http-request,http-response,request-fields'] | ||
|
||
=== 로그인 | ||
|
||
operation::auth/signin/success[snippets='http-request,http-response,request-fields,response-fields'] | ||
|
||
=== 로그아웃 | ||
|
||
operation::auth/signout/success[snippets='http-request,http-response'] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
[[buyerAuction]] | ||
== 경매: 구매자(구매자 권한 필요) | ||
|
||
=== 경매 입찰 | ||
|
||
operation::buyerAuctions/purchase/success[snippets='http-request,http-response,request-cookies,path-parameters,request-fields,response-fields'] | ||
|
||
=== 경매 환불 | ||
|
||
operation::buyerAuctions/cancel/success[snippets='http-request,http-response,request-cookies,path-parameters'] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<style> | ||
h2 { | ||
margin-top: 50px; | ||
} | ||
|
||
h3 { | ||
margin-top: 20px; | ||
} | ||
</style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
[[error-code]] | ||
== 에러 코드 | ||
|
||
operation::error-code[snippets='error-code'] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
= LuckyVickyAuction | ||
:doctype: book | ||
:icons: font | ||
:source-highlighter: highlightjs | ||
:toc: left | ||
:toclevels: 2 | ||
:sectlinks: | ||
:docinfo: shared-head | ||
|
||
include::auth.adoc[] | ||
include::point.adoc[] | ||
include::memberAuctions.adoc[] | ||
include::sellerAuctions.adoc[] | ||
include::buyerAuctions.adoc[] | ||
include::receipts.adoc[] | ||
include::errorCode.adoc[] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
[[memberAuctions]] | ||
== 경매: 사용자(비로그인도 조회 가능) | ||
|
||
=== 경매 목록 조회 | ||
|
||
operation::memberAuctions/findAllBuyerAuctions/success[snippets='http-request,http-response,query-parameters,response-fields'] | ||
|
||
=== 경매 상세 조회(고정 할인 정책 조회) | ||
|
||
operation::memberAuctions/findOneConstantPolicy/success[snippets='http-request,http-response,path-parameters,response-fields'] | ||
|
||
=== 경매 상세 조회(퍼센트 할인 정책 조회) | ||
|
||
operation::memberAuctions/findOnePercentagePolicy/success[snippets='http-request,http-response,path-parameters,response-fields'] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
[[paymentPoint]] | ||
== 포인트(구매자, 판매자 권한 필요) | ||
|
||
=== 포인트 충전 | ||
|
||
operation::payment/chargePoint/success[snippets='http-request,http-response,request-cookies,request-fields'] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
[[Receipts]] | ||
== 거래 이력 | ||
|
||
=== 구매자 거래 목록 조회(구매자 권한 필요) | ||
|
||
operation::receipts/findAllBuyerReceipts/success[snippets='http-request,http-response,request-cookies,query-parameters,response-fields'] | ||
|
||
=== 판매자 거래 목록 조회(판매자 권한 필요) | ||
|
||
operation::receipts/findAllSellerReceipts/success[snippets='http-request,http-response,request-cookies,query-parameters,response-fields'] | ||
|
||
=== 거래 상세 조회(판매자, 구매자 권한 필요) | ||
|
||
operation::receipts/findOneMemberReceipt/success[snippets='http-request,http-response,request-cookies,path-parameters,response-fields'] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
[[sellerAuction]] | ||
== 경매: 판매자(판매자 권한 필요) | ||
|
||
=== 경매 등록(고정 할인 정책) | ||
|
||
operation::sellerAuctions/createConstantPolicy/success[snippets='http-request,http-response,request-cookies,request-fields'] | ||
|
||
=== 경매 등록(퍼센트 할인 정책) | ||
|
||
operation::sellerAuctions/createPercentagePolicy/success[snippets='http-request,http-response,request-cookies,request-fields'] | ||
|
||
=== 경매 등록 취소 | ||
|
||
operation::sellerAuctions/delete/success[snippets='http-request,http-response,request-cookies,path-parameters'] | ||
|
||
=== 경매 목록 조회 | ||
|
||
operation::sellerAuctions/findAll/success[snippets='http-request,http-response,request-cookies,query-parameters,response-fields'] | ||
|
||
=== 경매 상세 조회(고정 할인 정책 조회) | ||
|
||
operation::sellerAuctions/findOneConstantPolicy/success[snippets='http-request,http-response,request-cookies,path-parameters,response-fields'] | ||
|
||
=== 경매 상세 조회(퍼센트 할인 정책 조회) | ||
|
||
operation::sellerAuctions/findOnePercentagePolicy/success[snippets='http-request,http-response,request-cookies,path-parameters,response-fields'] | ||
|
4 changes: 2 additions & 2 deletions
4
...java/com/wootecam/api/ApiApplication.java → ...cam/luckyvickyauction/ApiApplication.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...a/com/wootecam/api/config/JsonConfig.java → .../luckyvickyauction/config/JsonConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...com/wootecam/api/config/MetricConfig.java → ...uckyvickyauction/config/MetricConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
...va/com/wootecam/api/config/WebConfig.java → ...m/luckyvickyauction/config/WebConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...am/api/context/AuthenticationContext.java → ...uction/context/AuthenticationContext.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 6 additions & 6 deletions
12
...otecam/api/controller/AuthController.java → ...ckyauction/controller/AuthController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 14 additions & 12 deletions
26
...pi/controller/BuyerAuctionController.java → ...on/controller/BuyerAuctionController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 7 additions & 5 deletions
12
...cam/api/controller/PaymentController.java → ...auction/controller/PaymentController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 13 additions & 9 deletions
22
...cam/api/controller/ReceiptController.java → ...auction/controller/ReceiptController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.