츄즈 1차 배포

.github/ISSUE_TEMPLATE/issue-template.md

@@ -7,11 +7,11 @@ assignees: ''
 
 ---
 
-## 📋 추가 기능
+## 📋 이슈 내용
 
-[추가할 기능 작성]
+[이슈 내용 작성]
 
-##  🛠️ 작업 내용
+##  🛠️ 작업할 내용
 
 - [ ] [TODO1]
 - [ ] [TODO2]

.github/workflows/cd-dev.yml

@@ -1,6 +1,7 @@
 name: cd dev
 
 on:
+  workflow_dispatch:
   pull_request:
     branches: [ "develop" ]
     types: [closed]
@@ -18,7 +19,10 @@ jobs:
         with:
           token: ${{ secrets.SUBMODULE_TOKEN }}
           submodules: true
-
+
+      - name: Set timezone
+        run: echo "TZ=Asia/Seoul" >> $GITHUB_ENV
+
       - name: Setup JDK 21
         uses: actions/setup-java@v4
         with:
@@ -33,7 +37,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
 
@@ -49,15 +53,15 @@ jobs:
         run: ./gradlew bootJar
 
       - name: Copy jar file
-        run: mv ./build/libs/*SNAPSHOT.jar ./photopic-dev.jar
+        run: mv ./build/libs/*SNAPSHOT.jar ./chooz-dev.jar
 
       - name: (SCP) transfer build file 
         uses: appleboy/scp-action@v0.1.7
         with:
           host: ${{ secrets.AWS_EC2_URL_DEV }}
           username: ${{ secrets.AWS_EC2_USER }}
           key: ${{ secrets.AWS_EC2_KEY }}
-          source: photopic-dev.jar
+          source: chooz-dev.jar
           target: /home/${{ secrets.AWS_EC2_USER }}
 
       - name: (SSH) connect EC2
@@ -69,4 +73,4 @@ jobs:
           script_stop: true
           script: |
             sudo fuser -k -n tcp 8080 || true
-            nohup java -Xms256m -Xmx742m -jar -Dspring.profiles.active=dev photopic-dev.jar > ./output.log 2>&1 &
+            nohup java -Xms256m -Xmx742m -Dspring.profiles.active=dev -jar /home/ubuntu/chooz-dev.jar >> /home/ubuntu/output.log 2>&1 &

.github/workflows/cd-prod.yml

@@ -18,7 +18,10 @@ jobs:
         with:
           token: ${{ secrets.SUBMODULE_TOKEN }}
           submodules: true
-
+
+      - name: Set timezone
+        run: echo "TZ=Asia/Seoul" >> $GITHUB_ENV
+
       - name: Setup JDK 21
         uses: actions/setup-java@v4
         with:
@@ -33,7 +36,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
 
@@ -49,15 +52,15 @@ jobs:
         run: ./gradlew bootJar
 
       - name: Copy jar file
-        run: mv ./build/libs/*SNAPSHOT.jar ./photopic-prod.jar
+        run: mv ./build/libs/*SNAPSHOT.jar ./chooz-prod.jar
 
       - name: (SCP) transfer build file 
         uses: appleboy/scp-action@v0.1.7
         with:
           host: ${{ secrets.AWS_EC2_URL_PROD }}
           username: ${{ secrets.AWS_EC2_USER }}
           key: ${{ secrets.AWS_EC2_KEY }}
-          source: photopic-prod.jar
+          source: chooz-prod.jar
           target: /home/${{ secrets.AWS_EC2_USER }}
 
       - name: (SSH) connect EC2
@@ -69,4 +72,4 @@ jobs:
           script_stop: true
           script: |
             sudo fuser -k -n tcp 8080 || true
-            nohup java -Xms256m -Xmx742m -jar -Dspring.profiles.active=prod photopic-prod.jar > ./output.log 2>&1 &
+            nohup java -Xms256m -Xmx742m -Dspring.profiles.active=prod -jar /home/ubuntu/chooz-prod.jar >> /home/ubuntu/output.log 2>&1 &

.github/workflows/ci.yml

@@ -17,7 +17,10 @@ jobs:
       with:
         token: ${{ secrets.SUBMODULE_TOKEN }}
         submodules: true
-
+
+    - name: Set timezone
+      run: echo "TZ=Asia/Seoul" >> $GITHUB_ENV
+
     - name: Setup JDK 21
       uses: actions/setup-java@v4
       with:
@@ -32,9 +35,9 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
         restore-keys: |
-          ${{ runner.os }}-gradle-
+            ${{ runner.os }}-gradle-
 
     - name: Create directory resources
       run: mkdir -p ./src/test/resources

.github/workflows/issue-to-trello.yml

@@ -0,0 +1,37 @@
+name: Create Trello Card on Issue
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  create-trello-card:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Create Trello Card in Trello
+        env:
+          TRELLO_LIST_ID: ${{ secrets.TRELLO_LIST_ID }}
+          TRELLO_LABEL_ID: ${{ secrets.TRELLO_REVIEW_LABEL_ID }}
+          TRELLO_KEY: ${{ secrets.TRELLO_KEY }}
+          TRELLO_TOKEN: ${{ secrets.TRELLO_TOKEN }}
+        run: |
+          ISSUE_NUMBER="${{ github.event.issue.number }}"
+          ISSUE_TITLE="${{ github.event.issue.title }}"
+          ISSUE_BODY="${{ github.event.issue.body }}"
+          ISSUE_URL="${{ github.event.issue.html_url }}"
+
+          DESCRIPTION=$(echo -e "Issue Number: #$ISSUE_NUMBER\n$ISSUE_URL\n\n$ISSUE_BODY" | jq -Rs .)
+          TITLE=$(echo "$ISSUE_TITLE" | jq -Rs .)
+
+          curl --request POST \
+            --url "https://api.trello.com/1/cards" \
+            --header "Content-Type: application/json" \
+            --data "{
+              \"idList\": \"$TRELLO_LIST_ID\",
+              \"name\": $TITLE,
+              \"desc\": $DESCRIPTION,
+              \"idLabels\": \"$TRELLO_LABEL_ID\",
+              \"key\": \"$TRELLO_KEY\",
+              \"token\": \"$TRELLO_TOKEN\"
+            }"

.github/workflows/update-trello.yml

@@ -0,0 +1,67 @@
+name: Update Trello Card on PR Events
+
+on:
+  pull_request:
+    types: [opened, closed]
+
+jobs:
+  update-trello-card:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Extract Issue Number from PR Body
+        id: extract
+        run: |
+          BODY="${{ github.event.pull_request.body }}"
+          ISSUE_NUMBER=$(echo "$BODY" | grep -oE "#[0-9]+" | head -n1 | tr -d '#')
+          echo "ISSUE_NUMBER=$ISSUE_NUMBER" >> "$GITHUB_OUTPUT"
+
+      - name: Skip if No Issue Number Found
+        if: steps.extract.outputs.ISSUE_NUMBER == ''
+        run: echo "No issue number found. Skipping workflow..."
+
+      - name: Add PR Link as Comment to Trello Card
+        if: github.event.action == 'opened' && steps.extract.outputs.ISSUE_NUMBER != ''
+        env:
+          TRELLO_KEY: ${{ secrets.TRELLO_KEY }}
+          TRELLO_TOKEN: ${{ secrets.TRELLO_TOKEN }}
+        run: |
+          CARD_ID="${{ steps.extract.outputs.ISSUE_NUMBER }}"
+          PR_URL="${{ github.event.pull_request.html_url }}"
+          PR_COMMENT=$(echo "PR opened: $PR_URL" | jq -Rs .)
+
+          curl --request POST \
+            --url "https://api.trello.com/1/cards/$CARD_ID/actions/comments" \
+            --header "Content-Type: application/json" \
+            --data "{
+              \"text\": $PR_COMMENT,
+              \"key\": \"$TRELLO_KEY\",
+              \"token\": \"$TRELLO_TOKEN\"
+            }"
+
+      - name: Mark Card as Done when PR is Merged
+        if: github.event.action == 'closed' && github.event.pull_request.merged == true && steps.extract.outputs.ISSUE_NUMBER != ''
+        env:
+          TRELLO_KEY: ${{ secrets.TRELLO_KEY }}
+          TRELLO_TOKEN: ${{ secrets.TRELLO_TOKEN }}
+          TRELLO_DONE_LABEL_ID: ${{ secrets.TRELLO_DONE_LABEL_ID }}
+        run: |
+          CARD_ID="${{ steps.extract.outputs.ISSUE_NUMBER }}"
+
+          curl --request POST \
+            --url "https://api.trello.com/1/cards/$CARD_ID/idLabels" \
+            --header "Content-Type: application/json" \
+            --data "{
+              \"value\": \"$TRELLO_DONE_LABEL_ID\",
+              \"key\": \"$TRELLO_KEY\",
+              \"token\": \"$TRELLO_TOKEN\"
+            }"
+
+          curl --request PUT \
+            --url "https://api.trello.com/1/cards/$CARD_ID" \
+            --header "Content-Type: application/json" \
+            --data "{
+              \"dueComplete\": true,
+              \"key\": \"$TRELLO_KEY\",
+              \"token\": \"$TRELLO_TOKEN\"
+            }"

.gitignore

@@ -40,4 +40,5 @@ out/
 
 application*.yml
 
-/src/main/generated/
+/src/main/generated/
+*.pem

build.gradle

@@ -5,7 +5,7 @@ plugins {
     id 'org.asciidoctor.jvm.convert' version '3.3.2'
 }
 
-group = 'com.swyp8team2'
+group = 'com.chooz'
 version = '0.0.1-SNAPSHOT'
 
 java {
@@ -39,8 +39,7 @@ dependencies {
     implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'
 
     // image
-    implementation 'software.amazon.awssdk:s3:2.30.18'
-    implementation 'software.amazon.awssdk:lambda:2.30.18'
+    implementation 'io.awspring.cloud:spring-cloud-aws-starter-s3:3.4.0'
     implementation 'com.twelvemonkeys.imageio:imageio-webp:3.9.4'
 
     // gson
@@ -49,11 +48,19 @@ dependencies {
     // base64
     implementation 'io.seruco.encoding:base62:0.1.3'
 
-    compileOnly 'org.projectlombok:lombok'
+    implementation 'io.github.openfeign.querydsl:querydsl-jpa:6.10.1'
+    annotationProcessor 'io.github.openfeign.querydsl:querydsl-apt:6.10.1:jpa'
+    annotationProcessor "jakarta.annotation:jakarta.annotation-api"
+    annotationProcessor "jakarta.persistence:jakarta.persistence-api"
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.mysql:mysql-connector-j'
+
+    compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
 
+    //test
+    testImplementation 'org.springframework.boot:spring-boot-docker-compose'
+
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'
     testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc'
@@ -93,3 +100,17 @@ tasks.named('test') {
     outputs.dir snippetsDir
     useJUnitPlatform()
 }
+
+def generated = 'src/main/generated'
+
+tasks.withType(JavaCompile).configureEach {
+    options.getGeneratedSourceOutputDirectory().set(file(generated))
+}
+
+sourceSets {
+    main.java.srcDirs += [ generated ]
+}
+
+clean {
+    delete file(generated)
+}

settings.gradle

@@ -1 +1 @@
-rootProject.name = 'swyp8team2'
+rootProject.name = 'chooz'

src/docs/asciidoc/auth.adoc

@@ -6,8 +6,6 @@
 
 operation::auth-controller-test/kakao-o-auth-sign-in[snippets='http-request,curl-request,request-fields,http-response,response-cookies,response-fields']
 
-[[게스트-로그인]]
-=== `POST` 게스트 로그인
 
 ```
 1. 리프레시 토큰이 있는 경우
@@ -34,6 +32,6 @@ operation::auth-controller-test/reissue[snippets='http-request,curl-request,requ
 operation::auth-controller-test/sign-out[snippets='http-request,curl-request,request-cookies,request-headers,http-response,response-cookies']
 
 [[회원탈퇴]]
-=== `POST` 회원탈퇴 (미구현)
+=== `POST` 회원탈퇴
 
-operation::auth-controller-test/withdraw[snippets='http-request,curl-request,request-cookies,request-headers,http-response']
+operation::auth-controller-test/withdraw[snippets='http-request,curl-request,request-headers,http-response']

src/docs/asciidoc/comment-likes.adoc

@@ -0,0 +1,12 @@
+[[댓글좋아요-API]]
+== 댓글좋아요 API
+
+[[댓글좋아요-생성]]
+=== `POST` 댓글 좋아요 생성
+
+operation::comment-like-controller-test/create-comment-like[snippets='http-request,curl-request,path-parameters,request-headers,http-response']
+
+[[댓글좋아요-삭제]]
+=== `DELETE` 댓글 좋아요 삭제
+
+operation::comment-like-controller-test/delete-comment-like[snippets='http-request,curl-request,path-parameters,request-headers,http-response']

src/docs/asciidoc/comments.adoc

@@ -4,17 +4,17 @@
 [[댓글-생성]]
 === `POST` 댓글 생성
 
-operation::comment-controller-test/create-comment[snippets='http-request,curl-request,path-parameters,request-headers,request-fields,http-response']
+operation::comment-controller-test/create-comments[snippets='http-request,curl-request,path-parameters,request-headers,request-fields,http-response,response-fields']
 
 [[댓글-조회]]
 === `GET` 댓글 조회
 
-operation::comment-controller-test/find-comments[snippets='http-request,curl-request,path-parameters,http-response,response-fields']
+operation::comment-controller-test/find-comments[snippets='http-request,curl-request,path-parameters,request-headers,query-parameters,http-response,response-fields']
 
 [[댓글-수정]]
-=== `POST` 댓글 수정
+=== `PATCH` 댓글 수정
 
-operation::comment-controller-test/update-comment[snippets='http-request,curl-request,path-parameters,request-headers,request-fields,http-response']
+operation::comment-controller-test/update-comment[snippets='http-request,curl-request,path-parameters,request-headers,request-fields,http-response,response-fields']
 
 [[댓글-삭제]]
 === `DELETE` 댓글 삭제

src/docs/asciidoc/images.adoc

@@ -4,4 +4,4 @@
 [[이미지-업로드]]
 === `POST` 이미지 업로드
 
-operation::image-controller-test/create-image-file[snippets='http-request,curl-request,request-headers,request-parts,http-response,response-fields']
+operation::image-controller-test/create-presigned-url[snippets='http-request,curl-request,request-headers,request-fields,http-response,response-fields']