diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index af088331..6399c1d4 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -21,53 +21,53 @@ jobs: 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@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 - - - name: Run chmod to make gradlew executable - run: chmod +x ./gradlew - - - name: Build with Gradle Wrapper - run: ./gradlew build -x test - - - name: make application.yml - run: | - mkdir ./src/main/resources - cd ./src/main/resources - touch ./application.yml - echo "${{ secrets.APPLICATION }}" > ./application.yml - - # docker build & push to develop - - name: Docker build & push to dev - run: | - docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} - docker build -f Dockerfile -t ${{ secrets.DOCKER_USERNAME }}/openbook . - docker push ${{ secrets.DOCKER_USERNAME }}/openbook - - ## deploy to develop - - name: Deploy to dev - uses: appleboy/ssh-action@master - id: dev - with: - host: ${{ secrets.HOST_DEV }} # EC2 퍼블릭 IPv4 DNS - username: ${{ secrets.USERNAME }} - port: 22 - key: ${{ secrets.EC2_SSH_PRIVATE_KEY }} - envs: GITHUB_SHA - script: | - sudo docker rm -f $(docker ps -qa) - sudo docker pull ${{ secrets.DOCKER_USERNAME }}/openbook - docker-compose up -d - docker image prune -f + - 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@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 + + - name: Run chmod to make gradlew executable + run: chmod +x ./gradlew + + - name: Build with Gradle Wrapper + run: ./gradlew build -x test + + - name: make application.yml + run: | + mkdir ./src/main/resources + cd ./src/main/resources + touch ./application.yml + echo "${{ secrets.APPLICATION }}" > ./application.yml + + # docker build & push to develop + - name: Docker build & push to dev + run: | + docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} + docker build -f Dockerfile -t ${{ secrets.DOCKER_USERNAME }}/openbook . + docker push ${{ secrets.DOCKER_USERNAME }}/openbook + + ## deploy to develop + - name: Deploy to dev + uses: appleboy/ssh-action@master + id: dev + with: + host: ${{ secrets.HOST_DEV }} # EC2 퍼블릭 IPv4 DNS + username: ${{ secrets.USERNAME }} + port: 22 + key: ${{ secrets.EC2_SSH_PRIVATE_KEY }} + envs: GITHUB_SHA + script: | + sudo docker rm -f $(docker ps -qa) + sudo docker pull ${{ secrets.DOCKER_USERNAME }}/openbook + docker-compose up -d + docker image prune -f # NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html). @@ -88,14 +88,14 @@ jobs: 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@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 + - 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@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 \ No newline at end of file diff --git a/src/main/java/com/openbook/openbook/api/booth/response/BoothDetail.java b/src/main/java/com/openbook/openbook/api/booth/response/BoothDetail.java index 025ff64c..c6d3bba5 100644 --- a/src/main/java/com/openbook/openbook/api/booth/response/BoothDetail.java +++ b/src/main/java/com/openbook/openbook/api/booth/response/BoothDetail.java @@ -19,6 +19,8 @@ public record BoothDetail( String mainImageUrl, LocalDateTime openData, LocalDateTime closeData, + String accountNumber, + String accountBankName, List location, List tags, UserPublicResponse manager, @@ -32,6 +34,8 @@ public static BoothDetail of(BoothDto booth){ booth.mainImageUrl(), booth.openTime(), booth.closeTime(), + booth.accountNumber(), + booth.accountBankName(), booth.locations(), booth.tags().stream().map(BoothTagDto::name).toList(), UserPublicResponse.of(booth.manager()),