Merge branch 'chore/migration' of https://github.com/depromeet/15th-t…

…eam1-BE into chore/migration
depromeet · Nov 12, 2024 · f9622ef · f9622ef
2 parents b096d17 + e333217
commit f9622ef
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/k3s-dev.yaml b/.github/workflows/k3s-dev.yaml
@@ -42,15 +42,15 @@ jobs:
         run: |
           CHANGED_MODULES=""
           
-          if [[ $(git diff --name-only HEAD^ HEAD) =~ ^layer-api/ ]]; then
+          if git diff --name-only HEAD^ HEAD | grep -q '^layer-api/'; then
             if [ -z "$CHANGED_MODULES" ]; then
               CHANGED_MODULES="layer-api"
             else
               CHANGED_MODULES="$CHANGED_MODULES,layer-api"
             fi
           fi
           
-          if [[ $(git diff --name-only HEAD^ HEAD) =~ ^layer-batch/ ]]; then
+          if git diff --name-only HEAD^ HEAD | grep -q '^layer-batch/'; then
             if [ -z "$CHANGED_MODULES" ]; then
               CHANGED_MODULES="layer-batch"
             else

diff --git a/layer-api/src/main/java/org/layer/LayerApplication.java b/layer-api/src/main/java/org/layer/LayerApplication.java
@@ -25,5 +25,4 @@ public static void main(String[] args) {
         SpringApplication.run(LayerApplication.class, args);
     }
 
-
 }
diff --git a/layer-api/src/main/resources/application-dev.yml b/layer-api/src/main/resources/application-dev.yml
@@ -8,7 +8,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     hibernate:
-      ddl-auto: update
+      ddl-auto: validate
     properties:
       hibernate:
         format_sql: true
@@ -49,7 +49,7 @@ google:
   sheet:
     id: ${GOOGLE_SHEET_ID}
     token_path: ${PROD_GOOGLE_TOKEN_PATH}
-    credential_path: ${PROD_GOOGLE_CREDENTIAL_PATH}
+    credential_path: ${PROD_GOOGLE_TOKEN_PATH}
 
 apple:
   login:

diff --git a/layer-api/src/main/resources/tokens/StoredCredential b/layer-api/src/main/resources/tokens/StoredCredential
diff --git a/layer-batch/src/main/resources/application.yml b/layer-batch/src/main/resources/application.yml
@@ -11,7 +11,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     hibernate:
-      ddl-auto: update
+      ddl-auto: validate
     properties:
       hibernate:
         format_sql: true

diff --git a/layer-domain/src/main/java/org/layer/domain/retrospect/entity/Retrospect.java b/layer-domain/src/main/java/org/layer/domain/retrospect/entity/Retrospect.java
@@ -78,7 +78,7 @@ public void validateRetrospectStatusDone() {
 
 	public void updateRetrospect(String title, String introduction, LocalDateTime deadline, Time time) {
 
-		if (deadline.isBefore(time.now())) {
+		if (deadline != null && deadline.isBefore(time.now())) {
 			throw new RetrospectException(INVALID_DEADLINE);
 		}
 

diff --git a/layer-domain/src/test/java/layer/domain/retrospect/entity/RetrospectTest.java b/layer-domain/src/test/java/layer/domain/retrospect/entity/RetrospectTest.java
@@ -4,6 +4,7 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.layer.domain.retrospect.entity.AnalysisStatus;
 import org.layer.domain.retrospect.entity.Retrospect;
 import org.layer.domain.retrospect.entity.RetrospectStatus;
 
@@ -12,7 +13,7 @@ public class RetrospectTest {
 	@Test
 	void 진행중인_회고는_진행여부로직에서_예외를_발생시키지_않는다() {
 		// given
-		Retrospect retrospect = new Retrospect(1L, "회고제목입니다", "회고소개입니다", RetrospectStatus.PROCEEDING,
+		Retrospect retrospect = new Retrospect(1L, "회고제목입니다", "회고소개입니다", RetrospectStatus.PROCEEDING, AnalysisStatus.PROCEEDING,
 			LocalDateTime.of(2024, 8, 4, 3, 5));
 
 		// when

diff --git a/layer-domain/src/test/java/layer/domain/retrospect/repository/RetrospectRepositoryTest.java b/layer-domain/src/test/java/layer/domain/retrospect/repository/RetrospectRepositoryTest.java
@@ -5,6 +5,7 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.layer.domain.retrospect.entity.AnalysisStatus;
 import org.layer.domain.retrospect.entity.Retrospect;
 import org.layer.domain.retrospect.entity.RetrospectStatus;
 import org.layer.domain.retrospect.repository.RetrospectRepository;
@@ -21,7 +22,7 @@ public class RetrospectRepositoryTest {
 	@Test
 	void 멀티모듈_레포지토리_테스트() {
 		// given
-		Retrospect retrospect = new Retrospect(1L, "회고제목입니다", "회고소개입니다", RetrospectStatus.PROCEEDING,
+		Retrospect retrospect = new Retrospect(1L, "회고제목입니다", "회고소개입니다", RetrospectStatus.PROCEEDING, AnalysisStatus.PROCEEDING,
 			LocalDateTime.of(2024, 8, 4, 3, 5));
 
 		// when