From 4277746395a1ad6b2a6fbf39a03563ddf710e71b Mon Sep 17 00:00:00 2001
From: JeongJun Min <41982054+m3k0813@users.noreply.github.com>
Date: Sun, 7 Jul 2024 22:04:56 +0900
Subject: [PATCH 01/17] ci: dev_deploy.yml

---
 .github/workflows/dev_deploy.yml | 67 ++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 .github/workflows/dev_deploy.yml

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
new file mode 100644
index 0000000..0f229be
--- /dev/null
+++ b/.github/workflows/dev_deploy.yml
@@ -0,0 +1,67 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
+
+name: Java CI with Gradle
+
+on:
+  push:
+    branches: [ "develop" ]
+  pull_request:
+    branches: [ "develop" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
+    # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
+    # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
+
+    - name: Build with Gradle Wrapper
+      run: ./gradlew build
+
+    # NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html).
+    # If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version.
+    #
+    # - name: Setup Gradle
+    #   uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
+    #   with:
+    #     gradle-version: '8.5'
+    #
+    # - name: Build with Gradle 8.5
+    #   run: gradle build
+
+  dependency-submission:
+
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: write
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
+    # Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies.
+    # See: https://github.com/gradle/actions/blob/main/dependency-submission/README.md
+    - name: Generate and submit dependency graph
+      uses: gradle/actions/dependency-submission@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0

From 0e9360223929d7804eb87236d2b0fbafb14523d5 Mon Sep 17 00:00:00 2001
From: JeongJun Min <41982054+m3k0813@users.noreply.github.com>
Date: Sun, 7 Jul 2024 22:28:04 +0900
Subject: [PATCH 02/17] Update dev_deploy.yml

---
 .github/workflows/dev_deploy.yml | 76 ++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index 0f229be..d5c1ffa 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -15,7 +15,6 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-22.04
     permissions:
       contents: read
@@ -28,40 +27,51 @@ jobs:
         java-version: '17'
         distribution: 'temurin'
 
-    # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
-    # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
-    - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
-
-    - name: Build with Gradle Wrapper
-      run: ./gradlew build
+    ## gradle caching
+    - name: Gradle Caching
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~/.gradle/caches
+          ~/.gradle/wrapper
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+        restore-keys: |
+          ${{ runner.os }}-gradle-
+    - name: Grant execute permission for gradlew
+      run:
+        chmod +x gradlew
 
-    # NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html).
-    # If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version.
-    #
-    # - name: Setup Gradle
-    #   uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
-    #   with:
-    #     gradle-version: '8.5'
-    #
-    # - name: Build with Gradle 8.5
-    #   run: gradle build
+    - name: Build with Gradle
+      run: ./gradlew build -x test
+      shell: bash
 
-  dependency-submission:
+    - name: Build With Gradle
+      if: contains(github.ref, 'develop')
+      run: ./gradlew build -x test
 
-    runs-on: ubuntu-22.04
-    permissions:
-      contents: write
+      ## docker build & push to production
+    - name: Docker build & push to prod
+      if: contains(github.ref, 'dev')
+      run: |
+        echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+        docker build -f Dockerfile -t ${{ secrets.DOCKER_REPO }} .
+        docker push ${{ secrets.DOCKER_REPO }}
+      
 
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 17
-      uses: actions/setup-java@v4
+    ## deploy to production
+    - name: Deploy to prod
+      uses: appleboy/ssh-action@v0.1.6
+      id: deploy-prod
+      if: contains(github.ref, 'develop')
       with:
-        java-version: '17'
-        distribution: 'temurin'
-
-    # Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies.
-    # See: https://github.com/gradle/actions/blob/main/dependency-submission/README.md
-    - name: Generate and submit dependency graph
-      uses: gradle/actions/dependency-submission@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
+        host: ${{ secrets.EC2_HOST}}
+        username: ${{ secrets.EC2_USERNAME }}
+        key: ${{ secrets.EC2_SSH_PRIVATE_KEY }}
+        port: 22
+        envs: GITHUB_SHA
+        script: |
+          echo test1234 > test.txt
+          sudo docker rm -f $(docker ps -qa)
+          sudo docker pull ${{ secrets.DOCKER_REPO }}
+          docker-compose up -d
+          docker image prune -f

From ab5189817d38ad95ad7f068563084ffdb04810ab Mon Sep 17 00:00:00 2001
From: JeongJun Min <41982054+m3k0813@users.noreply.github.com>
Date: Sun, 7 Jul 2024 22:31:04 +0900
Subject: [PATCH 03/17] Update dev_deploy.yml

---
 .github/workflows/dev_deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index d5c1ffa..ca32445 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -53,7 +53,7 @@ jobs:
     - name: Docker build & push to prod
       if: contains(github.ref, 'dev')
       run: |
-        echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+        echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
         docker build -f Dockerfile -t ${{ secrets.DOCKER_REPO }} .
         docker push ${{ secrets.DOCKER_REPO }}
       

From 673ce88637eb5a4b53742d266b40c21c308a67d7 Mon Sep 17 00:00:00 2001
From: JeongJun Min <41982054+m3k0813@users.noreply.github.com>
Date: Sun, 7 Jul 2024 22:35:35 +0900
Subject: [PATCH 04/17] Update dev_deploy.yml

---
 .github/workflows/dev_deploy.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index ca32445..52ab825 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -49,6 +49,12 @@ jobs:
       if: contains(github.ref, 'develop')
       run: ./gradlew build -x test
 
+        # docker build & push to production
+    - name: Configure Docker credential helper
+      run: |
+        echo '{"credsStore":"pass"}' > ~/.docker/config.json
+        docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_HUB_TOKEN }}
+        
       ## docker build & push to production
     - name: Docker build & push to prod
       if: contains(github.ref, 'dev')

From 181c37df58c9b9cb79f36ae5796bbd2a5c1eb1a4 Mon Sep 17 00:00:00 2001
From: JeongJun Min <41982054+m3k0813@users.noreply.github.com>
Date: Sun, 7 Jul 2024 22:47:42 +0900
Subject: [PATCH 05/17] Update dev_deploy.yml

---
 .github/workflows/dev_deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index 52ab825..287d68a 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -37,6 +37,7 @@ jobs:
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
         restore-keys: |
           ${{ runner.os }}-gradle-
+          
     - name: Grant execute permission for gradlew
       run:
         chmod +x gradlew

From 5303de48514aff32d1fa2db55b429a88e1c2edfe Mon Sep 17 00:00:00 2001
From: JeongJun Min <41982054+m3k0813@users.noreply.github.com>
Date: Sun, 7 Jul 2024 22:53:38 +0900
Subject: [PATCH 06/17] Update dev_deploy.yml

---
 .github/workflows/dev_deploy.yml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index 287d68a..29e166f 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -50,30 +50,23 @@ jobs:
       if: contains(github.ref, 'develop')
       run: ./gradlew build -x test
 
-        # docker build & push to production
-    - name: Configure Docker credential helper
-      run: |
-        echo '{"credsStore":"pass"}' > ~/.docker/config.json
-        docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_HUB_TOKEN }}
-        
-      ## docker build & push to production
+    # docker build & push to production
     - name: Docker build & push to prod
       if: contains(github.ref, 'dev')
       run: |
         echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
         docker build -f Dockerfile -t ${{ secrets.DOCKER_REPO }} .
         docker push ${{ secrets.DOCKER_REPO }}
-      
 
-    ## deploy to production
+    # deploy to production
     - name: Deploy to prod
       uses: appleboy/ssh-action@v0.1.6
       id: deploy-prod
-      if: contains(github.ref, 'develop')
+      if: contains(github.ref, 'dev')
       with:
         host: ${{ secrets.EC2_HOST}}
         username: ${{ secrets.EC2_USERNAME }}
-        key: ${{ secrets.EC2_SSH_PRIVATE_KEY }}
+        key: ${{ secrets.EC2_PRIVATE_KEY }}
         port: 22
         envs: GITHUB_SHA
         script: |

From 1ccccf1ca2a42d43816c2329e9e255190f10f112 Mon Sep 17 00:00:00 2001
From: JeongJun Min <41982054+m3k0813@users.noreply.github.com>
Date: Sun, 7 Jul 2024 22:58:23 +0900
Subject: [PATCH 07/17] Update dev_deploy.yml

---
 .github/workflows/dev_deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index 29e166f..91f9df1 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -62,11 +62,11 @@ jobs:
     - name: Deploy to prod
       uses: appleboy/ssh-action@v0.1.6
       id: deploy-prod
-      if: contains(github.ref, 'dev')
+      if: contains(github.ref, 'develop')
       with:
         host: ${{ secrets.EC2_HOST}}
         username: ${{ secrets.EC2_USERNAME }}
-        key: ${{ secrets.EC2_PRIVATE_KEY }}
+        key: ${{ secrets.EC2_SSH_PRIVATE_KEY }}
         port: 22
         envs: GITHUB_SHA
         script: |

From 70393b081169083d09eecc56c0507f3f782f6b2c Mon Sep 17 00:00:00 2001
From: JeongJun Min <41982054+m3k0813@users.noreply.github.com>
Date: Sun, 7 Jul 2024 23:06:50 +0900
Subject: [PATCH 08/17] Update dev_deploy.yml

---
 .github/workflows/dev_deploy.yml | 36 +++++++++++++-------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index 91f9df1..46e7ee0 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -50,28 +50,22 @@ jobs:
       if: contains(github.ref, 'develop')
       run: ./gradlew build -x test
 
-    # docker build & push to production
-    - name: Docker build & push to prod
-      if: contains(github.ref, 'dev')
+  # Spring 어플리케이션 Docker Image 빌드
+    - name: Build Docker Image For Spring
       run: |
-        echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-        docker build -f Dockerfile -t ${{ secrets.DOCKER_REPO }} .
-        docker push ${{ secrets.DOCKER_REPO }}
-
-    # deploy to production
-    - name: Deploy to prod
-      uses: appleboy/ssh-action@v0.1.6
-      id: deploy-prod
-      if: contains(github.ref, 'develop')
+        docker login -u ${{ secrets.DOCKER_REPO }} -p ${{ secrets.DOCKER_PASSWORD }}
+        docker build -t ${{ secrets.DOCKER_REPO }}/도커 레파지토리 이름 .
+        docker push ${{ secrets.DOCKER_REPO }}/도커 레파지토리 이름
+        
+    # 서버에서 Docker 이미지 실행
+    - name: EC2 Docker Run
+      uses: appleboy/ssh-action@master
       with:
-        host: ${{ secrets.EC2_HOST}}
-        username: ${{ secrets.EC2_USERNAME }}
-        key: ${{ secrets.EC2_SSH_PRIVATE_KEY }}
-        port: 22
-        envs: GITHUB_SHA
+        host: ${{ secrets.EC2_HOST }}
+        username: ubuntu
+        key: ${{ secrets.EC2_KEY }}
         script: |
-          echo test1234 > test.txt
-          sudo docker rm -f $(docker ps -qa)
-          sudo docker pull ${{ secrets.DOCKER_REPO }}
+          docker rm -f $(docker ps -qa)
+          docker rmi ${{ secrets.DOCKER_REPO }}/도커 레파지토리 이름
+          docker pull ${{ secrets.DOCKER_REPO }}/도커 레파지토리 이름
           docker-compose up -d
-          docker image prune -f

From 7c1661771da7807cd0b8bc5830d5686e7a973009 Mon Sep 17 00:00:00 2001
From: JeongJun Min <41982054+m3k0813@users.noreply.github.com>
Date: Sun, 7 Jul 2024 23:10:05 +0900
Subject: [PATCH 09/17] Update dev_deploy.yml

---
 .github/workflows/dev_deploy.yml | 117 ++++++++++++++++---------------
 1 file changed, 59 insertions(+), 58 deletions(-)

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index 46e7ee0..27fd2b2 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -1,71 +1,72 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
-
-name: Java CI with Gradle
+# github repository Actions 페이지에 나타낼 이름
+name: CI/CD
 
+# event trigger
 on:
   push:
     branches: [ "develop" ]
-  pull_request:
-    branches: [ "develop" ]
+
+
+permissions:
+  contents: read
 
 jobs:
   build:
     runs-on: ubuntu-22.04
-    permissions:
-      contents: read
-
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 17
-      uses: actions/setup-java@v4
-      with:
-        java-version: '17'
-        distribution: 'temurin'
+      ## jdk setting
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin' # https://github.com/actions/setup-java
+
+      ## gradle caching
+      - name: Gradle Caching
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Grant execute permission for gradlew
+        run:
+          chmod +x gradlew
 
-    ## gradle caching
-    - name: Gradle Caching
-      uses: actions/cache@v3
-      with:
-        path: |
-          ~/.gradle/caches
-          ~/.gradle/wrapper
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-        restore-keys: |
-          ${{ runner.os }}-gradle-
-          
-    - name: Grant execute permission for gradlew
-      run:
-        chmod +x gradlew
+      - name: Build with Gradle
+        run: ./gradlew build -x test
+        shell: bash
 
-    - name: Build with Gradle
-      run: ./gradlew build -x test
-      shell: bash
+      - name: Build With Gradle
+        if: contains(github.ref, 'dev')
+        run: ./gradlew build -x test
 
-    - name: Build With Gradle
-      if: contains(github.ref, 'develop')
-      run: ./gradlew build -x test
+      ## docker build & push to production
+      - name: Docker build & push to prod
+        if: contains(github.ref, 'dev')
+        run: |
+          echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+          docker build -f Dockerfile -t ${{ secrets.DOCKER_REPO }} .
+          docker push ${{ secrets.DOCKER_REPO }}
+      
 
-  # Spring 어플리케이션 Docker Image 빌드
-    - name: Build Docker Image For Spring
-      run: |
-        docker login -u ${{ secrets.DOCKER_REPO }} -p ${{ secrets.DOCKER_PASSWORD }}
-        docker build -t ${{ secrets.DOCKER_REPO }}/도커 레파지토리 이름 .
-        docker push ${{ secrets.DOCKER_REPO }}/도커 레파지토리 이름
-        
-    # 서버에서 Docker 이미지 실행
-    - name: EC2 Docker Run
-      uses: appleboy/ssh-action@master
-      with:
-        host: ${{ secrets.EC2_HOST }}
-        username: ubuntu
-        key: ${{ secrets.EC2_KEY }}
-        script: |
-          docker rm -f $(docker ps -qa)
-          docker rmi ${{ secrets.DOCKER_REPO }}/도커 레파지토리 이름
-          docker pull ${{ secrets.DOCKER_REPO }}/도커 레파지토리 이름
-          docker-compose up -d
+      ## deploy to production
+      - name: Deploy to prod
+        uses: appleboy/ssh-action@v0.1.6
+        id: deploy-prod
+        if: contains(github.ref, 'dev')
+        with:
+          host: ${{ secrets.EC2_HOST}}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          port: 22
+          envs: GITHUB_SHA
+          script: |
+            echo test1234 > test.txt
+            sudo docker rm -f $(docker ps -qa)
+            sudo docker pull ${{ secrets.DOCKER_REPO }}
+            docker-compose up -d
+            docker image prune -f

From f0e5dab4978c760e630f383230439ff25ee5fc97 Mon Sep 17 00:00:00 2001
From: JeongJun Min <41982054+m3k0813@users.noreply.github.com>
Date: Sun, 7 Jul 2024 23:16:33 +0900
Subject: [PATCH 10/17] Update dev_deploy.yml

---
 .github/workflows/dev_deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index 27fd2b2..23d6421 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -61,7 +61,7 @@ jobs:
         with:
           host: ${{ secrets.EC2_HOST}}
           username: ${{ secrets.EC2_USERNAME }}
-          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          key: ${{ secrets.EC2_SSH_PRIVATE_KEY }}
           port: 22
           envs: GITHUB_SHA
           script: |

From 80f77c701fa6fd9defbeeede53083a921f78f620 Mon Sep 17 00:00:00 2001
From: JeongJun Min <41982054+m3k0813@users.noreply.github.com>
Date: Mon, 8 Jul 2024 00:31:48 +0900
Subject: [PATCH 11/17] Update dev_deploy.yml


From dfe8ce01c18401d4e3a0c0f73ef8a92dce04f325 Mon Sep 17 00:00:00 2001
From: MJJ <m3k0813@gmail.com>
Date: Tue, 9 Jul 2024 14:10:10 +0900
Subject: [PATCH 12/17] =?UTF-8?q?fix:=20=ED=8E=AB=20=EA=B2=8C=EC=8B=9C?=
 =?UTF-8?q?=EA=B8=80=20=EC=B5=9C=EC=8B=A0=EC=88=9C=20=EC=A0=95=EB=A0=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pet_board/controller/PetBoardController.java          | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/techeer/abandoneddog/pet_board/controller/PetBoardController.java b/src/main/java/com/techeer/abandoneddog/pet_board/controller/PetBoardController.java
index 9808af0..cd02980 100644
--- a/src/main/java/com/techeer/abandoneddog/pet_board/controller/PetBoardController.java
+++ b/src/main/java/com/techeer/abandoneddog/pet_board/controller/PetBoardController.java
@@ -97,9 +97,10 @@ public ResponseEntity<?> getPetBoard(@PathVariable("petBoardId") Long petBoardId
     public ResponseEntity<?> getPetBoards(
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "12") int size,
-            @RequestParam(defaultValue = "asc") String direction) {
+            @RequestParam(defaultValue = "desc") String direction) {
         try {
-            Sort sort = direction.equalsIgnoreCase("desc") ? Sort.by("petBoardId").descending() : Sort.by("petBoardId").ascending();
+//            Sort sort = direction.equalsIgnoreCase("desc") ? Sort.by("petBoardId").descending() : Sort.by("petBoardId").ascending();
+            Sort sort = direction.equalsIgnoreCase("desc") ? Sort.by("createdAt").descending() : Sort.by("createdAt").ascending();
             Pageable pageable = PageRequest.of(page, size, sort);
             Page<PetBoardResponseDto> petBoardPage = petBoardService.getPetBoards(pageable);
             Map<String, Object> response = new LinkedHashMap<>();
@@ -121,9 +122,10 @@ public ResponseEntity<?> getPetBoardsByPetType(
             @PathVariable String petType,
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "12") int size,
-            @RequestParam(defaultValue = "asc") String direction) {
+            @RequestParam(defaultValue = "desc") String direction) {
         try {
             Sort sort = direction.equalsIgnoreCase("desc") ? Sort.by("petBoardId").descending() : Sort.by("petBoardId").ascending();
+//            Sort sort = direction.equalsIgnoreCase("desc") ? Sort.by("createdAt").descending() : Sort.by("createdAt").ascending();
             Pageable pageable = PageRequest.of(page, size, sort);
             Page<PetBoardResponseDto> petBoardPage = petBoardService.getPetBoardsByPetType(petType, pageable);
             Map<String, Object> response = new LinkedHashMap<>();

From 35580632c3ff1a77a79cfab9dcf7f6738ddca309 Mon Sep 17 00:00:00 2001
From: JeongJun Min <41982054+m3k0813@users.noreply.github.com>
Date: Thu, 11 Jul 2024 20:39:21 +0900
Subject: [PATCH 13/17] Update dev_deploy.yml

---
 .github/workflows/dev_deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index 23d6421..9949fbd 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -65,6 +65,7 @@ jobs:
           port: 22
           envs: GITHUB_SHA
           script: |
+            cd ./backend
             echo test1234 > test.txt
             sudo docker rm -f $(docker ps -qa)
             sudo docker pull ${{ secrets.DOCKER_REPO }}

From 410ac50fe1d9025a1514060b8202b767eef39efd Mon Sep 17 00:00:00 2001
From: JeongJun Min <41982054+m3k0813@users.noreply.github.com>
Date: Thu, 11 Jul 2024 20:42:28 +0900
Subject: [PATCH 14/17] Update dev_deploy.yml

---
 .github/workflows/dev_deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index 9949fbd..cb5652c 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -67,7 +67,7 @@ jobs:
           script: |
             cd ./backend
             echo test1234 > test.txt
-            sudo docker rm -f $(docker ps -qa)
+            sudo docker rm -f $(docker ps -qa) || true
             sudo docker pull ${{ secrets.DOCKER_REPO }}
             docker-compose up -d
             docker image prune -f

From 250f4a878934ae4d17916638816c6df6abb5f496 Mon Sep 17 00:00:00 2001
From: JeongJun Min <41982054+m3k0813@users.noreply.github.com>
Date: Thu, 11 Jul 2024 21:27:40 +0900
Subject: [PATCH 15/17] Update dev_deploy.yml

---
 .github/workflows/dev_deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index cb5652c..d6522d7 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -69,5 +69,5 @@ jobs:
             echo test1234 > test.txt
             sudo docker rm -f $(docker ps -qa) || true
             sudo docker pull ${{ secrets.DOCKER_REPO }}
-            docker-compose up -d
+            docker-compose up --build -d
             docker image prune -f

From 0074c0d4848b43e5ad0282c5f6f67358dcafd5d5 Mon Sep 17 00:00:00 2001
From: JeongJun Min <41982054+m3k0813@users.noreply.github.com>
Date: Thu, 11 Jul 2024 22:30:02 +0900
Subject: [PATCH 16/17] Update dev_deploy.yml

---
 .github/workflows/dev_deploy.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index d6522d7..0bf799d 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -65,7 +65,6 @@ jobs:
           port: 22
           envs: GITHUB_SHA
           script: |
-            cd ./backend
             echo test1234 > test.txt
             sudo docker rm -f $(docker ps -qa) || true
             sudo docker pull ${{ secrets.DOCKER_REPO }}

From 794a17e36e84b442383c61840e9e735b192092ca Mon Sep 17 00:00:00 2001
From: JeongJun Min <41982054+m3k0813@users.noreply.github.com>
Date: Thu, 11 Jul 2024 22:44:32 +0900
Subject: [PATCH 17/17] Update dev_deploy.yml

---
 .github/workflows/dev_deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index 0bf799d..d6522d7 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -65,6 +65,7 @@ jobs:
           port: 22
           envs: GITHUB_SHA
           script: |
+            cd ./backend
             echo test1234 > test.txt
             sudo docker rm -f $(docker ps -qa) || true
             sudo docker pull ${{ secrets.DOCKER_REPO }}