chore: 병합 충돌

Team-Smeme · Oct 13, 2024 · ac02818 · ac02818
2 parents 14af097 + cb40557
commit ac02818
Show file tree

Hide file tree

Showing 69 changed files with 701 additions and 429 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/README.md b/README.md
@@ -18,10 +18,8 @@
 <br/><br/>
 
 ## Tech Stack
-- Java, Spring Boot
-- PostgreSQL, Spring Data JPA, QueryDSL
-- AWS : EC2, RDS, Code Deploy, Nginx
-- JUnit5
+- Java 17, Spring Boot 3.2.1, Spring Data JPA
+- PostgreSQL, AWS(EC2, RDS), Docker
 - Swagger
 - Kakao/Apple Oauth, Discord WebHook, Firebase Messaging Service
 

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,10 @@ 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 \
+  -e SECRET_MANAGER_TOKEN="${SECRET_MANAGER_TOKEN}" \
+  -e SECRET_MANAGER_WORKSPACE_ID="${SECRET_MANAGER_WORKSPACE_ID}" \
+  "${REGISTRY_URL}"/"${IMAGE_NAME}":${TAG}
 
 echo "----------------------------------------------------------------------"
 

diff --git a/settings.gradle b/settings.gradle
@@ -12,3 +12,5 @@ include 'smeem-output-notification:firebase'
 include 'smeem-output-oauth'
 include 'smeem-output-oauth:apple'
 include 'smeem-output-oauth:kakao'
+include 'smeem-output-cache'
+include 'smeem-output-cache:redis'
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/member/MemberService.java b/smeem-application/src/main/java/com/smeem/application/domain/member/MemberService.java
@@ -3,7 +3,6 @@
 import com.smeem.application.domain.badge.Badge;
 import com.smeem.application.domain.trainingtime.DayType;
 import com.smeem.application.domain.trainingtime.TrainingTime;
-import com.smeem.application.domain.visit.Visit;
 import com.smeem.application.port.input.MemberUseCase;
 import com.smeem.application.port.input.dto.request.member.UpdateMemberHasPushAlarmRequest;
 import com.smeem.application.port.input.dto.request.member.UpdateMemberRequest;
@@ -13,6 +12,7 @@
 import com.smeem.application.port.input.dto.response.member.UpdateMemberResponse;
 import com.smeem.application.port.input.dto.response.member.UsernameDuplicatedResponse;
 import com.smeem.application.port.input.dto.response.plan.RetrieveMemberPlanResponse;
+import com.smeem.application.port.output.cache.CachePort;
 import com.smeem.application.port.output.persistence.*;
 import com.smeem.common.logger.HookLogger;
 import com.smeem.common.logger.LoggingMessage;
@@ -21,6 +21,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 
 @Service
@@ -31,10 +33,10 @@ public class MemberService implements MemberUseCase {
     private final TrainingTimePort trainingTimePort;
     private final BadgePort badgePort;
     private final DiaryPort diaryPort;
-    private final VisitPort visitPort;
     private final GoalPort goalPort;
     private final PlanPort planPort;
     private final HookLogger hookLogger;
+    private final CachePort cachePort;
 
     @Transactional
     public UpdateMemberResponse updateMember(long memberId, UpdateMemberRequest request) {
@@ -89,12 +91,15 @@ public RetrievePerformanceResponse retrieveMemberPerformance(long memberId) {
     }
 
     @Transactional
-    public void checkAttendance(long memberId) {
-        val foundMember = memberPort.findById(memberId);
-        if (!visitPort.isExistByMemberAndToday(foundMember.getId())) {
+    public void visit(long memberId) {
+        Member foundMember = memberPort.findById(memberId);
+        String today = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+        String key = "visit:" + today;
+
+        if (!cachePort.getBit(key, foundMember.getId())) {
             foundMember.visit();
             memberPort.update(foundMember);
-            visitPort.visit(new Visit(foundMember.getId()));
+            cachePort.setBit(key, foundMember.getId(), true);
         }
     }
 

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/java/com/smeem/application/domain/visit/Visit.java b/smeem-application/src/main/java/com/smeem/application/domain/visit/Visit.java
diff --git a/smeem-application/src/main/java/com/smeem/application/port/input/MemberUseCase.java b/smeem-application/src/main/java/com/smeem/application/port/input/MemberUseCase.java
@@ -15,7 +15,7 @@ public interface MemberUseCase {
     UsernameDuplicatedResponse checkUsernameDuplicated(String username);
     void updateMemberHasPush(long memberId, UpdateMemberHasPushAlarmRequest request);
     RetrievePerformanceResponse retrieveMemberPerformance(long memberId);
-    void checkAttendance(long memberId);
+    void visit(long memberId);
     void updatePlan(long memberId, UpdateMemberPlanRequest request);
     RetrieveMemberPlanResponse retrieveMemberPlan(long memberId);
 }
diff --git a/smeem-application/src/main/java/com/smeem/application/port/output/cache/CachePort.java b/smeem-application/src/main/java/com/smeem/application/port/output/cache/CachePort.java
@@ -0,0 +1,6 @@
+package com.smeem.application.port.output.cache;
+
+public interface CachePort {
+    void setBit(String key, long offset, boolean value);
+    boolean getBit(String key, long offset);
+}
diff --git a/smeem-application/src/main/java/com/smeem/application/port/output/persistence/VisitPort.java b/smeem-application/src/main/java/com/smeem/application/port/output/persistence/VisitPort.java
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}