Merge pull request #334 from Team-Smeme/fix/#311-configuration

fix: 설정 파일 분리
Team-Smeme · Sep 9, 2024 · 07d5369 · 07d5369
2 parents 22d0243 + 438fa16
commit 07d5369
Show file tree

Hide file tree

Showing 46 changed files with 478 additions and 323 deletions.
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -85,6 +85,12 @@ jobs:
             if ! grep -q "IMAGE_NAME=" .env; then
               echo "IMAGE_NAME=${{ secrets.IMAGE_NAME_DEV }}" >> .env
             fi
+            if ! grep -q "SECRET_MANAGER_TOKEN=" .env; then
+              echo "SECRET_MANAGER_TOKEN=${{ secrets.SECRET_MANAGER_TOKEN }}" >> .env
+            fi
+            if ! grep -q "SECRET_MANAGER_WORKSPACE_ID=" .env; then
+              echo "SECRET_MANAGER_WORKSPACE_ID=${{ secrets.SECRET_MANAGER_WORKSPACE_ID }}" >> .env
+            fi
 
             # 배포 스크립트 실행
             sudo ./deploy.sh
diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
@@ -85,6 +85,12 @@ jobs:
             if ! grep -q "IMAGE_NAME=" .env; then
               echo "IMAGE_NAME=${{ secrets.IMAGE_NAME_PROD }}" >> .env
             fi
+            if ! grep -q "SECRET_MANAGER_TOKEN=" .env; then
+              echo "SECRET_MANAGER_TOKEN=${{ secrets.SECRET_MANAGER_TOKEN }}" >> .env
+            fi
+            if ! grep -q "SECRET_MANAGER_WORKSPACE_ID=" .env; then
+              echo "SECRET_MANAGER_WORKSPACE_ID=${{ secrets.SECRET_MANAGER_WORKSPACE_ID }}" >> .env
+            fi
 
             # 배포 스크립트 실행
             sudo ./deploy.sh
diff --git a/script/deploy.sh b/script/deploy.sh
@@ -3,6 +3,8 @@ source .env
 
 REGISTRY_URL=${REGISTRY_URL}
 IMAGE_NAME=${IMAGE_NAME}
+SECRET_MANAGER_TOKEN=${SECRET_MANAGER_TOKEN}
+SECRET_MANAGER_WORKSPACE_ID=${SECRET_MANAGER_WORKSPACE_ID}
 TAG="latest"
 CONTAINER_NAME="smeem"
 HEALTH_CHECK_URI="/actuator/health"
@@ -17,7 +19,9 @@ if [ "$(sudo docker ps -a -q -f name=${CONTAINER_NAME})" ]; then
 fi
 
 echo "> Run docker"
-sudo docker run -d --name ${CONTAINER_NAME} -p 80:8080 "${REGISTRY_URL}"/"${IMAGE_NAME}":${TAG}
+sudo docker run -d --name ${CONTAINER_NAME} -p 80:8080 "${REGISTRY_URL}"/"${IMAGE_NAME}":${TAG} \
+  -e SECRET_MANAGER_TOKEN="${SECRET_MANAGER_TOKEN}" \
+  -e SECRET_MANAGER_WORKSPACE_ID="${SECRET_MANAGER_WORKSPACE_ID}"
 
 echo "----------------------------------------------------------------------"
 

diff --git a/smeem-application/src/main/java/com/smeem/application/config/SmeemConfig.java b/smeem-application/src/main/java/com/smeem/application/config/SmeemConfig.java
@@ -0,0 +1,9 @@
+package com.smeem.application.config;
+
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnableConfigurationProperties(SmeemProperties.class)
+public class SmeemConfig {
+}
diff --git a/smeem-application/src/main/java/com/smeem/application/config/SmeemProperties.java b/smeem-application/src/main/java/com/smeem/application/config/SmeemProperties.java
@@ -0,0 +1,61 @@
+package com.smeem.application.config;
+
+import jakarta.annotation.PostConstruct;
+import lombok.Getter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+@Getter
+@ConfigurationProperties(prefix = "smeem")
+public class SmeemProperties {
+    private final Secret secret;
+    private final Duration duration;
+    private final Client client;
+
+    public SmeemProperties(Secret secret, Duration duration, Client client) {
+        this.secret = secret;
+        this.duration = duration;
+        this.client = client;
+    }
+
+    @Getter
+    public static class Secret {
+        private String key;
+
+        public Secret(String key) {
+            this.key = key;
+        }
+
+        @PostConstruct
+        private void init() {
+            this.key = Base64.getEncoder().encodeToString(key.getBytes(StandardCharsets.UTF_8));
+        }
+    }
+
+    public record Duration(
+            int remind,
+            int expired
+    ) {
+    }
+
+    public record Client(
+            Version version
+    ) {
+
+        public record Version(
+                String title,
+                String content,
+                APP ios,
+                APP android
+        ) {
+
+            public record APP(
+                    String app,
+                    String force
+            ) {
+            }
+        }
+    }
+}
diff --git a/smeem-application/src/main/java/com/smeem/application/domain/auth/SecretKeyFactory.java b/smeem-application/src/main/java/com/smeem/application/domain/auth/SecretKeyFactory.java
@@ -1,22 +1,21 @@
 package com.smeem.application.domain.auth;
 
-import com.smeem.common.util.SmeemProperty;
+import com.smeem.application.config.SmeemProperties;
 import io.jsonwebtoken.security.Keys;
 import lombok.RequiredArgsConstructor;
 import lombok.val;
 import org.springframework.stereotype.Component;
 
 import javax.crypto.SecretKey;
-
-import static java.util.Base64.getEncoder;
+import java.util.Base64;
 
 @Component
 @RequiredArgsConstructor
 public class SecretKeyFactory {
-    private final SmeemProperty smeemProperty;
+    private final SmeemProperties smeemProperties;
 
     public SecretKey create() {
-        val encodedKey = getEncoder().encodeToString(smeemProperty.getSMEEM_SECRET_KEY().getBytes());
+        val encodedKey = Base64.getEncoder().encodeToString(smeemProperties.getSecret().getKey().getBytes());
         return Keys.hmacShaKeyFor(encodedKey.getBytes());
     }
 }
diff --git a/smeem-application/src/main/java/com/smeem/application/domain/diary/DiaryService.java b/smeem-application/src/main/java/com/smeem/application/domain/diary/DiaryService.java
@@ -1,5 +1,6 @@
 package com.smeem.application.domain.diary;
 
+import com.smeem.application.config.SmeemProperties;
 import com.smeem.application.domain.badge.Badge;
 import com.smeem.application.domain.badge.BadgeType;
 import com.smeem.application.domain.member.Member;
@@ -27,6 +28,7 @@ public class DiaryService implements DiaryUseCase {
     private final BadgePort badgePort;
     private final MemberBadgePort memberBadgePort;
     private final TopicPort topicPort;
+    private final SmeemProperties smeemProperties;
 
     @Transactional
     public WriteDiaryResponse writeDiary(long memberId, WriteDiaryRequest request) {
@@ -73,9 +75,10 @@ public void deleteDiary(long diary) {
     }
 
     public RetrieveDiariesResponse retrieveDiariesByTerm(long memberId, LocalDate startDate, LocalDate endDate) {
+        val remindDuration = smeemProperties.getDuration().remind();
         return RetrieveDiariesResponse.of(
                 diaryPort.findByMemberAndTerm(memberId, startDate, endDate),
-                diaryPort.isExistByMemberAndPastAgo(memberId, 30));
+                diaryPort.isExistByMemberAndPastAgo(memberId, remindDuration));
     }
 
     @Transactional

diff --git a/smeem-application/src/main/java/com/smeem/application/domain/version/Property.java b/smeem-application/src/main/java/com/smeem/application/domain/version/Property.java
diff --git a/smeem-application/src/main/java/com/smeem/application/domain/version/VersionService.java b/smeem-application/src/main/java/com/smeem/application/domain/version/VersionService.java
@@ -1,5 +1,6 @@
 package com.smeem.application.domain.version;
 
+import com.smeem.application.config.SmeemProperties;
 import com.smeem.application.port.input.VersionUseCase;
 import com.smeem.application.port.input.dto.response.version.RetrieveAppVersionResponse;
 import lombok.RequiredArgsConstructor;
@@ -10,16 +11,16 @@
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 public class VersionService implements VersionUseCase {
-    private final Property property;
+    private final SmeemProperties smeemProperties;
 
     @Override
     public RetrieveAppVersionResponse retrieveAppVersion() {
         return RetrieveAppVersionResponse.of(
-                property.getCLIENT_VERSION_UPDATE_TITLE(),
-                property.getCLIENT_VERSION_UPDATE_CONTENT(),
-                property.getCLIENT_VERSION_ANDROID_VERSION(),
-                property.getCLIENT_VERSION_ANDROID_FORCE_VERSION(),
-                property.getCLIENT_VERSION_IOS_VERSION(),
-                property.getCLIENT_VERSION_IOS_FORCE_VERSION());
+                smeemProperties.getClient().version().title(),
+                smeemProperties.getClient().version().content(),
+                smeemProperties.getClient().version().android().app(),
+                smeemProperties.getClient().version().android().force(),
+                smeemProperties.getClient().version().ios().app(),
+                smeemProperties.getClient().version().ios().force());
     }
 }
diff --git a/smeem-application/src/main/resources/smeem-config/application-dev.yml b/smeem-application/src/main/resources/smeem-config/application-dev.yml
@@ -0,0 +1,15 @@
+smeem:
+  secret:
+    key: ${SMEEM_SECRET_KEY}
+  duration:
+    remind: ${SMEEM_DURATION_REMIND}
+  client:
+    version:
+      title: ${CLIENT_VERSION_TITLE}
+      content: ${CLIENT_VERSION_CONTENT}
+      ios:
+        app: ${CLIENT_VERSION_IOS_APP}
+        force: ${CLIENT_VERSION_IOS_FORCE}
+      android:
+        app: ${CLIENT_VERSION_ANDROID_APP}
+        force: ${CLIENT_VERSION_ANDROID_FORCE}
diff --git a/smeem-application/src/main/resources/smeem-config/application-local.yml b/smeem-application/src/main/resources/smeem-config/application-local.yml
@@ -0,0 +1,15 @@
+smeem:
+  secret:
+    key: ${SMEEM_SECRET_KEY}
+  duration:
+    remind: ${SMEEM_DURATION_REMIND}
+  client:
+    version:
+      title: ${CLIENT_VERSION_TITLE}
+      content: ${CLIENT_VERSION_CONTENT}
+      ios:
+        app: ${CLIENT_VERSION_IOS_APP}
+        force: ${CLIENT_VERSION_IOS_FORCE}
+      android:
+        app: ${CLIENT_VERSION_ANDROID_APP}
+        force: ${CLIENT_VERSION_ANDROID_FORCE}
diff --git a/smeem-application/src/main/resources/smeem-config/application-prod.yml b/smeem-application/src/main/resources/smeem-config/application-prod.yml
@@ -0,0 +1,15 @@
+smeem:
+  secret:
+    key: ${SMEEM_SECRET_KEY}
+  duration:
+    remind: ${SMEEM_DURATION_REMIND}
+  client:
+    version:
+      title: ${CLIENT_VERSION_TITLE}
+      content: ${CLIENT_VERSION_CONTENT}
+      ios:
+        app: ${CLIENT_VERSION_IOS_APP}
+        force: ${CLIENT_VERSION_IOS_FORCE}
+      android:
+        app: ${CLIENT_VERSION_ANDROID_APP}
+        force: ${CLIENT_VERSION_ANDROID_FORCE}
diff --git a/smeem-batch/src/main/java/com/smeem/batch/scheduler/DiaryScheduler.java b/smeem-batch/src/main/java/com/smeem/batch/scheduler/DiaryScheduler.java
@@ -1,21 +1,21 @@
 package com.smeem.batch.scheduler;
 
+import com.smeem.application.config.SmeemProperties;
 import com.smeem.application.port.input.DiaryUseCase;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
+import lombok.val;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 @Component
 @RequiredArgsConstructor
 public class DiaryScheduler {
     private final DiaryUseCase diaryUseCase;
-
-    @Value("${smeem.duration.expired}")
-    private int DURATION_EXPIRED;
+    private final SmeemProperties smeemProperties;
 
     @Scheduled(cron = "0 0 0 * * *")
     public void deleteExpiredDiaries() {
-        diaryUseCase.deleteExpiredDiaries(DURATION_EXPIRED);
+        val expiredDuration = smeemProperties.getDuration().expired();
+        diaryUseCase.deleteExpiredDiaries(expiredDuration);
     }
 }
diff --git a/smeem-batch/src/main/java/com/smeem/batch/scheduler/NotificationScheduler.java b/smeem-batch/src/main/java/com/smeem/batch/scheduler/NotificationScheduler.java
@@ -16,7 +16,7 @@ public class NotificationScheduler {
     private final MemberPort memberPort;
     private final NotificationPort notificationPort;
 
-    @Scheduled(cron = "${smeem.notification.cron_expression}")
+    @Scheduled(cron = "0 0/30 * * * *")
     public void pushAlarmByTrainingTime() throws InterruptedException {
         Thread.sleep(1000);
         val members = memberPort.findByTrainingTime(LocalDateTime.now());