diff --git a/src/main/java/umc/th/juinjang/api/note/shared/service/response/SharedNoteGetResponse.java b/src/main/java/umc/th/juinjang/api/note/shared/service/response/SharedNoteGetResponse.java index 02b339d4..962b2351 100644 --- a/src/main/java/umc/th/juinjang/api/note/shared/service/response/SharedNoteGetResponse.java +++ b/src/main/java/umc/th/juinjang/api/note/shared/service/response/SharedNoteGetResponse.java @@ -126,6 +126,6 @@ private static List findImagesUrlBySharingStatus(boolean isImageShared, if (isImageShared) { return limjang.getImageList().stream().map(Image::getImageUrl).limit(maxSize).toList(); } - return null; + return List.of(); } } diff --git a/src/main/java/umc/th/juinjang/event/subscriber/DiscordEventListener.java b/src/main/java/umc/th/juinjang/event/subscriber/DiscordEventListener.java index 746c20c1..944ad14e 100644 --- a/src/main/java/umc/th/juinjang/event/subscriber/DiscordEventListener.java +++ b/src/main/java/umc/th/juinjang/event/subscriber/DiscordEventListener.java @@ -2,8 +2,6 @@ import lombok.RequiredArgsConstructor; -import org.springframework.core.env.Environment; -import org.springframework.core.env.Profiles; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import org.springframework.transaction.event.TransactionPhase; @@ -19,16 +17,13 @@ public class DiscordEventListener { private final DiscordAlertProvider discordAlertProvider; - private final Environment environment; @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT) @Async public void handleSignUpEvent(SignUpEvent event) { - if (isProdEnv()) { - discordAlertProvider.sendMemberCreateAlertToDiscord( - String.format(EventMessage.SIGN_UP_MESSAGE.getMessage(), event.memberProvider(), event.count(), - event.name())); - } + discordAlertProvider.sendMemberCreateAlertToDiscord( + String.format(EventMessage.SIGN_UP_MESSAGE.getMessage(), event.memberProvider(), event.count(), + event.name())); } @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT) @@ -46,13 +41,10 @@ public void handleFlagSharedNoteEvent(FlagSharedNoteEvent event) { @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT) @Async public void handlePaymentEvent(PaymentEvent event) { - discordAlertProvider.sendPaymentAlertToDiscord(String.format( - EventMessage.PAYMENT_COMPLETED_MESSAGE.getMessage(), - event.memberId(),event.nickname(),event.pencilQuantity(), event.price(), event.transactionStatus() - )); + discordAlertProvider.sendPaymentAlertToDiscord(String.format( + EventMessage.PAYMENT_COMPLETED_MESSAGE.getMessage(), + event.memberId(), event.nickname(), event.pencilQuantity(), event.price(), event.transactionStatus() + )); } - private boolean isProdEnv() { - return environment.acceptsProfiles(Profiles.of("prod")); - } }