Merge branch 'dev' of https://github.com/prgrms-web-devcourse-final-project/WEB5_7_OronaminC_BE into style/67-codeStyle

Author: chcch529

.github/workflows/release-workflow.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - release
+  workflow_dispatch:
 
 env:
   REGISTRY: ghcr.io
@@ -49,7 +50,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setting for Developent
-        run: echo "${{ secrets.APPLICATION_DEV_YML }}" > src/main/resources/application-dev.yml
+        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
@@ -75,3 +78,24 @@ jobs:
           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

@@ -20,5 +20,8 @@ WORKDIR /app
 
 COPY --from=builder /libs/build/libs/*.jar app.jar
 
-ENTRYPOINT ["java", "-Dspring.profiles.active=dev", "-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

@@ -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'
@@ -61,6 +62,10 @@ dependencies {
 
     // 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'
 }
 
 tasks.named('test') {

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

@@ -11,16 +11,13 @@
 @Builder
 @Schema(description = "WebSocket STOMP 통신 답변 응답 DTO")
 public record AnswerCreateResponse(
-    //TODO: QuestionCreateResponse와 유사-> 둘중 하나만?
     @Schema(description = "답변이 생성될 질문 ID")
     Long questionId,
     @Schema(description = "답변 생성/삭제/수정 상태", example = "CREATE")
     EventType event,
     @Schema(description = "답변 ID", example = "11")
     Long answerId,
     @Schema(description = "답변 내용", example = "답변입니다.")
-    @NotBlank(message = "답변 내용을 입력해주시기 바랍니다.")
-    @Size(max = 300, message = "답변 내용은 최대 300자까지 입력할 수 있습니다.")
     String content,
     @Schema(description = "답변 내용에 대한 공감 수", example = "23")
     int emojiCount,

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

@@ -6,7 +6,6 @@
 
 @Schema(description = "답변 생성/수정 요청 DTO")
 public record AnswerRequest(
-    //TODO: 빈값 or " " (space) 처리
     @NotBlank(message = "답변 내용을 입력해주시기 바랍니다.")
     @Size(max = 300, message = "답변 내용은 최대 300자까지 입력할 수 있습니다.")
     @Schema(description = "답변 내용", example = "답변입니다.")

src/main/java/com/oronaminc/join/answer/service/AnswerService.java

@@ -1,15 +1,14 @@
 package com.oronaminc.join.answer.service;
 
-import static com.oronaminc.join.global.exception.ErrorCode.BADREQUEST_DUPLICATION_ANSWER;
 
 import com.oronaminc.join.answer.dao.AnswerRepository;
 import com.oronaminc.join.answer.domain.Answer;
-import com.oronaminc.join.answer.dto.AnswerRequest;
 import com.oronaminc.join.answer.dto.AnswerGetResponse;
+import com.oronaminc.join.answer.dto.AnswerRequest;
 import com.oronaminc.join.answer.mapper.AnswerMapper;
+import com.oronaminc.join.answer.util.PermissionValidator;
 import com.oronaminc.join.emoji.domain.TargetType;
 import com.oronaminc.join.emoji.service.EmojiReader;
-import com.oronaminc.join.global.exception.ErrorException;
 import com.oronaminc.join.member.domain.Member;
 import com.oronaminc.join.member.service.MemberReader;
 import com.oronaminc.join.participant.service.ParticipantService;
@@ -28,32 +27,25 @@
 public class AnswerService {
 
     private final AnswerRepository answerRepository;
-    private final ParticipantService participantService;
     private final QuestionReader questionReader;
     private final MemberReader memberReader;
     private final AnswerReader answerReader;
     private final RoomReader roomReader;
     private final EmojiReader emojiReader;
+    private final PermissionValidator permissionValidator;
 
     @Transactional
     public Answer create(Long roomId, Long memberId, Long questionId,
         AnswerRequest request) {
 
         Member member = memberReader.getById(memberId);
         Room room = roomReader.getById(roomId);
-        Question question = questionReader.getByIdAndRoomId(questionId, roomId);
-
-        participantService.validateParticipant(member.getId(), room.getId());
-
-        if (answerReader.existsByQuestionIdAndMemberId(question.getId(), member.getId())) {
-            throw new ErrorException(BADREQUEST_DUPLICATION_ANSWER);
-        }
-
+        Question question = questionReader.getByIdAndRoomId(questionId, room.getId());
+        permissionValidator.validateAnswerCreatePermission(room.getId(), member.getId(), question);
         Answer answer = AnswerMapper.toEntity(question, member, request);
 
-        answerRepository.save(answer);
+        return answerRepository.save(answer);
 
-        return answer;
     }
 
     @Transactional
@@ -71,17 +63,17 @@ public AnswerGetResponse getAnswer(Long roomId, Long questionId, Long memberId)
     }
 
     @Transactional
-    public Answer update(Long answerId, AnswerRequest request) {
-        Answer answer = answerReader.getById(answerId);
+    public Answer update(Long answerId, Long memberId, AnswerRequest request) {
+        Answer answer = permissionValidator.validateAnswerUpdatePermission(answerId, memberId);
 
         answer.updataContent(request.content());
 
         return answer;
     }
 
     @Transactional
-    public void delete(Long answerId) {
-        Answer answer = answerReader.getById(answerId);
+    public void delete(Long answerId, Long memberId) {
+        Answer answer = permissionValidator.validateAnswerDeletePermission(answerId, memberId);
         answerRepository.delete(answer);
     }
 

src/main/java/com/oronaminc/join/answer/util/PermissionType.java

@@ -0,0 +1,18 @@
+package com.oronaminc.join.answer.util;
+
+import com.oronaminc.join.global.exception.ErrorCode;
+import lombok.Getter;
+
+
+@Getter
+public enum PermissionType {
+    CREATE, DELETE;
+
+    public ErrorCode toErrorCode() {
+        return switch (this) {
+            case CREATE -> ErrorCode.UNAUTHORIZED_ROLE_ANSWER;
+            case DELETE -> ErrorCode.UNAUTHORIZED_DELETE_ANSWER;
+        };
+    }
+
+}

src/main/java/com/oronaminc/join/answer/util/PermissionValidator.java

@@ -1,8 +1,6 @@
 package com.oronaminc.join.answer.util;
 
-import static com.oronaminc.join.global.exception.ErrorCode.UNAUTHORIZED_DELETE_ANSWER;
 import static com.oronaminc.join.global.exception.ErrorCode.UNAUTHORIZED_EDIT_ANSWER;
-import static com.oronaminc.join.global.exception.ErrorCode.UNAUTHORIZED_ROLE_ANSWER;
 
 import com.oronaminc.join.answer.domain.Answer;
 import com.oronaminc.join.answer.service.AnswerReader;
@@ -22,40 +20,40 @@ public class PermissionValidator {
     private final ParticipantReader participantReader;
     private final AnswerReader answerReader;
 
-    public void validateAnswerPermission(Long roomId, Long memberId) {
-        // TODO: 생성시 조건 ( null 이면 안됨, " " 안됨, 팀원이나 발표자, 질문 작성자 본인만 생성가능 )
-        Participant participant = participantReader.getByRoomIdAndMemberId(roomId, memberId);
-        ParticipantType type = participant.getParticipantType();
-
-        if (type == ParticipantType.GUEST) {
-            throw new ErrorException(UNAUTHORIZED_ROLE_ANSWER);
-        }
+    public void validateAnswerCreatePermission(Long roomId, Long memberId, Question question) {
+        validatePermission(roomId, memberId, question, PermissionType.CREATE);
     }
 
-    public void validateAnswerUpdatePermission(Long answerId, Long memberId) {
+    public Answer validateAnswerUpdatePermission(Long answerId, Long memberId) {
         Answer answer = answerReader.getById(answerId);
 
         if (!answer.getMember().getId().equals(memberId)) {
             throw new ErrorException(UNAUTHORIZED_EDIT_ANSWER);
         }
+
+        return answer;
     }
 
-    public void validateAnswerDeletePermission(Long answerId, Long memberId) {
+    public Answer validateAnswerDeletePermission(Long answerId, Long memberId) {
         Answer answer = answerReader.getById(answerId);
-
         Room room = answer.getQuestion().getRoom();
         Question question = answer.getQuestion();
 
-        Participant participant = participantReader.getByRoomIdAndMemberId(room.getId(), memberId);
-        ParticipantType type = participant.getParticipantType();
+        validatePermission(room.getId(), memberId, question, PermissionType.DELETE);
+
+        return answer;
+    }
 
+    private void validatePermission(Long roomId, Long memberId, Question question,
+        PermissionType permissionType) {
+        Participant participant = participantReader.getByRoomIdAndMemberId(roomId, memberId);
+        ParticipantType type = participant.getParticipantType();
         boolean isQuestionWriter = question.getMember().getId().equals(memberId);
 
         if (!(isQuestionWriter || type == ParticipantType.TEAM
             || type == ParticipantType.PRESENTER)) {
-            throw new ErrorException(UNAUTHORIZED_DELETE_ANSWER);
+            throw new ErrorException(permissionType.toErrorCode());
         }
-
     }
 
 }

src/main/java/com/oronaminc/join/document/api/DocumentController.java

@@ -7,12 +7,14 @@
 import com.oronaminc.join.member.security.MemberDetails;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
+@Tag(name = "발표자료")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/documents")
@@ -37,6 +39,6 @@ public DocumentResponse generatePresignedUrl(
             @AuthenticationPrincipal MemberDetails memberDetails
     ) {
         String memberRole = memberDetails.getRole();
-        return documentService.generatePresignedUrl(documentRequest, memberRole);
+        return documentService.generateUploadPresignedUrl(documentRequest, memberRole);
     }
 }

src/main/java/com/oronaminc/join/document/event/DocumentCreateEvent.java

@@ -0,0 +1,3 @@
+package com.oronaminc.join.document.event;
+
+public record DocumentCreateEvent(String objectKey, String fileName) { }