Merge branch 'dev' of https://github.com/PoolC/Palkia into dev

.github/workflows/dev.yml

@@ -10,8 +10,6 @@ name: Java CI with Gradle
 on:
   push:
     branches: [ "dev" ]
-  pull_request:
-    branches: [ "dev" ]
 
 permissions:
   contents: read
@@ -36,29 +34,28 @@ jobs:
       #  arguments: build
       run: ./gradlew clean build --exclude-task test
     - name: make directory for transfer
-      run: mkdir deploy
+      run: mkdir palkia
     - name: Copy Jar
-      run: cp ./build/libs/*.jar ./deploy/
+      run: cp ./build/libs/*.jar ./palkia/
     - name: copy file via ssh password
       uses: appleboy/[email protected]
       with:
         host: ${{ secrets.DEV_HOST }}
-        username: ${{ secrets.SERVER_USER }}
-        password: ${{ secrets.SSH_PASSWORD }}
+        username: ${{ secrets.DEV_USER }}
+        password: ${{ secrets.DEV_PASSWORD }}
+        key: ${{ secrets.DEV_KEY }}
+        port: ${{ secrets.SSH_PORT }}
+        source: "./palkia/*.jar"
+        target: /home/jimmy/k8s/
+    - name: restart server
+      uses: appleboy/[email protected]
+      with:
+        host: ${{ secrets.DEV_HOST }}
+        username: ${{ secrets.DEV_USER }}
+        password: ${{ secrets.DEV_PASSWORD }}
         key: ${{ secrets.DEV_KEY }}
         port: ${{ secrets.SSH_PORT }}
-        source: "./build/libs/*.jar"
-        target: /home/ubuntu/palkiabuilds/
-    # - name: restart server
-    #   uses: appleboy/[email protected]
-    #   with:
-    #     host: ${{ secrets.SERVER_HOST }}
-    #     username: ${{ secrets.SERVER_USER }}
-    #     password: ${{ secrets.SSH_PASSWORD }}
-    #     key: ${{ secrets.KEY }}
-    #     port: ${{ secrets.SSH_PORT }}
-    #     script: |
-    #       cd dockercompose/palkia
-    #       docker compose down
-    #       docker compose up -d --build
-
+        script: |
+          kubectl delete deployment palkia-deployment
+          kubectl apply -f ./k8s/palkia-deployment.yaml
+          kubectl rollout status deployment/palkia-deployment

README.md

@@ -67,3 +67,5 @@ compiler(`⌘,` > `Build, Execution, Deployment` > `Compiler` > `Java Compiler`
 ### Deploy
 
 TODO with docker
+
+

src/main/java/org/poolc/api/like/service/LikeService.java

@@ -12,6 +12,7 @@
 import org.poolc.api.post.domain.Post;
 import org.poolc.api.post.service.PostService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.NoSuchElementException;
 import org.springframework.transaction.annotation.Transactional;