YEL-219 [deploy] 광고 enum 수정, 로그 추가 배포

team-yello · Feb 15, 2024 · 3cd3264 · 3cd3264
2 parents 785c66a + 13a8d9a
commit 3cd3264
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/src/main/java/com/yello/server/domain/event/controller/EventController.java b/src/main/java/com/yello/server/domain/event/controller/EventController.java
@@ -70,13 +70,15 @@ public BaseResponse<EventRewardResponse> rewardEvent(@AccessTokenUser User user,
     @GetMapping("/v1/admob/verify")
     public ResponseEntity<?> verifyAdmob(HttpServletRequest request) {
         URI uri;
+        System.out.println(request.getQueryString() + " alalalalalal");
         try {
             uri =
                 new URI(request.getScheme(), null, request.getServerName(), request.getServerPort(),
                     request.getRequestURI(), request.getQueryString(), null);
         } catch (URISyntaxException e) {
             throw new EventBadRequestException(ADMOB_URI_BAD_REQUEST_EXCEPTION);
         }
+        System.out.println("URIIIII : " + uri);
         eventService.verifyAdmobReward(uri, request);
 
         return new ResponseEntity<>(HttpStatus.OK);

diff --git a/src/main/java/com/yello/server/domain/event/entity/EventType.java b/src/main/java/com/yello/server/domain/event/entity/EventType.java
@@ -10,7 +10,8 @@
 @Getter
 @RequiredArgsConstructor
 public enum EventType {
-    ADMOB("ADMOB"),
+    ADMOB_POINT("ADMOB_POINT"),
+    ADMOB_MULTIPLE_POINT("ADMOB_MULTIPLE_POINT"),
     LUNCH_EVENT("LUNCH_EVENT");
 
     private final String initial;

diff --git a/src/main/java/com/yello/server/global/exception/ControllerExceptionAdvice.java b/src/main/java/com/yello/server/global/exception/ControllerExceptionAdvice.java
@@ -144,8 +144,7 @@ public ResponseEntity<BaseResponse> BadRequestException(
         AppleBadRequestException.class,
         UserAdminBadRequestException.class,
         EnumIllegalArgumentException.class,
-        IllegalArgumentException.class,
-        EventBadRequestException.class
+        IllegalArgumentException.class
     })
     public ResponseEntity<BaseResponse> BadRequestException(CustomException exception) {
         return ResponseEntity.status(BAD_REQUEST)
@@ -196,7 +195,8 @@ public ResponseEntity<BaseResponse> ForbiddenException(CustomException exception
         UserAdminNotFoundException.class,
         NoticeNotFoundException.class,
         AdminConfigurationNotFoundException.class,
-        EventNotFoundException.class
+        EventNotFoundException.class,
+        EventBadRequestException.class
     })
     public ResponseEntity<BaseResponse> NotFoundException(CustomException exception) {
         return ResponseEntity.status(NOT_FOUND)

diff --git a/src/test/java/com/yello/server/domain/event/medium/EventControllerTest.java b/src/test/java/com/yello/server/domain/event/medium/EventControllerTest.java
@@ -1,6 +1,6 @@
 package com.yello.server.domain.event.medium;
 
-import static com.yello.server.domain.event.entity.EventType.ADMOB;
+import static com.yello.server.domain.event.entity.EventType.ADMOB_POINT;
 import static com.yello.server.domain.event.entity.EventType.LUNCH_EVENT;
 import static com.yello.server.global.common.util.ConstantUtil.GlobalZoneId;
 import static org.mockito.ArgumentMatchers.any;
@@ -174,7 +174,7 @@ void init() {
             .image("https://storage.googleapis.com/yelloworld/image/coin-stack.svg")
             .build();
         final Event admobEvent = Event.builder()
-            .tag(ADMOB)
+            .tag(ADMOB_POINT)
             .startDate(ZonedDateTime.of(2024, 1, 1, 0, 0, 0, 0, GlobalZoneId))
             .endDate(ZonedDateTime.of(2024, 12, 31, 0, 0, 0, 0, GlobalZoneId))
             .title("ADMOB 광고입니다.")
@@ -286,7 +286,7 @@ void init() {
             .image("https://storage.googleapis.com/yelloworld/image/coin-stack.svg")
             .build();
         final Event admobEvent = Event.builder()
-            .tag(ADMOB)
+            .tag(ADMOB_POINT)
             .startDate(ZonedDateTime.of(2024, 1, 1, 0, 0, 0, 0, GlobalZoneId))
             .endDate(ZonedDateTime.of(2024, 12, 31, 0, 0, 0, 0, GlobalZoneId))
             .title("ADMOB 광고입니다.")
@@ -351,7 +351,7 @@ void init() {
             .image("https://storage.googleapis.com/yelloworld/image/coin-stack.svg")
             .build();
         final Event admobEvent = Event.builder()
-            .tag(ADMOB)
+            .tag(ADMOB_POINT)
             .startDate(ZonedDateTime.of(2024, 1, 1, 0, 0, 0, 0, GlobalZoneId))
             .endDate(ZonedDateTime.of(2024, 12, 31, 0, 0, 0, 0, GlobalZoneId))
             .title("ADMOB 광고입니다.")
@@ -437,7 +437,7 @@ void init() {
         // given
         final String idempotencyKey = "0397b5f3-ecdc-47d6-b5d7-2b1afcf00e87";
         final EventJoinRequest request = EventJoinRequest.builder()
-            .tag(ADMOB.getInitial())
+            .tag(ADMOB_POINT.getInitial())
             .build();
 
         doNothing()