7월 20일 코드 리뷰

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
       - name: application-ci.yml 주입
         run: |
           mkdir -p src/main/resources
-          echo "${{ secrets.APPLICATION_YML_CI }}" | base64 --decode > src/main/resources/application-ci.yml
+          echo "${{ secrets.APPLICATION_YML_CI }}" > src/main/resources/application-ci.yml
 
       - name: 권한 세팅
         run: chmod +x ./gradlew

.github/workflows/release-workflow.yml

@@ -0,0 +1,101 @@
+name: OromaminC Backend Service Release
+
+on:
+  push:
+    branches:
+      - release
+  workflow_dispatch:
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+
+  tagging:
+    name: 태깅 및 릴리즈
+    runs-on: ubuntu-latest
+    outputs:
+      tag_name: ${{ steps.tag_version.outputs.new_tag }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: versioning and tagging
+        id: tag_version
+        uses: mathieudutour/[email protected]
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: releasing
+        uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ steps.tag_version.outputs.new_tag }}
+          name: ${{ steps.tag_version.outputs.new_tag }}
+          body: ${{ steps.tag_version.outputs.changelog }}
+
+  build-image:
+    name: 도커 이미지 빌드
+    runs-on: ubuntu-latest
+    needs: tagging
+
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
+
+    steps:
+      - name: Check out Repository
+        uses: actions/checkout@v4
+
+      - name: Setting for Developent
+        run: |
+          mkdir -p src/main/resources
+          echo "${{ secrets.APPLICATION_DEV_YML }}" > src/main/resources/application-dev.yml
+
+      - name: Sign in github container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=sha
+            type=raw,value=${{ needs.tagging.outputs.tag_name }}
+            type=raw,value=latest
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            SPRING_PROFILES_ACTIVE=dev
+
+  deploy:
+    name: EC2 자동 배포
+    runs-on: ubuntu-latest
+    needs: build-image
+
+    steps:
+      - name: EC2에 SSH로 접속 후 배포
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          port: ${{ secrets.EC2_PORT }}
+          script: |
+            cd ${{ secrets.EC2_DEPLOY_DIR }}
+            docker compose pull
+            docker compose down
+            docker compose up -d

Dockerfile

@@ -0,0 +1,27 @@
+FROM gradle:jdk21 as builder
+
+WORKDIR /libs
+
+COPY gradlew .
+COPY gradle gradle
+COPY build.gradle .
+COPY settings.gradle .
+
+RUN ./gradlew dependencies --no-daemon || true
+
+COPY src src
+
+RUN ./gradlew build --no-daemon -x test
+
+
+FROM openjdk:21-slim
+
+WORKDIR /app
+
+COPY --from=builder /libs/build/libs/*.jar app.jar
+
+ARG SPRING_PROFILES_ACTIVE
+ENV SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE}
+
+ENTRYPOINT ["java", "-Dspring.profiles.active=${SPRING_PROFILES_ACTIVE}", "-jar", "app.jar"]
+

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'com.oronaminc'
-version = '0.0.1-SNAPSHOT'
+version = '0.1'
 
 java {
     toolchain {
@@ -30,6 +30,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.boot:spring-boot-starter-cache'
     testImplementation 'org.springframework.security:spring-security-test'
 
     compileOnly 'org.projectlombok:lombok'
@@ -49,6 +50,27 @@ dependencies {
 
     // S3
     implementation 'software.amazon.awssdk:s3:2.31.77'
+
+    // querydsl
+    implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
+    annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta"
+    annotationProcessor("jakarta.persistence:jakarta.persistence-api")
+    annotationProcessor("jakarta.annotation:jakarta.annotation-api")
+
+    // bucket4j
+    implementation 'com.bucket4j:bucket4j_jdk17-core:8.14.0'
+
+    // commons-lang3
+    implementation 'org.apache.commons:commons-lang3:3.18.0'
+    // caffeine
+    implementation 'com.github.ben-manes.caffeine:caffeine'
+
+    implementation 'org.springframework.retry:spring-retry:2.0.12'
+
+    //jwt
+    implementation 'io.jsonwebtoken:jjwt-api:0.12.6'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.6'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.6'
 }
 
 tasks.named('test') {

src/main/java/com/oronaminc/join/Web57OronaminCBeApplication.java

@@ -1,11 +1,14 @@
 package com.oronaminc.join;
 
+import com.oronaminc.join.member.token.JwtConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
 @EnableJpaAuditing
 @SpringBootApplication
+@EnableConfigurationProperties(JwtConfiguration.class)
 public class Web57OronaminCBeApplication {
 
     public static void main(String[] args) {

src/main/java/com/oronaminc/join/answer/api/AnswerController.java

@@ -1,15 +1,22 @@
 package com.oronaminc.join.answer.api;
 
 import com.oronaminc.join.answer.dto.AnswerGetResponse;
+import com.oronaminc.join.answer.dto.AnswerListResponse;
+import com.oronaminc.join.answer.mapper.AnswerMapper;
 import com.oronaminc.join.answer.service.AnswerService;
 import com.oronaminc.join.member.security.MemberDetails;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import java.time.LocalDateTime;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Slice;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -20,16 +27,30 @@ public class AnswerController {
 
     private final AnswerService answerService;
 
+    @Operation(
+        summary = "답변 조회",
+        description = "답변 보기 클릭 시 질문에 대한 답변을 조회",
+        responses = {
+            @ApiResponse(responseCode = "200", description = "답변 조회 성공"),
+            @ApiResponse(responseCode = "400", description = "답변이 없는데 답변보기 버튼이 활성화 되어 잘못된 조회 접근")
+
+        }
+    )
     @GetMapping("/rooms/{roomId}/questions/{questionId}/answers")
     @ResponseStatus(HttpStatus.OK)
-    public ResponseEntity<AnswerGetResponse> getAnswer(
+    public ResponseEntity<AnswerListResponse> getAnswers(
         @PathVariable Long roomId,
         @PathVariable Long questionId,
-        @AuthenticationPrincipal MemberDetails memberDetails
+        @AuthenticationPrincipal MemberDetails memberDetails,
+        @RequestParam(required = false) Long lastId,
+        @RequestParam(required = false) LocalDateTime lastCreatedAt,
+        @RequestParam(defaultValue = "10") int size
     ) {
         Long memberId = memberDetails.getId();
-        AnswerGetResponse response = answerService.getAnswer(roomId, questionId, memberId);
-        return ResponseEntity.ok(response);
+
+        Slice<AnswerGetResponse> response = answerService.getAnswers(roomId, questionId, memberId,
+            lastId, lastCreatedAt, size);
+        return ResponseEntity.ok(AnswerMapper.toAnswerListResponse(response));
     }
 
 }

src/main/java/com/oronaminc/join/answer/dao/AnswerRepository.java

@@ -1,17 +1,63 @@
 package com.oronaminc.join.answer.dao;
 
-import java.util.List;
-
-import java.util.Optional;
-import org.springframework.data.jpa.repository.JpaRepository;
 import com.oronaminc.join.answer.domain.Answer;
 import com.oronaminc.join.question.domain.Question;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
 
 public interface AnswerRepository extends JpaRepository<Answer, Long> {
 
     Optional<Answer> findByQuestionId(Long questionId);
 
-    boolean existsByQuestionIdAndMemberId(Long questionId, Long memberId);
+    @Query("""
+                SELECT a
+                FROM Answer a
+                JOIN FETCH a.member m
+                WHERE a.question.id = :questionId
+                ORDER BY a.createdAt ASC, a.id ASC
+            """)
+    List<Answer> findFirstPageByQuestionId(
+            @Param("questionId") Long questionId,
+            Pageable pageable
+    );
+
+    @Query("""
+                SELECT a
+                FROM Answer a
+                JOIN FETCH a.member m
+                WHERE a.question.id = :questionId
+                  AND (a.createdAt > :lastCreatedAt OR (a.createdAt = :lastCreatedAt AND a.id > :lastId))
+                ORDER BY a.createdAt ASC, a.id ASC
+            """)
+    List<Answer> findByQuestionIdWithCursor(
+            @Param("questionId") Long questionId,
+            @Param("lastCreatedAt") LocalDateTime lastCreatedAt,
+            @Param("lastId") Long lastId,
+            Pageable pageable
+    );
+
+    void deleteByQuestionId(Long questionId);
 
     void deleteByQuestionIn(List<Question> questions);
+
+    @Query("""
+                select count(distinct a.question.id)
+                from Answer a
+                where a.question.room.id = :roomId
+            """)
+    Long countAnsweredQuestionsByRoomId(@Param("roomId") Long roomId);
+
+    @Query("""
+                select a
+                from Answer a
+                where a.question.id in :questionIds
+            """)
+    List<Answer> findAllByQuestionIds(@Param("questionIds") List<Long> questionIds);
+
 }

src/main/java/com/oronaminc/join/answer/domain/Answer.java

@@ -1,6 +1,5 @@
 package com.oronaminc.join.answer.domain;
 
-import com.oronaminc.join.answer.dto.AnswerCreateRequest;
 import com.oronaminc.join.global.entity.BaseEntity;
 import com.oronaminc.join.member.domain.Member;
 import com.oronaminc.join.question.domain.Question;
@@ -27,7 +26,6 @@
 @Builder
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-// TODO: ddl-auto: create,update에만 유효 -> 추후 flyway sql 생성
 @Table(name = "answer", indexes = {
     @Index(name = "idx_answer_question_member", columnList = "question_id, member_id")
 })
@@ -60,6 +58,10 @@ public static Answer create(Question question, Member member, String content) {
             .build();
     }
 
+    public void updataContent(String content) {
+        this.content = content;
+    }
+
     public Long incrementEmojiCount() {
         return ++this.emojiCount;
     }

src/main/java/com/oronaminc/join/answer/dto/AnswerCreateResponse.java

@@ -1,18 +1,20 @@
 package com.oronaminc.join.answer.dto;
 
 import com.oronaminc.join.global.dto.WriterDto;
+import com.oronaminc.join.websocket.common.EventType;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 import java.time.LocalDateTime;
 import lombok.Builder;
 
 @Builder
 @Schema(description = "WebSocket STOMP 통신 답변 응답 DTO")
 public record AnswerCreateResponse(
-    //TODO: QuestionCreateResponse와 유사-> 둘중 하나만?
     @Schema(description = "답변이 생성될 질문 ID")
     Long questionId,
     @Schema(description = "답변 생성/삭제/수정 상태", example = "CREATE")
-    String event,
+    EventType event,
     @Schema(description = "답변 ID", example = "11")
     Long answerId,
     @Schema(description = "답변 내용", example = "답변입니다.")