From 41df0a6ef07fb75176dbe7d1b58bdfed6d141b60 Mon Sep 17 00:00:00 2001 From: hyeonjeongs Date: Sun, 27 Aug 2023 01:54:39 +0900 Subject: [PATCH] =?UTF-8?q?YEL-144=20[fix]=20apple=20=EA=B2=B0=EC=A0=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/apple/AppleOrderResponse.java | 3 +-- .../factory/SlackWebhookMessageFactory.java | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/yello/server/domain/purchase/dto/apple/AppleOrderResponse.java b/src/main/java/com/yello/server/domain/purchase/dto/apple/AppleOrderResponse.java index 15502202..d1d884de 100644 --- a/src/main/java/com/yello/server/domain/purchase/dto/apple/AppleOrderResponse.java +++ b/src/main/java/com/yello/server/domain/purchase/dto/apple/AppleOrderResponse.java @@ -5,8 +5,7 @@ @Builder public record AppleOrderResponse( int appAppleId, - String environment, - String JWSTransaction + String environment ) { } diff --git a/src/main/java/com/yello/server/infrastructure/slack/factory/SlackWebhookMessageFactory.java b/src/main/java/com/yello/server/infrastructure/slack/factory/SlackWebhookMessageFactory.java index 9eb65dd5..6738b667 100644 --- a/src/main/java/com/yello/server/infrastructure/slack/factory/SlackWebhookMessageFactory.java +++ b/src/main/java/com/yello/server/infrastructure/slack/factory/SlackWebhookMessageFactory.java @@ -70,11 +70,10 @@ private List generateSlackPurchaseAttachment( HttpServletRequest request ) throws IOException { final SlackAttachment slackAttachment = new SlackAttachment() - .setColor("green") + .setColor("good") .setTitle(PURCHASE_TITLE) .setTitleLink(request.getContextPath()) .setText(PURCHASE_TITLE) - .setColor("green") .setFields(generateSlackFieldList(request)); return Collections.singletonList(slackAttachment); } @@ -82,23 +81,29 @@ private List generateSlackPurchaseAttachment( private List generateSlackFieldList( HttpServletRequest request ) throws IOException { - final String token = request.getHeader(HttpHeaders.AUTHORIZATION).substring("Bearer ".length()); + final String token = + request.getHeader(HttpHeaders.AUTHORIZATION).substring("Bearer ".length()); final Long userId = tokenProvider.getUserId(token); final Optional user = userRepository.findById(userId); final String yelloId = user.isPresent() ? user.get().getYelloId() : "null"; final String deviceToken = user.isPresent() ? user.get().getDeviceToken() : "null"; - String userInfo = String.format("userId : %d %nyelloId : %s %ndeviceToken : %s", userId, yelloId, deviceToken); + String userInfo = + String.format("userId : %d %nyelloId : %s %ndeviceToken : %s", userId, yelloId, + deviceToken); return Arrays.asList( new SlackField().setTitle("Request URL").setValue(request.getRequestURL().toString()), - new SlackField().setTitle("Request Time").setValue(TimeFactory.toDateFormattedString(LocalDateTime.now())), + new SlackField().setTitle("Request Time") + .setValue(TimeFactory.toDateFormattedString(LocalDateTime.now())), new SlackField().setTitle("Request IP").setValue(request.getRemoteAddr()), - new SlackField().setTitle("Request User-Agent").setValue(request.getHeader(HttpHeaders.USER_AGENT)), + new SlackField().setTitle("Request User-Agent") + .setValue(request.getHeader(HttpHeaders.USER_AGENT)), new SlackField().setTitle("인증/인가 정보 - Authorization") .setValue(request.getHeader(HttpHeaders.AUTHORIZATION)), new SlackField().setTitle("Request Body") - .setValue(StreamUtils.copyToString(request.getInputStream(), StandardCharsets.UTF_8)), + .setValue( + StreamUtils.copyToString(request.getInputStream(), StandardCharsets.UTF_8)), new SlackField().setTitle("인증/인가 정보 - 유저").setValue(userInfo) ); }