Merge pull request #53 from Donut-DONationUTile/feature/donation/giver

Feature/donation/giver

.github/workflows/gradle.yml

@@ -10,8 +10,6 @@ name: Java CI with Gradle
 on:
   push:
     branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
 
 jobs:
   build:
@@ -50,9 +48,9 @@ jobs:
     - name: Docker build
       run: |
         docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }}
-        docker build -t donut .
-        docker tag donut kang1221/donut:${GITHUB_SHA::7}
-        docker push kang1221/donut:${GITHUB_SHA::7}	
+        docker build -t ${{ secrets.DOCKERHUB_REPOSITORY }} .
+        docker tag ${{ secrets.DOCKERHUB_REPOSITORY }} ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${GITHUB_SHA::7}
+        docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${GITHUB_SHA::7}	
 
 
     # Deploy
@@ -68,33 +66,3 @@ jobs:
          sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${GITHUB_SHA::7}
          sudo docker tag ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${GITHUB_SHA::7} donut  
          sudo docker-compose up -d --remove-orphans
-    
-    # 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-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@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0

.gitignore

@@ -41,4 +41,3 @@ out/
 
 ### gcs access iam ###
 *.json
-adroit-metric-413519-d4e6d7038d34.json

src/main/java/zero/eight/donut/service/SerialDonationService.java

@@ -250,7 +250,7 @@ private String uploadImageToGCS(DonateGiftRequestDto requestDto) throws IOExcept
     }
 
     private void sendImageToAI(Long giftId, MultipartFile giftImage){
-        WebClient webClient = WebClient.builder().baseUrl("http://127.0.0.1:8000").build();
+        WebClient webClient = WebClient.builder().baseUrl("http://34.64.144.108:8000").build();
         MultipartBodyBuilder sandImageRequestDto = new MultipartBodyBuilder();
         sandImageRequestDto.part("giftId", giftId);
         log.info("giftId -> {}", giftId);

src/main/resources/application.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: prod, redis, gcs
+    active: prod, db, gcs

src/main/resources/banner.txt

@@ -0,0 +1,15 @@
+                                                                  ,----,
+                  ,----..             ,--.                      ,/   .`|
+    ,---,        /   /   \          ,--.'|                    ,`   .'  :
+  .'  .' `\     /   .     :     ,--,:  : |          ,--,    ;    ;     /
+,---.'     \   .   /   ;.  \ ,`--.'`|  ' :        ,'_ /|  .'___,/    ,'
+|   |  .`\  | .   ;   /  ` ; |   :  :  | |   .--. |  | :  |    :     |
+:   : |  '  | ;   |  ; \ ; | :   |   \ | : ,'_ /| :  . |  ;    |.';  ;
+|   ' '  ;  : |   :  | ; | ' |   : '  '; | |  ' | |  . .  `----'  |  |
+'   | ;  .  | .   |  ' ' ' : '   ' ;.    ; |  | ' |  | |      '   :  ;
+|   | :  |  ' '   ;  \; /  | |   | | \   | :  | | :  ' ;      |   |  '
+'   : | /  ;   \   \  ',  /  '   : |  ; .' |  ; ' |  | '      '   :  |
+|   | '` ,/     ;   :    /   |   | '`--'   :  | : ;  ; |      ;   |.'
+;   :  .'        \   \ .'    '   : |       '  :  `--'   \     '---'
+|   ,.'           `---`      ;   |.'       :  ,      .-./
+'---'                        '---'          `--`----'