Merge pull request #169 from makevook/develop

release 병합
makevook · Jul 22, 2024 · ed7a40b · ed7a40b
2 parents ae4964c + 87ff9e4
commit ed7a40b
Show file tree

Hide file tree

Showing 256 changed files with 1,811 additions and 785 deletions.
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -5,13 +5,17 @@ on:
   push:
     branches:
       - develop
+    paths:
+      - "server/**"
 
 jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
       - name: Deploy
         uses: dagger/dagger-for-github@v5
         env:
@@ -23,7 +27,7 @@ jobs:
           module: ./cicd
           args: >-
             deploy
-            --source-dir=api
+            --source-dir=server
             --profile=dev
             --ssh-dest=env:SSH_DEST
             --ssh-key=env:SSH_KEY

diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
@@ -5,13 +5,17 @@ on:
   push:
     branches:
       - main
+    paths:
+      - "server/**"
 
 jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
       - name: Deploy
         uses: dagger/dagger-for-github@v5
         env:
@@ -23,7 +27,7 @@ jobs:
           module: ./cicd
           args: >-
             deploy
-            --source-dir=api
+            --source-dir=server
             --profile=prod
             --ssh-dest=env:SSH_DEST
             --ssh-key=env:SSH_KEY

diff --git a/.github/workflows/deploy-stag.yml b/.github/workflows/deploy-stag.yml
@@ -5,13 +5,17 @@ on:
   push:
     branches:
       - release
+    paths:
+      - "server/**"
 
 jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
       - name: Deploy
         uses: dagger/dagger-for-github@v5
         env:
@@ -23,7 +27,7 @@ jobs:
           module: ./cicd
           args: >-
             deploy
-            --source-dir=api
+            --source-dir=server
             --profile=stag
             --ssh-dest=env:SSH_DEST
             --ssh-key=env:SSH_KEY

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "devenv/sql"]
+	path = devenv/sql
+	url = git@github.com:makevook/vook-sql.git
+[submodule "api/src/test/resources/migrate/sql"]
+	path = api/src/test/resources/migrate/sql
+	url = git@github.com:makevook/vook-sql.git
+[submodule "server/api/src/test/resources/migrate/sql"]
+	path = server/api/src/test/resources/migrate/sql
+	url = git@github.com:makevook/vook-sql.git
diff --git a/Makefile b/Makefile
@@ -0,0 +1,3 @@
+.PHONY:sql-update
+sql-update:
+	git submodule update --remote --merge
diff --git a/api/settings.gradle b/api/settings.gradle
diff --git a/api/src/main/java/vook/server/api/domain/user/logic/dto/UserSignUpFromSocialCommand.java b/api/src/main/java/vook/server/api/domain/user/logic/dto/UserSignUpFromSocialCommand.java
diff --git a/api/src/main/java/vook/server/api/domain/vocabulary/logic/TermLogic.java b/api/src/main/java/vook/server/api/domain/vocabulary/logic/TermLogic.java
diff --git a/api/src/main/java/vook/server/api/domain/vocabulary/logic/dto/TermCreateAllCommand.java b/api/src/main/java/vook/server/api/domain/vocabulary/logic/dto/TermCreateAllCommand.java
diff --git a/api/src/main/java/vook/server/api/domain/vocabulary/logic/dto/TermCreateCommand.java b/api/src/main/java/vook/server/api/domain/vocabulary/logic/dto/TermCreateCommand.java
diff --git a/api/src/main/java/vook/server/api/domain/vocabulary/logic/dto/TermUpdateCommand.java b/api/src/main/java/vook/server/api/domain/vocabulary/logic/dto/TermUpdateCommand.java
diff --git a/cicd/Makefile b/cicd/Makefile
@@ -3,7 +3,7 @@ VERSION := $(shell git describe --tags --always --dirty)
 .PHONY:deploy-dev
 deploy-dev:
 	dagger call -v deploy \
-	--source-dir=../api \
+	--source-dir=../server \
 	--profile=dev \
 	--ssh-dest=file:./secrets/dev/dest.txt \
 	--ssh-key=file:./secrets/dev/ssh.key \
@@ -14,7 +14,7 @@ deploy-dev:
 .PHONY:deploy-stag
 deploy-stag:
 	dagger call -v deploy \
-	--source-dir=../api \
+	--source-dir=../server \
 	--profile=stag \
 	--ssh-dest=file:./secrets/stag/dest.txt \
 	--ssh-key=file:./secrets/stag/ssh.key \
@@ -25,7 +25,7 @@ deploy-stag:
 .PHONY:deploy-prod
 deploy-prod:
 	dagger call -v deploy \
-	--source-dir=../api \
+	--source-dir=../server \
 	--profile=prod \
 	--ssh-dest=file:./secrets/prod/dest.txt \
 	--ssh-key=file:./secrets/prod/ssh.key \
@@ -35,7 +35,7 @@ deploy-prod:
 
 .PHONY:build-jar
 build-jar:
-	dagger call -v build-api-jar --dir=../api --test export --path out/api.jar
+	dagger call -v build-api-jar --dir=../server --test --sub-module=api export --path out/api.jar
 
 .PHONY:build-image
 build-image: build-jar