Merge pull request #334 from SOLPLY/feat/#308-alert-by-new-user-create

uykm · web-flow · commit ba4e49e3f71b · 2026-03-08T21:21:28.000+09:00
[FEAT] 신규 유저 가입시 디코 알람 기능 구현(+ 공유된 코스만 조회)
diff --git a/src/main/java/org/sopt/solply_server/domain/course/service/CourseService.java b/src/main/java/org/sopt/solply_server/domain/course/service/CourseService.java
@@ -197,6 +197,8 @@ public CourseAddPlaceResponse addPlaceToCourse(final Long userId, final Long pla
     public CourseDetailGetResponse getCourseDetailsById(final Long userId, final Long courseId) {
         Course course = entityLoader.getActiveCourseWithTagsAndPlaces(courseId);
 
+        if (!isSharedCourse(course, userId)) throw new BusinessException(ErrorCode.NOT_SHARED_COURSE);
+
         Tag courseTag = course.getTag();
         tagValidator.validateCourseTag(courseTag);
 
@@ -283,6 +285,7 @@ public CourseBookmarkListGetResponse getBookmarkedCourses(
 
         final List<CourseInfoDto> courseInfoDtos = createSortedCourseInfoDtoList(
                 filteredCourses,
+                userId,
                 courseIdCreatedAtMap,
                 candidatePlace,
                 candidatePlaceId != null
@@ -477,6 +480,7 @@ private List<CourseFolderDto> createSortedCourseFolderDtoList(List<Long> sortedC
 
     private List<CourseInfoDto> createSortedCourseInfoDtoList(
             final List<Course> filteredCourses,
+            final Long userId,
             final Map<Long, LocalDateTime> courseIdCreatedAtMap,
             final Place candidatePlace,
             final boolean hasCandidatePlace
@@ -486,6 +490,7 @@ private List<CourseInfoDto> createSortedCourseInfoDtoList(
                 prepareValidationResults(filteredCourses, candidatePlace, hasCandidatePlace);
 
         return filteredCourses.stream()
+                .filter(course -> isSharedCourse(course, userId))
                 .map(course -> {
                     Tag courseTag = course.getTag();
                     String courseTagName = TagViewUtils.getActiveNameOrNull(courseTag);
@@ -504,5 +509,9 @@ private List<CourseInfoDto> createSortedCourseInfoDtoList(
                 .toList();
     }
 
+    private boolean isSharedCourse(Course course, Long userId) {
+        return course.isShared() || course.isCreatedBy(userId);
+    }
+
 
 }
diff --git a/src/main/java/org/sopt/solply_server/domain/user/repository/UserRepository.java b/src/main/java/org/sopt/solply_server/domain/user/repository/UserRepository.java
@@ -28,4 +28,6 @@ public interface UserRepository extends JpaRepository<User, Long> {
     @Query(value = "SELECT * FROM users WHERE email = :email LIMIT 1", nativeQuery = true)
     Optional<User> findAnyByEmail(@Param("email") String email);
 
+    @Query("SELECT COUNT(u) FROM User u WHERE u.isDeleted = false ")
+    long countByActiveTrue();
 }
diff --git a/src/main/java/org/sopt/solply_server/domain/user/service/SocialUserService.java b/src/main/java/org/sopt/solply_server/domain/user/service/SocialUserService.java
@@ -7,8 +7,10 @@
 import org.sopt.solply_server.domain.user.entity.User;
 import org.sopt.solply_server.domain.user.repository.SocialUserInfoRepository;
 import org.sopt.solply_server.domain.user.repository.UserRepository;
+import org.sopt.solply_server.domain.user.service.event.UserRegistrationEvent;
 import org.sopt.solply_server.global.exception.BusinessException;
 import org.sopt.solply_server.global.exception.ErrorCode;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -19,6 +21,7 @@ public class SocialUserService {
 
     private final SocialUserInfoRepository socialUserInfoRepository;
     private final UserRepository userRepository;
+    private final ApplicationEventPublisher eventPublisher;
 
     @Transactional
     public User createOrLoginSocialUser(
@@ -46,6 +49,7 @@ public User createOrLoginSocialUser(
 
         // 2) 해당 소셜 링크가 없으면, email로 기존 유저 연동 시도
         User user = null;
+        boolean isNewUser = false; // 신규 유저 여부 체크 플래그
 
         if (email != null) {
             user = userRepository.findAnyByEmail(email)
@@ -56,12 +60,18 @@ public User createOrLoginSocialUser(
         // 3) 없으면 신규 생성
         if (user == null) {
             user = userRepository.save(User.create(email)); // email은 null 가능하게
+            isNewUser = true;
         }
 
         // 4) 소셜 링크 생성
         // socialCode는 유니크라서 여기서 동시성 안전하게 처리하는 게 좋음(아래 참고)
         linkSocialAccount(user, platform, socialId);
 
+        if (isNewUser) {
+            eventPublisher.publishEvent(new UserRegistrationEvent(user, platform));
+        }
+
+
         return user;
     }
 
diff --git a/src/main/java/org/sopt/solply_server/domain/user/service/event/UserRegistrationEvent.java b/src/main/java/org/sopt/solply_server/domain/user/service/event/UserRegistrationEvent.java
@@ -0,0 +1,10 @@
+package org.sopt.solply_server.domain.user.service.event;
+
+import org.sopt.solply_server.domain.auth.entity.SocialPlatform;
+import org.sopt.solply_server.domain.user.entity.User;
+
+public record UserRegistrationEvent(
+        User user,
+        SocialPlatform platform
+) {
+}
diff --git a/src/main/java/org/sopt/solply_server/global/exception/ErrorCode.java b/src/main/java/org/sopt/solply_server/global/exception/ErrorCode.java
@@ -75,6 +75,7 @@ public enum ErrorCode {
     NOT_SUFFICIENT_PLACE_COUNT(HttpStatus.BAD_REQUEST, "COURSE-006", "코스에 최소 1개 이상의 장소가 필요합니다."),
     INVALID_PLACES_ORDER(HttpStatus.BAD_REQUEST, "COURSE-007", "장소 순서가 올바르지 않습니다."),
     DUPLICATE_COURSE_NAME(HttpStatus.BAD_REQUEST,"COURSE-008","코스 이름이 중복됩니다."),
+    NOT_SHARED_COURSE(HttpStatus.FORBIDDEN,"COURSE-009" ,"공유되지 않은 코스입니다." ),
 
     // 동네 관련 (TOWN-xxx)
     NOT_FOUND_TOWN(HttpStatus.NOT_FOUND, "TOWN-001" , "존재하지 않는 동네입니다."),
diff --git a/src/main/java/org/sopt/solply_server/global/external/discord/dto/DiscordMessageDto.java b/src/main/java/org/sopt/solply_server/global/external/discord/dto/DiscordMessageDto.java
@@ -0,0 +1,28 @@
+package org.sopt.solply_server.global.external.discord.dto;
+
+import java.util.List;
+
+public record DiscordMessageDto(
+        String content,
+        List<Embed> embeds
+) {
+    public static DiscordMessageDto newUser(
+            String nickname, String joinTime, long totalCount
+    ) {
+        return new DiscordMessageDto(
+                "🎉 **새로운 솔플러가 합류했습니다!**",
+                List.of(new Embed(
+                        "신규 유저 가입 알림",
+                        0x3498DB, // 파란색 코드
+                        List.of(
+                                new Field("닉네임", nickname, true),
+                                new Field("가입시간", joinTime, true),
+                                new Field("총 가입자", totalCount + "명", true)
+                        )
+                ))
+        );
+    }
+
+    public record Embed(String title, int color, List<Field> fields) {}
+    public record Field(String name, String value, boolean inline) {}
+}
diff --git a/src/main/java/org/sopt/solply_server/global/listener/UserRegistrationEventListener.java b/src/main/java/org/sopt/solply_server/global/listener/UserRegistrationEventListener.java
@@ -0,0 +1,53 @@
+package org.sopt.solply_server.global.listener;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.sopt.solply_server.domain.user.service.event.UserRegistrationEvent;
+import org.sopt.solply_server.domain.user.repository.UserRepository;
+import org.sopt.solply_server.global.external.discord.dto.DiscordMessageDto;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.TransactionPhase;
+import org.springframework.transaction.event.TransactionalEventListener;
+import org.springframework.web.client.RestTemplate;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class UserRegistrationEventListener {
+
+    @Value("${discord.webhook.url}")
+    private String webhookUrl;
+
+    @Value("${discord.enabled:false}")
+    private boolean isDiscordEnabled;
+
+    private final UserRepository userRepository;
+    private final RestTemplate restTemplate = new RestTemplate();
+
+    @Async
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT) // 커밋 완료 후 실행
+    public void onUserRegistered(UserRegistrationEvent event) {
+        if (!isDiscordEnabled) return;
+
+        try {
+            var user = event.user();
+
+            String joinTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+            long totalCount = userRepository.countByActiveTrue();
+
+            DiscordMessageDto message = DiscordMessageDto.newUser(
+                    user.getNickname(),
+                    joinTime,
+                    totalCount
+            );
+
+            restTemplate.postForEntity(webhookUrl, message, String.class);
+        } catch (Exception e) {
+            log.error("유저 가입 디스코드 알림 전송 실패", e);
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,6 @@ public interface UserRepository extends JpaRepository<User, Long> {`
`28`	`28`	`@Query(value = "SELECT * FROM users WHERE email = :email LIMIT 1", nativeQuery = true)`
`29`	`29`	`Optional<User> findAnyByEmail(@Param("email") String email);`
`30`	`30`
	`31`	`+ @Query("SELECT COUNT(u) FROM User u WHERE u.isDeleted = false ")`
	`32`	`+ long countByActiveTrue();`
`31`	`33`	`}`