From 7ed41c28d6139111240c9ddd0b04ea6ac5134b26 Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 05:52:08 +0900 Subject: [PATCH 01/25] =?UTF-8?q?deploy=20:=20CD=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/banchango/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/banchango/src/main/resources/application.properties b/Server/banchango/src/main/resources/application.properties index eec36e7..ddd2312 100644 --- a/Server/banchango/src/main/resources/application.properties +++ b/Server/banchango/src/main/resources/application.properties @@ -4,4 +4,4 @@ spring.profiles.active=prod app.cors.allowedOrigins=http://localhost:3000,http://localhost:8080 app.oauth2.authorizedRedirectUris=http://localhost:3000/oauth2/redirect,myandroidapp://oauth2/redirect,myiosapp://oauth2/redirect - +# From ed223957c098993aedf1e4849602973edc8bc745 Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 06:13:34 +0900 Subject: [PATCH 02/25] =?UTF-8?q?deploy=20:=20Dockerfile=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/banchango/Dockerfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Server/banchango/Dockerfile diff --git a/Server/banchango/Dockerfile b/Server/banchango/Dockerfile new file mode 100644 index 0000000..1bc11b4 --- /dev/null +++ b/Server/banchango/Dockerfile @@ -0,0 +1,15 @@ +#경량 리눅스 배포판, 도커 이미지 크기를 줄이는데 유용함 +FROM openjdk:17-alpine + +#도커 이미지 내의 작업 디렉토리 정의 +WORKDIR /banchango/ + +#빌드 인자 기본값 정의 +ARG JAR_FILE=/build/libs/banchango-0.0.1-SNAPSHOT.jar + +#호스트 시스템에서 빌드된 Jar파일을 도커 이미지 내부로 옮김 +COPY ${JAR_FILE} /banchango.jar + +#컨테이너 실행 명령어 +#ex) java -jar -Dspring.profiles.active=prod /sejongmate.jar +ENTRYPOINT ["java","-jar","/banchango.jar"] \ No newline at end of file From e8ee86b458960ef629fecf614bae94cba58304b5 Mon Sep 17 00:00:00 2001 From: Due_it <48638700+FhRh@users.noreply.github.com> Date: Mon, 23 Sep 2024 06:16:20 +0900 Subject: [PATCH 03/25] Update gradle.yml --- .github/workflows/gradle.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index e6c81ab..190f2d8 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -34,7 +34,10 @@ jobs: # 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: move to project + run: cd Server/banchango/ + - name: Grant execute permission for gradlew run: chmod +x gradlew From 4e3c1e06c6d8d9b085bbee5100832f86b2d68b05 Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 06:16:57 +0900 Subject: [PATCH 04/25] =?UTF-8?q?deploy=20:=20CD=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/banchango/Dockerfile | 3 ++- Server/banchango/src/main/resources/application.properties | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/banchango/Dockerfile b/Server/banchango/Dockerfile index 1bc11b4..4596b2b 100644 --- a/Server/banchango/Dockerfile +++ b/Server/banchango/Dockerfile @@ -12,4 +12,5 @@ COPY ${JAR_FILE} /banchango.jar #컨테이너 실행 명령어 #ex) java -jar -Dspring.profiles.active=prod /sejongmate.jar -ENTRYPOINT ["java","-jar","/banchango.jar"] \ No newline at end of file +ENTRYPOINT ["java","-jar","/banchango.jar"] +# diff --git a/Server/banchango/src/main/resources/application.properties b/Server/banchango/src/main/resources/application.properties index ddd2312..d6711d0 100644 --- a/Server/banchango/src/main/resources/application.properties +++ b/Server/banchango/src/main/resources/application.properties @@ -4,4 +4,3 @@ spring.profiles.active=prod app.cors.allowedOrigins=http://localhost:3000,http://localhost:8080 app.oauth2.authorizedRedirectUris=http://localhost:3000/oauth2/redirect,myandroidapp://oauth2/redirect,myiosapp://oauth2/redirect -# From 9bdb56a623e086b8f19206a57e37ad9b32a17036 Mon Sep 17 00:00:00 2001 From: Due_it <48638700+FhRh@users.noreply.github.com> Date: Mon, 23 Sep 2024 06:21:17 +0900 Subject: [PATCH 05/25] Update gradle.yml --- .github/workflows/gradle.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 190f2d8..1d68340 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -33,16 +33,13 @@ jobs: # 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: move to project - run: cd Server/banchango/ + uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 - name: Grant execute permission for gradlew - run: chmod +x gradlew + run: chmod +x ./Server/banchango/gradlew - name: Build with Gradle - run: ./gradlew clean build -x test + run: ./Server/banchango/gradlew clean build -x test - name: Docker build run: | From b505ddc40f3bcf115d6eba7d277983a34bedf6ac Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 06:21:41 +0900 Subject: [PATCH 06/25] =?UTF-8?q?deploy=20:=20CD=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/banchango/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/banchango/Dockerfile b/Server/banchango/Dockerfile index 4596b2b..ac7492f 100644 --- a/Server/banchango/Dockerfile +++ b/Server/banchango/Dockerfile @@ -13,4 +13,4 @@ COPY ${JAR_FILE} /banchango.jar #컨테이너 실행 명령어 #ex) java -jar -Dspring.profiles.active=prod /sejongmate.jar ENTRYPOINT ["java","-jar","/banchango.jar"] -# + From ca94b135d9080d1486b2b75e025bc42d53db368e Mon Sep 17 00:00:00 2001 From: Due_it <48638700+FhRh@users.noreply.github.com> Date: Mon, 23 Sep 2024 06:25:06 +0900 Subject: [PATCH 07/25] Update gradle.yml --- .github/workflows/gradle.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 1d68340..f5db1dc 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -39,7 +39,9 @@ jobs: run: chmod +x ./Server/banchango/gradlew - name: Build with Gradle - run: ./Server/banchango/gradlew clean build -x test + run: | + cd Server/banchango + ./gradlew clean build -x test - name: Docker build run: | From a87ba3abf39de46adc16ade8af11bd94f0766de8 Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 06:25:22 +0900 Subject: [PATCH 08/25] =?UTF-8?q?deploy=20:=20CD=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/banchango/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/banchango/Dockerfile b/Server/banchango/Dockerfile index ac7492f..4596b2b 100644 --- a/Server/banchango/Dockerfile +++ b/Server/banchango/Dockerfile @@ -13,4 +13,4 @@ COPY ${JAR_FILE} /banchango.jar #컨테이너 실행 명령어 #ex) java -jar -Dspring.profiles.active=prod /sejongmate.jar ENTRYPOINT ["java","-jar","/banchango.jar"] - +# From 8c3ae464ae7d1981da5bb587af1b2487b80781a1 Mon Sep 17 00:00:00 2001 From: Due_it <48638700+FhRh@users.noreply.github.com> Date: Mon, 23 Sep 2024 06:28:38 +0900 Subject: [PATCH 09/25] Update gradle.yml --- .github/workflows/gradle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index f5db1dc..2e385fc 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -45,6 +45,7 @@ jobs: - name: Docker build run: | + cd Server/banchango docker login -u ${{ secrets.SERVER_DOCKER_USERNAME }} -p ${{ secrets.SERVER_DOCKER_PASSWORD }} docker build -t app . docker tag app ${{ secrets.SERVER_DOCKER_USERNAME }}/banchango:latest From e272d86b36708fc41e4816f00ea3d522dafada34 Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 06:29:05 +0900 Subject: [PATCH 10/25] =?UTF-8?q?deploy=20:=20CD=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/banchango/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/banchango/Dockerfile b/Server/banchango/Dockerfile index 4596b2b..ac7492f 100644 --- a/Server/banchango/Dockerfile +++ b/Server/banchango/Dockerfile @@ -13,4 +13,4 @@ COPY ${JAR_FILE} /banchango.jar #컨테이너 실행 명령어 #ex) java -jar -Dspring.profiles.active=prod /sejongmate.jar ENTRYPOINT ["java","-jar","/banchango.jar"] -# + From d897b650f07d3885f615598de8a91f7e17f45553 Mon Sep 17 00:00:00 2001 From: Due_it <48638700+FhRh@users.noreply.github.com> Date: Mon, 23 Sep 2024 06:34:09 +0900 Subject: [PATCH 11/25] Update gradle.yml --- .github/workflows/gradle.yml | 39 ------------------------------------ 1 file changed, 39 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 2e385fc..0daf7f3 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,10 +1,3 @@ -# 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 CD with Gradle on: @@ -30,8 +23,6 @@ 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@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 @@ -64,33 +55,3 @@ jobs: docker run -d --log-driver=syslog -p 8080:8080 ${{ secrets.SERVER_DOCKER_USERNAME }}/bnchango:latest docker rm $(docker ps --filter 'status=exited' -a -q) docker image prune -a -f - - # 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@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 - # with: - # gradle-version: '8.9' - # - # - name: Build with Gradle 8.9 - # run: gradle build - - dependency-submission: - - runs-on: ubuntu-latest - 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@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 From 26829cd1560f3dede37e3b671bd95e2d2570e532 Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 06:35:33 +0900 Subject: [PATCH 12/25] =?UTF-8?q?deploy=20:=20CD=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/banchango/Dockerfile | 1 - .../sundaegukbap/banchango/common/HealthCheckController.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Server/banchango/Dockerfile b/Server/banchango/Dockerfile index ac7492f..bad2041 100644 --- a/Server/banchango/Dockerfile +++ b/Server/banchango/Dockerfile @@ -13,4 +13,3 @@ COPY ${JAR_FILE} /banchango.jar #컨테이너 실행 명령어 #ex) java -jar -Dspring.profiles.active=prod /sejongmate.jar ENTRYPOINT ["java","-jar","/banchango.jar"] - diff --git a/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java b/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java index baba1ee..50c524b 100644 --- a/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java +++ b/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java @@ -14,6 +14,6 @@ public class HealthCheckController { @GetMapping @Operation(summary = "health-check") public ResponseEntity healthCheck() { - return ResponseEntity.ok("OK"); + return ResponseEntity.ok("GOOD"); } } From 16dd3c73aa1c2535373cc1f2d20158001fac5555 Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 07:01:02 +0900 Subject: [PATCH 13/25] =?UTF-8?q?deploy=20:=20CD=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/banchango/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Server/banchango/Dockerfile b/Server/banchango/Dockerfile index bad2041..4596b2b 100644 --- a/Server/banchango/Dockerfile +++ b/Server/banchango/Dockerfile @@ -13,3 +13,4 @@ COPY ${JAR_FILE} /banchango.jar #컨테이너 실행 명령어 #ex) java -jar -Dspring.profiles.active=prod /sejongmate.jar ENTRYPOINT ["java","-jar","/banchango.jar"] +# From 0677ac68892d604215f5c0ab5a6c2cdfed95a2e9 Mon Sep 17 00:00:00 2001 From: Due_it <48638700+FhRh@users.noreply.github.com> Date: Mon, 23 Sep 2024 07:32:52 +0900 Subject: [PATCH 14/25] Update gradle.yml --- .github/workflows/gradle.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 0daf7f3..d0e0c2a 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -25,6 +25,12 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 + + - name: make application-prod.yml + run: | + cd ./Server/banchango/src/main/resources + touch ./application-prod.properties + echo "${{ secrets.APPLICATION_PROD }}" > ./application-prod.properties - name: Grant execute permission for gradlew run: chmod +x ./Server/banchango/gradlew From dabaca059d5a9a01bec309f214174480605d950e Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 07:35:51 +0900 Subject: [PATCH 15/25] =?UTF-8?q?deploy=20:=20CD=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.properties | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 Server/banchango/src/main/resources/application-prod.properties diff --git a/Server/banchango/src/main/resources/application-prod.properties b/Server/banchango/src/main/resources/application-prod.properties deleted file mode 100644 index d0ce600..0000000 --- a/Server/banchango/src/main/resources/application-prod.properties +++ /dev/null @@ -1,12 +0,0 @@ -spring.datasource.url=${MARIADB_URL} -spring.datasource.username=${USER_NAME} -spring.datasource.password=${USER_PASS} -spring.datasource.driver-class-name=org.mariadb.jdbc.Driver - -spring.jpa.show-sql=true -spring.jpa.hibernate.ddl-auto=update - -# spring boot 2.5.x to use script -spring.sql.init.mode=never -# script use after hibernate initilalization -spring.jpa.defer-datasource-initialization=false From 65524494a3a01bd835f8abec6dec7c7b022c8a11 Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 07:42:31 +0900 Subject: [PATCH 16/25] =?UTF-8?q?deploy=20:=20CD=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sundaegukbap/banchango/common/HealthCheckController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java b/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java index 50c524b..baba1ee 100644 --- a/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java +++ b/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java @@ -14,6 +14,6 @@ public class HealthCheckController { @GetMapping @Operation(summary = "health-check") public ResponseEntity healthCheck() { - return ResponseEntity.ok("GOOD"); + return ResponseEntity.ok("OK"); } } From 64665a3d697792c30650a18022600063bebd1d05 Mon Sep 17 00:00:00 2001 From: Due_it <48638700+FhRh@users.noreply.github.com> Date: Mon, 23 Sep 2024 07:42:57 +0900 Subject: [PATCH 17/25] Update gradle.yml --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index d0e0c2a..b05ad6c 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -58,6 +58,6 @@ jobs: script: | docker pull ${{ secrets.SERVER_DOCKER_USERNAME }}/banchango:latest docker stop $(docker ps -a -q) - docker run -d --log-driver=syslog -p 8080:8080 ${{ secrets.SERVER_DOCKER_USERNAME }}/bnchango:latest + docker run -d --log-driver=syslog -p 8080:8080 ${{ secrets.SERVER_DOCKER_USERNAME }}/banchango:latest docker rm $(docker ps --filter 'status=exited' -a -q) docker image prune -a -f From 103a947f5574d2fa1f4cba598fbccddb80f7b6fc Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 07:43:14 +0900 Subject: [PATCH 18/25] =?UTF-8?q?deploy=20:=20CD=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sundaegukbap/banchango/common/HealthCheckController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java b/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java index baba1ee..2356eca 100644 --- a/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java +++ b/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java @@ -14,6 +14,6 @@ public class HealthCheckController { @GetMapping @Operation(summary = "health-check") public ResponseEntity healthCheck() { - return ResponseEntity.ok("OK"); + return ResponseEntity.ok("Wellcome"); } } From bf04ae022d43af2c4d28a14da442f8b118df633f Mon Sep 17 00:00:00 2001 From: FhRh Date: Thu, 3 Oct 2024 03:53:23 +0900 Subject: [PATCH 19/25] =?UTF-8?q?fix=20:=20recipeCategory=20db=EC=97=90=20?= =?UTF-8?q?string=20=ED=98=95=ED=83=9C=EB=A1=9C=20=EC=A0=80=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sundaegukbap/banchango/recipe/domain/Recipe.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/domain/Recipe.java b/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/domain/Recipe.java index 93ccc56..a3f9a57 100644 --- a/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/domain/Recipe.java +++ b/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/domain/Recipe.java @@ -37,6 +37,7 @@ public class Recipe { private RecipeDifficulty recipeDifficulty; private String bySort; private String byIngredient; + @Enumerated(EnumType.STRING) private RecipeCategory recipeCategory; @Builder From 941beac28ffc9f2a6ddc99878aa5bed7f4d18514 Mon Sep 17 00:00:00 2001 From: FhRh Date: Thu, 3 Oct 2024 05:31:57 +0900 Subject: [PATCH 20/25] =?UTF-8?q?chore=20:=20DNS=EB=A5=BC=20mvc=20cors?= =?UTF-8?q?=EB=8F=84=20=ED=97=88=EC=9A=A9=ED=95=B4=EB=B3=B8=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sundaegukbap/banchango/config/SwaggerConfig.java | 1 - Server/banchango/src/main/resources/application.properties | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Server/banchango/src/main/java/com/sundaegukbap/banchango/config/SwaggerConfig.java b/Server/banchango/src/main/java/com/sundaegukbap/banchango/config/SwaggerConfig.java index 48c4f00..d37969c 100644 --- a/Server/banchango/src/main/java/com/sundaegukbap/banchango/config/SwaggerConfig.java +++ b/Server/banchango/src/main/java/com/sundaegukbap/banchango/config/SwaggerConfig.java @@ -25,5 +25,4 @@ public OpenAPI openAPI() { .info(info) .servers(List.of(server)); } - } diff --git a/Server/banchango/src/main/resources/application.properties b/Server/banchango/src/main/resources/application.properties index cd52fe6..51dd2ca 100644 --- a/Server/banchango/src/main/resources/application.properties +++ b/Server/banchango/src/main/resources/application.properties @@ -2,7 +2,7 @@ spring.application.name=banchango spring.profiles.active=prod -app.cors.allowedOrigins=http://34.222.135.30:8000,http://localhost:3000,http://localhost:8080 -app.oauth2.authorizedRedirectUris=http://34.222.135.30:8000,http://localhost:3000/oauth2/redirect,myandroidapp://oauth2/redirect,myiosapp://oauth2/redirect +app.cors.allowedOrigins=https://backendu.com,http://34.222.135.30:8000,http://localhost:3000,http://localhost:8080 +app.oauth2.authorizedRedirectUris=https://backendu.com,http://34.222.135.30:8000,http://localhost:3000/oauth2/redirect,myandroidapp://oauth2/redirect,myiosapp://oauth2/redirect api.aiBaseUrl=http://34.222.135.30:8000 From 15eb6c9bc4a59bf5e0807a357a349799e4b03afc Mon Sep 17 00:00:00 2001 From: FhRh Date: Thu, 3 Oct 2024 05:39:11 +0900 Subject: [PATCH 21/25] =?UTF-8?q?style=20:=20=EB=9D=BC=EC=9D=B8=20?= =?UTF-8?q?=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../banchango/recipe/presentation/RecipeController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/presentation/RecipeController.java b/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/presentation/RecipeController.java index 914d90e..c5d53ec 100644 --- a/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/presentation/RecipeController.java +++ b/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/presentation/RecipeController.java @@ -44,7 +44,7 @@ public ResponseEntity getRecipeDetail(@PathVariable(" @PostMapping("/{userId}") @Operation(summary = "추천 레시피 카테고리 변경", description = "추천 레시피 카테고리를 변경하고 새로운 추천 레시피를 받아옵니다.") public ResponseEntity changeRecipeCategory(@PathVariable("userId") Long userId, - @RequestParam(defaultValue = "전체") RecipeCategory recipeCategory) { + @RequestParam(defaultValue = "전체") RecipeCategory recipeCategory) { recipeService.changeRecipeCategory(userId, recipeCategory); return new ResponseEntity<>("카테고리에 맞게 추천 레시피목록이 변경되었습니다.", HttpStatus.OK); } From 635800a976b6cf35c13257c435c38491d4f00070 Mon Sep 17 00:00:00 2001 From: FhRh Date: Thu, 3 Oct 2024 05:50:49 +0900 Subject: [PATCH 22/25] =?UTF-8?q?fix=20:=20=EC=A0=95=EB=A0=AC=ED=9B=84=20?= =?UTF-8?q?=EC=A0=80=EC=9E=A5=ED=95=98=EC=A7=80=20=EC=95=8A=EA=B3=A0=20?= =?UTF-8?q?=EB=B0=94=EB=A1=9C=20=EB=B0=94=EB=A1=9C=20=EC=A0=80=EC=9E=A5?= =?UTF-8?q?=ED=95=9C=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../recipe/application/RecipeService.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/application/RecipeService.java b/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/application/RecipeService.java index a976ec7..5b7cafb 100644 --- a/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/application/RecipeService.java +++ b/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/application/RecipeService.java @@ -56,12 +56,13 @@ public void refreshRecommendedRecipes(Long userId, RecipeCategory recipeCategory .orElseThrow(() -> new NoSuchElementException("no user")); List recommendedRecipeIds = aiRecipeRecommendClient.getRecommendedRecipesFromAI(recipeCategory, ingredients); List recipes = recipeRepository.findAllById(recommendedRecipeIds); - List recommendedRecipes = recipes.stream() - .map(recipe -> UserRecommendedRecipe.builder() - .user(user) - .recipe(recipe) - .build()) - .collect(Collectors.toList()); - recommendedRecipeRepository.saveAll(recommendedRecipes); + + recipes.forEach(recipe -> { + UserRecommendedRecipe recommendedRecipe = UserRecommendedRecipe.builder() + .user(user) + .recipe(recipe) + .build(); + recommendedRecipeRepository.save(recommendedRecipe); + }); } } From bfd732575ad65ad2e448a88648181f529a182ee0 Mon Sep 17 00:00:00 2001 From: FhRh Date: Thu, 3 Oct 2024 05:55:39 +0900 Subject: [PATCH 23/25] =?UTF-8?q?fix=20:=20=EC=9D=B4=20=EB=B6=80=EB=B6=84?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=A0=95=EB=A0=AC=EB=90=98=EB=8A=94=20?= =?UTF-8?q?=EA=B1=B4=EA=B0=80=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../recipe/application/RecipeService.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/application/RecipeService.java b/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/application/RecipeService.java index 5b7cafb..8d60ce3 100644 --- a/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/application/RecipeService.java +++ b/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/application/RecipeService.java @@ -19,8 +19,10 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.NoSuchElementException; +import java.util.Optional; import java.util.stream.Collectors; @Service @@ -55,14 +57,17 @@ public void refreshRecommendedRecipes(Long userId, RecipeCategory recipeCategory User user = userRepository.findById(userId) .orElseThrow(() -> new NoSuchElementException("no user")); List recommendedRecipeIds = aiRecipeRecommendClient.getRecommendedRecipesFromAI(recipeCategory, ingredients); - List recipes = recipeRepository.findAllById(recommendedRecipeIds); - - recipes.forEach(recipe -> { - UserRecommendedRecipe recommendedRecipe = UserRecommendedRecipe.builder() - .user(user) - .recipe(recipe) - .build(); - recommendedRecipeRepository.save(recommendedRecipe); + List recipes = new ArrayList<>(); + recommendedRecipeIds.forEach(recommendedRecipeId -> { + Optional recipe = recipeRepository.findById(recommendedRecipeId); + if(recipe.isPresent()) recipes.add(recipe.get()); }); + List recommendedRecipes = recipes.stream() + .map(recipe -> UserRecommendedRecipe.builder() + .user(user) + .recipe(recipe) + .build()) + .collect(Collectors.toList()); + recommendedRecipeRepository.saveAll(recommendedRecipes); } } From a0ce7456901f7697a578d705d73aa6a40428e309 Mon Sep 17 00:00:00 2001 From: FhRh Date: Thu, 3 Oct 2024 06:00:00 +0900 Subject: [PATCH 24/25] =?UTF-8?q?fix=20:=20transactional=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../banchango/recipe/application/RecipeService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/application/RecipeService.java b/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/application/RecipeService.java index 8d60ce3..dd792f6 100644 --- a/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/application/RecipeService.java +++ b/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/application/RecipeService.java @@ -36,10 +36,12 @@ public class RecipeService { private final AiRecipeRecommendClient aiRecipeRecommendClient; @EventListener + @Transactional public void refreshRecommendedRecipes(IngredientChangedEvent event) { refreshRecommendedRecipes(event.userId(), RecipeCategory.전체); } + @Transactional public void changeRecipeCategory(Long userId, RecipeCategory recipeCategory) { refreshRecommendedRecipes(userId, recipeCategory); } From c5ad95ee1e3dc03c9bcfbed60376735a884122c5 Mon Sep 17 00:00:00 2001 From: FhRh Date: Thu, 3 Oct 2024 06:12:08 +0900 Subject: [PATCH 25/25] =?UTF-8?q?refact=20:=20=EB=A9=94=EC=84=9C=EB=93=9C?= =?UTF-8?q?=20=EB=B6=84=ED=95=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../recipe/application/RecipeService.java | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/application/RecipeService.java b/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/application/RecipeService.java index dd792f6..c50a8fa 100644 --- a/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/application/RecipeService.java +++ b/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/application/RecipeService.java @@ -48,22 +48,14 @@ public void changeRecipeCategory(Long userId, RecipeCategory recipeCategory) { @Transactional public void refreshRecommendedRecipes(Long userId, RecipeCategory recipeCategory) { - List containers = containerRepository.findAllByUserId(userId); - List containerIngredients = containerIngredientRepository.findByContainerIn(containers); - List ingredients = containerIngredients.stream() - .map(ContainerIngredient::getIngredient) - .collect(Collectors.toList()); + List ingredients = getIngredientsWithUser(userId); recommendedRecipeRepository.deleteAllByUserId(userId); User user = userRepository.findById(userId) .orElseThrow(() -> new NoSuchElementException("no user")); - List recommendedRecipeIds = aiRecipeRecommendClient.getRecommendedRecipesFromAI(recipeCategory, ingredients); - List recipes = new ArrayList<>(); - recommendedRecipeIds.forEach(recommendedRecipeId -> { - Optional recipe = recipeRepository.findById(recommendedRecipeId); - if(recipe.isPresent()) recipes.add(recipe.get()); - }); + List recipes = recommendedRecipesFromAI(recipeCategory, ingredients); + List recommendedRecipes = recipes.stream() .map(recipe -> UserRecommendedRecipe.builder() .user(user) @@ -72,4 +64,24 @@ public void refreshRecommendedRecipes(Long userId, RecipeCategory recipeCategory .collect(Collectors.toList()); recommendedRecipeRepository.saveAll(recommendedRecipes); } + + private List getIngredientsWithUser(Long userId) { + List containers = containerRepository.findAllByUserId(userId); + List containerIngredients = containerIngredientRepository.findByContainerIn(containers); + List ingredients = containerIngredients.stream() + .map(ContainerIngredient::getIngredient) + .collect(Collectors.toList()); + return ingredients; + } + + private List recommendedRecipesFromAI(RecipeCategory recipeCategory, List ingredients) { + List recommendedRecipeIds = aiRecipeRecommendClient.getRecommendedRecipesFromAI(recipeCategory, ingredients); + List recipes = new ArrayList<>(); + recommendedRecipeIds.forEach(recommendedRecipeId -> { + Optional recipe = recipeRepository.findById(recommendedRecipeId); + + if (recipe.isPresent()) recipes.add(recipe.get()); + }); + return recipes; + } }