From 7369c9d031581d29c8e5f81639454a200d9bee6f Mon Sep 17 00:00:00 2001 From: Choi YoungLyn Date: Wed, 29 May 2024 23:39:00 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[Del]=20#276=20-=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/moonshot/user/repository/UserJpaRepository.java | 1 - 1 file changed, 1 deletion(-) diff --git a/moonshot-domain/src/main/java/org/moonshot/user/repository/UserJpaRepository.java b/moonshot-domain/src/main/java/org/moonshot/user/repository/UserJpaRepository.java index 4dcf9ff3..8ddcbb19 100644 --- a/moonshot-domain/src/main/java/org/moonshot/user/repository/UserJpaRepository.java +++ b/moonshot-domain/src/main/java/org/moonshot/user/repository/UserJpaRepository.java @@ -11,7 +11,6 @@ public interface UserJpaRepository extends JpaRepository { Optional findUserBySocialId(String socialId); - Optional findUserByNickname(String nickname); @Query("SELECT u FROM User u WHERE u.deleteAt < :currentDate") List findIdByDeletedAtBefore(LocalDateTime currentDate); From a93e5f30407cc3e2c0bc8226c64133272c3d0a1d Mon Sep 17 00:00:00 2001 From: Choi YoungLyn Date: Wed, 29 May 2024 23:52:19 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[Feat]=20#276=20-=20=EB=94=94=EC=8A=A4?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?= =?UTF-8?q?=EC=95=8C=EB=A6=BC=EC=97=90=20=EB=88=84=EC=A0=81=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=EC=88=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/moonshot/user/service/UserSignUpService.java | 4 ++++ .../src/main/java/org/moonshot/discord/DiscordAppender.java | 4 ++-- .../src/main/java/org/moonshot/discord/SignUpEvent.java | 6 +++--- .../main/java/org/moonshot/discord/SignUpEventListener.java | 1 + 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/moonshot-api/src/main/java/org/moonshot/user/service/UserSignUpService.java b/moonshot-api/src/main/java/org/moonshot/user/service/UserSignUpService.java index 01db6352..3fe55c0f 100644 --- a/moonshot-api/src/main/java/org/moonshot/user/service/UserSignUpService.java +++ b/moonshot-api/src/main/java/org/moonshot/user/service/UserSignUpService.java @@ -4,6 +4,7 @@ import lombok.RequiredArgsConstructor; import org.moonshot.discord.SignUpEvent; import org.moonshot.user.model.User; +import org.moonshot.user.repository.UserRepository; import org.springframework.context.ApplicationEventPublisher; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -14,12 +15,15 @@ @RequiredArgsConstructor public class UserSignUpService { + private final UserRepository userRepository; private final ApplicationEventPublisher eventPublisher; @Async @Transactional(propagation = Propagation.REQUIRES_NEW) public void publishSignUpEvent(User user) { + Long totalUsers = userRepository.count(); eventPublisher.publishEvent(SignUpEvent.of( + totalUsers, user.getName(), user.getEmail() == null ? "" : user.getEmail(), user.getSocialPlatform().toString(), diff --git a/moonshot-external/src/main/java/org/moonshot/discord/DiscordAppender.java b/moonshot-external/src/main/java/org/moonshot/discord/DiscordAppender.java index 3d8ccf7e..d0985062 100644 --- a/moonshot-external/src/main/java/org/moonshot/discord/DiscordAppender.java +++ b/moonshot-external/src/main/java/org/moonshot/discord/DiscordAppender.java @@ -118,11 +118,11 @@ protected void append(ILoggingEvent eventObject) { } } - public void signInAppend(String name, String email, String socialPlatform, LocalDateTime createdAt, String imgUrl){ + public void signInAppend(Long totalUsers, String name, String email, String socialPlatform, LocalDateTime createdAt, String imgUrl){ DiscordWebHook discordWebhook = new DiscordWebHook(DiscordConstants.signInWebhookUrl, username, avatarUrl, false); discordWebhook.addEmbed(new EmbedObject() - .setTitle("πŸš€[νšŒμ› κ°€μž…] μƒˆλ‘œμš΄ μœ μ €κ°€ κ°€μž…ν•˜μ˜€μŠ΅λ‹ˆλ‹€.πŸš€") + .setTitle("πŸš€[νšŒμ› κ°€μž…] " + totalUsers + "번쨰 μœ μ €κ°€ κ°€μž…ν•˜μ˜€μŠ΅λ‹ˆλ‹€.πŸš€") .setColor(Color.CYAN) .setDescription("moonshot에 μƒˆλ‘œμš΄ μœ μ €κ°€ κ°€μž…ν•˜μ˜€μŠ΅λ‹ˆλ‹€.") .setThumbnail(imgUrl) diff --git a/moonshot-external/src/main/java/org/moonshot/discord/SignUpEvent.java b/moonshot-external/src/main/java/org/moonshot/discord/SignUpEvent.java index 672d9669..cb3de3f2 100644 --- a/moonshot-external/src/main/java/org/moonshot/discord/SignUpEvent.java +++ b/moonshot-external/src/main/java/org/moonshot/discord/SignUpEvent.java @@ -3,11 +3,11 @@ import java.time.LocalDateTime; -public record SignUpEvent(String name, String email, String socialPlatform, LocalDateTime createdAt, String imageUrl) { +public record SignUpEvent(Long totalUsers, String name, String email, String socialPlatform, LocalDateTime createdAt, String imageUrl) { - public static SignUpEvent of(String name, String email, String socialPlatform, LocalDateTime createdAt, + public static SignUpEvent of(Long totalUsers, String name, String email, String socialPlatform, LocalDateTime createdAt, String imageUrl) { - return new SignUpEvent(name, email, socialPlatform, createdAt, imageUrl); + return new SignUpEvent(totalUsers, name, email, socialPlatform, createdAt, imageUrl); } } diff --git a/moonshot-external/src/main/java/org/moonshot/discord/SignUpEventListener.java b/moonshot-external/src/main/java/org/moonshot/discord/SignUpEventListener.java index 7683e237..bf5cff15 100644 --- a/moonshot-external/src/main/java/org/moonshot/discord/SignUpEventListener.java +++ b/moonshot-external/src/main/java/org/moonshot/discord/SignUpEventListener.java @@ -15,6 +15,7 @@ public class SignUpEventListener { @EventListener public void handleSignUpEvent(SignUpEvent event) { discordAppender.signInAppend( + event.totalUsers(), event.name(), event.email(), event.socialPlatform(), From 5993eb1cd908bdb56a28a27b54c68cb9c256d5f0 Mon Sep 17 00:00:00 2001 From: Choi YoungLyn Date: Wed, 29 May 2024 23:57:34 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[Fix]=20#276=20-=20=EB=88=84=EC=A0=81?= =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=88=98=20=ED=95=84=EB=93=9C=EB=AA=85=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/moonshot/user/service/UserSignUpService.java | 4 ++-- .../src/main/java/org/moonshot/discord/DiscordAppender.java | 4 ++-- .../src/main/java/org/moonshot/discord/SignUpEvent.java | 6 +++--- .../main/java/org/moonshot/discord/SignUpEventListener.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/moonshot-api/src/main/java/org/moonshot/user/service/UserSignUpService.java b/moonshot-api/src/main/java/org/moonshot/user/service/UserSignUpService.java index 3fe55c0f..c280801d 100644 --- a/moonshot-api/src/main/java/org/moonshot/user/service/UserSignUpService.java +++ b/moonshot-api/src/main/java/org/moonshot/user/service/UserSignUpService.java @@ -21,9 +21,9 @@ public class UserSignUpService { @Async @Transactional(propagation = Propagation.REQUIRES_NEW) public void publishSignUpEvent(User user) { - Long totalUsers = userRepository.count(); + Long totalUserCount = userRepository.count(); eventPublisher.publishEvent(SignUpEvent.of( - totalUsers, + totalUserCount, user.getName(), user.getEmail() == null ? "" : user.getEmail(), user.getSocialPlatform().toString(), diff --git a/moonshot-external/src/main/java/org/moonshot/discord/DiscordAppender.java b/moonshot-external/src/main/java/org/moonshot/discord/DiscordAppender.java index d0985062..3901b145 100644 --- a/moonshot-external/src/main/java/org/moonshot/discord/DiscordAppender.java +++ b/moonshot-external/src/main/java/org/moonshot/discord/DiscordAppender.java @@ -118,11 +118,11 @@ protected void append(ILoggingEvent eventObject) { } } - public void signInAppend(Long totalUsers, String name, String email, String socialPlatform, LocalDateTime createdAt, String imgUrl){ + public void signInAppend(Long totalUserCount, String name, String email, String socialPlatform, LocalDateTime createdAt, String imgUrl){ DiscordWebHook discordWebhook = new DiscordWebHook(DiscordConstants.signInWebhookUrl, username, avatarUrl, false); discordWebhook.addEmbed(new EmbedObject() - .setTitle("πŸš€[νšŒμ› κ°€μž…] " + totalUsers + "번쨰 μœ μ €κ°€ κ°€μž…ν•˜μ˜€μŠ΅λ‹ˆλ‹€.πŸš€") + .setTitle("πŸš€[νšŒμ› κ°€μž…] " + totalUserCount + "번쨰 μœ μ €κ°€ κ°€μž…ν•˜μ˜€μŠ΅λ‹ˆλ‹€.πŸš€") .setColor(Color.CYAN) .setDescription("moonshot에 μƒˆλ‘œμš΄ μœ μ €κ°€ κ°€μž…ν•˜μ˜€μŠ΅λ‹ˆλ‹€.") .setThumbnail(imgUrl) diff --git a/moonshot-external/src/main/java/org/moonshot/discord/SignUpEvent.java b/moonshot-external/src/main/java/org/moonshot/discord/SignUpEvent.java index cb3de3f2..b4ec45f4 100644 --- a/moonshot-external/src/main/java/org/moonshot/discord/SignUpEvent.java +++ b/moonshot-external/src/main/java/org/moonshot/discord/SignUpEvent.java @@ -3,11 +3,11 @@ import java.time.LocalDateTime; -public record SignUpEvent(Long totalUsers, String name, String email, String socialPlatform, LocalDateTime createdAt, String imageUrl) { +public record SignUpEvent(Long totalUserCount, String name, String email, String socialPlatform, LocalDateTime createdAt, String imageUrl) { - public static SignUpEvent of(Long totalUsers, String name, String email, String socialPlatform, LocalDateTime createdAt, + public static SignUpEvent of(Long totalUserCount, String name, String email, String socialPlatform, LocalDateTime createdAt, String imageUrl) { - return new SignUpEvent(totalUsers, name, email, socialPlatform, createdAt, imageUrl); + return new SignUpEvent(totalUserCount, name, email, socialPlatform, createdAt, imageUrl); } } diff --git a/moonshot-external/src/main/java/org/moonshot/discord/SignUpEventListener.java b/moonshot-external/src/main/java/org/moonshot/discord/SignUpEventListener.java index bf5cff15..d78bc54b 100644 --- a/moonshot-external/src/main/java/org/moonshot/discord/SignUpEventListener.java +++ b/moonshot-external/src/main/java/org/moonshot/discord/SignUpEventListener.java @@ -15,7 +15,7 @@ public class SignUpEventListener { @EventListener public void handleSignUpEvent(SignUpEvent event) { discordAppender.signInAppend( - event.totalUsers(), + event.totalUserCount(), event.name(), event.email(), event.socialPlatform(),