-
Notifications
You must be signed in to change notification settings - Fork 1
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
YEL-220 [feat] 광고 보고 보상얻기 가능 여부 조회 #454
Merged
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
978bd46
YEL-220 [feat] 검색 수정
hyeonjeongs 4b2bc7d
YEL-220 [feat] 광고 보고 포인트 얻기 여부 로직 구현
hyeonjeongs 7a9309f
YEL-220 [feat] 명세서 업로드
hyeonjeongs d57fb93
YEL-220 [feat] 광고 verify시 query string 빈 경우 404 에러 반환
hyeonjeongs 8b7727e
YEL-220 [feat] 로그 제거
hyeonjeongs File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,52 +1,28 @@ | ||
:reproducible: | ||
== 상점에서 보상형 광고 가능한지 여부 (명세) | ||
== 상점에서 보상형 광고 가능한지 여부 | ||
|
||
=== 요청 | ||
|
||
[http,json] | ||
---- | ||
GET /api/v1/admob/{tag} HTTP/1.1 | ||
Authorization: Bearer your-access-token | ||
Content-Type: application/json | ||
---- | ||
include::{snippets}/api/v1/admob/possible/http-request.adoc[] | ||
|
||
=== 요청 파라미터 | ||
|
||
include::{snippets}/api/v1/admob/possible/path-parameters.adoc[] | ||
|
||
---- | ||
tag -> shop | ||
tag -> ADMOB_POINT | ||
---- | ||
* 보상형 광고 다른곳에서 사용할 수도 있으므로 tag로 어떤 곳에서 사용하고 있는곳인지 tag로 명시 | ||
* 현재는 상점 -> shop에서만 보상형 광고 진행 | ||
* 현재는 상점에 있는 보상형 광고 (ADMOB_POINT를 tag에 요청) | ||
|
||
=== 응답 | ||
|
||
[http,json] | ||
---- | ||
HTTP/1.1 200 OK | ||
Vary: Origin | ||
Vary: Access-Control-Request-Method | ||
Vary: Access-Control-Request-Headers | ||
Content-Type: application/json | ||
{ | ||
"status" : 200, | ||
"message" : "광고 보고 포인트 얻기 가능 여부 조회에 성공했습니다.", | ||
"data": { | ||
"createdAt": "2024-01-01 12:00:00", | ||
"isPossible" : true, | ||
} | ||
} | ||
---- | ||
|
||
include::{snippets}/api/v1/admob/possible/http-response.adoc[] | ||
|
||
=== NOTE | ||
|
||
- Header에 무작위한 UUID4 값을 넣어주세요 | ||
* 예시) IdempotencyKey: 0397b5f3-ecdc-47d6-b5d7-2b1afcf00e87 | ||
- 주의사항 | ||
* 같은 멱등성키를 2번 요청하면, 400번 에러. | ||
- ADMOB | ||
* ADMOB 서버에 SSV(ServerSideVerification) Options의 customData에 입력한 것과 동일한 멱등성 키를 넘겨주세요. | ||
|
||
=== CHANGELOG | ||
|
||
- 2024.02.17 API 릴리즈 | ||
- 2024.02.16 명세서 작성 |
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 |
---|---|---|
@@ -1,20 +1,22 @@ | ||
package com.yello.server.domain.event.controller; | ||
|
||
import static com.yello.server.global.common.ErrorCode.ADMOB_URI_BAD_REQUEST_EXCEPTION; | ||
import static com.yello.server.global.common.ErrorCode.EMPTY_QUERY_STRING_EXCEPTION; | ||
import static com.yello.server.global.common.SuccessCode.EVENT_JOIN_SUCCESS; | ||
import static com.yello.server.global.common.SuccessCode.EVENT_NOTICE_SUCCESS; | ||
import static com.yello.server.global.common.SuccessCode.EVENT_REWARD_SUCCESS; | ||
import static com.yello.server.global.common.SuccessCode.GET_IS_POSSIBLE_ADMOB_SUCCESS; | ||
import static com.yello.server.global.common.SuccessCode.REWARD_ADMOB_SUCCESS; | ||
import static com.yello.server.global.common.SuccessCode.VERIFY_ADMOB_SSV_SUCCESS; | ||
import static com.yello.server.global.common.util.ConstantUtil.IdempotencyKeyHeader; | ||
|
||
import com.fasterxml.jackson.core.JsonProcessingException; | ||
import com.fasterxml.jackson.databind.ser.Serializers.Base; | ||
import com.yello.server.domain.event.dto.request.AdmobRewardRequest; | ||
import com.yello.server.domain.event.dto.request.EventJoinRequest; | ||
import com.yello.server.domain.event.dto.response.EventResponse; | ||
import com.yello.server.domain.event.dto.response.EventRewardResponse; | ||
import com.yello.server.domain.event.dto.response.GetIsPossibleAdmob; | ||
import com.yello.server.domain.event.exception.EventBadRequestException; | ||
import com.yello.server.domain.event.exception.EventNotFoundException; | ||
import com.yello.server.domain.event.service.EventService; | ||
import com.yello.server.domain.user.entity.User; | ||
import com.yello.server.global.common.annotation.AccessTokenUser; | ||
|
@@ -30,6 +32,7 @@ | |
import org.springframework.http.HttpStatus; | ||
import org.springframework.http.ResponseEntity; | ||
import org.springframework.web.bind.annotation.GetMapping; | ||
import org.springframework.web.bind.annotation.PathVariable; | ||
import org.springframework.web.bind.annotation.PostMapping; | ||
import org.springframework.web.bind.annotation.RequestBody; | ||
import org.springframework.web.bind.annotation.RequestMapping; | ||
|
@@ -71,6 +74,10 @@ public BaseResponse<EventRewardResponse> rewardEvent(@AccessTokenUser User user, | |
public ResponseEntity<?> verifyAdmob(HttpServletRequest request) { | ||
URI uri; | ||
System.out.println(request.getQueryString() + " alalalalalal"); | ||
if (request.getQueryString()==null) { | ||
throw new EventNotFoundException(EMPTY_QUERY_STRING_EXCEPTION); | ||
} | ||
|
||
try { | ||
uri = | ||
new URI(request.getScheme(), null, request.getServerName(), request.getServerPort(), | ||
|
@@ -85,8 +92,17 @@ public ResponseEntity<?> verifyAdmob(HttpServletRequest request) { | |
} | ||
|
||
@PostMapping("/v1/admob/reward") | ||
public BaseResponse<EventRewardResponse> rewardAdmob(@AccessTokenUser User user, @RequestBody AdmobRewardRequest request) { | ||
public BaseResponse<EventRewardResponse> rewardAdmob(@AccessTokenUser User user, | ||
@RequestBody AdmobRewardRequest request) { | ||
val data = eventService.rewardAdmob(user.getId(), request); | ||
return BaseResponse.success(REWARD_ADMOB_SUCCESS, data); | ||
} | ||
|
||
@GetMapping("/v1/admob/possible/{tag}") | ||
public BaseResponse<GetIsPossibleAdmob> getIsPossibleAdmob(@AccessTokenUser User user, | ||
@PathVariable("tag") String tag) { | ||
System.out.println(" asfsaasdfasdf"); | ||
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. 넵~ |
||
val data = eventService.getIsPossibleAdmob(user.getId(), tag); | ||
return BaseResponse.success(GET_IS_POSSIBLE_ADMOB_SUCCESS, data); | ||
} | ||
} |
19 changes: 19 additions & 0 deletions
19
src/main/java/com/yello/server/domain/event/dto/response/GetIsPossibleAdmob.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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
package com.yello.server.domain.event.dto.response; | ||
|
||
import com.yello.server.domain.user.entity.UserData; | ||
import com.yello.server.global.common.factory.TimeFactory; | ||
import lombok.Builder; | ||
|
||
@Builder | ||
public record GetIsPossibleAdmob( | ||
String createdAt, | ||
Boolean isPossible | ||
) { | ||
public static GetIsPossibleAdmob of(UserData userAdmob) { | ||
return GetIsPossibleAdmob.builder() | ||
.createdAt(userAdmob.getValue()) | ||
.isPossible(userAdmob.isPossible()) | ||
.build(); | ||
} | ||
|
||
} |
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
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
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
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.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
오타인거 같은데 지워주세용
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.
이거 verify할 때 signature, keyId 확인하려고 테스트겸 넣은거예욤 서버에서 로그로 확인하려구요