Merge pull request #73 from letmeknowmyfriend/Chore/Set_Up_For_Deploy

[Chore] Local, Prod 환경 분리 close #72
letmeknowmyfriend · Dec 24, 2023 · f86f1bc · f86f1bc
2 parents 0b36e6c + 5c0b43e
commit f86f1bc
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,4 +40,7 @@ out/
 ChaChaKeyStore.p12
 
 # Firebase
-letmeknow-bdaef-firebase-adminsdk-ogpdk-7f7f7325ab.json
+letmeknow-bdaef-firebase-adminsdk-ogpdk-7f7f7325ab.json
+
+# logs
+logs/
diff --git a/src/main/java/com/letmeknow/quartz/schedule/QuartzConfig.java b/src/main/java/com/letmeknow/quartz/schedule/QuartzConfig.java
@@ -1,11 +1,10 @@
 package com.letmeknow.quartz.schedule;
 
 import com.letmeknow.analyser.Analyser;
+import com.letmeknow.enumstorage.SpringProfile;
 import com.letmeknow.quartz.AutoWiringSpringBeanJobFactory;
-import org.quartz.DateBuilder;
-import org.quartz.JobDataMap;
-import org.quartz.JobDetail;
-import org.quartz.Trigger;
+import lombok.RequiredArgsConstructor;
+import org.quartz.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
@@ -25,11 +24,13 @@
 import static org.quartz.TriggerBuilder.newTrigger;
 
 @Configuration
+@RequiredArgsConstructor
 public class QuartzConfig {
-    @Autowired
-    private ApplicationContext applicationContext;
-    @Autowired
-    private PlatformTransactionManager transactionManager;
+    private final ApplicationContext applicationContext;
+    private final PlatformTransactionManager transactionManager;
+
+    @Value("${spring.profiles.active}")
+    private String activeProfile;
 
     @Bean
     public SchedulerFactoryBean schedulerFactoryBean() {
@@ -79,26 +80,26 @@ public JobDetail jobDetail() {
 
     @Bean
     public Trigger trigger() {
-        // Trigger the job to run now, and then repeat every 40 seconds
-//        return newTrigger()
-//                .withIdentity("trigger1", "group1")
-//                .forJob("job1", "group1")
-//                .build();
-        return newTrigger()
+        TriggerBuilder<Trigger> triggerTriggerBuilder = newTrigger();
+        triggerTriggerBuilder
                 .withIdentity("trigger1", "group1")
-                .forJob(jobDetail())
-
-//                // 매일 10시 30분부터 17시 30분까지 1시간마다 실행
-//                .startNow()
-//                .withSchedule(cronSchedule("0 30 10-17/1 * * ?"))
-
-            ////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                .forJob(jobDetail());
 
+        // Local Profile은 10초 후에 1번만 실행
+        if (activeProfile.equals(SpringProfile.LOCAL.getProfile())) {
+            triggerTriggerBuilder
                 .startAt(DateBuilder.futureDate(10, DateBuilder.IntervalUnit.SECOND)) // 10초 후에 실행
-                    .withSchedule(simpleSchedule()
-                        .withRepeatCount(0)) // 1번만 실행
-
-                .build();
+                .withSchedule(simpleSchedule()
+                .withRepeatCount(0)); // 1번만 실행
+        }
+        // Prod Profile은 매일 10시 30분부터 17시 30분까지 1시간마다 실행
+        else if (activeProfile.equals(SpringProfile.PROD.getProfile())) {
+            triggerTriggerBuilder
+                .startNow()
+                .withSchedule(cronSchedule("0 30 10-17/1 * * ?"));
+        }
+
+        return triggerTriggerBuilder.build();
     }
 
 //    @Bean

diff --git a/src/main/java/com/letmeknow/repository/board/BoardRepository.java b/src/main/java/com/letmeknow/repository/board/BoardRepository.java
@@ -11,7 +11,7 @@
 public interface BoardRepository extends JpaRepository<Board, Long> {
     @Query(
         value = "SELECT b.BOARD_ID as id, b.board_name as boardName, b.board_view_url as boardViewUrl, IF(COUNT(s.SUBSCRIPTION_ID) > 0, 'TRUE', 'FALSE') as isSubscribed\n" +
-        "FROM Board b\n" +
+        "FROM board b\n" +
         "LEFT JOIN subscription as s ON b.board_id = s.board_id\n" +
         "AND s.member_id = :memberId\n" +
         "WHERE b.college_id = :collegeId\n" +

diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
@@ -13,8 +13,23 @@ spring:
         hibernate:
             ddl-auto: ${JPA.DDL_AUTO}
 
+            logging:
+                level:
+                    org:
+                        hibernate.SQL: trace
+
+
 # JWT
 jwt:
     token:
         access:
             expiration: 86_400_000 # 1일
+
+logging:
+    level:
+      p6spy: DEBUG
+
+decorator:
+    datasource:
+        p6spy:
+            enable-logging: true
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
@@ -18,3 +18,7 @@ jwt:
     token:
         access:
             expiration: 300000 # 5분
+
+logging:
+    level:
+        p6spy: INFO
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -8,19 +8,13 @@ spring:
         #                show_sql: true
         #                format_sql: true
         #                dialect: org.hibernate.dialect.MySQL5InnoDBDialect
-        logging.level:
-        org.hibernate.SQL: debug
         open-in-view: false
         hibernate:
             dialect: org.hibernate.dialect.MySQL5InnoDBDialect
     properties:
         hibernate:
             default_batch_fetch_size: 100
-    logging:
-        level:
-            org:
-                hibernate:
-                    SQL: trace
+
     security:
         oauth2:
             client:
@@ -94,18 +88,13 @@ server:
 # p6spy
 logging:
     file:
-        path: /Users/mac/Desktop/letmeknow/log
+        path: ./logs
     level:
         root: info
-        p6spy: debug
     logback:
         rollingpolicy:
             max-file-size: 50MB
             max-history: 10
-decorator:
-    datasource:
-        p6spy:
-            enable-logging: true
 # p6spy
 
 # cors