diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml new file mode 100644 index 0000000..d6522d7 --- /dev/null +++ b/.github/workflows/dev_deploy.yml @@ -0,0 +1,73 @@ +# github repository Actions 페이지에 나타낼 이름 +name: CI/CD + +# event trigger +on: + push: + branches: [ "develop" ] + + +permissions: + contents: read + +jobs: + build: + runs-on: ubuntu-22.04 + steps: + ## 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 + + - 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 + + ## 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 }} + + + ## 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_SSH_PRIVATE_KEY }} + 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 }} + docker-compose up --build -d + docker image prune -f 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 fd79219..cb0de02 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 @@ -119,8 +119,10 @@ public ResponseEntity getPetBoards( @RequestParam(value="page",defaultValue = "0") int page, @RequestParam(value="size",defaultValue = "12") int size, @RequestParam(value="direction",defaultValue = "asc") 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 petBoardPage = petBoardService.getPetBoards(pageable); Map response = new LinkedHashMap<>(); @@ -144,8 +146,10 @@ public ResponseEntity getPetBoardsByPetType( @RequestParam(value="page",defaultValue = "0") int page, @RequestParam(value="size",defaultValue = "12") int size, @RequestParam(value="direction",defaultValue = "asc") 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 petBoardPage = petBoardService.getPetBoardsByPetType(petType, pageable); Map response = new LinkedHashMap<>();