Merge pull request #165 from Industry-Academic-SW-Capstone/feat/#164

[Test] 테스트 컨테이너 설정 및 동시성 제어 테스트

Author: hwanh2

build.gradle

@@ -64,6 +64,12 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+	
+	// Testcontainers
+	testImplementation platform('org.testcontainers:testcontainers-bom:1.19.8')
+	testImplementation 'org.testcontainers:testcontainers'
+	testImplementation 'org.testcontainers:junit-jupiter'
+	testImplementation 'org.testcontainers:postgresql'
 
 	// WebClient
 	implementation 'org.springframework.boot:spring-boot-starter-webflux'

src/main/java/grit/stockIt/domain/notification/controller/TestNotificationController.java

@@ -17,12 +17,18 @@
 @RestController
 @RequestMapping("/api/test/notifications")
 @Tag(name = "test-notifications", description = "알림 테스트 API (개발용)")
-@RequiredArgsConstructor
 public class TestNotificationController {
 
     private final FcmService fcmService;
     private final MemberRepository memberRepository;
 
+    public TestNotificationController(
+            @org.springframework.beans.factory.annotation.Autowired(required = false) FcmService fcmService,
+            MemberRepository memberRepository) {
+        this.fcmService = fcmService;
+        this.memberRepository = memberRepository;
+    }
+
     @Operation(
             summary = "테스트 or 관리자 전용 알림 전송"
     )
@@ -56,6 +62,14 @@ public ResponseEntity<Map<String, Object>> sendTestNotification(
         data.put("timestamp", String.valueOf(System.currentTimeMillis()));
 
         // FCM 푸시 알림 전송
+        if (fcmService == null) {
+            Map<String, Object> response = new HashMap<>();
+            response.put("success", false);
+            response.put("message", "FCM 서비스를 사용할 수 없습니다.");
+            response.put("memberId", memberId);
+            return ResponseEntity.badRequest().body(response);
+        }
+        
         boolean success = fcmService.sendExecutionNotification(member.getFcmToken(), data);
 
         // 응답

src/main/java/grit/stockIt/domain/notification/service/AdminNotificationService.java

@@ -19,13 +19,21 @@
 
 @Slf4j
 @Service
-@RequiredArgsConstructor
 public class AdminNotificationService {
 
     private final FcmService fcmService;
     private final NotificationRepository notificationRepository;
     private final ObjectMapper objectMapper;
 
+    public AdminNotificationService(
+            @org.springframework.beans.factory.annotation.Autowired(required = false) FcmService fcmService,
+            NotificationRepository notificationRepository,
+            ObjectMapper objectMapper) {
+        this.fcmService = fcmService;
+        this.notificationRepository = notificationRepository;
+        this.objectMapper = objectMapper;
+    }
+
     // 모든 회원에게 알림을 전송
     @Async
     @Transactional
@@ -61,7 +69,7 @@ public CompletableFuture<BroadcastResult> sendBroadcastNotification(
                 savedCount++;
 
                 // FCM 푸시 알림 전송 (토큰이 있는 경우만)
-                if (member.hasFcmToken()) {
+                if (member.hasFcmToken() && fcmService != null) {
                     // executionNotificationEnabled 체크 안 함
                     boolean success = fcmService.sendExecutionNotification(
                             member.getFcmToken(),

src/main/java/grit/stockIt/domain/notification/service/FcmService.java

@@ -8,6 +8,7 @@
 import com.google.firebase.messaging.WebpushFcmOptions;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
@@ -16,7 +17,7 @@
 // FirebaseMessaging Bean이 있을 때만 활성화됨
 @Slf4j
 @Service
-@org.springframework.context.annotation.DependsOn("firebaseMessaging")
+@ConditionalOnBean(FirebaseMessaging.class)
 @RequiredArgsConstructor
 public class FcmService {
 

src/main/java/grit/stockIt/domain/ranking/service/RankingService.java

@@ -18,6 +18,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -47,6 +48,7 @@ public class RankingService {
     private final MissionService missionService;
     private final RedisMarketDataRepository redisMarketDataRepository;
     private final StockDetailService stockDetailService;
+    private final Environment environment;
 
     // Rate Limiter: KIS API 초당 30개 제한 (안전하게 25개로 설정)
     private final RateLimiter kisApiRateLimiter = RateLimiter.create(25.0);
@@ -62,6 +64,12 @@ public class RankingService {
     @CacheEvict(value = "rankings", allEntries = true)
     @Transactional
     public void updateAllRankings() {
+        // 테스트 환경에서는 스케줄러 비활성화
+        String schedulingEnabled = environment.getProperty("spring.task.scheduling.enabled", "true");
+        if ("false".equals(schedulingEnabled)) {
+            return;
+        }
+        
         log.info("🔄 [스케줄러] 랭킹 갱신 시작: {}", LocalDateTime.now());
 
         try {

src/main/java/grit/stockIt/global/config/FlywayConfig.java

@@ -3,11 +3,13 @@
 import jakarta.annotation.PostConstruct;
 import org.flywaydb.core.Flyway;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Configuration;
 
 import javax.sql.DataSource;
 
 @Configuration
+@ConditionalOnProperty(name = "spring.flyway.enabled", havingValue = "true", matchIfMissing = true)
 public class FlywayConfig {
 
     @Autowired