chore: config 수정

Author: jemin

.gitignore

@@ -37,4 +37,5 @@ out/
 .vscode/
 src/main/resources/firebase/fcm_key.json
 src/main/resources/application.yml
-src/main/resources/application-dev.yml
+src/main/resources/application-dev.yml
+src/main/resources/application-prod.yml

build.gradle

@@ -46,6 +46,8 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 
+	implementation 'net.javacrumbs.shedlock:shedlock-spring:5.1.0'
+	implementation 'net.javacrumbs.shedlock:shedlock-provider-redis-spring:5.1.0'
 
 	implementation 'org.springframework.boot:spring-boot-starter-webflux'
 	implementation 'org.springframework.boot:spring-boot-starter'

src/main/java/com/backend/global/config/RedisConfig.java

@@ -1,13 +1,18 @@
 package com.backend.auth.config;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
 
+import net.javacrumbs.shedlock.core.LockProvider;
+import net.javacrumbs.shedlock.provider.redis.spring.RedisLockProvider;
+
 @Configuration
 @EnableRedisRepositories
 public class RedisConfig {
@@ -18,11 +23,20 @@ public class RedisConfig {
     @Value("${spring.data.redis.port}")
     private int port;
 
+    @Autowired
+    Environment env;
+
     @Bean
     public RedisConnectionFactory connectionFactory(){
         RedisStandaloneConfiguration redisConfiguration = new RedisStandaloneConfiguration();
         redisConfiguration.setHostName(host);
         redisConfiguration.setPort(port);
         return new LettuceConnectionFactory(redisConfiguration);
     }
+
+    @Bean
+    public LockProvider lockProvider(RedisConnectionFactory connectionFactory) {
+        String lockEnv = env.getProperty("spring.profiles.active");
+        return new RedisLockProvider(connectionFactory, lockEnv);
+    }
 }

src/main/java/com/backend/global/config/SchedulerConfig.java

@@ -2,8 +2,26 @@
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+
+import net.javacrumbs.shedlock.spring.annotation.EnableSchedulerLock;
 
-@EnableScheduling
 @Configuration
-public class SchedulerConfig {
+@EnableScheduling
+@EnableSchedulerLock(defaultLockAtLeastFor = "10s", defaultLockAtMostFor = "10s")
+public class SchedulerConfig implements SchedulingConfigurer {
+
+    @Override
+    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+        ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
+
+        threadPoolTaskScheduler.setPoolSize(3);
+        threadPoolTaskScheduler.setThreadGroupName("scheduler thread pool");
+        threadPoolTaskScheduler.setThreadNamePrefix("scheduler-thread-");
+        threadPoolTaskScheduler.initialize();
+
+        taskRegistrar.setTaskScheduler(threadPoolTaskScheduler);
+    }
 }

src/main/java/com/backend/global/scheduler/SchedulerService.java

@@ -20,6 +20,7 @@
 import java.time.LocalTime;
 import java.util.List;
 
+import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
 
 @Slf4j
 @Service
@@ -34,13 +35,15 @@ public class SchedulerService {
     private final ApplicationEventPublisher applicationEventPublisher;
 
 
+    @SchedulerLock(name = "outdate_goal_lock", lockAtMostFor = "10s", lockAtLeastFor = "10s")
     @Scheduled(cron = "0 0 * * * *", zone = "Asia/Seoul")
     public void storeOutDateGoal() {
 
         List<Goal> goalList = goalQueryRepository.findGoalListEndDateExpired(LocalDate.now());
         goalList.forEach(Goal::store);
     }
 
+    @SchedulerLock(name = "send_alarm_lock", lockAtMostFor = "10s", lockAtLeastFor = "10s")
     @Scheduled(cron = "0 */30 * * * *", zone = "Asia/Seoul")
     public void sendAlarm()
     {
@@ -53,31 +56,4 @@ public void sendAlarm()
         detailGoalAlarmList.forEach(alarmDto ->
                 applicationEventPublisher.publishEvent(new AlarmEvent(alarmDto.uid(), alarmDto.detailGoalTitle())));
     }
-
-//    @Scheduled(cron = "0 19 * * 0 *", zone = "Asia/Seoul")
-//    public void sendReminder()
-//    {
-//        List<Goal> goalListReminderEnabled = goalQueryRepository.findGoalListReminderEnabled();
-//
-//        Random random = new Random();
-//
-//        // 랜덤하게 2개 선택
-//        for (int i = 0; i < RAND_COUNT; i++) {
-//
-//            int randomIndex = random.nextInt(goalListReminderEnabled.size());
-//            Goal goal = goalListReminderEnabled.get(randomIndex);
-//
-//            if(Objects.nonNull(goal.getLastRemindDate()) && isIntervalDateExpired(goal))
-//            {
-//                goal.updateLastRemindDate(LocalDate.now());
-//                applicationEventPublisher.publishEvent(new ReminderEvent(goal.getMemberId(), goal.getTitle()));
-//            }
-//        }
-//    }
-//
-//    private boolean isIntervalDateExpired(Goal goal) {
-//        return goal.getLastRemindDate().isBefore(LocalDate.now().minusDays(REMIND_INTERVAL));
-//    }
-
-
 }