diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 238afe2..46e6800 100644 --- a/.github/workflows/ci.yml +++ b/.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 diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml new file mode 100644 index 0000000..aea75e9 --- /dev/null +++ b/.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/github-tag-action@v6.2 + 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/ssh-action@v1.2.2 + 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 diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..98af97d --- /dev/null +++ b/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"] + diff --git a/build.gradle b/build.gradle index e4bdf23..997118e 100644 --- a/build.gradle +++ b/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') { diff --git a/src/main/java/com/oronaminc/join/Web57OronaminCBeApplication.java b/src/main/java/com/oronaminc/join/Web57OronaminCBeApplication.java index 49f9e5b..dddd698 100644 --- a/src/main/java/com/oronaminc/join/Web57OronaminCBeApplication.java +++ b/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) { diff --git a/src/main/java/com/oronaminc/join/answer/api/AnswerController.java b/src/main/java/com/oronaminc/join/answer/api/AnswerController.java index 8e2b1eb..7452a6a 100644 --- a/src/main/java/com/oronaminc/join/answer/api/AnswerController.java +++ b/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 getAnswer( + public ResponseEntity 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 response = answerService.getAnswers(roomId, questionId, memberId, + lastId, lastCreatedAt, size); + return ResponseEntity.ok(AnswerMapper.toAnswerListResponse(response)); } } diff --git a/src/main/java/com/oronaminc/join/answer/dao/AnswerRepository.java b/src/main/java/com/oronaminc/join/answer/dao/AnswerRepository.java index 9c94c4b..dcaf09d 100644 --- a/src/main/java/com/oronaminc/join/answer/dao/AnswerRepository.java +++ b/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 { Optional 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 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 findByQuestionIdWithCursor( + @Param("questionId") Long questionId, + @Param("lastCreatedAt") LocalDateTime lastCreatedAt, + @Param("lastId") Long lastId, + Pageable pageable + ); + + void deleteByQuestionId(Long questionId); void deleteByQuestionIn(List 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 findAllByQuestionIds(@Param("questionIds") List questionIds); + } diff --git a/src/main/java/com/oronaminc/join/answer/domain/Answer.java b/src/main/java/com/oronaminc/join/answer/domain/Answer.java index 3517046..7abdf84 100644 --- a/src/main/java/com/oronaminc/join/answer/domain/Answer.java +++ b/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; } diff --git a/src/main/java/com/oronaminc/join/answer/dto/AnswerCreateRequest.java b/src/main/java/com/oronaminc/join/answer/dto/AnswerCreateRequest.java deleted file mode 100644 index 588b721..0000000 --- a/src/main/java/com/oronaminc/join/answer/dto/AnswerCreateRequest.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.oronaminc.join.answer.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -@Schema(description = "WebSocket STOMP 통신 답변 요청 DTO") -public record AnswerCreateRequest( - //TODO: 빈값 or " " (space) 처리 - @Schema(description = "답변 내용", example = "답변입니다.") - String content -) { - -} diff --git a/src/main/java/com/oronaminc/join/answer/dto/AnswerCreateResponse.java b/src/main/java/com/oronaminc/join/answer/dto/AnswerCreateResponse.java index 240f866..c8e8c88 100644 --- a/src/main/java/com/oronaminc/join/answer/dto/AnswerCreateResponse.java +++ b/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 = "답변입니다.") diff --git a/src/main/java/com/oronaminc/join/answer/dto/AnswerDeleteResponse.java b/src/main/java/com/oronaminc/join/answer/dto/AnswerDeleteResponse.java new file mode 100644 index 0000000..36b5c9b --- /dev/null +++ b/src/main/java/com/oronaminc/join/answer/dto/AnswerDeleteResponse.java @@ -0,0 +1,13 @@ +package com.oronaminc.join.answer.dto; + +import com.oronaminc.join.websocket.common.EventType; +import io.swagger.v3.oas.annotations.media.Schema; + +@Schema(description = "답변 삭제 응답 DTO") +public record AnswerDeleteResponse( + Long answerId, + @Schema(description = "삭제 이벤트", example = "DELETE") + EventType event +) { + +} diff --git a/src/main/java/com/oronaminc/join/answer/dto/AnswerGetResponse.java b/src/main/java/com/oronaminc/join/answer/dto/AnswerGetResponse.java index 5970acc..9de2804 100644 --- a/src/main/java/com/oronaminc/join/answer/dto/AnswerGetResponse.java +++ b/src/main/java/com/oronaminc/join/answer/dto/AnswerGetResponse.java @@ -12,7 +12,7 @@ public record AnswerGetResponse( @Schema(description = "답변 내용에 대한 공감 수", example = "23") Long emojiCount, @Schema(description = "답변 공감 여부", example = "true") - boolean Emojied, + boolean isEmojied, @Schema(description = "답변 내용", example = "답변입니다.") String content, @Schema(description = "작성자 정보 DTO") diff --git a/src/main/java/com/oronaminc/join/answer/dto/AnswerListResponse.java b/src/main/java/com/oronaminc/join/answer/dto/AnswerListResponse.java new file mode 100644 index 0000000..56870b3 --- /dev/null +++ b/src/main/java/com/oronaminc/join/answer/dto/AnswerListResponse.java @@ -0,0 +1,11 @@ +package com.oronaminc.join.answer.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; + +@Schema(description = "답변 목록을 묶기 위한 DTO") +public record AnswerListResponse( + List answers +) { + +} diff --git a/src/main/java/com/oronaminc/join/answer/dto/AnswerRequest.java b/src/main/java/com/oronaminc/join/answer/dto/AnswerRequest.java new file mode 100644 index 0000000..5646c80 --- /dev/null +++ b/src/main/java/com/oronaminc/join/answer/dto/AnswerRequest.java @@ -0,0 +1,18 @@ +package com.oronaminc.join.answer.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +@Schema(description = "답변 생성/수정 요청 DTO") +public record AnswerRequest( + @NotBlank(message = "답변 내용을 입력해주시기 바랍니다.") + @Size(max = 300, message = "답변 내용은 최대 300자까지 입력할 수 있습니다.") + @Schema(description = "답변 내용", example = "답변입니다.") + String content, + @NotNull + Long memberId +) { + +} diff --git a/src/main/java/com/oronaminc/join/answer/dto/AnswerUpdateResponse.java b/src/main/java/com/oronaminc/join/answer/dto/AnswerUpdateResponse.java new file mode 100644 index 0000000..11f3835 --- /dev/null +++ b/src/main/java/com/oronaminc/join/answer/dto/AnswerUpdateResponse.java @@ -0,0 +1,18 @@ +package com.oronaminc.join.answer.dto; + +import com.oronaminc.join.websocket.common.EventType; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Builder; + +@Builder +@Schema(description = "답변 수정 응답 DTO") +public record AnswerUpdateResponse( + Long answerId, + @Schema(description = "수정 이벤트", example = "UPDATE") + EventType event, + @Schema(description = "수정된 내용", example = "수정된 답변입니다.") + String content + +) { + +} diff --git a/src/main/java/com/oronaminc/join/answer/mapper/AnswerMapper.java b/src/main/java/com/oronaminc/join/answer/mapper/AnswerMapper.java index f523264..2e7d62d 100644 --- a/src/main/java/com/oronaminc/join/answer/mapper/AnswerMapper.java +++ b/src/main/java/com/oronaminc/join/answer/mapper/AnswerMapper.java @@ -1,14 +1,20 @@ package com.oronaminc.join.answer.mapper; import com.oronaminc.join.answer.domain.Answer; -import com.oronaminc.join.answer.dto.AnswerCreateRequest; import com.oronaminc.join.answer.dto.AnswerCreateResponse; import com.oronaminc.join.answer.dto.AnswerGetResponse; +import com.oronaminc.join.answer.dto.AnswerListResponse; +import com.oronaminc.join.answer.dto.AnswerRequest; +import com.oronaminc.join.answer.dto.AnswerUpdateResponse; +import com.oronaminc.join.emoji.domain.TargetType; +import com.oronaminc.join.emoji.service.EmojiReader; import com.oronaminc.join.global.dto.WriterDto; import com.oronaminc.join.member.domain.Member; import com.oronaminc.join.question.domain.Question; +import com.oronaminc.join.websocket.common.EventType; import lombok.AccessLevel; import lombok.NoArgsConstructor; +import org.springframework.data.domain.Slice; @NoArgsConstructor(access = AccessLevel.PRIVATE) public class AnswerMapper { @@ -16,7 +22,7 @@ public class AnswerMapper { public static AnswerCreateResponse toAnswerCreateResponse(Answer answer) { return AnswerCreateResponse.builder() .questionId(answer.getQuestion().getId()) - .event("CREATE") + .event(EventType.CREATE) .answerId(answer.getId()) .content(answer.getContent()) .emojiCount(0) @@ -29,11 +35,12 @@ public static AnswerCreateResponse toAnswerCreateResponse(Answer answer) { .build(); } - public static AnswerGetResponse toAnswerGetResponse(Answer answer, Long emojiCount, boolean isEmojied) { + public static AnswerGetResponse toAnswerGetResponse(Answer answer, boolean isEmojied) { + return AnswerGetResponse.builder() .answerId(answer.getId()) - .emojiCount(emojiCount) - .Emojied(isEmojied) + .emojiCount(answer.getEmojiCount()) + .isEmojied(isEmojied) .content(answer.getContent()) .writer(new WriterDto( answer.getMember().getId(), @@ -43,7 +50,21 @@ public static AnswerGetResponse toAnswerGetResponse(Answer answer, Long emojiCou .build(); } - public static Answer toEntity(Question question, Member member, AnswerCreateRequest request) { + public static Answer toEntity(Question question, Member member, AnswerRequest request) { return Answer.create(question, member, request.content()); } + + public static AnswerUpdateResponse toAnswerUpdateResponse(Answer answer) { + return AnswerUpdateResponse.builder() + .answerId(answer.getId()) + .event(EventType.UPDATE) + .content(answer.getContent()) + .build(); + } + + public static AnswerListResponse toAnswerListResponse( + Slice slice) { + return new AnswerListResponse(slice.getContent()); + } + } diff --git a/src/main/java/com/oronaminc/join/answer/service/AnswerReader.java b/src/main/java/com/oronaminc/join/answer/service/AnswerReader.java index c905c6d..349c842 100644 --- a/src/main/java/com/oronaminc/join/answer/service/AnswerReader.java +++ b/src/main/java/com/oronaminc/join/answer/service/AnswerReader.java @@ -1,16 +1,15 @@ package com.oronaminc.join.answer.service; -import static com.oronaminc.join.global.exception.ErrorCode.*; - -import com.oronaminc.join.global.exception.ErrorCode; -import com.oronaminc.join.room.domain.Room; +import java.time.LocalDateTime; import java.util.List; import java.util.Optional; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Component; import com.oronaminc.join.answer.dao.AnswerRepository; import com.oronaminc.join.answer.domain.Answer; +import com.oronaminc.join.global.exception.ErrorCode; import com.oronaminc.join.global.exception.ErrorException; import lombok.RequiredArgsConstructor; @@ -18,23 +17,33 @@ @Component @RequiredArgsConstructor public class AnswerReader { - private final AnswerRepository answerRepository; - public boolean existsByQuestionIdAndMemberId(Long questionId, Long memberId) { - return answerRepository.existsByQuestionIdAndMemberId(questionId, memberId); - } + private final AnswerRepository answerRepository; public Optional findById(Long answerId) { return answerRepository.findById(answerId); } - public Answer getByQuestionId(Long questionId) { - return answerRepository.findByQuestionId(questionId) - .orElseThrow(() -> new ErrorException(ErrorCode.NOT_FOUND_EXIST_ANSWER)); + public List getFirstPageByQuestionId(Long questionId, Pageable pageable) { + return answerRepository.findFirstPageByQuestionId(questionId, pageable); + } + + public List getAnswerByQuestionIdWithCursor(Long questionId, + LocalDateTime lastCreatedAt, Long lastId, Pageable pageable) { + return answerRepository.findByQuestionIdWithCursor(questionId, lastCreatedAt, lastId, + pageable); } public Answer getById(Long answerId) { return findById(answerId) .orElseThrow(() -> new ErrorException(ErrorCode.NOT_FOUND_ANSWER)); } + + public Long countAnsweredQuestionsByRoomId(Long roomId) { + return answerRepository.countAnsweredQuestionsByRoomId(roomId); + } + + public List getAnswerByQuestionIds(List questionIds) { + return answerRepository.findAllByQuestionIds(questionIds); + } } diff --git a/src/main/java/com/oronaminc/join/answer/service/AnswerService.java b/src/main/java/com/oronaminc/join/answer/service/AnswerService.java index 2570890..699123d 100644 --- a/src/main/java/com/oronaminc/join/answer/service/AnswerService.java +++ b/src/main/java/com/oronaminc/join/answer/service/AnswerService.java @@ -1,27 +1,32 @@ package com.oronaminc.join.answer.service; -import static com.oronaminc.join.global.exception.ErrorCode.BADREQUEST_DUPLICATION_ANSWER; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Set; + +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Slice; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import com.oronaminc.join.answer.dao.AnswerRepository; import com.oronaminc.join.answer.domain.Answer; -import com.oronaminc.join.answer.dto.AnswerCreateRequest; 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.ErrorCode; -import com.oronaminc.join.global.exception.ErrorException; +import com.oronaminc.join.global.util.SliceUtil; import com.oronaminc.join.member.domain.Member; import com.oronaminc.join.member.service.MemberReader; -import com.oronaminc.join.participant.service.ParticipantService; import com.oronaminc.join.question.domain.Question; import com.oronaminc.join.question.service.QuestionReader; import com.oronaminc.join.room.domain.Room; import com.oronaminc.join.room.service.RoomReader; -import java.util.List; + import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; @Service @Transactional(readOnly = true) @@ -29,50 +34,87 @@ 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, - AnswerCreateRequest requestDto) { + AnswerRequest request) { Member member = memberReader.getById(memberId); Room room = roomReader.getById(roomId); - Question question = questionReader.getByIdAndRoomId(questionId, roomId); + Question question = questionReader.getByIdAndRoomId(questionId, room.getId()); + permissionValidator.validateAnswerCreatePermission(room.getId(), member.getId(), question); + Answer answer = AnswerMapper.toEntity(question, member, request); - participantService.validateParticipant(member.getId(), room.getId()); + return answerRepository.save(answer); - if (answerReader.existsByQuestionIdAndMemberId(question.getId(), member.getId())) { - throw new ErrorException(BADREQUEST_DUPLICATION_ANSWER); - } + } - Answer answer = AnswerMapper.toEntity(question, member, requestDto); + @Transactional(readOnly = true) + public Slice getAnswers( + Long roomId, + Long questionId, + Long memberId, + Long lastId, + LocalDateTime lastCreatedAt, + int size + ) { + memberReader.getById(memberId); + roomReader.getById(roomId); + questionReader.getByIdAndRoomId(questionId, roomId); - answerRepository.save(answer); + Pageable pageable = PageRequest.of(0, size + 1); + + List answers = (lastCreatedAt == null || lastId == null) + ? answerReader.getFirstPageByQuestionId(questionId, pageable) + : answerReader.getAnswerByQuestionIdWithCursor(questionId, lastCreatedAt, lastId, + pageable); + + // 공감 여부 일괄 조회 + List answerIds = answers.stream().map(Answer::getId).toList(); + + Set emojiedAnswerIds = memberId != null + ? emojiReader.findTargetIdsByMemberAndTargetTypeInBatch(memberId, TargetType.ANSWER, answerIds) + : Set.of(); + + List responseList = answers.stream() + .map(answer -> { + boolean isEmojied = emojiedAnswerIds.contains(answer.getId()); + return AnswerMapper.toAnswerGetResponse(answer, isEmojied); + }) + .toList(); + + return SliceUtil.toSlice(responseList, PageRequest.of(0, size)); - return answer; } @Transactional - public AnswerGetResponse getAnswer(Long roomId, Long questionId, Long memberId) { - Member member = memberReader.getById(memberId); - roomReader.getById(roomId); - questionReader.getByIdAndRoomId(questionId, roomId); - Answer answer = answerReader.getByQuestionId(questionId); + public Answer update(Long answerId, Long memberId, AnswerRequest request) { + Answer answer = permissionValidator.validateAnswerUpdatePermission(answerId, memberId); + + answer.updataContent(request.content()); + + return answer; + } - Long emojiCount = answer.getEmojiCount(); - boolean isEmojied = emojiReader.findByMemberIdAndTargetIdAndTargetType(member.getId(), - answer.getId(), TargetType.ANSWER).isPresent(); + @Transactional + public void delete(Long answerId, Long memberId) { + Answer answer = permissionValidator.validateAnswerDeletePermission(answerId, memberId); + answerRepository.delete(answer); + } - return AnswerMapper.toAnswerGetResponse(answer, emojiCount, isEmojied); + @Transactional + public void deleteByQuestion(Long questionId) { + answerRepository.deleteByQuestionId(questionId); } + @Transactional public void deleteByQuestionList(List questions) { answerRepository.deleteByQuestionIn(questions); } - } diff --git a/src/main/java/com/oronaminc/join/answer/util/PermissionType.java b/src/main/java/com/oronaminc/join/answer/util/PermissionType.java new file mode 100644 index 0000000..0f3744a --- /dev/null +++ b/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; + }; + } + +} diff --git a/src/main/java/com/oronaminc/join/answer/util/PermissionValidator.java b/src/main/java/com/oronaminc/join/answer/util/PermissionValidator.java index 75293ad..072c55f 100644 --- a/src/main/java/com/oronaminc/join/answer/util/PermissionValidator.java +++ b/src/main/java/com/oronaminc/join/answer/util/PermissionValidator.java @@ -1,12 +1,15 @@ package com.oronaminc.join.answer.util; -import static com.oronaminc.join.global.exception.ErrorCode.NOT_FOUND_PARTICIPANT; -import static com.oronaminc.join.global.exception.ErrorCode.UNAUTHORIZED_ROLE_ANSWER; +import static com.oronaminc.join.global.exception.ErrorCode.UNAUTHORIZED_EDIT_ANSWER; +import com.oronaminc.join.answer.domain.Answer; +import com.oronaminc.join.answer.service.AnswerReader; import com.oronaminc.join.global.exception.ErrorException; -import com.oronaminc.join.participant.dao.ParticipantRepository; import com.oronaminc.join.participant.domain.Participant; import com.oronaminc.join.participant.domain.ParticipantType; +import com.oronaminc.join.participant.service.ParticipantReader; +import com.oronaminc.join.question.domain.Question; +import com.oronaminc.join.room.domain.Room; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -14,15 +17,42 @@ @RequiredArgsConstructor public class PermissionValidator { - private final ParticipantRepository participantRepository; + private final ParticipantReader participantReader; + private final AnswerReader answerReader; - public void validateAnswerPermission(Long roomId, Long memberId) { - Participant participant = participantRepository.findByRoomIdAndMemberId(roomId,memberId) - .orElseThrow(() -> new ErrorException(NOT_FOUND_PARTICIPANT)); + public void validateAnswerCreatePermission(Long roomId, Long memberId, Question question) { + validatePermission(roomId, memberId, question, PermissionType.CREATE); + } + + 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 Answer validateAnswerDeletePermission(Long answerId, Long memberId) { + Answer answer = answerReader.getById(answerId); + Room room = answer.getQuestion().getRoom(); + Question question = answer.getQuestion(); + + 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(type == ParticipantType.GUEST){ - throw new ErrorException(UNAUTHORIZED_ROLE_ANSWER); + if (!(isQuestionWriter || type == ParticipantType.TEAM + || type == ParticipantType.PRESENTER)) { + throw new ErrorException(permissionType.toErrorCode()); } } diff --git a/src/main/java/com/oronaminc/join/document/api/DocumentController.java b/src/main/java/com/oronaminc/join/document/api/DocumentController.java index 57dccbd..86dc696 100644 --- a/src/main/java/com/oronaminc/join/document/api/DocumentController.java +++ b/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); } } diff --git a/src/main/java/com/oronaminc/join/document/event/DocumentCreateEvent.java b/src/main/java/com/oronaminc/join/document/event/DocumentCreateEvent.java new file mode 100644 index 0000000..d32cb8a --- /dev/null +++ b/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) { } diff --git a/src/main/java/com/oronaminc/join/document/event/DocumentEventHandler.java b/src/main/java/com/oronaminc/join/document/event/DocumentEventHandler.java new file mode 100644 index 0000000..8ec126b --- /dev/null +++ b/src/main/java/com/oronaminc/join/document/event/DocumentEventHandler.java @@ -0,0 +1,34 @@ +package com.oronaminc.join.document.event; + + +import com.oronaminc.join.global.exception.ErrorCode; +import com.oronaminc.join.global.exception.ErrorException; +import com.oronaminc.join.infra.service.S3Service; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.transaction.event.TransactionPhase; +import org.springframework.transaction.event.TransactionalEventListener; + + +@Slf4j +@Component +@RequiredArgsConstructor +public class DocumentEventHandler { + + private final S3Service s3Service; + + @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT) + public void handleDocumentEvent(DocumentCreateEvent event) { + String newKey = "documents/" + event.fileName(); + + try { + s3Service.moveObject(event.objectKey(), newKey); + + log.debug("✅ S3 파일 이동 성공: {} → {}", event.objectKey(), newKey); + } catch (Exception e) { + log.error("❌ S3 파일 이동 실패: {} → {}, 이유: {}", event.objectKey(), newKey, e.getMessage(), e); + throw new ErrorException(ErrorCode.MOVEMENT_FILE_FAILED); + } + } +} diff --git a/src/main/java/com/oronaminc/join/document/service/DocumentService.java b/src/main/java/com/oronaminc/join/document/service/DocumentService.java index 37f889a..9216712 100644 --- a/src/main/java/com/oronaminc/join/document/service/DocumentService.java +++ b/src/main/java/com/oronaminc/join/document/service/DocumentService.java @@ -1,6 +1,14 @@ package com.oronaminc.join.document.service; + +import com.oronaminc.join.document.domain.Document; +import com.oronaminc.join.document.event.DocumentCreateEvent; +import org.springframework.context.ApplicationEventPublisher; + +import java.util.UUID; + import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import com.oronaminc.join.document.dao.DocumentRepository; import com.oronaminc.join.document.dto.DocumentRequest; @@ -11,12 +19,9 @@ import com.oronaminc.join.infra.service.S3Service; import com.oronaminc.join.member.domain.MemberType; import com.oronaminc.join.room.domain.Room; -import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; -import java.util.UUID; - @Service @RequiredArgsConstructor @@ -24,19 +29,30 @@ public class DocumentService { private final DocumentRepository documentRepository; private final S3Service s3Service; + private final ApplicationEventPublisher publisher; + private final DocumentReader documentReader; + @Transactional public void deleteByRoomId(Long roomId) { documentRepository.deleteByRoomId(roomId); } - public DocumentResponse generatePresignedUrl(DocumentRequest request, String memberRole) { + public DocumentResponse generateUploadPresignedUrl(DocumentRequest request, String memberRole) { if (!memberRole.equals(MemberType.MEMBER.name())) { throw new ErrorException(ErrorCode.UNAUTHORIZED_MEMBER); } + String OriginalFileName = request.fileName(); + String extension = ""; + + int dotIndex = OriginalFileName.lastIndexOf('.'); + if (dotIndex != -1) { + extension = OriginalFileName.substring(dotIndex); + } + String uuid = UUID.randomUUID().toString(); - String objectKey = "documents/" + uuid + "_" + request.fileName(); - String presignedUrl = s3Service.generatePresignedUrl(objectKey); + String objectKey = "temp/" + uuid + extension; + String presignedUrl = s3Service.generateUploadPresignedUrl(objectKey); return new DocumentResponse(presignedUrl, objectKey); } @@ -45,7 +61,24 @@ public DocumentResponse generatePresignedUrl(DocumentRequest request, String mem public void saveDocument(String objectKey, Room room) { String fileName = objectKey.replaceAll("^.*/",""); - documentRepository.save(DocumentMapper.toDocument(objectKey, fileName, room)); + String newKey = "documents/" + fileName; + + documentRepository.save(DocumentMapper.toDocument(newKey, fileName, room)); + publisher.publishEvent(new DocumentCreateEvent(objectKey, fileName)); + } + + @Transactional + public void updateDocument(String objectKey, Long roomId) { + Document document = documentReader.getByRoomId(roomId); + String fileName = objectKey.replaceAll("^.*/",""); + + String oldKey = document.getFileUrl(); + String newKey = "documents/" + fileName; + + document.update(newKey); + + s3Service.deleteFile(oldKey); + publisher.publishEvent(new DocumentCreateEvent(objectKey, fileName)); } } diff --git a/src/main/java/com/oronaminc/join/emoji/dao/EmojiRepository.java b/src/main/java/com/oronaminc/join/emoji/dao/EmojiRepository.java index dbf2af5..3389a9b 100644 --- a/src/main/java/com/oronaminc/join/emoji/dao/EmojiRepository.java +++ b/src/main/java/com/oronaminc/join/emoji/dao/EmojiRepository.java @@ -1,11 +1,13 @@ package com.oronaminc.join.emoji.dao; -import java.util.Optional; - -import org.springframework.data.jpa.repository.JpaRepository; - import com.oronaminc.join.emoji.domain.Emoji; import com.oronaminc.join.emoji.domain.TargetType; +import java.util.List; +import java.util.Optional; +import java.util.Set; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; public interface EmojiRepository extends JpaRepository { @@ -15,4 +17,20 @@ Optional findByMemberIdAndTargetIdAndTargetType(Long memberId, Long targe TargetType targetType); Integer countByTargetIdAndTargetType(Long targetId, TargetType targetType); + + boolean existsByMemberIdAndTargetIdAndTargetType(Long memberId, Long targetId, + TargetType targetType); + + @Query(""" + SELECT e.targetId + FROM Emoji e + WHERE e.member.id = :memberId + AND e.targetType = :targetType + AND e.targetId IN :targetIds + """) + Set findTargetIdsByMemberIdAndTargetTypeAndTargetIdIn( + @Param("memberId") Long memberId, + @Param("targetType") TargetType targetType, + @Param("targetIds") List targetIds + ); } diff --git a/src/main/java/com/oronaminc/join/emoji/dto/EmojiRequest.java b/src/main/java/com/oronaminc/join/emoji/dto/EmojiRequest.java index f30ff76..e72a036 100644 --- a/src/main/java/com/oronaminc/join/emoji/dto/EmojiRequest.java +++ b/src/main/java/com/oronaminc/join/emoji/dto/EmojiRequest.java @@ -2,13 +2,18 @@ import com.oronaminc.join.emoji.domain.TargetType; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; @Schema(description = "발표방/질문/답변 공감 생성/삭제 요청 DTO") public record EmojiRequest( + @NotNull @Schema(description = "공감 대상 타입 (ROOM, QUESTION, ANSWER)", example = "ROOM") TargetType targetType, + @NotNull @Schema(description = "공감 대상 ID", example = "1") - Long targetId + Long targetId, + @NotNull + Long memberId ) { } diff --git a/src/main/java/com/oronaminc/join/emoji/dto/EmojiResponse.java b/src/main/java/com/oronaminc/join/emoji/dto/EmojiResponse.java index eda6d68..99fc8a5 100644 --- a/src/main/java/com/oronaminc/join/emoji/dto/EmojiResponse.java +++ b/src/main/java/com/oronaminc/join/emoji/dto/EmojiResponse.java @@ -1,12 +1,13 @@ package com.oronaminc.join.emoji.dto; import com.oronaminc.join.emoji.domain.TargetType; +import com.oronaminc.join.websocket.common.EventType; import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "발표방/질문/답변 공감 생성/삭제 응답 DTO") public record EmojiResponse( @Schema(description = "이벤트 타입 (CREATE, DELETE)", example = "CREATE") - String event, + EventType event, @Schema(description = "공감 대상 타입 (ROOM, QUESTION, ANSWER)", example = "ROOM") TargetType targetType, @Schema(description = "공감 대상 ID", example = "1") diff --git a/src/main/java/com/oronaminc/join/emoji/service/EmojiFacade.java b/src/main/java/com/oronaminc/join/emoji/service/EmojiFacade.java index 5b55fe2..8bc099c 100644 --- a/src/main/java/com/oronaminc/join/emoji/service/EmojiFacade.java +++ b/src/main/java/com/oronaminc/join/emoji/service/EmojiFacade.java @@ -1,12 +1,14 @@ package com.oronaminc.join.emoji.service; +import org.springframework.orm.ObjectOptimisticLockingFailureException; +import org.springframework.stereotype.Service; + import com.oronaminc.join.emoji.dto.EmojiRequest; import com.oronaminc.join.emoji.dto.EmojiResponse; import com.oronaminc.join.global.exception.ErrorCode; import com.oronaminc.join.global.exception.ErrorException; + import lombok.RequiredArgsConstructor; -import org.springframework.orm.ObjectOptimisticLockingFailureException; -import org.springframework.stereotype.Service; @Service @RequiredArgsConstructor @@ -14,19 +16,34 @@ public class EmojiFacade { private final EmojiService emojiService; - public EmojiResponse toggleEmoji(Long memberId, EmojiRequest emojiRequest) { + public EmojiResponse createEmoji(Long memberId, EmojiRequest emojiRequest) { + for (int i = 0; i < 10; i++) { + try { + return emojiService.createEmoji(memberId, emojiRequest); + } catch (ObjectOptimisticLockingFailureException e) { + try { + Thread.sleep(50); + } catch (InterruptedException ex) { + throw new ErrorException(ErrorCode.CONFLICT_EMOJI); + } + } + } + throw new ErrorException(ErrorCode.CONFLICT_EMOJI); + } + + public EmojiResponse deleteEmoji(Long memberId, EmojiRequest emojiRequest) { for (int i = 0; i < 10; i++) { try { - return emojiService.toggleEmoji(memberId, emojiRequest); + return emojiService.deleteEmoji(memberId, emojiRequest); } catch (ObjectOptimisticLockingFailureException e) { try { Thread.sleep(50); } catch (InterruptedException ex) { - throw new ErrorException(ErrorCode.EMOJI_CONFLICT); + throw new ErrorException(ErrorCode.CONFLICT_EMOJI); } } } - throw new ErrorException(ErrorCode.EMOJI_CONFLICT); + throw new ErrorException(ErrorCode.CONFLICT_EMOJI); } } diff --git a/src/main/java/com/oronaminc/join/emoji/service/EmojiReader.java b/src/main/java/com/oronaminc/join/emoji/service/EmojiReader.java index 7c5112a..6bf8182 100644 --- a/src/main/java/com/oronaminc/join/emoji/service/EmojiReader.java +++ b/src/main/java/com/oronaminc/join/emoji/service/EmojiReader.java @@ -1,26 +1,48 @@ package com.oronaminc.join.emoji.service; -import java.util.Optional; - -import org.springframework.stereotype.Component; - import com.oronaminc.join.emoji.dao.EmojiRepository; import com.oronaminc.join.emoji.domain.Emoji; import com.oronaminc.join.emoji.domain.TargetType; - +import com.oronaminc.join.global.exception.ErrorCode; +import com.oronaminc.join.global.exception.ErrorException; +import java.util.List; +import java.util.Optional; +import java.util.Set; import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor public class EmojiReader { + private final EmojiRepository emojiRepository; - public Optional findByMemberIdAndTargetIdAndTargetType(Long memberId, Long targetId, TargetType targetType) { - return emojiRepository.findByMemberIdAndTargetIdAndTargetType(memberId, targetId, targetType); + public Optional findByMemberIdAndTargetIdAndTargetType(Long memberId, Long targetId, + TargetType targetType) { + return emojiRepository.findByMemberIdAndTargetIdAndTargetType(memberId, targetId, + targetType); + } + + public Emoji findEmojiByMemberIdAndTargetIdAndTargetType(Long memberId, Long targetId, + TargetType targetType) { + return emojiRepository.findByMemberIdAndTargetIdAndTargetType(memberId, targetId, + targetType) + .orElseThrow(() -> new ErrorException(ErrorCode.NOT_FOUND_EMOJI)); } public Integer countByTargetIdAndTargetType(Long targetId, TargetType targetType) { return emojiRepository.countByTargetIdAndTargetType(targetId, targetType); } + public boolean existsByMemberIdAndTargetIdAndTargetType(Long memberId, Long targetId, + TargetType targetType) { + return emojiRepository.existsByMemberIdAndTargetIdAndTargetType(memberId, targetId, + targetType); + } + + public Set findTargetIdsByMemberAndTargetTypeInBatch(Long memberId, TargetType targetType, List targetIds) { + if (targetIds.isEmpty() || targetType == null) return Set.of(); + return emojiRepository.findTargetIdsByMemberIdAndTargetTypeAndTargetIdIn(memberId, targetType, targetIds); + } + } diff --git a/src/main/java/com/oronaminc/join/emoji/service/EmojiService.java b/src/main/java/com/oronaminc/join/emoji/service/EmojiService.java index 3f8b5cc..4b20cae 100644 --- a/src/main/java/com/oronaminc/join/emoji/service/EmojiService.java +++ b/src/main/java/com/oronaminc/join/emoji/service/EmojiService.java @@ -1,21 +1,20 @@ package com.oronaminc.join.emoji.service; -import java.util.Optional; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.oronaminc.join.answer.service.AnswerReader; import com.oronaminc.join.emoji.dao.EmojiRepository; import com.oronaminc.join.emoji.domain.Emoji; import com.oronaminc.join.emoji.domain.TargetType; import com.oronaminc.join.emoji.dto.EmojiRequest; import com.oronaminc.join.emoji.dto.EmojiResponse; +import com.oronaminc.join.global.exception.ErrorCode; +import com.oronaminc.join.global.exception.ErrorException; import com.oronaminc.join.member.service.MemberReader; import com.oronaminc.join.question.service.QuestionReader; import com.oronaminc.join.room.service.RoomReader; - +import com.oronaminc.join.websocket.common.EventType; import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; @Service @Transactional(readOnly = true) @@ -35,27 +34,36 @@ public void deleteByRoomEmoji(Long roomId) { } @Transactional - public EmojiResponse toggleEmoji(Long memberId, EmojiRequest emojiRequest) { + public EmojiResponse createEmoji(Long memberId, EmojiRequest emojiRequest) { Long emojiCount; TargetType targetType = emojiRequest.targetType(); Long targetId = emojiRequest.targetId(); - Optional findEmoji = emojiReader.findByMemberIdAndTargetIdAndTargetType( - memberId, targetId, targetType); - - if (findEmoji.isPresent()) { - emojiRepository.delete(findEmoji.get()); - emojiCount = decrementEmojiCount(targetType, targetId); - - return new EmojiResponse("DELETE", targetType, targetId, emojiCount); + if (emojiReader.existsByMemberIdAndTargetIdAndTargetType(memberId, targetId, targetType)) { + throw new ErrorException(ErrorCode.ALREADY_EXISTS_EMOJI); } - Emoji emoji = Emoji.create(memberReader.getById(memberId), targetType, targetId); - emojiRepository.save(emoji); + emojiRepository.save(Emoji.create(memberReader.getById(memberId), targetType, targetId)); emojiCount = incrementEmojiCount(targetType, targetId); - return new EmojiResponse("CREATE", targetType, targetId, emojiCount); + return new EmojiResponse(EventType.CREATE, targetType, targetId, emojiCount); + + } + + @Transactional + public EmojiResponse deleteEmoji(Long memberId, EmojiRequest emojiRequest) { + Long emojiCount; + TargetType targetType = emojiRequest.targetType(); + Long targetId = emojiRequest.targetId(); + + emojiRepository.delete( + emojiReader.findEmojiByMemberIdAndTargetIdAndTargetType(memberId, targetId, + targetType) + ); + emojiCount = decrementEmojiCount(targetType, targetId); + + return new EmojiResponse(EventType.DELETE, targetType, targetId, emojiCount); } @@ -75,4 +83,12 @@ private Long incrementEmojiCount(TargetType targetType, Long targetId) { }; } + private Long getEmojiCount(TargetType targetType, Long targetId) { + return switch (targetType) { + case ROOM -> roomReader.getById(targetId).getEmojiCount(); + case QUESTION -> questionReader.getById(targetId).getEmojiCount(); + case ANSWER -> answerReader.getById(targetId).getEmojiCount(); + }; + } + } diff --git a/src/main/java/com/oronaminc/join/global/config/CacheConfig.java b/src/main/java/com/oronaminc/join/global/config/CacheConfig.java new file mode 100644 index 0000000..590e322 --- /dev/null +++ b/src/main/java/com/oronaminc/join/global/config/CacheConfig.java @@ -0,0 +1,40 @@ +package com.oronaminc.join.global.config; + +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.TimeUnit; + +import org.springframework.cache.CacheManager; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.cache.caffeine.CaffeineCache; +import org.springframework.cache.support.SimpleCacheManager; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import com.github.benmanes.caffeine.cache.Caffeine; +import com.github.benmanes.caffeine.cache.Scheduler; + +@EnableCaching +@Configuration +public class CacheConfig { + + @Bean + public CacheManager cacheManager() { + List caches = Arrays.stream(CacheType.values()) + .map(cache -> new CaffeineCache( + cache.cacheName, + Caffeine.newBuilder() + .expireAfterWrite(cache.expireAfterWrite, TimeUnit.SECONDS) + .maximumSize(cache.maximumSize) + .scheduler(Scheduler.systemScheduler()) + .build() + ) + ) + .toList(); + + SimpleCacheManager cacheManager = new SimpleCacheManager(); + cacheManager.setCaches(caches); + + return cacheManager; + } +} diff --git a/src/main/java/com/oronaminc/join/global/config/CacheType.java b/src/main/java/com/oronaminc/join/global/config/CacheType.java new file mode 100644 index 0000000..74f0d11 --- /dev/null +++ b/src/main/java/com/oronaminc/join/global/config/CacheType.java @@ -0,0 +1,15 @@ +package com.oronaminc.join.global.config; + +import lombok.AllArgsConstructor; + +@AllArgsConstructor +public enum CacheType { + ROOM_BY_ID("roomById", 300, 1000), + ROOM_BY_SECRET_CODE("roomBySecretCode", 300, 1000), + REFRESH_LATEST("refreshLatest", 60 * 60 * 24 * 14, 100_000), // 14일 + REFRESH_BLACKLIST("refreshBlacklist", 60 * 60 * 24 * 14, 100_000); + public final String cacheName; + public final int expireAfterWrite; + public final int maximumSize; + +} diff --git a/src/main/java/com/oronaminc/join/global/config/QueryDslConfig.java b/src/main/java/com/oronaminc/join/global/config/QueryDslConfig.java new file mode 100644 index 0000000..9ea16a7 --- /dev/null +++ b/src/main/java/com/oronaminc/join/global/config/QueryDslConfig.java @@ -0,0 +1,20 @@ +package com.oronaminc.join.global.config; + +import com.querydsl.jpa.impl.JPAQueryFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class QueryDslConfig { + + @PersistenceContext + private EntityManager entityManager; + + @Bean + public JPAQueryFactory jpaQueryFactory() { + return new JPAQueryFactory(entityManager); + } + +} diff --git a/src/main/java/com/oronaminc/join/global/config/RestTemplateConfig.java b/src/main/java/com/oronaminc/join/global/config/RestTemplateConfig.java new file mode 100644 index 0000000..1e98591 --- /dev/null +++ b/src/main/java/com/oronaminc/join/global/config/RestTemplateConfig.java @@ -0,0 +1,38 @@ +package com.oronaminc.join.global.config; + +import java.time.Duration; + +import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.client.ClientHttpRequestInterceptor; +import org.springframework.retry.policy.SimpleRetryPolicy; +import org.springframework.retry.support.RetryTemplate; +import org.springframework.web.client.RestTemplate; + +@Configuration +class RestTemplateConfig { + + @Bean + public RestTemplate restTemplate() { + return new RestTemplateBuilder() + .connectTimeout(Duration.ofSeconds(5)) + .readTimeout(Duration.ofSeconds(5)) + .additionalInterceptors(clientHttpRequestInterceptor()) + .build(); + } + + // 3번 재시도 + public ClientHttpRequestInterceptor clientHttpRequestInterceptor() { + return (request, body, execution) -> { + RetryTemplate retryTemplate = new RetryTemplate(); + retryTemplate.setRetryPolicy(new SimpleRetryPolicy(3)); + try { + return retryTemplate.execute(context -> execution.execute(request, body)); + } catch (Throwable throwable) { + throw new RuntimeException(throwable); + } + }; + } + +} diff --git a/src/main/java/com/oronaminc/join/global/dev/DevController.java b/src/main/java/com/oronaminc/join/global/dev/DevController.java index 722dccd..d0baaf5 100644 --- a/src/main/java/com/oronaminc/join/global/dev/DevController.java +++ b/src/main/java/com/oronaminc/join/global/dev/DevController.java @@ -1,69 +1,66 @@ -package com.oronaminc.join.global.dev; - -import java.util.List; - -import org.springframework.http.HttpStatus; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.web.bind.annotation.RestController; - -import com.oronaminc.join.member.dao.MemberRepository; -import com.oronaminc.join.member.domain.Member; -import com.oronaminc.join.member.domain.MemberType; -import com.oronaminc.join.member.security.MemberDetails; - -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpSession; -import lombok.RequiredArgsConstructor; - -@RestController -@RequestMapping("/dev") -@RequiredArgsConstructor -public class DevController { - private final MemberRepository memberRepository; - - @PostMapping("/join") - @ResponseStatus(HttpStatus.OK) - public Member devJoin(@RequestBody DevJoinRequest devJoinRequest) { - return memberRepository.save( - Member.builder() - .email(devJoinRequest.email()) - .nickname(devJoinRequest.nickname()) - .memberType(MemberType.MEMBER) - .build() - ); - } - - @PostMapping("/login") - @ResponseStatus(HttpStatus.OK) - public void devLogin(@RequestBody DevLoginRequest devLoginRequest, HttpServletRequest request) { - Member member = memberRepository.findById(devLoginRequest.memberId()) - .orElseThrow(() -> new IllegalArgumentException("해당 ID의 사용자가 존재하지 않습니다.")); - - MemberDetails memberDetails = MemberDetails.builder() - .id(member.getId()) - .name(member.getEmail()) - .nickname(member.getNickname()) - .role(member.getMemberType()) - .build(); - - Authentication authentication = new UsernamePasswordAuthenticationToken( - memberDetails, - null, - List.of(new SimpleGrantedAuthority(memberDetails.getRole())) - ); - - SecurityContextHolder.getContext().setAuthentication(authentication); - - HttpSession session = request.getSession(true); - session.setAttribute("SPRING_SECURITY_CONTEXT", SecurityContextHolder.getContext()); - } - - -} +//package com.oronaminc.join.global.dev; +// +//import com.oronaminc.join.member.dao.MemberRepository; +//import com.oronaminc.join.member.domain.Member; +//import com.oronaminc.join.member.domain.MemberType; +//import com.oronaminc.join.member.security.MemberDetails; +//import io.swagger.v3.oas.annotations.tags.Tag; +//import jakarta.servlet.http.HttpServletRequest; +//import jakarta.servlet.http.HttpSession; +//import lombok.RequiredArgsConstructor; +//import org.springframework.http.HttpStatus; +//import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +//import org.springframework.security.core.Authentication; +//import org.springframework.security.core.authority.SimpleGrantedAuthority; +//import org.springframework.security.core.context.SecurityContextHolder; +//import org.springframework.web.bind.annotation.*; +// +//import java.util.List; +// +/// /@Profile("local") +//@RestController +//@Tag(name = "개발용 API") +//@RequestMapping("/dev") +//@RequiredArgsConstructor +//public class DevController { +// private final MemberRepository memberRepository; +// +// @PostMapping("/join") +// @ResponseStatus(HttpStatus.OK) +// public Member devJoin(@RequestBody DevJoinRequest devJoinRequest) { +// return memberRepository.save( +// Member.builder() +// .email(devJoinRequest.email()) +// .nickname(devJoinRequest.nickname()) +// .memberType(MemberType.MEMBER) +// .build() +// ); +// } +// +// @PostMapping("/login") +// @ResponseStatus(HttpStatus.OK) +// public void devLogin(@RequestBody DevLoginRequest devLoginRequest, HttpServletRequest request) { +// Member member = memberRepository.findById(devLoginRequest.memberId()) +// .orElseThrow(() -> new IllegalArgumentException("해당 ID의 사용자가 존재하지 않습니다.")); +// +// MemberDetails memberDetails = MemberDetails.builder() +// .id(member.getId()) +// .name(member.getEmail()) +// .nickname(member.getNickname()) +// .role(member.getMemberType()) +// .build(); +// +// Authentication authentication = new UsernamePasswordAuthenticationToken( +// memberDetails, +// null, +// List.of(new SimpleGrantedAuthority(memberDetails.getRole())) +// ); +// +// SecurityContextHolder.getContext().setAuthentication(authentication); +// +// HttpSession session = request.getSession(true); +// session.setAttribute("SPRING_SECURITY_CONTEXT", SecurityContextHolder.getContext()); +// } +// +// +//} diff --git a/src/main/java/com/oronaminc/join/global/dev/HealthController.java b/src/main/java/com/oronaminc/join/global/dev/HealthController.java new file mode 100644 index 0000000..b0582ff --- /dev/null +++ b/src/main/java/com/oronaminc/join/global/dev/HealthController.java @@ -0,0 +1,28 @@ +//package com.oronaminc.join.global.dev; +// +//import org.springframework.http.HttpStatus; +//import org.springframework.web.bind.annotation.GetMapping; +//import org.springframework.web.bind.annotation.ResponseStatus; +//import org.springframework.web.bind.annotation.RestController; +// +//import io.swagger.v3.oas.annotations.Operation; +//import io.swagger.v3.oas.annotations.tags.Tag; +// +//@RestController +//@Tag(name = "헬스체크 API") +//public class HealthController { +// +// @Operation(summary = "애플리케이션 헬스체크") +// @ResponseStatus(HttpStatus.OK) +// @GetMapping("/health") +// public String health() { +// return "Server is Healthy!"; +// } +// +// @Operation(summary = "홈") +// @ResponseStatus(HttpStatus.OK) +// @GetMapping("/") +// public String home() { +// return "It's Home!"; +// } +//} diff --git a/src/main/java/com/oronaminc/join/global/exception/ErrorCode.java b/src/main/java/com/oronaminc/join/global/exception/ErrorCode.java index df1969d..e710928 100644 --- a/src/main/java/com/oronaminc/join/global/exception/ErrorCode.java +++ b/src/main/java/com/oronaminc/join/global/exception/ErrorCode.java @@ -5,6 +5,7 @@ import static com.oronaminc.join.global.exception.ErrorStatus.FORBIDDEN; import static com.oronaminc.join.global.exception.ErrorStatus.INTERNAL_SERVER_ERROR; import static com.oronaminc.join.global.exception.ErrorStatus.NOT_FOUND; +import static com.oronaminc.join.global.exception.ErrorStatus.TOO_MANY_REQUESTS; import static com.oronaminc.join.global.exception.ErrorStatus.UNAUTHORIZED; import lombok.AllArgsConstructor; @@ -20,22 +21,34 @@ public enum ErrorCode { NOT_FOUND_ROOM("ROOM-001", "존재하지 않는 발표방입니다.", NOT_FOUND), BAD_REQUEST_ROOM_STARTED("ROOM-002", "시작 상태의 발표방은 수정 및 삭제할 수 없습니다.", BAD_REQUEST), BAD_REQUEST_UPDATE_STATUS("ROOM-003", "변경할 수 없는 상태입니다.", BAD_REQUEST), + UNAUTHORIZED_JOIN_ROOM("ROOM-004", "시작 전 방에 참가할 수 없습니다.", UNAUTHORIZED), + UNAUTHORIZED_SUBSCRIBE_ROOM("ROOM-005", "시작 전 혹은 종료된 방에 참가할 수 없습니다.", UNAUTHORIZED), NOT_FOUND_PARTICIPANT("PARTICIPANT-001", "발표방에 존재하지 않는 회원입니다.", NOT_FOUND), UNAUTHORIZED_TEAM_GUEST("PARTICIPANT-002", "게스트는 팀이 될 수 없습니다.", UNAUTHORIZED), UNAUTHORIZED_UPDATE_AND_DELETE("PARTICIPANT-003", "발표방 수정 및 삭제 권한이 없습니다.", UNAUTHORIZED), + UNAUTHORIZED_REPORT_READ("PARTICIPANT-004", "결과 리포트 조회 권한이 없습니다.", UNAUTHORIZED), + UNAUTHORIZED_LIMIT_PARTICIPANT("PARTICIPANT-005", "인원이 가득 차 참가할 수 없습니다.", UNAUTHORIZED), + UNAUTHORIZED_NOT_JOIN_ROOM("PARTICIPANT-006", "발표방에 참여하지 않았습니다. 먼저 참여해주세요.", UNAUTHORIZED), FILE_UPLOAD_FAILED("FILE-001", "파일 업로드에 실패하였습니다.", INTERNAL_SERVER_ERROR), NOT_FOUND_FILE("FILE-002", "존재하지 않는 파일입니다.", NOT_FOUND), + MOVEMENT_FILE_FAILED("FILE-003", "파일 이동이 실패하였습니다.", INTERNAL_SERVER_ERROR), + DELETE_FILE_FAILED("FILE-004", "파일 삭제에 실패하였습니다.", INTERNAL_SERVER_ERROR), + NOT_FOUND_ROOM_QUESTION("QUESTION-001", "질문을 해당 방에서 찾을 수 없습니다.", NOT_FOUND), NOT_FOUND_QUESTION("QUESTION-002", "질문을 찾을 수 없습니다.", NOT_FOUND), + UNAUTHORIZED_EDIT_QUESTION("QUESTION-003", "작성자만 질문을 수정할 수 있습니다.", UNAUTHORIZED), + UNAUTHORIZED_DELETE_QUESTION("QUESTION-004", "작성자 및 관리자만 질문을 삭제할 수 있습니다.", UNAUTHORIZED), + TOO_MANY_REQUESTS_QUESTION("QUESTION-005", "잠시 후 다시 시도해주세요.", TOO_MANY_REQUESTS), - UNAUTHORIZED_ROLE_ANSWER("ANSWER-001", "팀원 또는 발표자만 댓글을 작성할 수 있습니다.", UNAUTHORIZED), + UNAUTHORIZED_ROLE_ANSWER("ANSWER-001", "질문 작성자 또는 팀원과 발표자만 댓글을 작성할 수 있습니다.", UNAUTHORIZED), NOT_FOUND_EXIST_ANSWER("ANSWER-002", "해당 질문에 대한 답변이 존재하지 않습니다.", NOT_FOUND), NOT_FOUND_ANSWER("ANSWER-003", "답변이 존재하지 않습니다.", NOT_FOUND), - BADREQUEST_DUPLICATION_ANSWER("ANSWER-004", "이미 답변한 질문입니다.", BAD_REQUEST), - + UNAUTHORIZED_EDIT_ANSWER("ANSWER-004", "작성자가 아니면 해당 댓글을 수정할 수 없습니다.", UNAUTHORIZED), + UNAUTHORIZED_DELETE_ANSWER("ANSWER-005", "작성자 혹은 팀원, 발표자가 아니면 해당 댓글을 삭제할 수 없습니다.", UNAUTHORIZED), + TOO_MANY_REQUESTS_ANSWER("ANSWER-006", "잠시 후 다시 시도해주세요.", UNAUTHORIZED), ACCESS_DENIED_SESSION("SESSION-1201", "접근 권한이 없습니다.", FORBIDDEN), NOT_FOUND_SESSION("SESSION-1202", "세션이 유효하지 않습니다.", UNAUTHORIZED), @@ -44,8 +57,16 @@ public enum ErrorCode { SOCKET_ERROR("SOCKET-3000", "웹소켓 연결 중 서버 오류가 발생했습니다.", INTERNAL_SERVER_ERROR), SOCKET_RUNTIME_ERROR("SOCKET-2000", "처리되지 않은 오류가 발생했습니다", INTERNAL_SERVER_ERROR), SOCKET_VALIDATION_ERROR("SOCKET-1001", "입력값이 유효하지 않습니다.", BAD_REQUEST), + SOCKET_BAD_REQUEST_PATH("SOCKET-1002", "경로가 유효하지 않습니다.", BAD_REQUEST), + SOCKET_BAD_REQUEST_MEMBER("SOCKET-1003", "회원이 유효하지 않습니다.", BAD_REQUEST), + + STOMP_INVALID_DESTINATION("STOMP-001", "경로가 유효하지 않습니다.", BAD_REQUEST), - EMOJI_CONFLICT("EMOJI-001", "공감 처리 중 충돌이 발생했습니다.", CONFLICT); + CONFLICT_EMOJI("EMOJI-001", "공감 처리 중 충돌이 발생했습니다.", CONFLICT), + NOT_FOUND_EMOJI("EMOJI-002", "해당 이모지가 존재하지 않습니다.", NOT_FOUND), + TOO_MANY_REQUESTS_EMOJI("EMOJI-003", "잠시 후 다시 시도해주세요.", TOO_MANY_REQUESTS), + ALREADY_EXISTS_EMOJI("EMOJI-004", "이미 해당 이모지가 존재합니다.", CONFLICT) + ; private final String code; private final String message; diff --git a/src/main/java/com/oronaminc/join/global/exception/ErrorException.java b/src/main/java/com/oronaminc/join/global/exception/ErrorException.java index 979f2c1..76828f7 100644 --- a/src/main/java/com/oronaminc/join/global/exception/ErrorException.java +++ b/src/main/java/com/oronaminc/join/global/exception/ErrorException.java @@ -1,5 +1,7 @@ package com.oronaminc.join.global.exception; +import com.oronaminc.join.global.util.StringUtil; +import java.text.MessageFormat; import lombok.AllArgsConstructor; import lombok.Getter; @@ -8,5 +10,19 @@ public class ErrorException extends RuntimeException { private final ErrorCode errorCode; + private final String errorMessage; -} + public ErrorException(ErrorCode errorCode) { + this(errorCode, null); + } + + public static ErrorException of(ErrorCode errorCode, String message, Object... args) { + String errorMessage = createMessage(message, args); + return new ErrorException(errorCode, errorMessage); + } + + public static String createMessage(String message, Object... args) { + return StringUtil.format(message, args); + } + +} \ No newline at end of file diff --git a/src/main/java/com/oronaminc/join/global/exception/ErrorStatus.java b/src/main/java/com/oronaminc/join/global/exception/ErrorStatus.java index 75d0929..5fa20c5 100644 --- a/src/main/java/com/oronaminc/join/global/exception/ErrorStatus.java +++ b/src/main/java/com/oronaminc/join/global/exception/ErrorStatus.java @@ -7,5 +7,6 @@ public enum ErrorStatus { ALREADY_EXISTS, BAD_REQUEST, UNAUTHORIZED, - FORBIDDEN + FORBIDDEN, + TOO_MANY_REQUESTS } diff --git a/src/main/java/com/oronaminc/join/global/exception/ExceptionAdvice.java b/src/main/java/com/oronaminc/join/global/exception/ExceptionAdvice.java index ae89e68..3572740 100644 --- a/src/main/java/com/oronaminc/join/global/exception/ExceptionAdvice.java +++ b/src/main/java/com/oronaminc/join/global/exception/ExceptionAdvice.java @@ -1,5 +1,7 @@ package com.oronaminc.join.global.exception; +import static org.springframework.http.HttpStatus.TOO_MANY_REQUESTS; + import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -16,7 +18,7 @@ public class ExceptionAdvice { public ResponseEntity handleErrorException(ErrorException ex) { ErrorCode errorCode = ex.getErrorCode(); - log.error(errorCode.getMessage(), ex); + log.error("ErrorCode: {}, ErrorMessage: {}", ex.getErrorCode(), ex.getErrorMessage()); HttpStatus httpStatus = switch (errorCode.getErrorStatus()) { case NOT_FOUND -> HttpStatus.NOT_FOUND; @@ -25,6 +27,7 @@ public ResponseEntity handleErrorException(ErrorException ex) { case ALREADY_EXISTS, BAD_REQUEST -> HttpStatus.BAD_REQUEST; case UNAUTHORIZED -> HttpStatus.UNAUTHORIZED; case FORBIDDEN -> HttpStatus.FORBIDDEN; + case TOO_MANY_REQUESTS -> TOO_MANY_REQUESTS; }; return ResponseEntity.status(httpStatus) @@ -50,11 +53,13 @@ public ResponseEntity handleUnhandled(Exception ex) { } @ExceptionHandler(MethodArgumentNotValidException.class) - public ResponseEntity handleMethodArgumentNotValid(MethodArgumentNotValidException ex) { + public ResponseEntity handleMethodArgumentNotValid( + MethodArgumentNotValidException ex) { log.error("Method argument not valid", ex); return ResponseEntity.status(HttpStatus.BAD_REQUEST) - .body(new ErrorResponse("400", ex.getBindingResult().getAllErrors().get(0).getDefaultMessage())); + .body(new ErrorResponse("400", + ex.getBindingResult().getAllErrors().get(0).getDefaultMessage())); } } diff --git a/src/main/java/com/oronaminc/join/global/ratelimit/RateLimitService.java b/src/main/java/com/oronaminc/join/global/ratelimit/RateLimitService.java new file mode 100644 index 0000000..5fc204c --- /dev/null +++ b/src/main/java/com/oronaminc/join/global/ratelimit/RateLimitService.java @@ -0,0 +1,26 @@ +package com.oronaminc.join.global.ratelimit; + +import io.github.bucket4j.Bucket; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class RateLimitService { + + private final Map cache = new ConcurrentHashMap<>(); + + public Bucket getBucket(RateLimitType rateLimitType, Object... args) { + String apiKey = rateLimitType.createKey(args); + return cache.computeIfAbsent(apiKey, key -> + Bucket.builder() + .addLimit( + rateLimitType.getBandwidth() + ) + .build() + ); + } + +} diff --git a/src/main/java/com/oronaminc/join/global/ratelimit/RateLimitType.java b/src/main/java/com/oronaminc/join/global/ratelimit/RateLimitType.java new file mode 100644 index 0000000..59a7ff4 --- /dev/null +++ b/src/main/java/com/oronaminc/join/global/ratelimit/RateLimitType.java @@ -0,0 +1,46 @@ +package com.oronaminc.join.global.ratelimit; + +import com.oronaminc.join.global.util.StringUtil; +import io.github.bucket4j.Bandwidth; +import java.time.Duration; +import lombok.Getter; + +public enum RateLimitType { + CREATE_QUESTION( + "CREATE_QUESTION:{}:{}", + Bandwidth.builder() + .capacity(3) + .refillIntervally(3, Duration.ofSeconds(15)) + .build() + ), + EMOJI( + "EMOJI:{}:{}:{}", + Bandwidth.builder() + .capacity(3) + .refillIntervally(3, Duration.ofSeconds(1)) + .build() + ), + + CREATE_ANSWER( + "CREATE_ANSWER:{}:{}:{}", + Bandwidth.builder() + .capacity(5) + .refillIntervally(5, Duration.ofSeconds(10)) + .build() + ); + + private final String format; + + @Getter + private final Bandwidth bandwidth; + + RateLimitType(String format, Bandwidth bandwidth) { + this.format = format; + this.bandwidth = bandwidth; + } + + public String createKey(Object... args) { + return StringUtil.format(format, args); + } + +} diff --git a/src/main/java/com/oronaminc/join/global/util/StringUtil.java b/src/main/java/com/oronaminc/join/global/util/StringUtil.java new file mode 100644 index 0000000..1285d81 --- /dev/null +++ b/src/main/java/com/oronaminc/join/global/util/StringUtil.java @@ -0,0 +1,13 @@ +package com.oronaminc.join.global.util; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.slf4j.helpers.MessageFormatter; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class StringUtil { + + public static String format(String format, Object... args) { + return MessageFormatter.arrayFormat(format, args).getMessage(); + } +} \ No newline at end of file diff --git a/src/main/java/com/oronaminc/join/infra/service/S3Service.java b/src/main/java/com/oronaminc/join/infra/service/S3Service.java index 2f88641..f5ac28d 100644 --- a/src/main/java/com/oronaminc/join/infra/service/S3Service.java +++ b/src/main/java/com/oronaminc/join/infra/service/S3Service.java @@ -1,18 +1,18 @@ package com.oronaminc.join.infra.service; +import com.oronaminc.join.global.exception.ErrorCode; import com.oronaminc.join.global.exception.ErrorException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import software.amazon.awssdk.services.s3.S3Client; -import software.amazon.awssdk.services.s3.model.DeleteObjectRequest; -import software.amazon.awssdk.services.s3.model.GetObjectRequest; -import software.amazon.awssdk.services.s3.model.HeadObjectRequest; -import software.amazon.awssdk.services.s3.model.S3Exception; +import software.amazon.awssdk.services.s3.model.*; import software.amazon.awssdk.services.s3.presigner.S3Presigner; import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest; import software.amazon.awssdk.services.s3.presigner.model.PresignedGetObjectRequest; +import software.amazon.awssdk.services.s3.presigner.model.PresignedPutObjectRequest; +import software.amazon.awssdk.services.s3.presigner.model.PutObjectPresignRequest; import java.time.Duration; @@ -27,7 +27,8 @@ public class S3Service { @Value("${cloud.aws.s3.bucket}") private String bucket; - public String generatePresignedUrl(String key) { + // 조회용 + public String generateGetPresignedUrl(String key) { GetObjectRequest getObjectRequest = GetObjectRequest.builder() .bucket(bucket) .key(key) @@ -43,6 +44,24 @@ public String generatePresignedUrl(String key) { return presignedRequest.url().toString(); } + // 업로드용 + public String generateUploadPresignedUrl(String key) { + PutObjectRequest putObjectRequest = PutObjectRequest.builder() + .bucket(bucket) + .contentType("application/pdf") + .key(key) + .build(); + + PutObjectPresignRequest presignRequest = PutObjectPresignRequest.builder() + .signatureDuration(Duration.ofMinutes(3)) + .putObjectRequest(putObjectRequest) + .build(); + + PresignedPutObjectRequest presignedRequest = s3Presigner.presignPutObject(presignRequest); + + return presignedRequest.url().toString(); + } + public void deleteFile(String key) { try { if (isFileExist(key)) { @@ -53,6 +72,7 @@ public void deleteFile(String key) { } } catch (S3Exception e) { log.error("S3Exception: {}", e.getMessage(), e); + throw new ErrorException(ErrorCode.DELETE_FILE_FAILED); } } @@ -68,4 +88,21 @@ public Boolean isFileExist(String key) { return false; } } + + public void moveObject(String objectKey, String destinationKey) { + CopyObjectRequest copyRequest = CopyObjectRequest.builder() + .sourceBucket(bucket) + .sourceKey(objectKey) + .destinationBucket(bucket) + .destinationKey(destinationKey) + .build(); + s3Client.copyObject(copyRequest); + + DeleteObjectRequest deleteRequest = DeleteObjectRequest.builder() + .bucket(bucket) + .key(objectKey) + .build(); + + s3Client.deleteObject(deleteRequest); + } } diff --git a/src/main/java/com/oronaminc/join/member/api/MemberController.java b/src/main/java/com/oronaminc/join/member/api/MemberController.java index d70b916..b48a3ce 100644 --- a/src/main/java/com/oronaminc/join/member/api/MemberController.java +++ b/src/main/java/com/oronaminc/join/member/api/MemberController.java @@ -46,8 +46,8 @@ public class MemberController { @GetMapping("/exists") @ResponseStatus(HttpStatus.OK) public ExistsMemberResponse existsMemberByEmail( - @Valid ExistsMemberRequest existsMemberRequest) { - boolean exists = memberService.existsMemberByEmail(existsMemberRequest.email()); + @RequestParam String email) { + boolean exists = memberService.existsMemberByEmail(email); return new ExistsMemberResponse(exists); } diff --git a/src/main/java/com/oronaminc/join/member/domain/Member.java b/src/main/java/com/oronaminc/join/member/domain/Member.java index 837948b..c7254b7 100644 --- a/src/main/java/com/oronaminc/join/member/domain/Member.java +++ b/src/main/java/com/oronaminc/join/member/domain/Member.java @@ -30,4 +30,8 @@ public class Member extends BaseEntity { public void updateNickname(String nickname) { this.nickname = nickname; } + + public void registerGuest() { + this.email = "GUEST_" + this.id; + } } diff --git a/src/main/java/com/oronaminc/join/member/dto/KakaoLoginRequest.java b/src/main/java/com/oronaminc/join/member/dto/KakaoLoginRequest.java new file mode 100644 index 0000000..e6a99e8 --- /dev/null +++ b/src/main/java/com/oronaminc/join/member/dto/KakaoLoginRequest.java @@ -0,0 +1,7 @@ +package com.oronaminc.join.member.dto; + +public record KakaoLoginRequest( + String code, + String state +) { +} diff --git a/src/main/java/com/oronaminc/join/member/dto/KakaoLoginResponse.java b/src/main/java/com/oronaminc/join/member/dto/KakaoLoginResponse.java new file mode 100644 index 0000000..9e0ef7d --- /dev/null +++ b/src/main/java/com/oronaminc/join/member/dto/KakaoLoginResponse.java @@ -0,0 +1,9 @@ +package com.oronaminc.join.member.dto; + +import io.swagger.v3.oas.annotations.media.Schema; + +public record KakaoLoginResponse( + @Schema(description = "회원 id", example = "1001") + Long id +) { +} diff --git a/src/main/java/com/oronaminc/join/member/dto/KakaoUserResponse.java b/src/main/java/com/oronaminc/join/member/dto/KakaoUserResponse.java new file mode 100644 index 0000000..0ce9106 --- /dev/null +++ b/src/main/java/com/oronaminc/join/member/dto/KakaoUserResponse.java @@ -0,0 +1,11 @@ +package com.oronaminc.join.member.dto; + +import lombok.Builder; + +@Builder +public record KakaoUserResponse( + String email, + String nickname, + String profileImageUrl +) { +} diff --git a/src/main/java/com/oronaminc/join/member/dto/SessionInfoResponse.java b/src/main/java/com/oronaminc/join/member/dto/SessionInfoResponse.java deleted file mode 100644 index 44edbd1..0000000 --- a/src/main/java/com/oronaminc/join/member/dto/SessionInfoResponse.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.oronaminc.join.member.dto; - -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(description = "유효한 세션으로 로그인한 사용자 정보 응답 DTO") -public record SessionInfoResponse( - @Schema(description = "Kakao 회원 ID", example = "1") - Long id, - @Schema(description = "Kakao 회원 이름", example = "카카오") - String name, - @Schema(description = "Kakao 회원 닉네임", example = "kakao") - String nickname, - @Schema(description = "Kakao 회원 역할", example = "MEMBER") - String role -) { - -} diff --git a/src/main/java/com/oronaminc/join/member/security/AuthController.java b/src/main/java/com/oronaminc/join/member/security/AuthController.java index 85b9741..2b8d12f 100644 --- a/src/main/java/com/oronaminc/join/member/security/AuthController.java +++ b/src/main/java/com/oronaminc/join/member/security/AuthController.java @@ -1,48 +1,62 @@ package com.oronaminc.join.member.security; + +import com.oronaminc.join.member.dto.GuestLoginRequest; +import com.oronaminc.join.member.dto.KakaoLoginRequest; +import com.oronaminc.join.member.token.AuthTokenResponse; +import com.oronaminc.join.member.token.JwtTokenProvider; +import com.oronaminc.join.member.token.JwtUtils; +import com.oronaminc.join.member.token.LoginResponse; +import com.oronaminc.join.member.token.RefreshTokenStore; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.tags.Tags; -import java.util.List; - +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import java.util.Map; +import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.core.context.SecurityContext; +import org.springframework.http.ResponseCookie; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.web.context.HttpSessionSecurityContextRepository; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; -import com.oronaminc.join.member.dto.GuestLoginRequest; -import com.oronaminc.join.member.dto.GuestLoginResponse; -import com.oronaminc.join.member.dto.SessionInfoResponse; - -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.servlet.http.HttpSession; -import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; - @RestController @RequestMapping("/api/auth") @Tag(name = "Auth", description = "로그인 관련 API") @RequiredArgsConstructor public class AuthController { + private final AuthService authService; + private final JwtTokenProvider jwtTokenProvider; + private final RefreshTokenStore refreshTokenStore; + + @Operation( + summary = "카카오 로그인" + ) + @PostMapping("/kakao") + @ResponseStatus(HttpStatus.OK) + public Map kakaoLogin( + @RequestBody KakaoLoginRequest kakaoLoginRequest, + HttpServletResponse response + ) { + LoginResponse loginResponse = authService.kakaoLogin(kakaoLoginRequest.code()); + + String refreshToken = loginResponse.refreshToken(); + + JwtUtils.addRefreshTokenCookie(response, refreshToken, + loginResponse.refreshTokenExpiresIn()); + + return Map.of("token", loginResponse.authTokenResponse()); + } @Operation( summary = "비회원 로그인", - description = "닉네임을 입력하면 비회원 세션이 생성되고 인증이 설정됩니다. 이후 모든 요청에 세션 인증이 적용됩니다.", responses = { @ApiResponse(responseCode = "201", description = "비회원 로그인 성공"), @ApiResponse(responseCode = "400", description = "닉네임 누락 또는 유효성 검증 실패") @@ -50,41 +64,17 @@ public class AuthController { ) @PostMapping("/guest") @ResponseStatus(HttpStatus.CREATED) - public GuestLoginResponse guestLogin(@RequestBody @Valid GuestLoginRequest guestLoginRequest, HttpServletRequest request) { - MemberDetails guest = authService.loadGuest(guestLoginRequest); - - Authentication authentication = new UsernamePasswordAuthenticationToken( - guest, null, List.of(new SimpleGrantedAuthority(guest.getRole())) - ); + public Map guestLogin( + @RequestBody @Valid GuestLoginRequest guestLoginRequest, + HttpServletResponse response) { + LoginResponse loginResponse = authService.loadGuest(guestLoginRequest); - SecurityContext context = SecurityContextHolder.createEmptyContext(); - context.setAuthentication(authentication); - SecurityContextHolder.setContext(context); + String refreshToken = loginResponse.refreshToken(); - request.getSession(true).setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, context); + JwtUtils.addRefreshTokenCookie(response, refreshToken, + loginResponse.refreshTokenExpiresIn()); - return new GuestLoginResponse(guest.getId()); - } - - @Operation( - summary = "현재 세션 사용자 정보 조회", - description = "로그인한 사용자의 세션 정보를 반환합니다. 로그인하지 않은 경우 403 또는 401이 발생합니다.", - responses = { - @ApiResponse(responseCode = "200", description = "세션 사용자 정보 조회 성공"), - @ApiResponse(responseCode = "401", description = "로그인되지 않은 사용자"), - @ApiResponse(responseCode = "403", description = "인증된 사용자 아님") - } - ) - @GetMapping("/session") - @ResponseStatus(HttpStatus.OK) - public SessionInfoResponse getSessionInfo(@AuthenticationPrincipal MemberDetails memberDetails) { - - return new SessionInfoResponse( - memberDetails.getId(), - memberDetails.getName(), - memberDetails.getNickname(), - memberDetails.getRole() - ); + return Map.of("token", loginResponse.authTokenResponse()); } @Operation( @@ -98,7 +88,30 @@ public SessionInfoResponse getSessionInfo(@AuthenticationPrincipal MemberDetails @PostMapping("/logout") @ResponseStatus(HttpStatus.NO_CONTENT) public void logout(HttpServletRequest request, HttpServletResponse response) { - HttpSession session = request.getSession(); + + String refresh = null; + if(request.getCookies() != null){ + for (Cookie cookie : request.getCookies()) { + if ("refreshToken".equals(cookie.getName())) refresh = cookie.getValue(); + } + } + + if (refresh != null) { + try { + var body = jwtTokenProvider.parseClaims(refresh); + refreshTokenStore.isBlacklisted(refresh); + refreshTokenStore.saveLatest(body.memberId(), ""); + }catch (Exception ignored){ } + } + + // 쿠키 제거 + ResponseCookie expired = ResponseCookie.from("refreshToken", "") + .httpOnly(true).secure(true).sameSite("None") + .path("/").maxAge(0).build(); + + SecurityContextHolder.clearContext(); + + /*HttpSession session = request.getSession(); if (session != null) { session.invalidate(); } @@ -109,6 +122,6 @@ public void logout(HttpServletRequest request, HttpServletResponse response) { cookie.setPath("/"); cookie.setHttpOnly(true); cookie.setMaxAge(0); - response.addCookie(cookie); + response.addCookie(cookie);*/ } } diff --git a/src/main/java/com/oronaminc/join/member/security/AuthService.java b/src/main/java/com/oronaminc/join/member/security/AuthService.java index f9c9c72..6e681db 100644 --- a/src/main/java/com/oronaminc/join/member/security/AuthService.java +++ b/src/main/java/com/oronaminc/join/member/security/AuthService.java @@ -1,83 +1,151 @@ package com.oronaminc.join.member.security; -import java.util.Map; -import java.util.Optional; - -import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService; -import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest; -import org.springframework.security.oauth2.core.OAuth2AuthenticationException; -import org.springframework.security.oauth2.core.user.OAuth2User; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; +import static com.oronaminc.join.member.util.MemberMapper.toGuestMember; import com.oronaminc.join.member.dao.MemberRepository; import com.oronaminc.join.member.domain.Member; -import com.oronaminc.join.member.domain.MemberType; import com.oronaminc.join.member.dto.GuestLoginRequest; +import com.oronaminc.join.member.dto.KakaoUserResponse; import com.oronaminc.join.member.service.MemberReader; - +import com.oronaminc.join.member.token.AuthTokenResponse; +import com.oronaminc.join.member.token.JwtMemberInfo; +import com.oronaminc.join.member.token.JwtTokenProvider; +import com.oronaminc.join.member.token.LoginResponse; +import com.oronaminc.join.member.token.RefreshTokenStore; +import com.oronaminc.join.member.token.TokenPair; +import com.oronaminc.join.member.util.MemberMapper; +import java.util.Map; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.client.RestTemplate; @Service @Slf4j @RequiredArgsConstructor public class AuthService extends DefaultOAuth2UserService { + private final MemberRepository memberRepository; private final MemberReader memberReader; + private final JwtTokenProvider jwtTokenProvider; + private final RefreshTokenStore refreshTokenStore; + + private final RestTemplate restTemplate = new RestTemplate(); + + private static final String TOKEN_URI = "https://kauth.kakao.com/oauth/token"; + private static final String USER_INFO_URI = "https://kapi.kakao.com/v2/user/me"; + + @Value("${spring.security.oauth2.client.registration.kakao.client-id}") + private String clientId; + + @Value("${spring.security.oauth2.client.registration.kakao.redirect-uri}") + private String redirectUri; + + @Value("${spring.security.oauth2.client.registration.kakao.client-secret}") + private String clientSecret; + + // @Override + // public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException { + // OAuth2User oAuth2User = super.loadUser(userRequest); + // Map attributes = oAuth2User.getAttributes(); + // + // log.info("attributes :: " + attributes); + // + // Map kakaoAccount = (Map) attributes.get("kakao_account"); + // Map profile = (Map) kakaoAccount.get("profile"); + // + // + // Optional optionalMember = memberReader.findByEmail(kakaoAccount.get("email").toString()); + // + // Member member = optionalMember.orElseGet(() -> memberRepository.save(toKakaoMember(kakaoAccount, profile))); + // + // return toOAuth2MemberDetails(member); + // } - @Override - public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException { - OAuth2User oAuth2User = super.loadUser(userRequest); - Map attributes = oAuth2User.getAttributes(); + @Transactional + public LoginResponse loadGuest(GuestLoginRequest guestLoginRequest) { + Member guest = toGuestMember(guestLoginRequest); - log.info("attributes :: " + attributes); + memberRepository.save(guest); + guest.registerGuest(); - Map kakaoAccount = (Map) attributes.get("kakao_account"); - Map profile = (Map) kakaoAccount.get("profile"); + TokenPair tokenPair = jwtTokenProvider.generateTokenPair( + new JwtMemberInfo(guest.getId(), guest.getNickname(), guest.getMemberType())); + refreshTokenStore.saveLatest(guest.getId(), tokenPair.refreshToken()); + AuthTokenResponse authTokenResponse = new AuthTokenResponse(tokenPair.accessToken(), + tokenPair.accessTokenExpiresIn(), guest.getId(), + guest.getNickname(), guest.getMemberType()); - Optional optionalMember = memberReader.findByEmail(kakaoAccount.get("email").toString()); - - Member member = optionalMember.orElseGet( - () -> memberRepository.save( - Member.builder() - .email(kakaoAccount.get("email").toString()) - .nickname(profile.get("nickname").toString()) - .profileImage(profile.get("profile_image_url").toString()) - .memberType(MemberType.MEMBER) - .build() - ) - ); - - return MemberDetails.builder() - .id(member.getId()) - .name(member.getEmail()) - .nickname(member.getNickname()) - .role(member.getMemberType()) - .build(); + return new LoginResponse(authTokenResponse, tokenPair.refreshToken(), + tokenPair.refreshTokenExpiresIn()); } @Transactional - public MemberDetails loadGuest(GuestLoginRequest guestLoginRequest) { - Member guest = Member.builder() - .email(null) - .nickname(guestLoginRequest.nickname()) - .profileImage(null) - .memberType(MemberType.GUEST) - .build(); + public LoginResponse kakaoLogin(String code) { + String accessToken = getAccessToken(code); + KakaoUserResponse kakaoUser = getUserInfo(accessToken); - memberRepository.save(guest); + Member member = memberRepository.findByEmail(kakaoUser.email()) + .orElseGet(() -> memberRepository.save(MemberMapper.toNewKakaoMember(kakaoUser))); + + TokenPair tokenPair = jwtTokenProvider.generateTokenPair( + new JwtMemberInfo(member.getId(), member.getNickname(), member.getMemberType())); - // 1. 비회원 MemberDetails 생성 - MemberDetails memberDetails = MemberDetails.builder() - .id(guest.getId()) - .name("GUEST_" + guest.getId()) - .nickname(guest.getNickname()) - .role(MemberType.GUEST) - .build(); + refreshTokenStore.saveLatest(member.getId(), tokenPair.refreshToken()); - return memberDetails; + AuthTokenResponse authTokenResponse = new AuthTokenResponse(tokenPair.accessToken(), + tokenPair.accessTokenExpiresIn(), member.getId(), + member.getNickname(), member.getMemberType()); + + return new LoginResponse(authTokenResponse, tokenPair.refreshToken(), + tokenPair.refreshTokenExpiresIn()); + + } + + private String getAccessToken(String code) { + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); + + MultiValueMap params = new LinkedMultiValueMap<>(); + params.add("grant_type", "authorization_code"); + params.add("client_id", clientId); + params.add("redirect_uri", redirectUri); + params.add("code", code); + params.add("client_secret", clientSecret); + + HttpEntity> request = new HttpEntity<>(params, headers); + + ResponseEntity response = restTemplate.postForEntity(TOKEN_URI, request, Map.class); + + return (String) response.getBody().get("access_token"); } + private KakaoUserResponse getUserInfo(String accessToken) { + HttpHeaders headers = new HttpHeaders(); + headers.setBearerAuth(accessToken); + headers.setContentType(MediaType.APPLICATION_JSON); + + HttpEntity entity = new HttpEntity<>(headers); + + ResponseEntity response = restTemplate.exchange(USER_INFO_URI, HttpMethod.GET, entity, + Map.class); + + Map attributes = response.getBody(); + + Map kakaoAccount = (Map) attributes.get("kakao_account"); + Map profile = (Map) kakaoAccount.get("profile"); + + return MemberMapper.toKakaoUserResponse(kakaoAccount, profile); + } } diff --git a/src/main/java/com/oronaminc/join/member/security/JwtAuthenticationFilter.java b/src/main/java/com/oronaminc/join/member/security/JwtAuthenticationFilter.java new file mode 100644 index 0000000..a2ccc3f --- /dev/null +++ b/src/main/java/com/oronaminc/join/member/security/JwtAuthenticationFilter.java @@ -0,0 +1,47 @@ +package com.oronaminc.join.member.security; + +import com.oronaminc.join.member.token.JwtTokenProvider; +import com.oronaminc.join.member.token.TokenBody; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import org.springframework.http.HttpHeaders; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.util.StringUtils; +import org.springframework.web.filter.OncePerRequestFilter; + +@RequiredArgsConstructor +public class JwtAuthenticationFilter extends OncePerRequestFilter { + + private final JwtTokenProvider jwtTokenProvider; + + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, + FilterChain filterChain) throws ServletException, IOException { + + String header = request.getHeader(HttpHeaders.AUTHORIZATION); + if (StringUtils.hasText(header) && header.startsWith("Bearer ")) { + String token = header.substring(7); + try { + TokenBody body = jwtTokenProvider.parseClaims(token); + var auth = new UsernamePasswordAuthenticationToken( + body.memberId(), + null, + List.of(new SimpleGrantedAuthority(body.role().name())) + ); + SecurityContextHolder.getContext().setAuthentication(auth); + }catch (Exception e){ + + } + } + + filterChain.doFilter(request,response); + } +} diff --git a/src/main/java/com/oronaminc/join/member/security/SecurityConfig.java b/src/main/java/com/oronaminc/join/member/security/SecurityConfig.java index 89bdeb9..498a3aa 100644 --- a/src/main/java/com/oronaminc/join/member/security/SecurityConfig.java +++ b/src/main/java/com/oronaminc/join/member/security/SecurityConfig.java @@ -1,51 +1,78 @@ package com.oronaminc.join.member.security; -import static org.springframework.security.config.Customizer.*; - +import com.oronaminc.join.member.token.JwtTokenProvider; +import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.CorsConfigurationSource; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import lombok.RequiredArgsConstructor; +import java.util.List; + +import static org.springframework.security.config.Customizer.withDefaults; @Configuration +//@Profile("!test") @EnableWebSecurity @RequiredArgsConstructor public class SecurityConfig { private final AuthService authService; @Bean - public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + public SecurityFilterChain filterChain(HttpSecurity http, JwtTokenProvider jwt) throws Exception { return http .csrf(csrf -> csrf.disable()) + .cors(cors -> cors.configurationSource(corsConfigurationSource())) .authorizeHttpRequests(auth -> auth - .requestMatchers( - "/api/auth/guest", - "/login" - ) - .anonymous() - .requestMatchers( - "/swagger-ui/**", - "/swagger-resources/**", - "/v3/api-docs/**", - "/oauth2/authorization/**", - "/login/oauth2/code/kakao", - "/api/auth/logout", - "/dev/**", - "/ws/**" - ) - .permitAll() - .requestMatchers("/ws/**").permitAll() - .anyRequest().authenticated() + // .requestMatchers( + // "/api/auth/guest", + // "/api/auth/kakao", + // "/login" + // ) + // .anonymous() + .requestMatchers( + "/swagger-ui/**", + "/swagger-resources/**", + "/v3/api-docs/**", + "/oauth2/**", + "/login/oauth2/code/kakao", + "/api/auth/logout", + "/dev/**", + "/ws/**", + "/api/auth/guest", + "/api/auth/kakao", + "/login" +// "/health" + ) + .permitAll() + .anyRequest() + .authenticated() ) .formLogin(AbstractHttpConfigurer::disable) .oauth2Login(oauth2 -> oauth2.userInfoEndpoint(userInfo -> userInfo .userService(authService))) + .addFilterBefore(new JwtAuthenticationFilter(jwt), + UsernamePasswordAuthenticationFilter.class) .logout(withDefaults()) .build(); } + @Bean + public CorsConfigurationSource corsConfigurationSource() { + CorsConfiguration configuration = new CorsConfiguration(); + configuration.setAllowCredentials(true); + configuration.setAllowedOriginPatterns(List.of("*")); + configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS")); + configuration.setAllowedHeaders(List.of("*")); + + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", configuration); + return source; + } } diff --git a/src/main/java/com/oronaminc/join/member/security/TokenController.java b/src/main/java/com/oronaminc/join/member/security/TokenController.java new file mode 100644 index 0000000..e01634c --- /dev/null +++ b/src/main/java/com/oronaminc/join/member/security/TokenController.java @@ -0,0 +1,52 @@ +package com.oronaminc.join.member.security; + +import com.oronaminc.join.member.token.AuthTokenResponse; +import com.oronaminc.join.member.token.JwtMemberInfo; +import com.oronaminc.join.member.token.JwtTokenProvider; +import com.oronaminc.join.member.token.JwtUtils; +import com.oronaminc.join.member.token.RefreshTokenStore; +import com.oronaminc.join.member.token.TokenBody; +import com.oronaminc.join.member.token.TokenPair; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/auth/token") +@RequiredArgsConstructor +public class TokenController { + + private final JwtTokenProvider jwtTokenProvider; + private final RefreshTokenStore refreshTokenStore; + + @PostMapping("/refresh") + public AuthTokenResponse refresh(HttpServletRequest request, HttpServletResponse response) { + String refresh = extraRefreshCookie(request); + if (refresh == null) throw new IllegalArgumentException("refresh cookie is null"); + + if (refreshTokenStore.isBlacklisted(refresh)) throw new IllegalArgumentException("refresh cookie is blacklisted"); + + TokenBody body = jwtTokenProvider.parseClaims(refresh); + if (!refreshTokenStore.isLatest(body.memberId(), refresh)) throw new IllegalArgumentException("refresh token is invalid"); + + TokenPair tokenPair = jwtTokenProvider.generateTokenPair(new JwtMemberInfo(body.memberId(), + body.nickname(), body.role())); + refreshTokenStore.isBlacklisted(refresh); + refreshTokenStore.saveLatest(body.memberId(), tokenPair.refreshToken()); + JwtUtils.addRefreshTokenCookie(response, tokenPair.refreshToken(), tokenPair.refreshTokenExpiresIn()); + + return new AuthTokenResponse(tokenPair.accessToken(), tokenPair.accessTokenExpiresIn(), body.memberId(), body.nickname(), body.role()); + } + + private String extraRefreshCookie(HttpServletRequest request) { + if (request.getCookies() == null) return null; + for (Cookie cookie : request.getCookies()) { + if ("refreshToken".equals(cookie.getName())) return cookie.getValue(); + } + return null; + } +} diff --git a/src/main/java/com/oronaminc/join/member/token/AuthTokenResponse.java b/src/main/java/com/oronaminc/join/member/token/AuthTokenResponse.java new file mode 100644 index 0000000..56b58fc --- /dev/null +++ b/src/main/java/com/oronaminc/join/member/token/AuthTokenResponse.java @@ -0,0 +1,13 @@ +package com.oronaminc.join.member.token; + +import com.oronaminc.join.member.domain.MemberType; + +public record AuthTokenResponse( + String accessToken, + long accessTokenExpiresIn, + Long memberId, + String nickname, + MemberType role +) { + +} diff --git a/src/main/java/com/oronaminc/join/member/token/JwtConfiguration.java b/src/main/java/com/oronaminc/join/member/token/JwtConfiguration.java new file mode 100644 index 0000000..b6d397a --- /dev/null +++ b/src/main/java/com/oronaminc/join/member/token/JwtConfiguration.java @@ -0,0 +1,11 @@ +package com.oronaminc.join.member.token; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = "jwt") +public record JwtConfiguration( + String secret, + Long accessTokenExpiration, + Long refreshTokenExpiration +) { +} diff --git a/src/main/java/com/oronaminc/join/member/token/JwtMemberInfo.java b/src/main/java/com/oronaminc/join/member/token/JwtMemberInfo.java new file mode 100644 index 0000000..d876e4b --- /dev/null +++ b/src/main/java/com/oronaminc/join/member/token/JwtMemberInfo.java @@ -0,0 +1,10 @@ +package com.oronaminc.join.member.token; + +import com.oronaminc.join.member.domain.MemberType; + +public record JwtMemberInfo( + Long memberId, + String nickname, + MemberType role +) { +} diff --git a/src/main/java/com/oronaminc/join/member/token/JwtTokenProvider.java b/src/main/java/com/oronaminc/join/member/token/JwtTokenProvider.java new file mode 100644 index 0000000..f774e78 --- /dev/null +++ b/src/main/java/com/oronaminc/join/member/token/JwtTokenProvider.java @@ -0,0 +1,72 @@ +package com.oronaminc.join.member.token; + +import com.oronaminc.join.member.domain.MemberType; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jws; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.security.Keys; +import java.util.Date; +import javax.crypto.SecretKey; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@RequiredArgsConstructor +public class JwtTokenProvider { + + private final JwtConfiguration jwtConfiguration; + + public TokenPair generateTokenPair(JwtMemberInfo jwtMemberInfo) { + + String accessToken = issueAccessToken(jwtMemberInfo); + String refreshToken = issueRefreshToken(jwtMemberInfo); + + return new TokenPair(accessToken, refreshToken, + jwtConfiguration.accessTokenExpiration(), jwtConfiguration.refreshTokenExpiration()); + } + + private String issueAccessToken(JwtMemberInfo jwtMemberInfo) { + return issue(jwtMemberInfo, jwtConfiguration.accessTokenExpiration()); + } + + private String issueRefreshToken(JwtMemberInfo jwtMemberInfo) { + return issue(jwtMemberInfo, jwtConfiguration.refreshTokenExpiration()); + } + + private String issue(JwtMemberInfo jwtMemberInfo, Long expTime) { + return Jwts.builder() + .subject(jwtMemberInfo.memberId().toString()) + .claim("nickname", jwtMemberInfo.nickname()) + .claim("role", jwtMemberInfo.role()) + .issuedAt(new Date()) + .expiration(new Date(new Date().getTime() + expTime)) + .signWith(getSecretKey(), Jwts.SIG.HS256) + .compact(); + } + + public TokenBody parseClaims(String token) { + + Jws claims = Jwts.parser() + .verifyWith(getSecretKey()) + .build() + .parseSignedClaims(token); + + Claims payload = claims.getPayload(); + + Long memberId = Long.parseLong(payload.getSubject()); + + return new TokenBody( + memberId, + payload.get("nickname").toString(), + MemberType.valueOf(payload.get("role").toString()), + payload.getIssuedAt(), + payload.getExpiration() + ); + } + + private SecretKey getSecretKey() { + return Keys.hmacShaKeyFor(jwtConfiguration.secret().getBytes()); + } +} \ No newline at end of file diff --git a/src/main/java/com/oronaminc/join/member/token/JwtUtils.java b/src/main/java/com/oronaminc/join/member/token/JwtUtils.java new file mode 100644 index 0000000..22fad53 --- /dev/null +++ b/src/main/java/com/oronaminc/join/member/token/JwtUtils.java @@ -0,0 +1,29 @@ +package com.oronaminc.join.member.token; + +import jakarta.servlet.http.HttpServletResponse; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.http.ResponseCookie; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class JwtUtils { + + public static long toSeconds(long millis) { + return millis / 1000; + } + + public static void addRefreshTokenCookie(HttpServletResponse response, String refreshToken, + long expiresIn) { + ResponseCookie refreshCookie = ResponseCookie.from("refreshToken", refreshToken) + .httpOnly(true) + .secure(true) + .path("/") + .sameSite("None") + .maxAge(JwtUtils.toSeconds(expiresIn)) + .build(); + + response.setHeader(HttpHeaders.SET_COOKIE, refreshCookie.toString()); + } + +} diff --git a/src/main/java/com/oronaminc/join/member/token/LoginResponse.java b/src/main/java/com/oronaminc/join/member/token/LoginResponse.java new file mode 100644 index 0000000..f1e32da --- /dev/null +++ b/src/main/java/com/oronaminc/join/member/token/LoginResponse.java @@ -0,0 +1,9 @@ +package com.oronaminc.join.member.token; + +public record LoginResponse( + AuthTokenResponse authTokenResponse, + String refreshToken, + long refreshTokenExpiresIn +) { + +} diff --git a/src/main/java/com/oronaminc/join/member/token/RefreshTokenStore.java b/src/main/java/com/oronaminc/join/member/token/RefreshTokenStore.java new file mode 100644 index 0000000..70586be --- /dev/null +++ b/src/main/java/com/oronaminc/join/member/token/RefreshTokenStore.java @@ -0,0 +1,38 @@ +package com.oronaminc.join.member.token; + +import java.util.Objects; +import lombok.RequiredArgsConstructor; +import org.springframework.cache.Cache; +import org.springframework.cache.CacheManager; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class RefreshTokenStore { + private final CacheManager cacheManager; + + private Cache latest() { + return cacheManager.getCache("refreshLatest"); + } + private Cache blacklist() { + return cacheManager.getCache("refreshBlacklist"); + } + + public void saveLatest(Long memberId, String refreshToken) { + latest().put(key(memberId), refreshToken); + } + + public boolean isLatest(Long memberId, String refreshToken) { + String stored = latest().get(key(memberId), String.class); + return Objects.equals(stored, refreshToken); + } + + public boolean isBlacklisted(String refreshToken) { + Boolean v = blacklist().get(refreshToken, Boolean.class); + return v != null && v; + } + + private String key(Long memberId) { + return "refresh:" + memberId; + } +} diff --git a/src/main/java/com/oronaminc/join/member/token/TokenBody.java b/src/main/java/com/oronaminc/join/member/token/TokenBody.java new file mode 100644 index 0000000..98d5df2 --- /dev/null +++ b/src/main/java/com/oronaminc/join/member/token/TokenBody.java @@ -0,0 +1,14 @@ +package com.oronaminc.join.member.token; + +import com.oronaminc.join.member.domain.MemberType; + +import java.util.Date; + +public record TokenBody( + Long memberId, + String nickname, + MemberType role, + Date issuedAt, + Date expiration +) { +} diff --git a/src/main/java/com/oronaminc/join/member/token/TokenPair.java b/src/main/java/com/oronaminc/join/member/token/TokenPair.java new file mode 100644 index 0000000..928803c --- /dev/null +++ b/src/main/java/com/oronaminc/join/member/token/TokenPair.java @@ -0,0 +1,9 @@ +package com.oronaminc.join.member.token; + +public record TokenPair( + String accessToken, + String refreshToken, + long accessTokenExpiresIn, + long refreshTokenExpiresIn +) { +} diff --git a/src/main/java/com/oronaminc/join/member/util/MemberMapper.java b/src/main/java/com/oronaminc/join/member/util/MemberMapper.java new file mode 100644 index 0000000..bc85917 --- /dev/null +++ b/src/main/java/com/oronaminc/join/member/util/MemberMapper.java @@ -0,0 +1,41 @@ +package com.oronaminc.join.member.util; + +import com.oronaminc.join.member.domain.Member; +import com.oronaminc.join.member.domain.MemberType; +import com.oronaminc.join.member.dto.GuestLoginRequest; +import com.oronaminc.join.member.dto.KakaoUserResponse; +import java.util.Map; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; + +@AllArgsConstructor(access = AccessLevel.PRIVATE) +public class MemberMapper { + + public static Member toGuestMember(GuestLoginRequest guestLoginRequest) { + return Member.builder() + .email(null) + .nickname(guestLoginRequest.nickname()) + .profileImage(null) + .memberType(MemberType.GUEST) + .build(); + } + + public static Member toNewKakaoMember(KakaoUserResponse kakaoUser) { + return Member.builder() + .email(kakaoUser.email()) + .nickname(kakaoUser.nickname()) + .profileImage(kakaoUser.profileImageUrl()) + .memberType(MemberType.MEMBER) + .build(); + } + + public static KakaoUserResponse toKakaoUserResponse(Map kakaoAccount, + Map profile) { + return KakaoUserResponse.builder() + .email((String) kakaoAccount.get("email")) + .nickname((String) profile.get("nickname")) + .profileImageUrl((String) profile.get("profile_image_url")) + .build(); + } + +} diff --git a/src/main/java/com/oronaminc/join/member/util/MyPageMapper.java b/src/main/java/com/oronaminc/join/member/util/MyPageMapper.java index ccdb1eb..bf1c3dd 100644 --- a/src/main/java/com/oronaminc/join/member/util/MyPageMapper.java +++ b/src/main/java/com/oronaminc/join/member/util/MyPageMapper.java @@ -4,35 +4,44 @@ import com.oronaminc.join.member.dto.MyRoomsGetResponse; import com.oronaminc.join.member.dto.ParticipationType; import com.oronaminc.join.participant.domain.Participant; +import com.oronaminc.join.participant.domain.ParticipantType; import com.oronaminc.join.room.domain.Room; -import java.util.Map; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.springframework.data.domain.Page; +import java.time.LocalDate; +import java.util.Map; + @NoArgsConstructor(access = AccessLevel.PRIVATE) public class MyPageMapper { public static MyRoomsGetResponse toMyRoomsGetResponse(Page response) { return MyRoomsGetResponse.builder() - .content(response.getContent()) - .currentPage(response.getNumber()) - .size(response.getSize()) - .totalElements(response.getTotalElements()) - .totalPages(response.getTotalPages()) - .build(); + .content(response.getContent()) + .currentPage(response.getNumber()) + .size(response.getSize()) + .totalElements(response.getTotalElements()) + .totalPages(response.getTotalPages()) + .build(); } public static MyRoomsDto toMyRoomsDto(Participant p, Map countMap) { Room room = p.getRoom(); + LocalDate date; + if (p.getParticipantType() == ParticipantType.PRESENTER) { + date = room.getCreatedAt().toLocalDate(); + } else { + date = p.getCreatedAt().toLocalDate(); + } return MyRoomsDto.builder() - .roomId(room.getId()) - .title(room.getTitle()) - .emojiCount(room.getEmojiCount()) - .status(room.getRoomStatus()) - .startedAt(room.getCreatedAt().toLocalDate()) - .participationType(ParticipationType.from(p.getParticipantType())) - .questions(countMap.getOrDefault(room.getId(), 0L)) - .build(); + .roomId(room.getId()) + .title(room.getTitle()) + .emojiCount(room.getEmojiCount()) + .status(room.getRoomStatus()) + .startedAt(date) + .participationType(ParticipationType.from(p.getParticipantType())) + .questions(countMap.getOrDefault(room.getId(), 0L)) + .build(); } } diff --git a/src/main/java/com/oronaminc/join/participant/dao/ParticipantRepository.java b/src/main/java/com/oronaminc/join/participant/dao/ParticipantRepository.java index 479f4c2..6f200f8 100644 --- a/src/main/java/com/oronaminc/join/participant/dao/ParticipantRepository.java +++ b/src/main/java/com/oronaminc/join/participant/dao/ParticipantRepository.java @@ -15,11 +15,11 @@ public interface ParticipantRepository extends JpaRepository { - @Query( - "SELECT COUNT(p) > 0 " + - "FROM Participant p " + - "WHERE p.room.id = :roomId AND p.member.id = :memberId" - ) + @Query(""" + select COUNT(p) > 0 + from Participant p + where p.room.id = :roomId and p.member.id = :memberId + """) boolean existsByRoomIdAndMemberId(@Param("roomId") Long roomId, @Param("memberId") Long memberId); Optional findByRoomIdAndParticipantType(Long roomId, ParticipantType participantType); @@ -30,7 +30,7 @@ public interface ParticipantRepository extends JpaRepository from Participant p where p.member.id = :memberId group by p.participantType - """) + """) List countByMemberIdGroupByParticipantType(Long memberId); @Query(""" @@ -38,7 +38,7 @@ public interface ParticipantRepository extends JpaRepository from Participant p join fetch p.room where p.member.id = :memberId - """) + """) Page findByMemberId(Long memberId, Pageable pageable); @Query(""" @@ -46,7 +46,7 @@ public interface ParticipantRepository extends JpaRepository from Participant p join fetch p.room where p.member.id = :memberId and p.participantType = :pType - """) + """) Page findByMemberIdAndParticipantType(Long memberId, ParticipantType pType, Pageable pageable); @@ -55,11 +55,30 @@ Page findByMemberIdAndParticipantType(Long memberId, ParticipantTyp from Participant p join fetch p.room where p.member.id = :memberId and p.participantType != :pType - """) + """) Page findByMemberIdAndParticipantTypeNot(Long memberId, ParticipantType pType, Pageable pageable); Optional findByRoomIdAndMemberId( @Param("roomId") Long roomId, @Param("memberId") Long memberId ); + @Query(""" + select case when COUNT(p) > 0 then true else false end + from Participant p + where p.room.id = :roomId + and p.member.id = :memberId + and (p.participantType = com.oronaminc.join.participant.domain.ParticipantType.PRESENTER + or p.participantType = com.oronaminc.join.participant.domain.ParticipantType.TEAM) + """) + boolean existsPresenterOrTeamByMemberId(@Param("roomId") Long roomId, @Param("memberId") Long memberId); + void deleteByRoomId(Long roomId); + + @Query(value = """ + select COUNT(*) + from participant + where room_id = :roomId + and exited_at is not null + and TIMESTAMPDIFF(SECOND, created_at, exited_at) >= 30 + """, nativeQuery = true) + Long countParticipantsStayedOver30Seconds(@Param("roomId") Long roomId); } \ No newline at end of file diff --git a/src/main/java/com/oronaminc/join/participant/domain/Participant.java b/src/main/java/com/oronaminc/join/participant/domain/Participant.java index 25783a4..b2ca28b 100644 --- a/src/main/java/com/oronaminc/join/participant/domain/Participant.java +++ b/src/main/java/com/oronaminc/join/participant/domain/Participant.java @@ -1,15 +1,23 @@ package com.oronaminc.join.participant.domain; -import jakarta.persistence.Column; -import jakarta.persistence.FetchType; -import jakarta.persistence.Index; -import jakarta.persistence.Table; import java.time.LocalDateTime; import com.oronaminc.join.global.entity.BaseEntity; import com.oronaminc.join.member.domain.Member; import com.oronaminc.join.room.domain.Room; -import jakarta.persistence.*; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Builder; @@ -44,4 +52,8 @@ public class Participant extends BaseEntity { private ParticipantType participantType; private LocalDateTime exitedAt; + + public void updateExitAt() { + this.exitedAt = LocalDateTime.now(); + } } diff --git a/src/main/java/com/oronaminc/join/participant/event/ParticipantEventHandler.java b/src/main/java/com/oronaminc/join/participant/event/ParticipantEventHandler.java new file mode 100644 index 0000000..a5a1cb3 --- /dev/null +++ b/src/main/java/com/oronaminc/join/participant/event/ParticipantEventHandler.java @@ -0,0 +1,21 @@ +package com.oronaminc.join.participant.event; + +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Component; + +import com.oronaminc.join.participant.service.ParticipantService; +import com.oronaminc.join.room.event.RoomExitEvent; + +import lombok.RequiredArgsConstructor; + +@Component +@RequiredArgsConstructor +public class ParticipantEventHandler { + + private final ParticipantService participantService; + + @EventListener + public void exitRoomEvent(RoomExitEvent roomExitEvent) { + participantService.updateExitAt(roomExitEvent.roomId(), roomExitEvent.memberId()); + } +} diff --git a/src/main/java/com/oronaminc/join/participant/service/ParticipantReader.java b/src/main/java/com/oronaminc/join/participant/service/ParticipantReader.java index 40d5103..c472303 100644 --- a/src/main/java/com/oronaminc/join/participant/service/ParticipantReader.java +++ b/src/main/java/com/oronaminc/join/participant/service/ParticipantReader.java @@ -58,8 +58,16 @@ public Participant getByRoomIdAndMemberId(Long roomId, Long memberId) { .orElseThrow(() -> new ErrorException(ErrorCode.NOT_FOUND_PARTICIPANT)); } + public boolean existsPresenterOrTeamByMemberId(Long roomId, Long memberId) { + return participantRepository.existsPresenterOrTeamByMemberId(roomId, memberId); + } + public void deleteByRoomId(Long roomId) { participantRepository.deleteByRoomId(roomId); } + public Long countTotalView(Long roomId) { + return participantRepository.countParticipantsStayedOver30Seconds(roomId); + } + } diff --git a/src/main/java/com/oronaminc/join/participant/service/ParticipantService.java b/src/main/java/com/oronaminc/join/participant/service/ParticipantService.java index d1f0957..44a0cd8 100644 --- a/src/main/java/com/oronaminc/join/participant/service/ParticipantService.java +++ b/src/main/java/com/oronaminc/join/participant/service/ParticipantService.java @@ -20,13 +20,14 @@ import lombok.RequiredArgsConstructor; @Service -@Transactional +@Transactional(readOnly=true) @RequiredArgsConstructor public class ParticipantService { private final ParticipantRepository participantRepository; private final ParticipantReader participantReader; private final MemberReader memberReader; + @Transactional public void savePresenterAndTeam(String presenterEmail, List teamEmail, Room room) { saveMemberParticipantByEmail(presenterEmail, room, ParticipantType.PRESENTER); for (String email : teamEmail) { @@ -34,6 +35,7 @@ public void savePresenterAndTeam(String presenterEmail, List teamEmail, } } + @Transactional public void saveMemberParticipantByEmail(String email, Room room, ParticipantType participantType) { Member participantMember = memberReader.getByEmail(email); if (participantMember.getMemberType().equals(MemberType.GUEST)) { @@ -42,7 +44,8 @@ public void saveMemberParticipantByEmail(String email, Room room, ParticipantTyp Participant participant = ParticipantMapper.toParticipant(participantMember, room, participantType); participantRepository.save(participant); } - + + @Transactional public void saveParticipantById(Long memberId, Room room, ParticipantType participantType) { Member participantMember = memberReader.getById(memberId); if (participantReader.existsByRoomIdAndMemberId(room.getId(), participantMember.getId())) { @@ -67,6 +70,7 @@ public List getTeam(Long roomId) { return participantReader.findAllByRoomIdAndParticipantType(roomId, ParticipantType.TEAM); } + @Transactional public void updateTeam(Room room, List emails) { List team = this.getTeam(room.getId()); for (Participant participant : team) { @@ -87,7 +91,14 @@ public void validatePresenter(Long roomId, Long memberId) { } } + @Transactional public void deleteParticipantByRoomId(Long roomId) { participantRepository.deleteByRoomId(roomId); } + + @Transactional + public void updateExitAt(Long roomId, Long memberId) { + Participant participant = participantReader.getByRoomIdAndMemberId(roomId, memberId); + participant.updateExitAt(); + } } diff --git a/src/main/java/com/oronaminc/join/question/api/QuestionController.java b/src/main/java/com/oronaminc/join/question/api/QuestionController.java index 2d183ee..901cfb7 100644 --- a/src/main/java/com/oronaminc/join/question/api/QuestionController.java +++ b/src/main/java/com/oronaminc/join/question/api/QuestionController.java @@ -10,6 +10,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; 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; @@ -30,7 +31,7 @@ public ResponseEntity getQuestions( @RequestParam(required = false) Long lastEmojiCount, @RequestParam(defaultValue = "10") int size, @RequestParam Long memberId, - @RequestParam Long roomId + @PathVariable Long roomId ) { Slice result = questionService.getQuestions( sort, lastId, lastEmojiCount, size, memberId, roomId diff --git a/src/main/java/com/oronaminc/join/question/dao/QuestionCustomRepository.java b/src/main/java/com/oronaminc/join/question/dao/QuestionCustomRepository.java new file mode 100644 index 0000000..d117c21 --- /dev/null +++ b/src/main/java/com/oronaminc/join/question/dao/QuestionCustomRepository.java @@ -0,0 +1,12 @@ +package com.oronaminc.join.question.dao; + +import com.oronaminc.join.question.domain.QuestionSort; +import com.oronaminc.join.question.dto.QuestionFlatResponse; +import java.util.List; +import org.springframework.data.domain.Pageable; + +public interface QuestionCustomRepository { + + List findQuestionsOrderBy(Long lastId, Long lastEmojiCount, + Long memberId, Long roomId, QuestionSort sortType, Pageable pageable); +} diff --git a/src/main/java/com/oronaminc/join/question/dao/QuestionCustomRepositoryImpl.java b/src/main/java/com/oronaminc/join/question/dao/QuestionCustomRepositoryImpl.java new file mode 100644 index 0000000..8f2703b --- /dev/null +++ b/src/main/java/com/oronaminc/join/question/dao/QuestionCustomRepositoryImpl.java @@ -0,0 +1,103 @@ +package com.oronaminc.join.question.dao; + +import static com.oronaminc.join.answer.domain.QAnswer.answer; +import static com.oronaminc.join.emoji.domain.QEmoji.emoji; +import static com.oronaminc.join.member.domain.QMember.member; +import static com.oronaminc.join.question.domain.QQuestion.question; + +import com.oronaminc.join.question.domain.QuestionSort; +import com.oronaminc.join.question.dto.QuestionFlatResponse; +import com.querydsl.core.BooleanBuilder; +import com.querydsl.core.types.Order; +import com.querydsl.core.types.OrderSpecifier; +import com.querydsl.core.types.Predicate; +import com.querydsl.core.types.Projections; +import com.querydsl.jpa.JPAExpressions; +import com.querydsl.jpa.impl.JPAQuery; +import com.querydsl.jpa.impl.JPAQueryFactory; +import java.util.ArrayList; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Pageable; + +@RequiredArgsConstructor +public class QuestionCustomRepositoryImpl implements QuestionCustomRepository { + + private final JPAQueryFactory jpaQueryFactory; + + @Override + public List findQuestionsOrderBy(Long lastId, Long lastEmojiCount, + Long memberId, Long roomId, QuestionSort sortType, Pageable pageable) { + + Predicate where = createPredicate(lastId, lastEmojiCount, memberId, roomId, + sortType); + + JPAQuery query = jpaQueryFactory + .select(Projections.constructor(QuestionFlatResponse.class, + question.id, + question.content, + question.emojiCount, + JPAExpressions.selectOne().from(answer).where(answer.question.eq(question)) + .exists(), + JPAExpressions.selectOne().from(emoji).where(emoji.member.id.eq(memberId)).exists(), + member.id, + member.nickname, + question.createdAt + )) + .from(question) + .join(question.member, member) + .where(where) + .orderBy(createOrderSpecifiers(sortType)); + + return query + .offset(pageable.getOffset()) + .limit(pageable.getPageSize()) + .fetch(); + } + + private Predicate createPredicate(Long lastId, Long lastEmojiCount, + Long memberId, Long roomId, QuestionSort sortType) { + + BooleanBuilder builder = new BooleanBuilder(); + builder.and(question.room.id.eq(roomId)); + + switch (sortType) { + case CREATEDAT -> { + if (lastId != null) { + builder.and(question.id.lt(lastId)); + } + } + case EMOJI -> { + if (lastEmojiCount != null) { + builder.and( + question.emojiCount.lt(lastEmojiCount) + .or(question.emojiCount.eq(lastEmojiCount).and(question.id.lt(lastId))) + ); + } + } + case MYQUESTION -> { + builder.and(question.member.id.eq(memberId)); + if (lastId != null) { + builder.and(question.id.lt(lastId)); + } + } + } + + return builder; + } + + private OrderSpecifier[] createOrderSpecifiers(QuestionSort sortType) { + + List> orders = new ArrayList<>(); + + // 공감순인 경우에만 emojiCount 정렬 조건 추가 + if (sortType.equals(QuestionSort.EMOJI)) { + orders.add(new OrderSpecifier<>(Order.DESC, question.emojiCount)); + } + + // 최신순, 내 질문 + orders.add(new OrderSpecifier<>(Order.DESC, question.id)); + + return orders.toArray(new OrderSpecifier[0]); + } +} diff --git a/src/main/java/com/oronaminc/join/question/dao/QuestionRepository.java b/src/main/java/com/oronaminc/join/question/dao/QuestionRepository.java index 593fe59..957dd33 100644 --- a/src/main/java/com/oronaminc/join/question/dao/QuestionRepository.java +++ b/src/main/java/com/oronaminc/join/question/dao/QuestionRepository.java @@ -2,105 +2,17 @@ import com.oronaminc.join.question.domain.Question; import java.util.Optional; -import com.oronaminc.join.question.dto.QuestionFlatResponse; import java.util.List; + 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; -public interface QuestionRepository extends JpaRepository { +public interface QuestionRepository extends JpaRepository, QuestionCustomRepository { Optional findByIdAndRoomId(Long questionId, Long roomId); - @Query(""" - SELECT new com.oronaminc.join.question.dto.QuestionFlatResponse( - q.id, - q.content, - q.emojiCount, - (CASE WHEN EXISTS ( - SELECT a FROM Answer a - WHERE a.question = q - ) THEN true ELSE false END), - (CASE WHEN EXISTS ( - SELECT e FROM Emoji e - WHERE e.member.id = :memberId - AND e.targetType = com.oronaminc.join.emoji.domain.TargetType.QUESTION - AND e.targetId = q.id - ) THEN true ELSE false END), - m.id, - m.nickname, - q.createdAt - ) - FROM Question q - JOIN q.member m - WHERE :roomId = q.room.id - AND (:lastId IS NULL OR q.id < :lastId) - ORDER BY q.id DESC - """) - List findByCreatedAt(@Param("lastId") Long lastId, - @Param("memberId") Long memberId, @Param("roomId") Long roomId, Pageable pageable); - - @Query(""" - SELECT new com.oronaminc.join.question.dto.QuestionFlatResponse( - q.id, - q.content, - q.emojiCount, - (CASE WHEN EXISTS ( - SELECT a FROM Answer a - WHERE a.question = q - ) THEN true ELSE false END), - (CASE WHEN EXISTS ( - SELECT e FROM Emoji e - WHERE e.member.id = :memberId - AND e.targetType = com.oronaminc.join.emoji.domain.TargetType.QUESTION - AND e.targetId = q.id - ) THEN true ELSE false END), - m.id, - m.nickname, - q.createdAt - ) - FROM Question q - JOIN q.member m - WHERE :roomId = q.room.id - AND (:lastEmojiCount IS NULL OR ( - q.emojiCount < :lastEmojiCount OR (q.emojiCount = :lastEmojiCount AND q.id < :lastId) - )) - ORDER BY q.emojiCount DESC, q.id DESC - """) - List findByEmojiCount(@Param("lastId") Long lastId, - @Param("lastEmojiCount") Long lastEmojiCount, - @Param("memberId") Long memberId, @Param("roomId") Long roomId, Pageable pageable); - - @Query(""" - SELECT new com.oronaminc.join.question.dto.QuestionFlatResponse( - q.id, - q.content, - q.emojiCount, - (CASE WHEN EXISTS ( - SELECT a FROM Answer a - WHERE a.question = q - ) THEN true ELSE false END), - (CASE WHEN EXISTS ( - SELECT e FROM Emoji e - WHERE e.member.id = :memberId - AND e.targetType = com.oronaminc.join.emoji.domain.TargetType.QUESTION - AND e.targetId = q.id - ) THEN true ELSE false END), - m.id, - m.nickname, - q.createdAt - ) - FROM Question q - JOIN q.member m - WHERE :roomId = q.room.id - AND q.member.id = :memberId - AND (:lastId IS NULL OR q.id > :lastId) - ORDER BY q.id DESC - """) - List findByMyQuestion(@Param("lastId") Long lastId, - @Param("memberId") Long memberId, @Param("roomId") Long roomId, Pageable pageable); - @Query(""" select q.room.id, count(q) from Question q @@ -111,5 +23,17 @@ where q.room.id in (:roomIds) List findByRoomId(Long roomId); + void deleteById(Long questionId); + void deleteByRoomId(Long roomId); + + Long countByRoomId(@Param("roomId") Long roomId); + + @Query (""" + select q + from Question q + where q.room.id = :roomId + order by q.emojiCount desc + """) + List findTop3QuestionByRoomId(Long roomId, Pageable pageable); } diff --git a/src/main/java/com/oronaminc/join/question/domain/Question.java b/src/main/java/com/oronaminc/join/question/domain/Question.java index e3eea51..d3e9caa 100644 --- a/src/main/java/com/oronaminc/join/question/domain/Question.java +++ b/src/main/java/com/oronaminc/join/question/domain/Question.java @@ -2,7 +2,7 @@ import com.oronaminc.join.global.entity.BaseEntity; import com.oronaminc.join.member.domain.Member; -import com.oronaminc.join.question.dto.QuestionCreateRequest; +import com.oronaminc.join.question.dto.QuestionRequest; import com.oronaminc.join.room.domain.Room; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; @@ -25,7 +25,6 @@ @Builder @AllArgsConstructor(access = AccessLevel.PRIVATE) @NoArgsConstructor(access = AccessLevel.PROTECTED) -// TODO: ddl-auto: create,update에만 유효 -> 추후 flyway sql 생성 @Table(name = "question", indexes = { @Index(name = "idx_question_id_room", columnList = "room_id") }) @@ -50,7 +49,7 @@ public class Question extends BaseEntity { @Version private Integer version; - public static Question create(Room room, Member member, QuestionCreateRequest requestDto) { + public static Question create(Room room, Member member, QuestionRequest requestDto) { return Question.builder() .room(room) .member(member) @@ -59,6 +58,10 @@ public static Question create(Room room, Member member, QuestionCreateRequest re .build(); } + public void updateContent(String content) { + this.content = content; + } + public Long incrementEmojiCount() { return ++this.emojiCount; } diff --git a/src/main/java/com/oronaminc/join/question/dto/QuestionCreateRequest.java b/src/main/java/com/oronaminc/join/question/dto/QuestionCreateRequest.java deleted file mode 100644 index 973c3a1..0000000 --- a/src/main/java/com/oronaminc/join/question/dto/QuestionCreateRequest.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.oronaminc.join.question.dto; - -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(description = "질문 생성 요청 DTO") -public record QuestionCreateRequest( - @Schema(description = "질문 내용", example = "질문있습니다. 질문생성DTO가 맞나요?") - String content -) { - -} diff --git a/src/main/java/com/oronaminc/join/question/dto/QuestionCreateResponse.java b/src/main/java/com/oronaminc/join/question/dto/QuestionCreateResponse.java index 6cd4055..6e53af7 100644 --- a/src/main/java/com/oronaminc/join/question/dto/QuestionCreateResponse.java +++ b/src/main/java/com/oronaminc/join/question/dto/QuestionCreateResponse.java @@ -2,6 +2,7 @@ import com.oronaminc.join.global.dto.WriterDto; +import com.oronaminc.join.websocket.common.EventType; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDateTime; import lombok.Builder; @@ -10,7 +11,7 @@ @Schema(description = "질문 생성 응답 DTO") public record QuestionCreateResponse( @Schema(description = "", example = "CREATE") - String event, + EventType event, @Schema(description = "질문 ID", example = "11") Long questionId, @Schema(description = "질문 내용", example = "질문있습니다. 질문생성DTO가 맞나요?") diff --git a/src/main/java/com/oronaminc/join/question/dto/QuestionDeleteResponse.java b/src/main/java/com/oronaminc/join/question/dto/QuestionDeleteResponse.java new file mode 100644 index 0000000..a3f1044 --- /dev/null +++ b/src/main/java/com/oronaminc/join/question/dto/QuestionDeleteResponse.java @@ -0,0 +1,12 @@ +package com.oronaminc.join.question.dto; + +import com.oronaminc.join.websocket.common.EventType; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Builder; + +@Schema(description = "질문 삭제 응답 DTO") +public record QuestionDeleteResponse( + EventType event, + Long questionId +) { +} diff --git a/src/main/java/com/oronaminc/join/question/dto/QuestionRequest.java b/src/main/java/com/oronaminc/join/question/dto/QuestionRequest.java new file mode 100644 index 0000000..d4f28e3 --- /dev/null +++ b/src/main/java/com/oronaminc/join/question/dto/QuestionRequest.java @@ -0,0 +1,16 @@ +package com.oronaminc.join.question.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +@Schema(description = "질문 생성/수정 요청 DTO") +public record QuestionRequest( + @Schema(description = "질문 내용", example = "질문있습니다. 질문생성DTO가 맞나요?") + @NotBlank(message = "질문 내용을 입력해주시기 바랍니다.") + @Size(max = 500, message = "질문 내용은 최대 500자까지 입력할 수 있습니다.") + String content, + Long memberId +) { + +} diff --git a/src/main/java/com/oronaminc/join/question/dto/QuestionUpdateResponse.java b/src/main/java/com/oronaminc/join/question/dto/QuestionUpdateResponse.java new file mode 100644 index 0000000..ee4388e --- /dev/null +++ b/src/main/java/com/oronaminc/join/question/dto/QuestionUpdateResponse.java @@ -0,0 +1,15 @@ +package com.oronaminc.join.question.dto; + +import com.oronaminc.join.websocket.common.EventType; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Builder; + +@Builder +@Schema(description = "질문 수정 응답 DTO") +public record QuestionUpdateResponse( + EventType event, + Long questionId, + String content + + ) { +} diff --git a/src/main/java/com/oronaminc/join/question/service/QuestionReader.java b/src/main/java/com/oronaminc/join/question/service/QuestionReader.java index 7591439..3c738f0 100644 --- a/src/main/java/com/oronaminc/join/question/service/QuestionReader.java +++ b/src/main/java/com/oronaminc/join/question/service/QuestionReader.java @@ -3,6 +3,7 @@ import java.util.List; import java.util.Optional; +import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Component; @@ -10,6 +11,7 @@ import com.oronaminc.join.global.exception.ErrorException; import com.oronaminc.join.question.dao.QuestionRepository; import com.oronaminc.join.question.domain.Question; +import com.oronaminc.join.question.domain.QuestionSort; import com.oronaminc.join.question.dto.QuestionFlatResponse; import lombok.RequiredArgsConstructor; @@ -17,6 +19,7 @@ @Component @RequiredArgsConstructor public class QuestionReader { + private final QuestionRepository questionRepository; public Optional findById(Long questionId) { @@ -25,7 +28,7 @@ public Optional findById(Long questionId) { public Question getById(Long questionId) { return this.findById(questionId) - .orElseThrow(() -> new ErrorException(ErrorCode.NOT_FOUND_QUESTION)); + .orElseThrow(() -> new ErrorException(ErrorCode.NOT_FOUND_QUESTION)); } public Optional findByIdAndRoomId(Long questionId, Long roomId) { @@ -34,19 +37,13 @@ public Optional findByIdAndRoomId(Long questionId, Long roomId) { public Question getByIdAndRoomId(Long questionId, Long roomId) { return this.findByIdAndRoomId(questionId, roomId) - .orElseThrow(() -> new ErrorException(ErrorCode.NOT_FOUND_ROOM_QUESTION)); - } - - public List findByCreatedAt(Long lastId, Long memberId, Long roomId, Pageable pageable) { - return questionRepository.findByCreatedAt(lastId, memberId, roomId, pageable); - } - - public List findByEmojiCount(Long lastId, Long lastEmojiCount, Long memberId, Long roomId, Pageable pageable) { - return questionRepository.findByEmojiCount(lastId, lastEmojiCount, memberId, roomId, pageable); + .orElseThrow(() -> new ErrorException(ErrorCode.NOT_FOUND_ROOM_QUESTION)); } - public List findByMyQuestion(Long lastId, Long memberId, Long roomId, Pageable pageable) { - return questionRepository.findByMyQuestion(lastId, memberId, roomId, pageable); + public List findQuestionsOrderBy(Long lastId, Long lastEmojiCount, + Long memberId, Long roomId, QuestionSort sortType, Pageable pageable) { + return questionRepository.findQuestionsOrderBy(lastId, lastEmojiCount, + memberId, roomId, sortType, pageable); } public List findByRoomId(Long roomId) { @@ -60,4 +57,12 @@ public List countByRoomIds(List roomIds) { public boolean existsInRoom(Long roomId) { return !questionRepository.findByRoomId(roomId).isEmpty(); } + + public Long countByRoomId(Long roomId) { + return questionRepository.countByRoomId(roomId); + } + + public List findTop3Question(Long roomId) { + return questionRepository.findTop3QuestionByRoomId(roomId, PageRequest.of(0,3)); + } } diff --git a/src/main/java/com/oronaminc/join/question/service/QuestionService.java b/src/main/java/com/oronaminc/join/question/service/QuestionService.java index 2646e05..7a283a1 100644 --- a/src/main/java/com/oronaminc/join/question/service/QuestionService.java +++ b/src/main/java/com/oronaminc/join/question/service/QuestionService.java @@ -9,15 +9,18 @@ import org.springframework.transaction.annotation.Transactional; import com.oronaminc.join.answer.service.AnswerService; +import com.oronaminc.join.global.exception.ErrorCode; +import com.oronaminc.join.global.exception.ErrorException; import com.oronaminc.join.global.util.SliceUtil; import com.oronaminc.join.member.domain.Member; import com.oronaminc.join.member.service.MemberReader; +import com.oronaminc.join.participant.service.ParticipantReader; import com.oronaminc.join.participant.service.ParticipantService; import com.oronaminc.join.question.dao.QuestionRepository; import com.oronaminc.join.question.domain.Question; import com.oronaminc.join.question.domain.QuestionSort; import com.oronaminc.join.question.dto.QuestionAssembleResponse; -import com.oronaminc.join.question.dto.QuestionCreateRequest; +import com.oronaminc.join.question.dto.QuestionRequest; import com.oronaminc.join.question.dto.QuestionFlatResponse; import com.oronaminc.join.question.util.QuestionMapper; import com.oronaminc.join.room.domain.Room; @@ -36,14 +39,13 @@ public class QuestionService { private final QuestionReader questionReader; private final MemberReader memberReader; private final RoomReader roomReader; + private final ParticipantReader participantReader; @Transactional - public Question create(Long roomId, Long memberId, QuestionCreateRequest requestDto) { + public Question create(Long roomId, Long memberId, QuestionRequest requestDto) { Member member = memberReader.getById(memberId); - Room room = roomReader.getById(roomId); - participantService.validateParticipant(memberId, roomId); Question question = QuestionMapper.toQuestion(room, member, requestDto); @@ -66,14 +68,9 @@ public Slice getQuestions( Pageable pageable = PageRequest.of(0, size + 1); - List questions = switch (sort) { - case QuestionSort.CREATEDAT -> questionReader.findByCreatedAt(lastId, - memberId, roomId, pageable); - case QuestionSort.EMOJI -> questionReader.findByEmojiCount(lastId, - lastEmojiCount, memberId, roomId, pageable); - case QuestionSort.MYQUESTION -> questionReader.findByMyQuestion(lastId, - memberId, roomId, pageable); - }; + List questions = questionReader.findQuestionsOrderBy(lastId, + lastEmojiCount, memberId, roomId, sort, + pageable); List assembledList = questions.stream() .map(QuestionMapper::toQuestionListResponse).toList(); @@ -81,6 +78,49 @@ public Slice getQuestions( return SliceUtil.toSlice(assembledList, PageRequest.of(0, size)); } + @Transactional + public Question update(Long memberId, Long roomId, Long questionId, QuestionRequest request) { + Question question = questionReader.getByIdAndRoomId(questionId, roomId); + + // 참여자가 아님 + if (!participantReader.existsByRoomIdAndMemberId(roomId, memberId)) { + throw ErrorException.of(ErrorCode.NOT_FOUND_PARTICIPANT, + "{}번 발표방에는 {}번 회원이 잠가 중이지 않습니다.", roomId, memberId); + } + + // 작성자가 아님 + if (!question.getMember().getId().equals(memberId)) { + throw ErrorException.of(ErrorCode.UNAUTHORIZED_EDIT_QUESTION, + "{}번 회원은 {}번 질문을 수정할 권한이 없습니다.", memberId, questionId); + } + + question.updateContent(request.content()); + + return question; + } + + @Transactional + public Long delete(Long memberId, Long roomId, Long questionId) { + Question question = questionReader.getByIdAndRoomId(questionId, roomId); + + // 참여자가 아님 + if (!participantReader.existsByRoomIdAndMemberId(roomId, memberId)) { + throw ErrorException.of(ErrorCode.NOT_FOUND_PARTICIPANT, + "{}번 발표방에는 {}번 회원이 잠가 중이지 않습니다.", roomId, memberId); + } + + // 관리자가 아님 && 작성자도 아님 + if (!participantReader.existsPresenterOrTeamByMemberId(roomId, memberId) + && !question.getMember().getId().equals(memberId)) { + throw ErrorException.of(ErrorCode.UNAUTHORIZED_DELETE_QUESTION, + "{}번 회원은 {}번 질문을 삭제할 권한이 없습니다.", memberId, questionId); + } + + answerService.deleteByQuestion(questionId); + questionRepository.deleteById(questionId); + + return question.getId(); + } @Transactional public void deleteByRoomId(Long roomId) { diff --git a/src/main/java/com/oronaminc/join/question/util/QuestionMapper.java b/src/main/java/com/oronaminc/join/question/util/QuestionMapper.java index a32ec86..4a045e8 100644 --- a/src/main/java/com/oronaminc/join/question/util/QuestionMapper.java +++ b/src/main/java/com/oronaminc/join/question/util/QuestionMapper.java @@ -4,12 +4,15 @@ import com.oronaminc.join.global.dto.WriterDto; import com.oronaminc.join.member.domain.Member; import com.oronaminc.join.question.domain.Question; -import com.oronaminc.join.question.dto.QuestionCreateRequest; +import com.oronaminc.join.question.dto.QuestionRequest; import com.oronaminc.join.question.dto.QuestionCreateResponse; +import com.oronaminc.join.question.dto.QuestionDeleteResponse; import com.oronaminc.join.question.dto.QuestionFlatResponse; import com.oronaminc.join.question.dto.QuestionAssembleResponse; import com.oronaminc.join.question.dto.QuestionListResponse; +import com.oronaminc.join.question.dto.QuestionUpdateResponse; import com.oronaminc.join.room.domain.Room; +import com.oronaminc.join.websocket.common.EventType; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.springframework.data.domain.Slice; @@ -17,13 +20,13 @@ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class QuestionMapper { - public static Question toQuestion(Room room, Member member, QuestionCreateRequest request) { + public static Question toQuestion(Room room, Member member, QuestionRequest request) { return Question.create(room, member, request); } public static QuestionCreateResponse toQuestionCreateResponse (Question question) { return QuestionCreateResponse.builder() - .event("CREATE") + .event(EventType.CREATE) .questionId(question.getId()) .content(question.getContent()) .emojiCount(0L) @@ -52,6 +55,21 @@ public static QuestionAssembleResponse toQuestionListResponse(QuestionFlatRespon .build(); } + public static QuestionUpdateResponse toQuestionUpdateResponse(Question question) { + return QuestionUpdateResponse.builder() + .event(EventType.UPDATE) + .questionId(question.getId()) + .content(question.getContent()) + .build(); + } + + public static QuestionDeleteResponse toQuestionDeleteResponse(Long questionId) { + return new QuestionDeleteResponse( + EventType.DELETE, + questionId + ); + } + public static QuestionListResponse toQuestionListResponse( Slice slice) { return new QuestionListResponse(slice.getContent()); diff --git a/src/main/java/com/oronaminc/join/room/api/RoomController.java b/src/main/java/com/oronaminc/join/room/api/RoomController.java index 6fbf1d1..d64cc68 100644 --- a/src/main/java/com/oronaminc/join/room/api/RoomController.java +++ b/src/main/java/com/oronaminc/join/room/api/RoomController.java @@ -17,6 +17,7 @@ import com.oronaminc.join.room.dto.CreateRoomResponse; import com.oronaminc.join.room.dto.JoinRoomRequest; import com.oronaminc.join.room.dto.JoinRoomResponse; +import com.oronaminc.join.room.dto.ReportResponse; import com.oronaminc.join.room.dto.RoomDetailResponse; import com.oronaminc.join.room.dto.RoomUpdateInfoResponse; import com.oronaminc.join.room.dto.RoomUpdateRequest; @@ -26,9 +27,11 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; +@Tag(name = "발표방") @RestController @RequestMapping("/api/rooms") @RequiredArgsConstructor @@ -55,7 +58,12 @@ public CreateRoomResponse createRoom( return roomService.createRoom(createRoomRequest, presenterEmail); } - @GetMapping("/code") + @Operation( + summary = "비밀코드로 방 입장", + description = "비밀코드를 통해 해당 발표방에 참가자로 등록합니다. 시작 전 상태이면 참가할 수 없습니다.", + security = @SecurityRequirement(name = "sessionAuth") + ) + @PostMapping("/code") @ResponseStatus(HttpStatus.OK) public JoinRoomResponse joinRoom( @RequestBody JoinRoomRequest joinRoomRequest, @@ -64,12 +72,22 @@ public JoinRoomResponse joinRoom( return roomService.joinRoom(memberDetails.getId(), joinRoomRequest); } + @Operation( + summary = "발표방 상세 조회", + description = "발표방을 상세 조회합니다. 비밀코드로 방 입장을 통해 참가자로 등록되었거나 팀 혹은 생성자가 아니면 예외가 발생합니다. roomStatus에는 BEFORE_START, STARTED, ENDED가 있습니다.", + security = @SecurityRequirement(name = "sessionAuth") + ) @GetMapping("/{roomId}") @ResponseStatus(HttpStatus.OK) public RoomDetailResponse getRoomDetail(@PathVariable Long roomId, @AuthenticationPrincipal MemberDetails memberDetails) { return roomService.getRoomDetail(memberDetails.getId(), roomId); } + @Operation( + summary = "발표방 수정", + description = "발표방을 수정합니다. 발표방 생성자만 가능합니다. 기존 값을 유지하고 싶으면 발표방 수정용 조회를 통해 가져온 값을 그대로 입력해주세요.", + security = @SecurityRequirement(name = "sessionAuth") + ) @PatchMapping("/{roomId}") @ResponseStatus(HttpStatus.NO_CONTENT) public void updateRoom( @@ -80,12 +98,22 @@ public void updateRoom( roomService.updateRoom(memberDetails.getId(), roomId, roomUpdateRequest); } + @Operation( + summary = "발표방 삭제", + description = "발표방을 삭제합니다. 발표방 생성자만 가능합니다.", + security = @SecurityRequirement(name = "sessionAuth") + ) @DeleteMapping("/{roomId}") @ResponseStatus(HttpStatus.NO_CONTENT) public void deleteRoom(@PathVariable Long roomId, @AuthenticationPrincipal MemberDetails memberDetails) { roomService.deleteRoom(memberDetails.getId(), roomId); } + @Operation( + summary = "발표방 상태변경", + description = "발표방의 상태를 변경합니다.", + security = @SecurityRequirement(name = "sessionAuth") + ) @PatchMapping("/{roomId}/status") @ResponseStatus(HttpStatus.NO_CONTENT) public void updateRoomStatus( @@ -95,6 +123,11 @@ public void updateRoomStatus( roomService.updateRoomStatus(memberDetails.getId(), roomId, roomUpdateStatusRequest); } + @Operation( + summary = "발표방 수정용 조회", + description = "발표방 수정용 조회입니다. 발표방 수정에서 이 값을 그대로 보내주시면 수정되지 않습니다.", + security = @SecurityRequirement(name = "sessionAuth") + ) @GetMapping("/{roomId}/update") @ResponseStatus(HttpStatus.OK) public RoomUpdateInfoResponse getUpdateInfo( @@ -103,4 +136,18 @@ public RoomUpdateInfoResponse getUpdateInfo( ) { return roomService.getRoomUpdateInfo(memberDetails.getId(), roomId); } + + @Operation( + summary = "리포트 조회", + description = "리포트에 필요한 데이터 조회입니다. 생성자만 조회 가능합니다.", + security = @SecurityRequirement(name = "sessionAuth") + ) + @GetMapping("/{roomId}/report") + @ResponseStatus(HttpStatus.OK) + public ReportResponse getReport( + @PathVariable Long roomId, + @AuthenticationPrincipal MemberDetails memberDetails + ) { + return roomService.getRoomReport(roomId, memberDetails.getId()); + } } diff --git a/src/main/java/com/oronaminc/join/room/domain/Room.java b/src/main/java/com/oronaminc/join/room/domain/Room.java index cd33c0a..2598be7 100644 --- a/src/main/java/com/oronaminc/join/room/domain/Room.java +++ b/src/main/java/com/oronaminc/join/room/domain/Room.java @@ -6,6 +6,7 @@ import com.oronaminc.join.global.entity.BaseEntity; import com.oronaminc.join.room.dto.RoomUpdateRequest; +import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; @@ -33,6 +34,7 @@ public class Room extends BaseEntity { private String title; private String description; + @Column(unique = true) private String secretCode; @Enumerated(EnumType.STRING) diff --git a/src/main/java/com/oronaminc/join/room/domain/RoomStatus.java b/src/main/java/com/oronaminc/join/room/domain/RoomStatus.java index 0deff29..c4f71bc 100644 --- a/src/main/java/com/oronaminc/join/room/domain/RoomStatus.java +++ b/src/main/java/com/oronaminc/join/room/domain/RoomStatus.java @@ -1,5 +1,13 @@ package com.oronaminc.join.room.domain; +import lombok.AllArgsConstructor; + +@AllArgsConstructor public enum RoomStatus { - BEFORE_START, STARTED, ENDED + BEFORE_START(false), + STARTED(true), + ENDED(false) + ; + + public final Boolean canSubscribeRoom; } diff --git a/src/main/java/com/oronaminc/join/room/dto/CreateRoomRequest.java b/src/main/java/com/oronaminc/join/room/dto/CreateRoomRequest.java index 9e54e7b..c75396b 100644 --- a/src/main/java/com/oronaminc/join/room/dto/CreateRoomRequest.java +++ b/src/main/java/com/oronaminc/join/room/dto/CreateRoomRequest.java @@ -1,11 +1,11 @@ package com.oronaminc.join.room.dto; -import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; import java.util.List; import org.hibernate.validator.constraints.Length; +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.FutureOrPresent; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.NotBlank; @@ -38,7 +38,7 @@ public record CreateRoomRequest( @NotNull @Size(max = 5) - @Schema(description = "발표방 추가한 팀원 목록", example = "{팀원1@example.com, 팀원2@example.com}") + @Schema(description = "발표방 추가한 팀원 목록") List teamEmail ) { } diff --git a/src/main/java/com/oronaminc/join/room/dto/ReportResponse.java b/src/main/java/com/oronaminc/join/room/dto/ReportResponse.java new file mode 100644 index 0000000..0503474 --- /dev/null +++ b/src/main/java/com/oronaminc/join/room/dto/ReportResponse.java @@ -0,0 +1,17 @@ +package com.oronaminc.join.room.dto; + +import java.util.List; + +import lombok.Builder; + +@Builder +public record ReportResponse( + Long roomId, + String title, + Long totalView, + Long totalQuestions, + Double answerRate, + Long totalEmojis, + List topQnA +) { +} diff --git a/src/main/java/com/oronaminc/join/room/dto/RoomJoinResponse.java b/src/main/java/com/oronaminc/join/room/dto/RoomJoinResponse.java new file mode 100644 index 0000000..64f6fa7 --- /dev/null +++ b/src/main/java/com/oronaminc/join/room/dto/RoomJoinResponse.java @@ -0,0 +1,6 @@ +package com.oronaminc.join.room.dto; + +public record RoomJoinResponse( + Integer participantCount +) { +} diff --git a/src/main/java/com/oronaminc/join/room/dto/RoomUpdateStatusRequest.java b/src/main/java/com/oronaminc/join/room/dto/RoomUpdateStatusRequest.java index ec0348f..8c960b7 100644 --- a/src/main/java/com/oronaminc/join/room/dto/RoomUpdateStatusRequest.java +++ b/src/main/java/com/oronaminc/join/room/dto/RoomUpdateStatusRequest.java @@ -2,7 +2,10 @@ import com.oronaminc.join.room.domain.RoomStatus; +import io.swagger.v3.oas.annotations.media.Schema; + public record RoomUpdateStatusRequest( + @Schema(description = "BEFORE_START, STARTED, ENDED", example = "BEFORE_START") RoomStatus roomStatus ) { } diff --git a/src/main/java/com/oronaminc/join/room/dto/TopQnAResponse.java b/src/main/java/com/oronaminc/join/room/dto/TopQnAResponse.java new file mode 100644 index 0000000..5645aad --- /dev/null +++ b/src/main/java/com/oronaminc/join/room/dto/TopQnAResponse.java @@ -0,0 +1,10 @@ +package com.oronaminc.join.room.dto; + +import java.util.List; + +public record TopQnAResponse( + String question, + Long emojiCount, + List answers +) { +} diff --git a/src/main/java/com/oronaminc/join/room/event/RoomDeleteEvent.java b/src/main/java/com/oronaminc/join/room/event/RoomDeleteEvent.java new file mode 100644 index 0000000..025de9d --- /dev/null +++ b/src/main/java/com/oronaminc/join/room/event/RoomDeleteEvent.java @@ -0,0 +1,6 @@ +package com.oronaminc.join.room.event; + +public record RoomDeleteEvent( + Long roomId +) { +} diff --git a/src/main/java/com/oronaminc/join/room/event/RoomEventHandler.java b/src/main/java/com/oronaminc/join/room/event/RoomEventHandler.java new file mode 100644 index 0000000..f032491 --- /dev/null +++ b/src/main/java/com/oronaminc/join/room/event/RoomEventHandler.java @@ -0,0 +1,28 @@ +package com.oronaminc.join.room.event; + +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Component; + +import com.oronaminc.join.document.service.DocumentService; +import com.oronaminc.join.emoji.service.EmojiService; +import com.oronaminc.join.participant.service.ParticipantService; +import com.oronaminc.join.question.service.QuestionService; + +import lombok.RequiredArgsConstructor; + +@Component +@RequiredArgsConstructor +public class RoomEventHandler { + private final ParticipantService participantService; + private final QuestionService questionService; + private final EmojiService emojiService; + private final DocumentService documentService; + + @EventListener + public void handleRoomDelete(RoomDeleteEvent event) { + participantService.deleteParticipantByRoomId(event.roomId()); + questionService.deleteByRoomId(event.roomId()); + emojiService.deleteByRoomEmoji(event.roomId()); + documentService.deleteByRoomId(event.roomId()); + } +} diff --git a/src/main/java/com/oronaminc/join/room/event/RoomExitEvent.java b/src/main/java/com/oronaminc/join/room/event/RoomExitEvent.java new file mode 100644 index 0000000..d7eac04 --- /dev/null +++ b/src/main/java/com/oronaminc/join/room/event/RoomExitEvent.java @@ -0,0 +1,7 @@ +package com.oronaminc.join.room.event; + +public record RoomExitEvent( + Long memberId, + Long roomId +) { +} diff --git a/src/main/java/com/oronaminc/join/room/service/RoomReader.java b/src/main/java/com/oronaminc/join/room/service/RoomReader.java index 80ea9ce..d1e73a4 100644 --- a/src/main/java/com/oronaminc/join/room/service/RoomReader.java +++ b/src/main/java/com/oronaminc/join/room/service/RoomReader.java @@ -4,6 +4,7 @@ import java.util.Optional; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Component; import com.oronaminc.join.global.exception.ErrorException; @@ -22,7 +23,13 @@ public Optional findById(Long roomId) { } public Room getById(Long roomId) { - return roomRepository.findById(roomId) + return findById(roomId) + .orElseThrow(() -> new ErrorException(NOT_FOUND_ROOM)); + } + + @Cacheable(cacheNames = "roomById") + public Room getCacheById(Long roomId) { + return findById(roomId) .orElseThrow(() -> new ErrorException(NOT_FOUND_ROOM)); } @@ -35,6 +42,12 @@ public Room getBySecretCode(String secretCode) { .orElseThrow(() -> new ErrorException(NOT_FOUND_ROOM)); } + @Cacheable(cacheNames = "roomBySecretCode") + public Room getCacheBySecretCode(String secretCode) { + return this.findBySecretCode(secretCode) + .orElseThrow(() -> new ErrorException(NOT_FOUND_ROOM)); + } + public Boolean existsBySecretCode(String secretCode) { return roomRepository.existsBySecretCode(secretCode); } diff --git a/src/main/java/com/oronaminc/join/room/service/RoomService.java b/src/main/java/com/oronaminc/join/room/service/RoomService.java index 4214a4e..c06ea32 100644 --- a/src/main/java/com/oronaminc/join/room/service/RoomService.java +++ b/src/main/java/com/oronaminc/join/room/service/RoomService.java @@ -1,21 +1,30 @@ package com.oronaminc.join.room.service; +import static com.oronaminc.join.global.exception.ErrorCode.*; + import java.util.List; -import com.oronaminc.join.infra.service.S3Service; +import java.util.Map; +import java.util.stream.Collectors; + +import org.springframework.cache.Cache; +import org.springframework.cache.CacheManager; +import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import static com.oronaminc.join.global.exception.ErrorCode.*; - +import com.oronaminc.join.answer.domain.Answer; +import com.oronaminc.join.answer.service.AnswerReader; import com.oronaminc.join.document.domain.Document; import com.oronaminc.join.document.service.DocumentReader; import com.oronaminc.join.document.service.DocumentService; -import com.oronaminc.join.emoji.service.EmojiService; import com.oronaminc.join.global.exception.ErrorException; +import com.oronaminc.join.infra.service.S3Service; import com.oronaminc.join.participant.domain.Participant; import com.oronaminc.join.participant.domain.ParticipantType; +import com.oronaminc.join.participant.service.ParticipantReader; import com.oronaminc.join.participant.service.ParticipantService; -import com.oronaminc.join.question.service.QuestionService; +import com.oronaminc.join.question.domain.Question; +import com.oronaminc.join.question.service.QuestionReader; import com.oronaminc.join.room.dao.RoomRepository; import com.oronaminc.join.room.domain.Room; import com.oronaminc.join.room.domain.RoomStatus; @@ -23,47 +32,61 @@ import com.oronaminc.join.room.dto.CreateRoomResponse; import com.oronaminc.join.room.dto.JoinRoomRequest; import com.oronaminc.join.room.dto.JoinRoomResponse; +import com.oronaminc.join.room.dto.ReportResponse; import com.oronaminc.join.room.dto.RoomDetailResponse; +import com.oronaminc.join.room.dto.RoomJoinResponse; import com.oronaminc.join.room.dto.RoomUpdateInfoResponse; import com.oronaminc.join.room.dto.RoomUpdateRequest; import com.oronaminc.join.room.dto.RoomUpdateStatusRequest; +import com.oronaminc.join.room.dto.TopQnAResponse; +import com.oronaminc.join.room.event.RoomDeleteEvent; import com.oronaminc.join.room.util.CodeGenerator; import com.oronaminc.join.room.util.RoomMapper; +import com.oronaminc.join.websocket.session.CurrentParticipantManager; import lombok.RequiredArgsConstructor; @Service -@Transactional +@Transactional(readOnly = true) @RequiredArgsConstructor public class RoomService { private final RoomRepository roomRepository; private final ParticipantService participantService; private final DocumentService documentService; - private final QuestionService questionService; - private final DocumentReader documentReader; - private final EmojiService emojiService; private final S3Service s3Service; + private final ParticipantReader participantReader; + private final DocumentReader documentReader; + private final QuestionReader questionReader; + private final AnswerReader answerReader; private final RoomReader roomReader; - + private final CurrentParticipantManager currentParticipantManager; + private final ApplicationEventPublisher publisher; + private final CacheManager cacheManager; private static final int CODE_LENGTH = 6; - public CreateRoomResponse createRoom(CreateRoomRequest createRoomRequest, - String presenterEmail) { + @Transactional + public CreateRoomResponse createRoom( + CreateRoomRequest createRoomRequest, + String presenterEmail + ) { String code = this.generateCode(); Room room = RoomMapper.toRoom(createRoomRequest, code); roomRepository.save(room); - documentService.saveDocument(createRoomRequest.documentUrl(), room); participantService.savePresenterAndTeam(presenterEmail, createRoomRequest.teamEmail(), room); + documentService.saveDocument(createRoomRequest.documentUrl(), room); return RoomMapper.toCreateRoomResponse(room); } + @Transactional public JoinRoomResponse joinRoom(Long memberId, JoinRoomRequest joinRoomRequest) { - Room room = roomReader.getBySecretCode(joinRoomRequest.secretCode()); - + Room room = roomReader.getCacheBySecretCode(joinRoomRequest.secretCode()); + if (room.getRoomStatus().equals(RoomStatus.BEFORE_START)) { + throw new ErrorException(UNAUTHORIZED_JOIN_ROOM); + } participantService.saveParticipantById(memberId, room, ParticipantType.GUEST); return new JoinRoomResponse(room.getId()); } @@ -71,32 +94,35 @@ public JoinRoomResponse joinRoom(Long memberId, JoinRoomRequest joinRoomRequest) public RoomDetailResponse getRoomDetail(Long memberId, Long roomId) { participantService.validateParticipant(memberId, roomId); - Room room = roomReader.getById(roomId); + Room room = roomReader.getCacheById(roomId); Participant presenter = participantService.getPresenter(roomId); List team = participantService.getTeam(roomId); Document document = documentReader.getByRoomId(roomId); + int participantCount = currentParticipantManager.getRoomParticipants(roomId).size(); + String presignedUrl = s3Service.generateGetPresignedUrl(document.getFileUrl()); - String presignedUrl = s3Service.generatePresignedUrl(document.getFileUrl()); - - return RoomMapper.toRoomDetailResponse(room, presenter, team, presignedUrl, memberId); + return RoomMapper.toRoomDetailResponse(room, presenter, team, presignedUrl, memberId, participantCount); } + @Transactional public void updateRoom(Long memberId, Long roomId, RoomUpdateRequest updateRoomRequest) { participantService.validatePresenter(roomId, memberId); Room room = roomReader.getById(roomId); - Document document = documentReader.getByRoomId(roomId); if (room.getRoomStatus().equals(RoomStatus.STARTED)) { throw new ErrorException(BAD_REQUEST_ROOM_STARTED); } - document.update(updateRoomRequest.documentUrl()); room.update(updateRoomRequest); participantService.updateTeam(room, updateRoomRequest.teamEmail()); + documentService.updateDocument(updateRoomRequest.documentUrl(), roomId); + + clearCache(room.getId(), room.getSecretCode()); } + @Transactional public void deleteRoom(Long memberId, Long roomId) { participantService.validatePresenter(roomId, memberId); @@ -107,20 +133,19 @@ public void deleteRoom(Long memberId, Long roomId) { throw new ErrorException(BAD_REQUEST_ROOM_STARTED); } - participantService.deleteParticipantByRoomId(roomId); - questionService.deleteByRoomId(roomId); - emojiService.deleteByRoomEmoji(roomId); - // S3 버킷 내 파일 삭제 - s3Service.deleteFile(document.getFileUrl()); - documentService.deleteByRoomId(roomId); + clearCache(room.getId(), room.getSecretCode()); + publisher.publishEvent(new RoomDeleteEvent(roomId)); roomRepository.deleteById(roomId); + s3Service.deleteFile(document.getFileUrl()); } + @Transactional public void updateRoomStatus(Long memberId, Long roomId, - RoomUpdateStatusRequest roomUpdateStatusRequest) { + RoomUpdateStatusRequest roomUpdateStatusRequest) { participantService.validatePresenter(roomId, memberId); Room room = roomReader.getById(roomId); + clearCache(room.getId(), room.getSecretCode()); RoomStatus updateStatus = roomUpdateStatusRequest.roomStatus(); List canUpdateStatus = List.of(RoomStatus.STARTED, RoomStatus.ENDED); if (!canUpdateStatus.contains(roomUpdateStatusRequest.roomStatus())) { @@ -129,9 +154,10 @@ public void updateRoomStatus(Long memberId, Long roomId, room.updateStatus(updateStatus); } + @Transactional public RoomUpdateInfoResponse getRoomUpdateInfo(Long memberId, Long roomId) { participantService.validatePresenter(roomId, memberId); - Room room = roomReader.getById(roomId); + Room room = roomReader.getCacheById(roomId); List team = participantService.getTeam(roomId); return RoomMapper.toRoomUpdateInfoResponse(room, team); } @@ -144,4 +170,83 @@ private String generateCode() { } } } + + public ReportResponse getRoomReport(Long roomId, Long memberId) { + + Participant participant = participantService.getPresenter(roomId); + + if (!participant.getMember().getId().equals(memberId)) { + throw new ErrorException(UNAUTHORIZED_REPORT_READ); + } + + Room room = roomReader.getCacheById(roomId); + Long totalView = participantReader.countTotalView(roomId); + Long totalQuestions = questionReader.countByRoomId(roomId); + Long totalAnswerByQuestion = answerReader.countAnsweredQuestionsByRoomId(roomId); + Double answerRate = calculateAnswerRate(totalQuestions, totalAnswerByQuestion); + List topQnA = getTopQnA(roomId); + + return RoomMapper.toReportResponse(room, totalView, totalQuestions, answerRate, topQnA); + } + + private List getTopQnA(Long roomId) { + // top3 질문 리스트 + List top3Question = questionReader.findTop3Question(roomId); + + // top3 질문 id + List questionIds = top3Question.stream() + .map(Question::getId) + .toList(); + + // top3에 질문의 답변 조회 + List answerByQuestionIds = answerReader.getAnswerByQuestionIds(questionIds); + + // 답변을 질문 ID 기준으로 그룹화 + Map> answersByQuestionId = answerByQuestionIds.stream() + .collect(Collectors.groupingBy( + a -> a.getQuestion().getId(), + Collectors.mapping(Answer::getContent, Collectors.toList()) + )); + + return top3Question.stream() + .map(q -> new TopQnAResponse( + q.getContent(), + q.getEmojiCount(), + answersByQuestionId.getOrDefault(q.getId(), List.of()) + )) + .toList(); + } + + private Double calculateAnswerRate(Long totalQuestions, Long totalAnswerByQuestion) { + if (totalQuestions == 0) { + return 0.0; + } + + double rate = ((double) totalAnswerByQuestion / totalQuestions) * 100; + return Math.round(rate * 10.0) / 10.0; + + } + + public RoomJoinResponse subscribeRoom(Long roomId, Long memberId) { + participantService.validateParticipant(memberId, roomId); + Room room = roomReader.getCacheById(roomId); + if (!room.getRoomStatus().canSubscribeRoom) { + throw new ErrorException(UNAUTHORIZED_SUBSCRIBE_ROOM); + } + Integer limit = room.getParticipantLimit(); + currentParticipantManager.addParticipant(roomId, memberId, limit); + return new RoomJoinResponse(currentParticipantManager.getRoomParticipants(roomId).size()); + } + + private void clearCache(Long roomId, String secretCode) { + Cache roomByIdCache = cacheManager.getCache("roomById"); + if (roomByIdCache != null) { + roomByIdCache.evict(roomId); + } + + Cache roomBySecretCodeCache = cacheManager.getCache("roomBySecretCode"); + if (roomBySecretCodeCache != null) { + roomBySecretCodeCache.evict(secretCode); + } + } } diff --git a/src/main/java/com/oronaminc/join/room/util/CodeGenerator.java b/src/main/java/com/oronaminc/join/room/util/CodeGenerator.java index 39b86c4..558077a 100644 --- a/src/main/java/com/oronaminc/join/room/util/CodeGenerator.java +++ b/src/main/java/com/oronaminc/join/room/util/CodeGenerator.java @@ -1,21 +1,16 @@ package com.oronaminc.join.room.util; -import java.util.Random; - import lombok.AccessLevel; import lombok.NoArgsConstructor; +import org.apache.commons.lang3.RandomStringUtils; @NoArgsConstructor(access = AccessLevel.PRIVATE) public class CodeGenerator { + private static final String CHAR_POOL = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - private static final Random random = new Random(); public static String generateCode(int length) { - StringBuilder sb = new StringBuilder(length); - for (int i = 0; i < length; i++) { - int idx = random.nextInt(CHAR_POOL.length()); - sb.append(CHAR_POOL.charAt(idx)); - } - return sb.toString(); + + return RandomStringUtils.random(length, CHAR_POOL); } } diff --git a/src/main/java/com/oronaminc/join/room/util/RoomMapper.java b/src/main/java/com/oronaminc/join/room/util/RoomMapper.java index 46e89f1..eb24a38 100644 --- a/src/main/java/com/oronaminc/join/room/util/RoomMapper.java +++ b/src/main/java/com/oronaminc/join/room/util/RoomMapper.java @@ -3,15 +3,16 @@ import java.time.LocalTime; import java.util.List; -import com.oronaminc.join.document.domain.Document; import com.oronaminc.join.participant.domain.Participant; import com.oronaminc.join.room.domain.Room; import com.oronaminc.join.room.domain.RoomStatus; import com.oronaminc.join.room.domain.RoomType; import com.oronaminc.join.room.dto.CreateRoomRequest; import com.oronaminc.join.room.dto.CreateRoomResponse; +import com.oronaminc.join.room.dto.ReportResponse; import com.oronaminc.join.room.dto.RoomDetailResponse; import com.oronaminc.join.room.dto.RoomUpdateInfoResponse; +import com.oronaminc.join.room.dto.TopQnAResponse; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -36,7 +37,7 @@ public static CreateRoomResponse toCreateRoomResponse(Room room) { return new CreateRoomResponse(room.getId(), room.getSecretCode()); } - public static RoomDetailResponse toRoomDetailResponse(Room room, Participant presenter, List team, String presignedUrl, Long memberId) { + public static RoomDetailResponse toRoomDetailResponse(Room room, Participant presenter, List team, String presignedUrl, Long memberId, int participantCount) { return RoomDetailResponse.builder() .title(room.getTitle()) .description(room.getDescription()) @@ -44,7 +45,7 @@ public static RoomDetailResponse toRoomDetailResponse(Room room, Participant pre .team(team.stream().map(participant -> participant.getMember().getNickname()).toList()) .roomCode(room.getSecretCode()) .presignedUrl(presignedUrl) - .participantCount(0) + .participantCount(participantCount) .participantLimit(room.getParticipantLimit()) .emojiCount(room.getEmojiCount()) .isHost(presenter.getMember().getId().equals(memberId)) @@ -66,4 +67,16 @@ public static RoomUpdateInfoResponse toRoomUpdateInfoResponse(Room room, List teamParticipant.getMember().getEmail()).toList()) .build(); } + + public static ReportResponse toReportResponse(Room room, Long totalView,Long totalQuestions, Double answerRate, List top3QnA) { + return ReportResponse.builder() + .roomId(room.getId()) + .title(room.getTitle()) + .totalView(totalView) + .totalQuestions(totalQuestions) + .answerRate(answerRate) + .totalEmojis(room.getEmojiCount()) + .topQnA(top3QnA) + .build(); + } } diff --git a/src/main/java/com/oronaminc/join/websocket/api/AnswerWebsocketController.java b/src/main/java/com/oronaminc/join/websocket/api/AnswerWebsocketController.java index f0177b4..13c13fa 100644 --- a/src/main/java/com/oronaminc/join/websocket/api/AnswerWebsocketController.java +++ b/src/main/java/com/oronaminc/join/websocket/api/AnswerWebsocketController.java @@ -1,23 +1,29 @@ package com.oronaminc.join.websocket.api; +import static com.oronaminc.join.global.exception.ErrorCode.*; + +import org.springframework.messaging.handler.annotation.DestinationVariable; +import org.springframework.messaging.handler.annotation.MessageMapping; +import org.springframework.messaging.handler.annotation.Payload; +import org.springframework.messaging.handler.annotation.SendTo; +import org.springframework.stereotype.Controller; + import com.oronaminc.join.answer.domain.Answer; -import com.oronaminc.join.answer.dto.AnswerCreateRequest; import com.oronaminc.join.answer.dto.AnswerCreateResponse; +import com.oronaminc.join.answer.dto.AnswerDeleteResponse; +import com.oronaminc.join.answer.dto.AnswerRequest; +import com.oronaminc.join.answer.dto.AnswerUpdateResponse; import com.oronaminc.join.answer.mapper.AnswerMapper; import com.oronaminc.join.answer.service.AnswerService; -import com.oronaminc.join.answer.util.PermissionValidator; -import com.oronaminc.join.member.dao.MemberRepository; -import com.oronaminc.join.participant.dao.ParticipantRepository; -import com.oronaminc.join.question.dao.QuestionRepository; -import com.oronaminc.join.room.dao.RoomRepository; -import java.security.Principal; +import com.oronaminc.join.global.exception.ErrorException; +import com.oronaminc.join.global.ratelimit.RateLimitService; +import com.oronaminc.join.global.ratelimit.RateLimitType; +import com.oronaminc.join.websocket.common.EventType; + +import io.github.bucket4j.Bucket; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.messaging.handler.annotation.DestinationVariable; -import org.springframework.messaging.handler.annotation.MessageMapping; -import org.springframework.messaging.handler.annotation.Payload; -import org.springframework.messaging.handler.annotation.SendTo; -import org.springframework.stereotype.Controller; @Slf4j @Controller @@ -25,25 +31,59 @@ public class AnswerWebsocketController { private final AnswerService answerService; - private final PermissionValidator permissionValidator; + private final RateLimitService rateLimitService; @MessageMapping("/rooms/{roomId}/question/{questionId}/answers/create") @SendTo("/topic/rooms/{roomId}/answers") public AnswerCreateResponse create( @DestinationVariable Long roomId, @DestinationVariable Long questionId, - @Payload AnswerCreateRequest request, - Principal principal + @Payload @Valid AnswerRequest request ) { - Long memberId = Long.valueOf(principal.getName()); + Long memberId = request.memberId(); + + Bucket bucket = rateLimitService.getBucket(RateLimitType.CREATE_ANSWER, roomId, memberId, questionId); - permissionValidator.validateAnswerPermission(roomId, memberId); + if (!bucket.tryConsume(1)) { + throw new ErrorException(TOO_MANY_REQUESTS_ANSWER); + } Answer answer = answerService.create(roomId, memberId, questionId, request); - log.info("답변 메세지 = {}", request.content()); + log.info("답변 메세지 = {}", answer.getContent()); return AnswerMapper.toAnswerCreateResponse(answer); } + @MessageMapping("/answers/{answerId}/update") + @SendTo("/topic/rooms/{roomId}/answers") + public AnswerUpdateResponse update( + @DestinationVariable Long answerId, + @Payload @Valid AnswerRequest request + ) { + + Long memberId = request.memberId(); + + Answer answer = answerService.update(answerId, memberId, request); + + log.info("수정 메세지 = {}", answer.getContent()); + + return AnswerMapper.toAnswerUpdateResponse(answer); + } + + @MessageMapping("/answers/{answerId}/delete") + @SendTo("/topic/rooms/{roomId}/answers") + public AnswerDeleteResponse delete( + @DestinationVariable Long answerId, + @Payload @Valid StompMemberRequest request + ) { + Long memberId = request.memberId(); + + answerService.delete(answerId, memberId); + + log.info("삭제되었습니다."); + + return new AnswerDeleteResponse(answerId, EventType.DELETE); + } + } diff --git a/src/main/java/com/oronaminc/join/websocket/api/EmojiWebsocketController.java b/src/main/java/com/oronaminc/join/websocket/api/EmojiWebsocketController.java index eda7161..2e29715 100644 --- a/src/main/java/com/oronaminc/join/websocket/api/EmojiWebsocketController.java +++ b/src/main/java/com/oronaminc/join/websocket/api/EmojiWebsocketController.java @@ -1,32 +1,63 @@ package com.oronaminc.join.websocket.api; -import com.oronaminc.join.emoji.dto.EmojiRequest; -import com.oronaminc.join.emoji.dto.EmojiResponse; -import com.oronaminc.join.emoji.service.EmojiFacade; -import java.security.Principal; -import lombok.RequiredArgsConstructor; import org.springframework.messaging.handler.annotation.DestinationVariable; import org.springframework.messaging.handler.annotation.MessageMapping; import org.springframework.messaging.handler.annotation.Payload; import org.springframework.messaging.handler.annotation.SendTo; import org.springframework.stereotype.Controller; +import com.oronaminc.join.emoji.dto.EmojiRequest; +import com.oronaminc.join.emoji.dto.EmojiResponse; +import com.oronaminc.join.emoji.service.EmojiFacade; +import com.oronaminc.join.global.exception.ErrorCode; +import com.oronaminc.join.global.exception.ErrorException; +import com.oronaminc.join.global.ratelimit.RateLimitService; +import com.oronaminc.join.global.ratelimit.RateLimitType; + +import io.github.bucket4j.Bucket; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; + @Controller @RequiredArgsConstructor public class EmojiWebsocketController { private final EmojiFacade emojiFacade; + private final RateLimitService rateLimitService; - @MessageMapping("/rooms/{roomId}/emojis") + @MessageMapping("/rooms/{roomId}/emojis/create") @SendTo("/topic/rooms/{roomId}/emojis") - public EmojiResponse toggleEmoji( + public EmojiResponse createEmoji( @DestinationVariable Long roomId, - @Payload EmojiRequest emojiRequest, - Principal principal + @Payload @Valid EmojiRequest emojiRequest ) { - Long memberId = Long.valueOf(principal.getName()); + Long memberId = emojiRequest.memberId(); + + Bucket bucket = rateLimitService.getBucket(RateLimitType.EMOJI, memberId, + emojiRequest.targetType(), emojiRequest.targetId()); + + if (!bucket.tryConsume(1)) { + throw new ErrorException(ErrorCode.TOO_MANY_REQUESTS_EMOJI); + } + + return emojiFacade.createEmoji(memberId, emojiRequest); + } + + @MessageMapping("/rooms/{roomId}/emojis/delete") + @SendTo("/topic/rooms/{roomId}/emojis") + public EmojiResponse deleteEmoji( + @DestinationVariable Long roomId, + @Payload @Valid EmojiRequest emojiRequest + ) { + Long memberId = emojiRequest.memberId(); + + Bucket bucket = rateLimitService.getBucket(RateLimitType.EMOJI, memberId, + emojiRequest.targetType(), emojiRequest.targetId()); + if (!bucket.tryConsume(1)) { + throw new ErrorException(ErrorCode.TOO_MANY_REQUESTS_EMOJI); + } - return emojiFacade.toggleEmoji(memberId, emojiRequest); + return emojiFacade.deleteEmoji(memberId, emojiRequest); } } diff --git a/src/main/java/com/oronaminc/join/websocket/api/QuestionWebsocketController.java b/src/main/java/com/oronaminc/join/websocket/api/QuestionWebsocketController.java index 0a22ca1..6f0e73e 100644 --- a/src/main/java/com/oronaminc/join/websocket/api/QuestionWebsocketController.java +++ b/src/main/java/com/oronaminc/join/websocket/api/QuestionWebsocketController.java @@ -1,46 +1,86 @@ package com.oronaminc.join.websocket.api; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.oronaminc.join.member.security.MemberDetails; -import com.oronaminc.join.question.domain.Question; -import com.oronaminc.join.question.dto.QuestionCreateRequest; -import com.oronaminc.join.question.dto.QuestionCreateResponse; -import com.oronaminc.join.question.util.QuestionMapper; -import com.oronaminc.join.question.service.QuestionService; -import java.security.Principal; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.messaging.handler.annotation.DestinationVariable; import org.springframework.messaging.handler.annotation.MessageMapping; import org.springframework.messaging.handler.annotation.Payload; import org.springframework.messaging.handler.annotation.SendTo; -import org.springframework.security.core.Authentication; import org.springframework.stereotype.Controller; +import com.oronaminc.join.global.exception.ErrorCode; +import com.oronaminc.join.global.exception.ErrorException; +import com.oronaminc.join.global.ratelimit.RateLimitService; +import com.oronaminc.join.global.ratelimit.RateLimitType; +import com.oronaminc.join.question.domain.Question; +import com.oronaminc.join.question.dto.QuestionCreateResponse; +import com.oronaminc.join.question.dto.QuestionDeleteResponse; +import com.oronaminc.join.question.dto.QuestionRequest; +import com.oronaminc.join.question.dto.QuestionUpdateResponse; +import com.oronaminc.join.question.service.QuestionService; +import com.oronaminc.join.question.util.QuestionMapper; + +import io.github.bucket4j.Bucket; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + @Slf4j @Controller @RequiredArgsConstructor public class QuestionWebsocketController { private final QuestionService questionService; - private final ObjectMapper objectMapper; + private final RateLimitService rateLimitService; @MessageMapping("/rooms/{roomId}/questions/create") @SendTo("/topic/rooms/{roomId}/questions") - public QuestionCreateResponse create( + public QuestionCreateResponse createQuestion( @DestinationVariable Long roomId, - @Payload QuestionCreateRequest request, - Principal principal + @Payload @Valid QuestionRequest request ) { + log.debug("수신한 메시지 = {}", request.content()); + + Long memberId = request.memberId(); - Long memberId = Long.valueOf(principal.getName()); + log.debug("회원 아이디 = {}", memberId); + + Bucket bucket = rateLimitService.getBucket(RateLimitType.CREATE_QUESTION, roomId, memberId); + + if (!bucket.tryConsume(1)) { + throw new ErrorException(ErrorCode.TOO_MANY_REQUESTS_QUESTION); + } Question question = questionService.create(roomId, memberId, request); - log.info("수신한 메시지 = {}", request.content()); return QuestionMapper.toQuestionCreateResponse(question); } + @MessageMapping("/rooms/{roomId}/questions/{questionId}/update") + @SendTo("/topic/rooms/{roomId}/questions") + public QuestionUpdateResponse updateQuestion( + @DestinationVariable Long roomId, + @DestinationVariable Long questionId, + @Payload @Valid QuestionRequest request + ) { + + Long memberId = request.memberId(); + Question updated = questionService.update(memberId, roomId, questionId, request); + + return QuestionMapper.toQuestionUpdateResponse(updated); + } + + @MessageMapping("rooms/{roomId}/questions/{questionId}/delete") + @SendTo("/topic/rooms/{roomId}/questions") + public QuestionDeleteResponse deleteQuestion( + @DestinationVariable Long roomId, + @DestinationVariable Long questionId, + @Payload @Valid StompMemberRequest request + ) { + Long memberId = request.memberId(); + + Long deletedId = questionService.delete(memberId, roomId, questionId); + + return QuestionMapper.toQuestionDeleteResponse(deletedId); + } } diff --git a/src/main/java/com/oronaminc/join/websocket/api/RoomWebsocketController.java b/src/main/java/com/oronaminc/join/websocket/api/RoomWebsocketController.java new file mode 100644 index 0000000..e4fe0e2 --- /dev/null +++ b/src/main/java/com/oronaminc/join/websocket/api/RoomWebsocketController.java @@ -0,0 +1,39 @@ +package com.oronaminc.join.websocket.api; + +import org.springframework.messaging.Message; +import org.springframework.messaging.handler.annotation.DestinationVariable; +import org.springframework.messaging.handler.annotation.MessageMapping; +import org.springframework.messaging.handler.annotation.SendTo; +import org.springframework.messaging.simp.stomp.StompHeaderAccessor; +import org.springframework.stereotype.Controller; + +import com.oronaminc.join.room.dto.RoomJoinResponse; +import com.oronaminc.join.room.service.RoomService; +import com.oronaminc.join.websocket.session.WebsocketSessionManager; + +import lombok.RequiredArgsConstructor; + +@Controller +@RequiredArgsConstructor +public class RoomWebsocketController { + private final RoomService roomService; + private final WebsocketSessionManager sessionManager; + + @MessageMapping("/rooms/{roomId}/join") + @SendTo("/topic/rooms/{roomId}/join") + public RoomJoinResponse joinRoom( + @DestinationVariable Long roomId, + StompMemberRequest request, + Message message + ) { + Long memberId = request.memberId(); + StompHeaderAccessor accessor = StompHeaderAccessor.wrap(message); + String sessionId = accessor.getSessionId(); + + // 세션 매니저에서 세션 정보 활용 + RoomJoinResponse response = roomService.subscribeRoom(roomId, memberId); + sessionManager.addAttribute(sessionId, "roomId", roomId); + + return response; + } +} diff --git a/src/main/java/com/oronaminc/join/websocket/api/StompMemberRequest.java b/src/main/java/com/oronaminc/join/websocket/api/StompMemberRequest.java new file mode 100644 index 0000000..a353e20 --- /dev/null +++ b/src/main/java/com/oronaminc/join/websocket/api/StompMemberRequest.java @@ -0,0 +1,9 @@ +package com.oronaminc.join.websocket.api; + +import jakarta.validation.constraints.NotNull; + +public record StompMemberRequest( + @NotNull + Long memberId +) { +} diff --git a/src/main/java/com/oronaminc/join/websocket/api/WebSocketExceptionHandler.java b/src/main/java/com/oronaminc/join/websocket/api/WebSocketExceptionHandler.java index 832fda9..ad738d1 100644 --- a/src/main/java/com/oronaminc/join/websocket/api/WebSocketExceptionHandler.java +++ b/src/main/java/com/oronaminc/join/websocket/api/WebSocketExceptionHandler.java @@ -1,13 +1,8 @@ package com.oronaminc.join.websocket.api; -import com.oronaminc.join.global.exception.ErrorCode; -import com.oronaminc.join.global.exception.ErrorException; -import com.oronaminc.join.global.exception.ErrorResponse; -import com.oronaminc.join.websocket.config.WebsocketSessionManager; import java.io.IOException; import java.net.SocketException; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.springframework.messaging.Message; import org.springframework.messaging.handler.annotation.MessageExceptionHandler; import org.springframework.messaging.simp.annotation.SendToUser; @@ -15,6 +10,14 @@ import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ControllerAdvice; +import com.oronaminc.join.global.exception.ErrorCode; +import com.oronaminc.join.global.exception.ErrorException; +import com.oronaminc.join.global.exception.ErrorResponse; +import com.oronaminc.join.websocket.session.WebsocketSessionManager; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + @Slf4j @ControllerAdvice @RequiredArgsConstructor @@ -45,6 +48,7 @@ public ErrorResponse handleCustomException(ErrorException e, Message message) StompHeaderAccessor accessor = StompHeaderAccessor.wrap(message); log.info("에러를 보낼 세션 ID: {}", accessor.getSessionId()); + log.info("에러: {} - {}", e.getErrorCode(), e.getMessage()); return new ErrorResponse(e.getErrorCode()); } diff --git a/src/main/java/com/oronaminc/join/websocket/common/EventType.java b/src/main/java/com/oronaminc/join/websocket/common/EventType.java new file mode 100644 index 0000000..b3bb363 --- /dev/null +++ b/src/main/java/com/oronaminc/join/websocket/common/EventType.java @@ -0,0 +1,5 @@ +package com.oronaminc.join.websocket.common; + +public enum EventType { + CREATE, UPDATE, DELETE +} diff --git a/src/main/java/com/oronaminc/join/websocket/config/CustomWebSocketHandlerDecorator.java b/src/main/java/com/oronaminc/join/websocket/config/CustomWebSocketHandlerDecorator.java deleted file mode 100644 index 7a32702..0000000 --- a/src/main/java/com/oronaminc/join/websocket/config/CustomWebSocketHandlerDecorator.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.oronaminc.join.websocket.config; - -import org.springframework.web.socket.CloseStatus; -import org.springframework.web.socket.WebSocketHandler; -import org.springframework.web.socket.WebSocketSession; -import org.springframework.web.socket.handler.WebSocketHandlerDecorator; - -public class CustomWebSocketHandlerDecorator extends WebSocketHandlerDecorator { -// 연결된 세션 관리 - - private final WebsocketSessionManager sessionManager; - - public CustomWebSocketHandlerDecorator(WebSocketHandler delegate, - WebsocketSessionManager sessionManager) { - super(delegate); - this.sessionManager = sessionManager; - } - - @Override - public void afterConnectionEstablished(WebSocketSession session) throws Exception { - // 세션 연결되면 map에 저장 - - sessionManager.registerSession(session); - super.afterConnectionEstablished(session); - } - - @Override - public void afterConnectionClosed(WebSocketSession session, CloseStatus closeStatus) - throws Exception { - // 세션 연결 종료되면 map에서 제거 - - sessionManager.removeSession(session.getId()); - super.afterConnectionClosed(session, closeStatus); - } - -} diff --git a/src/main/java/com/oronaminc/join/websocket/config/StompAuthChannelInterceptor.java b/src/main/java/com/oronaminc/join/websocket/config/StompAuthChannelInterceptor.java new file mode 100644 index 0000000..0cc944d --- /dev/null +++ b/src/main/java/com/oronaminc/join/websocket/config/StompAuthChannelInterceptor.java @@ -0,0 +1,29 @@ +package com.oronaminc.join.websocket.config; + +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.simp.stomp.StompCommand; +import org.springframework.messaging.simp.stomp.StompHeaderAccessor; +import org.springframework.messaging.support.ChannelInterceptor; +import org.springframework.messaging.support.MessageHeaderAccessor; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Component; + +@Component +public class StompAuthChannelInterceptor implements ChannelInterceptor { + @Override + public Message preSend(Message message, MessageChannel channel) { + StompHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class); + + if (StompCommand.CONNECT.equals(accessor.getCommand())) { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + + if (authentication != null && authentication.isAuthenticated()) { + accessor.setUser(authentication); + } + } + + return message; + } +} diff --git a/src/main/java/com/oronaminc/join/websocket/config/WebSocketConfig.java b/src/main/java/com/oronaminc/join/websocket/config/WebSocketConfig.java index b6380be..f529f45 100644 --- a/src/main/java/com/oronaminc/join/websocket/config/WebSocketConfig.java +++ b/src/main/java/com/oronaminc/join/websocket/config/WebSocketConfig.java @@ -1,14 +1,22 @@ package com.oronaminc.join.websocket.config; -import lombok.RequiredArgsConstructor; +import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.messaging.simp.config.ChannelRegistration; import org.springframework.messaging.simp.config.MessageBrokerRegistry; import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; import org.springframework.web.socket.config.annotation.StompEndpointRegistry; import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; +import org.springframework.web.socket.config.annotation.WebSocketTransportRegistration; import org.springframework.web.socket.handler.WebSocketHandlerDecoratorFactory; -import org.springframework.web.socket.server.support.HttpSessionHandshakeInterceptor; + +import com.oronaminc.join.websocket.handshake.CustomHandshakeHandler; +import com.oronaminc.join.websocket.session.CustomWebSocketHandlerDecorator; +import com.oronaminc.join.websocket.session.WebsocketSessionManager; +import com.oronaminc.join.websocket.stomp.StompErrorHandler; + +import lombok.RequiredArgsConstructor; @Configuration @RequiredArgsConstructor @@ -17,11 +25,16 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer { private final CustomHandshakeHandler handshakeHandler; private final StompErrorHandler stompErrorHandler; + private final WebsocketSessionManager sessionManager; + private final ApplicationEventPublisher publisher; + private final StompAuthChannelInterceptor stompAuthChannelInterceptor; @Bean public WebSocketHandlerDecoratorFactory webSocketHandlerDecoratorFactory( - WebsocketSessionManager sessionManager) { - return delegate -> new CustomWebSocketHandlerDecorator(delegate, sessionManager); + WebsocketSessionManager sessionManager, + ApplicationEventPublisher publisher + ) { + return delegate -> new CustomWebSocketHandlerDecorator(delegate, sessionManager, publisher); } @Override @@ -34,18 +47,30 @@ public void configureMessageBroker(MessageBrokerRegistry config) { @Override public void registerStompEndpoints(StompEndpointRegistry registry) { registry.addEndpoint("/ws") - .setAllowedOriginPatterns("*") - // websocket 연결 전 쿠키 체크 - .addInterceptors(new HttpSessionHandshakeInterceptor()) - // websocket 연결 후 principal 생성 - .setHandshakeHandler(handshakeHandler) - .withSockJS(); + .setAllowedOriginPatterns("*") + // websocket 연결 전 쿠키 체크 + // .addInterceptors(new HttpSessionHandshakeInterceptor()) + // websocket 연결 후 principal 생성 + // .setHandshakeHandler(handshakeHandler) + .withSockJS(); - registry.addEndpoint("/ws") - .setAllowedOriginPatterns("*") - .addInterceptors(new HttpSessionHandshakeInterceptor()) - .setHandshakeHandler(handshakeHandler); + // registry.addEndpoint("/ws") + // .setAllowedOriginPatterns("*") + // .addInterceptors(new HttpSessionHandshakeInterceptor()) + // .setHandshakeHandler(handshakeHandler) + + //; registry.setErrorHandler(stompErrorHandler); } + + @Override + public void configureWebSocketTransport(WebSocketTransportRegistration registry) { + registry.setDecoratorFactories(webSocketHandlerDecoratorFactory(sessionManager, publisher)); + } + + @Override + public void configureClientInboundChannel(ChannelRegistration registration) { + registration.interceptors(stompAuthChannelInterceptor); + } } diff --git a/src/main/java/com/oronaminc/join/websocket/config/CustomHandshakeHandler.java b/src/main/java/com/oronaminc/join/websocket/handshake/CustomHandshakeHandler.java similarity index 87% rename from src/main/java/com/oronaminc/join/websocket/config/CustomHandshakeHandler.java rename to src/main/java/com/oronaminc/join/websocket/handshake/CustomHandshakeHandler.java index a14fbfa..9910dae 100644 --- a/src/main/java/com/oronaminc/join/websocket/config/CustomHandshakeHandler.java +++ b/src/main/java/com/oronaminc/join/websocket/handshake/CustomHandshakeHandler.java @@ -1,25 +1,25 @@ -package com.oronaminc.join.websocket.config; +package com.oronaminc.join.websocket.handshake; -import com.oronaminc.join.global.exception.ErrorCode; -import com.oronaminc.join.global.exception.ErrorException; -import com.oronaminc.join.member.domain.Member; -import com.oronaminc.join.member.security.MemberDetails; -import com.oronaminc.join.member.service.MemberReader; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpSession; import java.security.Principal; import java.util.Map; -import lombok.RequiredArgsConstructor; + import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken; -import org.springframework.security.oauth2.core.user.OAuth2User; import org.springframework.stereotype.Component; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.server.support.DefaultHandshakeHandler; +import com.oronaminc.join.global.exception.ErrorCode; +import com.oronaminc.join.global.exception.ErrorException; +import com.oronaminc.join.member.security.MemberDetails; +import com.oronaminc.join.websocket.stomp.StompPrincipal; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; +import lombok.RequiredArgsConstructor; + @Component @RequiredArgsConstructor public class CustomHandshakeHandler extends DefaultHandshakeHandler { @@ -58,5 +58,4 @@ protected Principal determineUser(ServerHttpRequest request, WebSocketHandler ws // fallback 경로로 전송 return null; } - } diff --git a/src/main/java/com/oronaminc/join/websocket/session/CurrentParticipantEventHandler.java b/src/main/java/com/oronaminc/join/websocket/session/CurrentParticipantEventHandler.java new file mode 100644 index 0000000..806c75d --- /dev/null +++ b/src/main/java/com/oronaminc/join/websocket/session/CurrentParticipantEventHandler.java @@ -0,0 +1,78 @@ +package com.oronaminc.join.websocket.session; + +import static com.oronaminc.join.global.exception.ErrorCode.*; + +import java.security.Principal; +import java.util.Set; + +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Component; + +import com.oronaminc.join.global.exception.ErrorException; +import com.oronaminc.join.room.event.RoomExitEvent; + +import lombok.RequiredArgsConstructor; + +@Component +@RequiredArgsConstructor +public class CurrentParticipantEventHandler { + private final CurrentParticipantManager currentParticipantManager; + + private static final String ROOM_PREFIX = "/topic/rooms/"; + private static final String JOIN_SUFFIX = "/join"; + + // @EventListener + // public void handleSubscribe(SessionSubscribeEvent event) { + // StompHeaderAccessor accessor = StompHeaderAccessor.wrap(event.getMessage()); + // String destination = accessor.getDestination(); + // Principal principal = accessor.getUser(); + // + // if (destination == null) { + // throw new ErrorException(STOMP_INVALID_DESTINATION); + // } + // + // if (!destination.startsWith(ROOM_PREFIX)) { + // return; + // } + // + // Long memberId = parseMemberId(principal); + // Long roomId = parseRoomId(destination); + // + // if (!isRoomJoinPath(destination)) { + // validateParticipantRoomJoin(roomId, memberId); + // } + // } + + @EventListener + public void handleUnsubscribe(RoomExitEvent event) { + currentParticipantManager.removeParticipant(event.memberId(), event.roomId()); + } + + private boolean isRoomJoinPath(String destination) { + return destination.startsWith(ROOM_PREFIX) && destination.endsWith(JOIN_SUFFIX); + } + + private void validateParticipantRoomJoin(Long roomId, Long memberId) { + Set participants = currentParticipantManager.getRoomParticipants(roomId); + if (participants == null || !participants.contains(memberId)) { + throw new ErrorException(UNAUTHORIZED_NOT_JOIN_ROOM); + } + } + + private Long parseRoomId(String destination) { + try { + String[] parts = destination.split("/"); + return Long.valueOf(parts[3]); + } catch (Exception e) { + throw new ErrorException(STOMP_INVALID_DESTINATION); + } + } + + private Long parseMemberId(Principal principal) { + try { + return Long.valueOf(principal.getName()); + } catch (Exception e) { + throw new ErrorException(SOCKET_BAD_REQUEST_MEMBER); + } + } +} diff --git a/src/main/java/com/oronaminc/join/websocket/session/CurrentParticipantManager.java b/src/main/java/com/oronaminc/join/websocket/session/CurrentParticipantManager.java new file mode 100644 index 0000000..d976c9c --- /dev/null +++ b/src/main/java/com/oronaminc/join/websocket/session/CurrentParticipantManager.java @@ -0,0 +1,61 @@ +package com.oronaminc.join.websocket.session; + +import static com.oronaminc.join.global.exception.ErrorCode.*; + +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; + +import org.springframework.stereotype.Component; + +import com.oronaminc.join.global.exception.ErrorException; + +@Component +public class CurrentParticipantManager { + private final Map> roomParticipants = new ConcurrentHashMap<>(); + + public Set getRoomParticipants(Long roomId) { + createRoom(roomId); + return roomParticipants.get(roomId); + } + + public void createRoom(Long roomId) { + roomParticipants.computeIfAbsent(roomId, k -> ConcurrentHashMap.newKeySet()); + } + + // public void addParticipant(Long roomId, Long memberId, int limit) { + // Set participants = getRoomParticipants(roomId); + // + // if (participants.contains(memberId)) return; + // + // synchronized (participants) { + // if (participants.size() >= limit) { + // throw new ErrorException(UNAUTHORIZED_LIMIT_PARTICIPANT); + // } + // participants.add(memberId); + // } + // } + + public void addParticipant(Long roomId, Long memberId, int limit) { + roomParticipants.compute(roomId, (id, participants) -> { + participants = getRoomParticipants(roomId); + + // 중복 참가자일 경우 그대로 반환 (변화 없음) + if (participants.contains(memberId)) { + return participants; + } + + // 인원 초과 시 예외 발생 + if (participants.size() >= limit) { + throw new ErrorException(UNAUTHORIZED_LIMIT_PARTICIPANT); + } + + participants.add(memberId); + return participants; + }); + } + + public void removeParticipant(Long memberId, Long roomId) { + roomParticipants.get(roomId).remove(memberId); + } +} diff --git a/src/main/java/com/oronaminc/join/websocket/session/CustomWebSocketHandlerDecorator.java b/src/main/java/com/oronaminc/join/websocket/session/CustomWebSocketHandlerDecorator.java new file mode 100644 index 0000000..509fe9f --- /dev/null +++ b/src/main/java/com/oronaminc/join/websocket/session/CustomWebSocketHandlerDecorator.java @@ -0,0 +1,62 @@ +package com.oronaminc.join.websocket.session; + +import java.security.Principal; +import java.util.Objects; + +import org.springframework.context.ApplicationEventPublisher; +import org.springframework.web.socket.CloseStatus; +import org.springframework.web.socket.WebSocketHandler; +import org.springframework.web.socket.WebSocketSession; +import org.springframework.web.socket.handler.WebSocketHandlerDecorator; + +import com.oronaminc.join.room.event.RoomExitEvent; + +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class CustomWebSocketHandlerDecorator extends WebSocketHandlerDecorator { + private static final String ATTRIBUTES_ROOM_ID_KEY = "roomId"; + + // 연결된 세션 관리 + private final WebsocketSessionManager sessionManager; + private final ApplicationEventPublisher publisher; + + public CustomWebSocketHandlerDecorator(WebSocketHandler delegate, + WebsocketSessionManager sessionManager, + ApplicationEventPublisher publisher + ) { + super(delegate); + this.sessionManager = sessionManager; + this.publisher = publisher; + } + + @Override + public void afterConnectionEstablished(WebSocketSession session) throws Exception { + // 세션 연결되면 map에 저장 + sessionManager.registerSession(session); + super.afterConnectionEstablished(session); + } + + @Override + public void afterConnectionClosed(WebSocketSession session, CloseStatus closeStatus) + throws Exception { + // 세션 연결 종료되면 map에서 제거 + // exitRoomPublishEvent(session); + sessionManager.removeSession(session.getId()); + super.afterConnectionClosed(session, closeStatus); + } + + private void exitRoomPublishEvent(WebSocketSession session) { + Principal principal = Objects.requireNonNull(session.getPrincipal()); + Long memberId = Long.valueOf(principal.getName()); + + Object value = session.getAttributes().get(ATTRIBUTES_ROOM_ID_KEY); + if (value == null) { + return; + } + Long roomId = (Long) value; + + publisher.publishEvent(new RoomExitEvent(memberId, roomId)); + } + +} diff --git a/src/main/java/com/oronaminc/join/websocket/config/WebsocketSessionManager.java b/src/main/java/com/oronaminc/join/websocket/session/WebsocketSessionManager.java similarity index 75% rename from src/main/java/com/oronaminc/join/websocket/config/WebsocketSessionManager.java rename to src/main/java/com/oronaminc/join/websocket/session/WebsocketSessionManager.java index 3b7ec8a..48c740c 100644 --- a/src/main/java/com/oronaminc/join/websocket/config/WebsocketSessionManager.java +++ b/src/main/java/com/oronaminc/join/websocket/session/WebsocketSessionManager.java @@ -1,4 +1,4 @@ -package com.oronaminc.join.websocket.config; +package com.oronaminc.join.websocket.session; import java.io.IOException; import java.util.Map; @@ -30,4 +30,8 @@ public void closeSession(String sessionId) throws IOException { } + public void addAttribute(String sessionId, String attributeName, Object attributeValue) { + WebSocketSession session = sessions.get(sessionId); + session.getAttributes().put(attributeName, attributeValue); + } } diff --git a/src/main/java/com/oronaminc/join/websocket/config/StompErrorHandler.java b/src/main/java/com/oronaminc/join/websocket/stomp/StompErrorHandler.java similarity index 98% rename from src/main/java/com/oronaminc/join/websocket/config/StompErrorHandler.java rename to src/main/java/com/oronaminc/join/websocket/stomp/StompErrorHandler.java index 8b93cc9..80668ab 100644 --- a/src/main/java/com/oronaminc/join/websocket/config/StompErrorHandler.java +++ b/src/main/java/com/oronaminc/join/websocket/stomp/StompErrorHandler.java @@ -1,13 +1,7 @@ -package com.oronaminc.join.websocket.config; +package com.oronaminc.join.websocket.stomp; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.oronaminc.join.global.exception.ErrorCode; -import com.oronaminc.join.global.exception.ErrorException; -import com.oronaminc.join.global.exception.ErrorResponse; import java.nio.charset.StandardCharsets; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.springframework.context.annotation.Configuration; import org.springframework.messaging.Message; import org.springframework.messaging.simp.stomp.StompCommand; @@ -16,6 +10,15 @@ import org.springframework.util.MimeTypeUtils; import org.springframework.web.socket.messaging.StompSubProtocolErrorHandler; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.oronaminc.join.global.exception.ErrorCode; +import com.oronaminc.join.global.exception.ErrorException; +import com.oronaminc.join.global.exception.ErrorResponse; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + @Slf4j @Configuration @RequiredArgsConstructor diff --git a/src/main/java/com/oronaminc/join/websocket/config/StompPrincipal.java b/src/main/java/com/oronaminc/join/websocket/stomp/StompPrincipal.java similarity index 84% rename from src/main/java/com/oronaminc/join/websocket/config/StompPrincipal.java rename to src/main/java/com/oronaminc/join/websocket/stomp/StompPrincipal.java index b9c3db5..236bfa0 100644 --- a/src/main/java/com/oronaminc/join/websocket/config/StompPrincipal.java +++ b/src/main/java/com/oronaminc/join/websocket/stomp/StompPrincipal.java @@ -1,4 +1,4 @@ -package com.oronaminc.join.websocket.config; +package com.oronaminc.join.websocket.stomp; import java.security.Principal; import lombok.AllArgsConstructor; diff --git a/src/main/resources/static/favicon.ico b/src/main/resources/static/favicon.ico new file mode 100644 index 0000000..e69de29 diff --git a/src/test/java/com/oronaminc/join/answer/api/PermissionValidTests.java b/src/test/java/com/oronaminc/join/answer/api/PermissionValidTests.java index b3059ac..326fe16 100644 --- a/src/test/java/com/oronaminc/join/answer/api/PermissionValidTests.java +++ b/src/test/java/com/oronaminc/join/answer/api/PermissionValidTests.java @@ -1,8 +1,11 @@ package com.oronaminc.join.answer.api; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; import static org.mockito.BDDMockito.given; +import com.oronaminc.join.answer.domain.Answer; +import com.oronaminc.join.answer.service.AnswerReader; import com.oronaminc.join.answer.util.PermissionValidator; import com.oronaminc.join.global.exception.ErrorCode; import com.oronaminc.join.global.exception.ErrorException; @@ -12,6 +15,8 @@ import com.oronaminc.join.participant.dao.ParticipantRepository; import com.oronaminc.join.participant.domain.Participant; import com.oronaminc.join.participant.domain.ParticipantType; +import com.oronaminc.join.participant.service.ParticipantReader; +import com.oronaminc.join.question.domain.Question; import com.oronaminc.join.room.dao.RoomRepository; import com.oronaminc.join.room.domain.Room; import com.oronaminc.join.room.domain.RoomStatus; @@ -30,70 +35,129 @@ public class PermissionValidTests { @InjectMocks private PermissionValidator permissionValidator; - @Mock - private ParticipantRepository participantRepository; + private ParticipantReader participantReader; + @Mock - private MemberRepository memberRepository; - @Mock private RoomRepository roomRepository; + private AnswerReader answerReader; - private Member mockMember; - private Room mockRoom; + private Member questionAuthor; + private Room room; + private Member member; + private Question question; + private Answer answer; + private Participant participant; @BeforeEach void setUp() { - mockMember = Member.builder() - .id(1L) - .email("user@email.com") - .nickname("유저") - .memberType(MemberType.MEMBER) - .build(); - mockRoom = Room.builder() + member = Member.builder().id(1L).build(); + room = Room.builder().id(1L).build(); + questionAuthor = Member.builder().id(2L).build(); // 질문 작성자는 다른 사람으로 기본 설정 + participant = Participant.builder() .id(1L) - .title("제목") - .description("내용") - .secretCode("123456") - .emojiCount(0L) - .participantLimit(0) - .endedAt(LocalDateTime.now()) - .version(1) - .roomStatus(RoomStatus.STARTED) + .member(member) + .room(room) + .participantType(ParticipantType.GUEST) .build(); - + question = Question.builder().id(100L).member(questionAuthor).room(room).build(); + answer = Answer.builder().id(200L).question(question).member(member).build(); } @Test - @DisplayName("TEAM or PRESENTER가 아닌 GUEST가 답변시 예외 발생") - void validateAnswerPermission_fail_not_team_or_presenter() { - //given - Participant participant = Participant.builder() - .id(1L) - .member(mockMember) - .room(mockRoom) - .participantType(ParticipantType.GUEST) - .build(); - - given(participantRepository.findByRoomIdAndMemberId(1L, 1L)).willReturn(Optional.of(participant)); + @DisplayName("TEAM or PRESENTER or 작성자가 아닌 참여자가 답변시 예외 발생") + void validateAnswerPermission_fail_not_team_or_presenter_orWriter() { + // given + given(participantReader.getByRoomIdAndMemberId(1L, 1L)).willReturn(participant); // when & then - assertThatThrownBy(() -> permissionValidator.validateAnswerPermission(1L, 1L)) + assertThatThrownBy(() -> permissionValidator.validateAnswerCreatePermission(1L, 1L, question)) .isInstanceOf(ErrorException.class) .hasFieldOrPropertyWithValue("errorCode", ErrorCode.UNAUTHORIZED_ROLE_ANSWER); - } @Test @DisplayName("발표방에 존재하지 않는 participant라면 예외 발생") void validateAnswerPermission_fail_not_found_participant() { - //given - given(participantRepository.findByRoomIdAndMemberId(1L, 1L)).willReturn(Optional.empty()); + // given + given(participantReader.getByRoomIdAndMemberId(1L, 1L)) + .willThrow(new ErrorException(ErrorCode.NOT_FOUND_PARTICIPANT)); // when & then - assertThatThrownBy(() -> permissionValidator.validateAnswerPermission(1L, 1L)) + assertThatThrownBy(() -> permissionValidator.validateAnswerCreatePermission(1L, 1L, question)) .isInstanceOf(ErrorException.class) .hasFieldOrPropertyWithValue("errorCode", ErrorCode.NOT_FOUND_PARTICIPANT); + } + + @Test + @DisplayName("삭제 권한 - 질문 작성자(GUEST 포함)는 삭제 가능") + void deletePermission_success_byQuestionWriter() { + // given + question = Question.builder().id(100L).member(member).room(room).build(); // 질문자 = 본인 + answer = Answer.builder().id(200L).question(question).member(Member.builder().id(999L).build()).build(); // 답변자는 본인 아님 + Participant participant = Participant.builder() + .member(member) + .room(room) + .participantType(ParticipantType.GUEST) + .build(); + + given(answerReader.getById(200L)).willReturn(answer); + given(participantReader.getByRoomIdAndMemberId(1L, 1L)).willReturn(participant); + + // when & then + assertThatCode(() -> permissionValidator.validateAnswerDeletePermission( 200L, 1L)) + .doesNotThrowAnyException(); } + + @Test + @DisplayName("삭제 권한 - 팀원(TEAM)은 삭제 가능") + void deletePermission_success_byTeam() { + Participant participant = Participant.builder() + .member(member) + .room(room) + .participantType(ParticipantType.TEAM) + .build(); + + given(answerReader.getById(200L)).willReturn(answer); + given(participantReader.getByRoomIdAndMemberId(1L, 1L)).willReturn(participant); + + assertThatCode(() -> permissionValidator.validateAnswerDeletePermission( 200L, 1L)) + .doesNotThrowAnyException(); + } + + @Test + @DisplayName("삭제 권한 - 발표자(PRESENTER)는 삭제 가능") + void deletePermission_success_byPresenter() { + Participant participant = Participant.builder() + .member(member) + .room(room) + .participantType(ParticipantType.PRESENTER) + .build(); + + given(answerReader.getById(200L)).willReturn(answer); + given(participantReader.getByRoomIdAndMemberId(1L, 1L)).willReturn(participant); + + assertThatCode(() -> permissionValidator.validateAnswerDeletePermission( 200L, 1L)) + .doesNotThrowAnyException(); + } + + + @Test + @DisplayName("삭제 권한 - 권한 없는 GUEST는 삭제 불가") + void deletePermission_fail_unauthorizedGuest() { + Participant participant = Participant.builder() + .member(member) + .room(room) + .participantType(ParticipantType.GUEST) + .build(); + + given(answerReader.getById(200L)).willReturn(answer); + given(participantReader.getByRoomIdAndMemberId(1L, 1L)).willReturn(participant); + + assertThatThrownBy(() -> permissionValidator.validateAnswerDeletePermission(200L, 1L)) + .isInstanceOf(ErrorException.class) + .hasFieldOrPropertyWithValue("errorCode", ErrorCode.UNAUTHORIZED_DELETE_ANSWER); + } } diff --git a/src/test/java/com/oronaminc/join/answer/service/AnswerServiceTests.java b/src/test/java/com/oronaminc/join/answer/service/AnswerServiceTests.java index c4a4830..d59c318 100644 --- a/src/test/java/com/oronaminc/join/answer/service/AnswerServiceTests.java +++ b/src/test/java/com/oronaminc/join/answer/service/AnswerServiceTests.java @@ -1,17 +1,30 @@ package com.oronaminc.join.answer.service; -import static com.oronaminc.join.global.exception.ErrorCode.NOT_FOUND_ROOM; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.BDDMockito.given; -import static org.mockito.BDDMockito.willThrow; +import static com.oronaminc.join.global.exception.ErrorCode.*; +import static org.assertj.core.api.AssertionsForClassTypes.*; +import static org.assertj.core.api.InstanceOfAssertFactories.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.BDDMockito.*; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Set; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.data.domain.Slice; +import org.springframework.test.util.ReflectionTestUtils; import com.oronaminc.join.answer.dao.AnswerRepository; import com.oronaminc.join.answer.domain.Answer; -import com.oronaminc.join.answer.dto.AnswerCreateRequest; import com.oronaminc.join.answer.dto.AnswerGetResponse; +import com.oronaminc.join.answer.dto.AnswerRequest; +import com.oronaminc.join.answer.util.PermissionValidator; import com.oronaminc.join.emoji.domain.Emoji; import com.oronaminc.join.emoji.domain.TargetType; import com.oronaminc.join.emoji.service.EmojiReader; @@ -22,21 +35,13 @@ import com.oronaminc.join.member.service.MemberReader; import com.oronaminc.join.participant.domain.Participant; import com.oronaminc.join.participant.domain.ParticipantType; +import com.oronaminc.join.participant.service.ParticipantReader; import com.oronaminc.join.participant.service.ParticipantService; import com.oronaminc.join.question.domain.Question; import com.oronaminc.join.question.service.QuestionReader; import com.oronaminc.join.room.domain.Room; import com.oronaminc.join.room.domain.RoomStatus; import com.oronaminc.join.room.service.RoomReader; -import java.time.LocalDateTime; -import java.util.Optional; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) public class AnswerServiceTests { @@ -58,12 +63,17 @@ public class AnswerServiceTests { private AnswerReader answerReader; @Mock private EmojiReader emojiReader; + @Mock + private PermissionValidator permissionValidator; + @Mock + private ParticipantReader participantReader; + private Member mockMember; private Room mockRoom; private Question mockQuestion; private Participant mockParticipant; - private AnswerCreateRequest request; + private AnswerRequest request; private Emoji mockEmoji; @BeforeEach @@ -103,7 +113,7 @@ void setUp() { .participantType(ParticipantType.TEAM) .build(); - request = new AnswerCreateRequest("답변입니다."); + request = new AnswerRequest("답변입니다.", mockMember.getId()); } @Test @@ -117,13 +127,12 @@ void createAnswer_success() { .question(mockQuestion) .emojiCount(0L) .version(1) - .content("답변입니다") + .content("답변입니다.") .build(); given(memberReader.getById(1L)).willReturn(mockMember); given(roomReader.getById(1L)).willReturn(mockRoom); given(questionReader.getByIdAndRoomId(1L, 1L)).willReturn(mockQuestion); - given(answerReader.existsByQuestionIdAndMemberId(1L, 1L)).willReturn(false); given(answerRepository.save(any(Answer.class))).willReturn(answer); // when @@ -136,49 +145,124 @@ void createAnswer_success() { } @Test - @DisplayName("답변 조회 성공") - void getAnswer_success() { + @DisplayName("답변 목록 조회 - 커서 없이 최초 페이지 조회") + void getAnswers_firstPage_success() { // given - Long memberId = 1L; - Long roomId = 1L; - Long questionId = 1L; + List answers = List.of(createAnswer(100L,LocalDateTime.now()), createAnswer(99L,LocalDateTime.now() )); + given(memberReader.getById(1L)).willReturn(mockMember); + given(roomReader.getById(1L)).willReturn(mockRoom); + given(questionReader.getByIdAndRoomId(1L, 1L)).willReturn(mockQuestion); + given(answerReader.getFirstPageByQuestionId(eq(1L), any())).willReturn(answers); + given(emojiReader.findTargetIdsByMemberAndTargetTypeInBatch(1L, TargetType.ANSWER, + List.of(100L, 99L))) + .willReturn(Set.of(100L)); - Answer mockAnswer = Answer.builder() - .id(10L) - .question(mockQuestion) + // when + Slice response = answerService.getAnswers(1L, 1L, 1L, null, null, 10); + + // then + assertThat(response.getContent().get(0).answerId()).isEqualTo(100L); + assertThat(response.getContent().get(0).isEmojied()).isTrue(); + } + + @Test + @DisplayName("답변 목록 조회 - 커서 기준 이후 답변 조회") + void getAnswers_cursorPaging_success() { + // given + List answers = List.of(createAnswer(80L,LocalDateTime.now()), createAnswer(79L,LocalDateTime.now())); + given(memberReader.getById(1L)).willReturn(mockMember); + given(roomReader.getById(1L)).willReturn(mockRoom); + given(questionReader.getByIdAndRoomId(1L, 1L)).willReturn(mockQuestion); + given(answerReader.getAnswerByQuestionIdWithCursor(eq(1L), any(), any(), any())).willReturn( + answers); + given(emojiReader.findTargetIdsByMemberAndTargetTypeInBatch(1L, TargetType.ANSWER, + List.of(80L, 79L))) + .willReturn(Set.of()); + + // when + Slice response = answerService.getAnswers(1L, 1L, 1L, 90L, + LocalDateTime.now(), 10); + + // then + assertThat(response.getContent().get(0).answerId()).isEqualTo(80L); + assertThat(response.getContent().get(0).isEmojied()).isFalse(); + } + + @Test + @DisplayName("답변 목록 조회 - 공감이 포함된 답변들 조회") + void getAnswers_containsEmojiedAnswers() { + // given + List answers = List.of(createAnswer(1L,LocalDateTime.now()), createAnswer(2L,LocalDateTime.now())); + given(memberReader.getById(1L)).willReturn(mockMember); + given(roomReader.getById(1L)).willReturn(mockRoom); + given(questionReader.getByIdAndRoomId(1L, 1L)).willReturn(mockQuestion); + given(answerReader.getFirstPageByQuestionId(eq(1L), any())).willReturn(answers); + given(emojiReader.findTargetIdsByMemberAndTargetTypeInBatch(1L, TargetType.ANSWER, + List.of(1L, 2L))) + .willReturn(Set.of(2L)); + + // when + Slice response = answerService.getAnswers(1L, 1L, 1L, null, null, 10); + + // then + assertThat(response.getContent().get(0).isEmojied()).isFalse(); + assertThat(response.getContent().get(1).isEmojied()).isTrue(); + } + + + @Test + @DisplayName("답변 목록 조회 - 결과가 비어도 예외 없이 처리") + void getAnswers_emptyList_noError() { + // given + given(memberReader.getById(1L)).willReturn(mockMember); + given(roomReader.getById(1L)).willReturn(mockRoom); + given(questionReader.getByIdAndRoomId(1L, 1L)).willReturn(mockQuestion); + given(answerReader.getFirstPageByQuestionId(eq(1L), any())).willReturn(List.of()); + + // when + Slice response = answerService.getAnswers(1L, 1L, 1L, null, null, 10); + + // then + assertThat(response.getContent()).asInstanceOf(LIST).isEmpty(); + } + + private Answer createAnswer(Long id, LocalDateTime createdAt) { + Answer answer = Answer.builder() + .id(id) .member(mockMember) - .content("답변입니다.") - .emojiCount(5L) - .version(0) + .question(mockQuestion) + .content("답변입니다") + .emojiCount(0L) .build(); - mockEmoji = Emoji.builder() + ReflectionTestUtils.setField(answer, "createdAt", createdAt); + return answer; + } + + @Test + @DisplayName("답변 수정 - 작성자 본인이면 수정에 성공한다") + void updateAnswer_success() { + // given + Answer answer = Answer.builder() .id(1L) .member(mockMember) - .targetType(TargetType.ANSWER) - .targetId(mockAnswer.getId()) + .question(mockQuestion) + .content("기존 내용") .build(); - // mocking - given(memberReader.getById(memberId)).willReturn(mockMember); - given(roomReader.getById(roomId)).willReturn(mockRoom); - given(questionReader.getByIdAndRoomId(questionId, roomId)).willReturn(mockQuestion); - given(answerReader.getByQuestionId(questionId)).willReturn(mockAnswer); - given(emojiReader.findByMemberIdAndTargetIdAndTargetType(memberId, mockAnswer.getId(), - TargetType.ANSWER)).willReturn(Optional.of(mockEmoji)); + given(permissionValidator.validateAnswerUpdatePermission(1L, 1L)) + .willReturn(answer); + + AnswerRequest request = new AnswerRequest("수정된 내용", 1L); // when - AnswerGetResponse response = answerService.getAnswer(roomId, questionId, memberId); + Answer result = answerService.update(answer.getId(), answer.getMember().getId(), request); // then - assertThat(response.answerId()).isEqualTo(mockAnswer.getId()); - assertThat(response.content()).isEqualTo(mockAnswer.getContent()); - assertThat(response.emojiCount()).isEqualTo(5L); - assertThat(response.Emojied()).isTrue(); - assertThat(response.writer().memberId()).isEqualTo(mockMember.getId()); - assertThat(response.writer().nickname()).isEqualTo(mockMember.getNickname()); + assertThat(result.getContent()).isEqualTo("수정된 내용"); } + @Test @DisplayName("존재하지 않는 member가 들어오면 예외 발생") void createAnswer_member_fail() { @@ -193,43 +277,27 @@ void createAnswer_member_fail() { } - @Test - @DisplayName("존재하지 않는 room이 들어오면 예외 발생") - void createAnswer_room_fail() { - // given - given(memberReader.getById(1L)).willReturn(mockMember); - given(roomReader.getById(anyLong())).willThrow( - new ErrorException(NOT_FOUND_ROOM)); - // when & then - assertThatThrownBy(() -> answerService.create(1L, 1L, 1L, request)) - .isInstanceOf(ErrorException.class) - .hasFieldOrPropertyWithValue("errorCode", ErrorCode.NOT_FOUND_ROOM); - - } - @Test - @DisplayName("존재하지 않는 participant가 들어오면 예외 발생") - void createAnswer_participant_fail() { + @DisplayName("존재하지 않는 room이 들어오면 예외 발생") + void createAnswer_room_fail() { // given given(memberReader.getById(1L)).willReturn(mockMember); - given(roomReader.getById(1L)).willReturn(mockRoom); - given(questionReader.getByIdAndRoomId(1L, 1L)).willReturn(mockQuestion); - willThrow(new ErrorException(ErrorCode.NOT_FOUND_PARTICIPANT)) - .given(participantService) - .validateParticipant(1L, 1L); - + given(roomReader.getById(anyLong())).willThrow( + new ErrorException(NOT_FOUND_ROOM)); // when & then assertThatThrownBy(() -> answerService.create(1L, 1L, 1L, request)) .isInstanceOf(ErrorException.class) - .hasFieldOrPropertyWithValue("errorCode", ErrorCode.NOT_FOUND_PARTICIPANT); + .hasFieldOrPropertyWithValue("errorCode", ErrorCode.NOT_FOUND_ROOM); } + @Test @DisplayName("존재하지_않는_질문이_들어오면_예외_발생") void createAnswer_question_fail() { // given given(memberReader.getById(1L)).willReturn(mockMember); + given(roomReader.getById(1L)).willReturn(mockRoom); given(questionReader.getByIdAndRoomId(1L, 1L)).willThrow( new ErrorException(ErrorCode.NOT_FOUND_QUESTION)); @@ -240,21 +308,6 @@ void createAnswer_question_fail() { } - @Test - @DisplayName("중복_답변_남길시_예외_발생") - void createAnswer_duplicate_fail() { - // given - given(memberReader.getById(1L)).willReturn(mockMember); - given(roomReader.getById(1L)).willReturn(mockRoom); - given(questionReader.getByIdAndRoomId(1L, 1L)).willReturn(mockQuestion); - given(answerReader.existsByQuestionIdAndMemberId(1L, 1L)).willReturn(true); - - // when & then - assertThatThrownBy(() -> answerService.create(1L, 1L, 1L, request)) - .isInstanceOf(ErrorException.class) - .hasFieldOrPropertyWithValue("errorCode", ErrorCode.BADREQUEST_DUPLICATION_ANSWER); - - } } diff --git a/src/test/java/com/oronaminc/join/config/TestQueryDslConfig.java b/src/test/java/com/oronaminc/join/config/TestQueryDslConfig.java new file mode 100644 index 0000000..8f483d7 --- /dev/null +++ b/src/test/java/com/oronaminc/join/config/TestQueryDslConfig.java @@ -0,0 +1,19 @@ +package com.oronaminc.join.config; + +import com.querydsl.jpa.impl.JPAQueryFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.context.annotation.Bean; + +@TestConfiguration +public class TestQueryDslConfig { + + @PersistenceContext + private EntityManager entityManager; + + @Bean + public JPAQueryFactory jpaQueryFactory() { + return new JPAQueryFactory(entityManager); + } +} diff --git a/src/test/java/com/oronaminc/join/emoji/service/EmojiFacadeTests.java b/src/test/java/com/oronaminc/join/emoji/service/EmojiFacadeTests.java index a7c316d..5c6192f 100644 --- a/src/test/java/com/oronaminc/join/emoji/service/EmojiFacadeTests.java +++ b/src/test/java/com/oronaminc/join/emoji/service/EmojiFacadeTests.java @@ -1,24 +1,14 @@ package com.oronaminc.join.emoji.service; -import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; -import com.oronaminc.join.answer.service.AnswerReader; -import com.oronaminc.join.emoji.domain.TargetType; -import com.oronaminc.join.emoji.dto.EmojiRequest; -import com.oronaminc.join.member.dao.MemberRepository; -import com.oronaminc.join.member.domain.Member; -import com.oronaminc.join.member.service.MemberReader; -import com.oronaminc.join.question.service.QuestionReader; -import com.oronaminc.join.room.dao.RoomRepository; -import com.oronaminc.join.room.domain.Room; -import com.oronaminc.join.room.domain.RoomStatus; -import com.oronaminc.join.room.service.RoomReader; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -28,9 +18,24 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import com.oronaminc.join.answer.service.AnswerReader; +import com.oronaminc.join.config.TestQueryDslConfig; +import com.oronaminc.join.emoji.dao.EmojiRepository; +import com.oronaminc.join.emoji.domain.Emoji; +import com.oronaminc.join.emoji.domain.TargetType; +import com.oronaminc.join.emoji.dto.EmojiRequest; +import com.oronaminc.join.member.dao.MemberRepository; +import com.oronaminc.join.member.domain.Member; +import com.oronaminc.join.member.service.MemberReader; +import com.oronaminc.join.question.service.QuestionReader; +import com.oronaminc.join.room.dao.RoomRepository; +import com.oronaminc.join.room.domain.Room; +import com.oronaminc.join.room.domain.RoomStatus; +import com.oronaminc.join.room.service.RoomReader; + @DataJpaTest @Import({EmojiFacade.class, EmojiService.class, MemberReader.class, EmojiReader.class, - RoomReader.class, QuestionReader.class, AnswerReader.class}) + RoomReader.class, QuestionReader.class, AnswerReader.class, TestQueryDslConfig.class}) @ActiveProfiles("test") class EmojiFacadeTests { @@ -40,22 +45,83 @@ class EmojiFacadeTests { @Autowired private MemberRepository memberRepository; + @Autowired + private EmojiRepository emojiRepository; + @Autowired private EmojiFacade emojiFacade; @Test - @DisplayName("동시에 50개의 공감 요청") + @DisplayName("동시에 50개의 공감 생성 요청") @Transactional(propagation = Propagation.NOT_SUPPORTED) - void toggleEmoji_success_test() throws InterruptedException { + void createEmoji_success_test() throws InterruptedException { + Long emojiCount = 0L; // given Room savedRoom = roomRepository.saveAndFlush( Room.builder() .title("제목") .description("내용") .secretCode("123456") - .emojiCount(0L) + .emojiCount(emojiCount) + .participantLimit(0) + .endedAt(LocalDateTime.now()) + .version(0) + .roomStatus(RoomStatus.STARTED) + .build() + ); + Long roomId = savedRoom.getId(); + + int threadCount = 50; + ExecutorService executorService = Executors.newFixedThreadPool(threadCount); + CountDownLatch latch = new CountDownLatch(threadCount); + + List members = new ArrayList<>(); + for (int i = 0; i < threadCount; i++) { + Member member = Member.builder().build(); + members.add(memberRepository.saveAndFlush(member)); + } + + // when + for (int i = 0; i < threadCount; i++) { + final int idx = i; + executorService.submit(() -> { + try { + emojiFacade.createEmoji(members.get(idx).getId(), + new EmojiRequest(TargetType.ROOM, roomId, members.get(idx).getId())); + } catch (Exception e) { + e.printStackTrace(); + } finally { + latch.countDown(); + } + }); + } + + latch.await(); + executorService.shutdown(); + + // then + Room findRoom = roomRepository.findById(roomId).orElse(null); + assertThat(findRoom.getEmojiCount()).isEqualTo(threadCount); + assertThat(findRoom.getVersion()).isEqualTo(threadCount); + + } + + @Test + @DisplayName("동시에 50개의 공감 삭제 요청") + @Transactional(propagation = Propagation.NOT_SUPPORTED) + void deleteEmoji_success_test() throws InterruptedException { + + Long emojiCount = 50L; + + // given + Room savedRoom = roomRepository.saveAndFlush( + Room.builder() + .title("제목") + .description("내용") + .secretCode("654321") + .emojiCount(emojiCount) .participantLimit(0) .endedAt(LocalDateTime.now()) .version(0) @@ -72,7 +138,7 @@ void toggleEmoji_success_test() throws InterruptedException { for (int i = 0; i < threadCount; i++) { Member member = Member.builder().build(); members.add(memberRepository.saveAndFlush(member)); - System.out.println("memberId: " + members.get(i).getId()); + emojiRepository.saveAndFlush(Emoji.create(member, TargetType.ROOM, roomId)); } // when @@ -80,8 +146,8 @@ void toggleEmoji_success_test() throws InterruptedException { final int idx = i; executorService.submit(() -> { try { - emojiFacade.toggleEmoji(members.get(idx).getId(), - new EmojiRequest(TargetType.ROOM, roomId)); + emojiFacade.deleteEmoji(members.get(idx).getId(), + new EmojiRequest(TargetType.ROOM, roomId, members.get(idx).getId())); } catch (Exception e) { e.printStackTrace(); } finally { @@ -95,8 +161,8 @@ void toggleEmoji_success_test() throws InterruptedException { // then Room findRoom = roomRepository.findById(roomId).orElse(null); - assertThat(findRoom.getEmojiCount()).isEqualTo(50); - assertThat(findRoom.getVersion()).isEqualTo(50); + assertThat(findRoom.getEmojiCount()).isEqualTo(0); + assertThat(findRoom.getVersion()).isEqualTo(threadCount); } diff --git a/src/test/java/com/oronaminc/join/emoji/service/EmojiServiceTests.java b/src/test/java/com/oronaminc/join/emoji/service/EmojiServiceTests.java index 176bfc8..c6e1ecb 100644 --- a/src/test/java/com/oronaminc/join/emoji/service/EmojiServiceTests.java +++ b/src/test/java/com/oronaminc/join/emoji/service/EmojiServiceTests.java @@ -4,8 +4,6 @@ import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; -import java.util.Optional; - import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -21,12 +19,15 @@ import com.oronaminc.join.emoji.domain.TargetType; import com.oronaminc.join.emoji.dto.EmojiRequest; import com.oronaminc.join.emoji.dto.EmojiResponse; +import com.oronaminc.join.global.exception.ErrorCode; +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.question.domain.Question; import com.oronaminc.join.question.service.QuestionReader; import com.oronaminc.join.room.domain.Room; import com.oronaminc.join.room.service.RoomReader; +import com.oronaminc.join.websocket.common.EventType; @ExtendWith(MockitoExtension.class) class EmojiServiceTests { @@ -53,7 +54,7 @@ class EmojiServiceTests { private EmojiService emojiService; @Test - @DisplayName("멤버가 발표방 좋아요를 누르지 않은 상태에서 toggle 시 좋아요 수가 +1 된다") + @DisplayName("멤버가 발표방 좋아요를 누르지 않은 상태에서 요청 시 좋아요 수가 +1 된다") void toggleEmoji_createRoomEmoji_success() { // given Member member = Member.builder().build(); @@ -72,18 +73,18 @@ void toggleEmoji_createRoomEmoji_success() { .targetId(targetId) .build(); - when(emojiReader.findByMemberIdAndTargetIdAndTargetType(memberId, targetId, - targetType)).thenReturn(Optional.empty()); + when(emojiReader.existsByMemberIdAndTargetIdAndTargetType(memberId, targetId, + targetType)).thenReturn(false); when(memberReader.getById(memberId)).thenReturn(member); when(emojiRepository.save(any(Emoji.class))).thenReturn(findEmoji); when(roomReader.getById(targetId)).thenReturn(room); // when - EmojiResponse response = emojiService.toggleEmoji(memberId, - new EmojiRequest(targetType, targetId)); + EmojiResponse response = emojiService.createEmoji(memberId, + new EmojiRequest(targetType, targetId, memberId)); // then - assertThat(response.event()).isEqualTo("CREATE"); + assertThat(response.event()).isEqualTo(EventType.CREATE); assertThat(response.targetType()).isEqualTo(targetType); assertThat(response.targetId()).isEqualTo(targetId); assertThat(response.emojiCount()).isEqualTo(emojiCount + 1); @@ -91,7 +92,7 @@ void toggleEmoji_createRoomEmoji_success() { } @Test - @DisplayName("멤버가 질문 공감을 누르지 않은 상태에서 toggle 시 공감 수가 +1 된다") + @DisplayName("멤버가 질문 공감을 누르지 않은 상태에서 요청 시 공감 수가 +1 된다") void toggleEmoji_createQuestionEmoji_success() { // given Member member = Member.builder().build(); @@ -110,18 +111,18 @@ void toggleEmoji_createQuestionEmoji_success() { .targetId(targetId) .build(); - when(emojiReader.findByMemberIdAndTargetIdAndTargetType(memberId, targetId, - targetType)).thenReturn(Optional.empty()); + when(emojiReader.existsByMemberIdAndTargetIdAndTargetType(memberId, targetId, + targetType)).thenReturn(false); when(memberReader.getById(memberId)).thenReturn(member); when(emojiRepository.save(any(Emoji.class))).thenReturn(findEmoji); when(questionReader.getById(targetId)).thenReturn(question); // when - EmojiResponse response = emojiService.toggleEmoji(memberId, - new EmojiRequest(targetType, targetId)); + EmojiResponse response = emojiService.createEmoji(memberId, + new EmojiRequest(targetType, targetId, memberId)); // then - assertThat(response.event()).isEqualTo("CREATE"); + assertThat(response.event()).isEqualTo(EventType.CREATE); assertThat(response.targetType()).isEqualTo(targetType); assertThat(response.targetId()).isEqualTo(targetId); assertThat(response.emojiCount()).isEqualTo(emojiCount + 1); @@ -129,7 +130,7 @@ void toggleEmoji_createQuestionEmoji_success() { } @Test - @DisplayName("멤버가 답변 공감을 누르지 않은 상태에서 toggle 시 공감 수가 +1 된다") + @DisplayName("멤버가 답변 공감을 누르지 않은 상태에서 요청 시 공감 수가 +1 된다") void toggleEmoji_createAnswerEmoji_success() { // given Member member = Member.builder().build(); @@ -148,18 +149,18 @@ void toggleEmoji_createAnswerEmoji_success() { .targetId(targetId) .build(); - when(emojiReader.findByMemberIdAndTargetIdAndTargetType(memberId, targetId, - targetType)).thenReturn(Optional.empty()); + when(emojiReader.existsByMemberIdAndTargetIdAndTargetType(memberId, targetId, + targetType)).thenReturn(false); when(memberReader.getById(memberId)).thenReturn(member); when(emojiRepository.save(any(Emoji.class))).thenReturn(findEmoji); when(answerReader.getById(targetId)).thenReturn(answer); // when - EmojiResponse response = emojiService.toggleEmoji(memberId, - new EmojiRequest(targetType, targetId)); + EmojiResponse response = emojiService.createEmoji(memberId, + new EmojiRequest(targetType, targetId, memberId)); // then - assertThat(response.event()).isEqualTo("CREATE"); + assertThat(response.event()).isEqualTo(EventType.CREATE); assertThat(response.targetType()).isEqualTo(targetType); assertThat(response.targetId()).isEqualTo(targetId); assertThat(response.emojiCount()).isEqualTo(emojiCount + 1); @@ -167,7 +168,40 @@ void toggleEmoji_createAnswerEmoji_success() { } @Test - @DisplayName("멤버가 발표방 좋아요를 누른 상태에서 toggle 시 좋아요 수가 -1 된다") + @DisplayName("멤버가 발표방 좋아요를 누른 상태에서 요청 시 좋아요 수가 그대로 반환된다") + void toggleEmoji_createRoomEmoji_fail() { + // given + Member member = Member.builder().build(); + Long memberId = member.getId(); + + TargetType targetType = TargetType.ROOM; + Long targetId = 100L; + Long emojiCount = 1L; + + Room room = Room.builder().emojiCount(emojiCount).build(); + ReflectionTestUtils.setField(room, "id", targetId); + + Emoji findEmoji = Emoji.builder() + .member(member) + .targetType(targetType) + .targetId(targetId) + .build(); + + when(emojiReader.existsByMemberIdAndTargetIdAndTargetType(memberId, targetId, + targetType)).thenReturn(true); + + // when + // then + assertThatThrownBy( + () -> { + emojiService.createEmoji(memberId, new EmojiRequest(targetType, targetId, memberId)); + } + ).isInstanceOf(ErrorException.class); + + } + + @Test + @DisplayName("멤버가 발표방 좋아요를 누른 상태에서 요청 시 좋아요 수가 -1 된다") void toggleEmoji_deleteRoomEmoji_success() { // given Member member = Member.builder().build(); @@ -186,16 +220,16 @@ void toggleEmoji_deleteRoomEmoji_success() { .targetId(targetId) .build(); - when(emojiReader.findByMemberIdAndTargetIdAndTargetType(memberId, targetId, - targetType)).thenReturn(Optional.of(findEmoji)); + when(emojiReader.findEmojiByMemberIdAndTargetIdAndTargetType(memberId, targetId, + targetType)).thenReturn(findEmoji); when(roomReader.getById(targetId)).thenReturn(room); // when - EmojiResponse response = emojiService.toggleEmoji(memberId, - new EmojiRequest(targetType, targetId)); + EmojiResponse response = emojiService.deleteEmoji(memberId, + new EmojiRequest(targetType, targetId, memberId)); // then - assertThat(response.event()).isEqualTo("DELETE"); + assertThat(response.event()).isEqualTo(EventType.DELETE); assertThat(response.targetType()).isEqualTo(targetType); assertThat(response.targetId()).isEqualTo(targetId); assertThat(response.emojiCount()).isEqualTo(emojiCount - 1); @@ -203,7 +237,7 @@ void toggleEmoji_deleteRoomEmoji_success() { } @Test - @DisplayName("멤버가 질문 공감을 누른 상태에서 toggle 시 공감 수가 -1 된다") + @DisplayName("멤버가 질문 공감을 누른 상태에서 요청 시 공감 수가 -1 된다") void toggleEmoji_deleteQuestionEmoji_success() { // given Member member = Member.builder().build(); @@ -222,16 +256,16 @@ void toggleEmoji_deleteQuestionEmoji_success() { .targetId(targetId) .build(); - when(emojiReader.findByMemberIdAndTargetIdAndTargetType(memberId, targetId, - targetType)).thenReturn(Optional.of(findEmoji)); + when(emojiReader.findEmojiByMemberIdAndTargetIdAndTargetType(memberId, targetId, + targetType)).thenReturn(findEmoji); when(questionReader.getById(targetId)).thenReturn(question); // when - EmojiResponse response = emojiService.toggleEmoji(memberId, - new EmojiRequest(targetType, targetId)); + EmojiResponse response = emojiService.deleteEmoji(memberId, + new EmojiRequest(targetType, targetId, memberId)); // then - assertThat(response.event()).isEqualTo("DELETE"); + assertThat(response.event()).isEqualTo(EventType.DELETE); assertThat(response.targetType()).isEqualTo(targetType); assertThat(response.targetId()).isEqualTo(targetId); assertThat(response.emojiCount()).isEqualTo(emojiCount - 1); @@ -239,7 +273,7 @@ void toggleEmoji_deleteQuestionEmoji_success() { } @Test - @DisplayName("멤버가 발표방 좋아요를 누른 상태에서 toggle 시 좋아요 수가 -1 된다") + @DisplayName("멤버가 발표방 좋아요를 누른 상태에서 요청 시 좋아요 수가 -1 된다") void toggleEmoji_deleteAnswerEmoji_success() { // given Member member = Member.builder().build(); @@ -258,21 +292,53 @@ void toggleEmoji_deleteAnswerEmoji_success() { .targetId(targetId) .build(); - when(emojiReader.findByMemberIdAndTargetIdAndTargetType(memberId, targetId, - targetType)).thenReturn(Optional.of(findEmoji)); + when(emojiReader.findEmojiByMemberIdAndTargetIdAndTargetType(memberId, targetId, + targetType)).thenReturn(findEmoji); when(answerReader.getById(targetId)).thenReturn(answer); // when - EmojiResponse response = emojiService.toggleEmoji(memberId, - new EmojiRequest(targetType, targetId)); + EmojiResponse response = emojiService.deleteEmoji(memberId, + new EmojiRequest(targetType, targetId, memberId)); // then - assertThat(response.event()).isEqualTo("DELETE"); + assertThat(response.event()).isEqualTo(EventType.DELETE); assertThat(response.targetType()).isEqualTo(targetType); assertThat(response.targetId()).isEqualTo(targetId); assertThat(response.emojiCount()).isEqualTo(emojiCount - 1); } + @Test + @DisplayName("멤버가 발표방 좋아요를 누르지 않은 상태에서 요청 시 좋아요 수가 그대로 반환된다") + void toggleEmoji_deleteRoomEmoji_fail() { + // given + Member member = Member.builder().build(); + Long memberId = member.getId(); + + TargetType targetType = TargetType.ROOM; + Long targetId = 100L; + Long emojiCount = 3L; + + Room room = Room.builder().emojiCount(emojiCount).build(); + ReflectionTestUtils.setField(room, "id", targetId); + + Emoji findEmoji = Emoji.builder() + .member(member) + .targetType(targetType) + .targetId(targetId) + .build(); + + when(emojiReader.findEmojiByMemberIdAndTargetIdAndTargetType(memberId, targetId, + targetType)).thenThrow(new ErrorException(ErrorCode.NOT_FOUND_EMOJI)); + + // when + // then + assertThatThrownBy( + () -> { + emojiService.deleteEmoji(memberId, new EmojiRequest(targetType, targetId, memberId)); + } + ).isInstanceOf(ErrorException.class); + + } } \ No newline at end of file diff --git a/src/test/java/com/oronaminc/join/member/service/MyPageServiceTests.java b/src/test/java/com/oronaminc/join/member/service/MyPageServiceTests.java index 7e14314..8e65792 100644 --- a/src/test/java/com/oronaminc/join/member/service/MyPageServiceTests.java +++ b/src/test/java/com/oronaminc/join/member/service/MyPageServiceTests.java @@ -1,11 +1,12 @@ package com.oronaminc.join.member.service; -import static org.assertj.core.api.Assertions.*; -import static org.mockito.Mockito.*; - -import java.time.LocalDateTime; -import java.util.List; - +import com.oronaminc.join.member.domain.Member; +import com.oronaminc.join.member.dto.*; +import com.oronaminc.join.participant.domain.Participant; +import com.oronaminc.join.participant.domain.ParticipantType; +import com.oronaminc.join.participant.service.ParticipantReader; +import com.oronaminc.join.question.service.QuestionReader; +import com.oronaminc.join.room.domain.Room; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -18,18 +19,11 @@ import org.springframework.data.domain.Pageable; import org.springframework.test.util.ReflectionTestUtils; -import com.oronaminc.join.member.domain.Member; -import com.oronaminc.join.member.dto.MyPageType; -import com.oronaminc.join.member.dto.MyProfileGetResponse; -import com.oronaminc.join.member.dto.MyProfileUpdateRequest; -import com.oronaminc.join.member.dto.MyRoomsGetResponse; -import com.oronaminc.join.member.dto.ParticipantCountDto; -import com.oronaminc.join.member.dto.ParticipationType; -import com.oronaminc.join.participant.domain.Participant; -import com.oronaminc.join.participant.domain.ParticipantType; -import com.oronaminc.join.participant.service.ParticipantReader; -import com.oronaminc.join.question.service.QuestionReader; -import com.oronaminc.join.room.domain.Room; +import java.time.LocalDateTime; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) class MyPageServiceTests { @@ -54,14 +48,14 @@ void getMyProfile_success_test() { Member member = Member.builder().build(); List pc = List.of( - new ParticipantCountDto(ParticipantType.PRESENTER, 1L), - new ParticipantCountDto(ParticipantType.TEAM, 1L), - new ParticipantCountDto(ParticipantType.GUEST, 1L) + new ParticipantCountDto(ParticipantType.PRESENTER, 1L), + new ParticipantCountDto(ParticipantType.TEAM, 1L), + new ParticipantCountDto(ParticipantType.GUEST, 1L) ); when(memberReader.getById(member.getId())).thenReturn(member); when(participantReader.countByMemberIdGroupByParticipantType(member.getId())) - .thenReturn(pc); + .thenReturn(pc); // when MyProfileGetResponse myProfile = myPageService.getMyProfile(member.getId()); @@ -84,7 +78,7 @@ void getMyProfile_success_test2() { when(memberReader.getById(member.getId())).thenReturn(member); when(participantReader.countByMemberIdGroupByParticipantType(member.getId())) - .thenReturn(pc); + .thenReturn(pc); // when MyProfileGetResponse myProfile = myPageService.getMyProfile(member.getId()); @@ -127,8 +121,8 @@ void getMyRooms_success_test() { Pageable pageable = PageRequest.of(0, 10); Room room1 = Room.builder() - .title("~1~의 정석") - .build(); + .title("~1~의 정석") + .build(); Room room2 = Room.builder().title("~2~의 정석").build(); Room room3 = Room.builder().title("~3~의 정석").build(); ReflectionTestUtils.setField(room1, "id", 100L); @@ -139,33 +133,35 @@ void getMyRooms_success_test() { ReflectionTestUtils.setField(room3, "createdAt", LocalDateTime.now()); Participant participant1 = Participant.builder() - .room(room1) - .member(member) - .participantType(ParticipantType.PRESENTER) - .build(); + .room(room1) + .member(member) + .participantType(ParticipantType.PRESENTER) + .build(); Participant participant2 = Participant.builder() - .room(room2) - .member(member) - .participantType(ParticipantType.TEAM) - .build(); + .room(room2) + .member(member) + .participantType(ParticipantType.TEAM) + .build(); Participant participant3 = Participant.builder() - .room(room3) - .member(member) - .participantType(ParticipantType.GUEST) - .build(); + .room(room3) + .member(member) + .participantType(ParticipantType.GUEST) + .build(); + ReflectionTestUtils.setField(participant2, "createdAt", LocalDateTime.now()); + ReflectionTestUtils.setField(participant3, "createdAt", LocalDateTime.now()); List pc = List.of(participant1, participant2, participant3); Page participantPage = new PageImpl<>(pc, pageable, 1); List roomIds = List.of(room1.getId(), room2.getId(), room3.getId()); List questions = List.of( - new Object[]{room1.getId(), 1L}, - new Object[]{room2.getId(), 2L}, - new Object[]{room3.getId(), 3L} + new Object[]{room1.getId(), 1L}, + new Object[]{room2.getId(), 2L}, + new Object[]{room3.getId(), 3L} ); when(participantReader.findByMemberId(memberId, pageable)) - .thenReturn(participantPage); + .thenReturn(participantPage); when(questionReader.countByRoomIds(roomIds)).thenReturn(questions); // when @@ -176,7 +172,7 @@ void getMyRooms_success_test() { assertThat(result.content().getFirst().roomId()).isEqualTo(100L); assertThat(result.content().getFirst().title()).isEqualTo("~1~의 정석"); assertThat(result.content().getFirst().participationType()).isEqualTo( - ParticipationType.CREATED); + ParticipationType.CREATED); assertThat(result.content().get(1).participationType()).isEqualTo(ParticipationType.JOINED); } diff --git a/src/test/java/com/oronaminc/join/participant/dao/ParticipantRepositoryTests.java b/src/test/java/com/oronaminc/join/participant/dao/ParticipantRepositoryTests.java index 29be952..8193047 100644 --- a/src/test/java/com/oronaminc/join/participant/dao/ParticipantRepositoryTests.java +++ b/src/test/java/com/oronaminc/join/participant/dao/ParticipantRepositoryTests.java @@ -2,6 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.oronaminc.join.config.TestQueryDslConfig; import com.oronaminc.join.member.dao.MemberRepository; import com.oronaminc.join.member.domain.Member; import com.oronaminc.join.member.dto.ParticipantCountDto; @@ -15,6 +16,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.context.annotation.Import; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; @@ -22,6 +24,7 @@ @DataJpaTest @ActiveProfiles("test") +@Import(TestQueryDslConfig.class) class ParticipantRepositoryTests { @Autowired @@ -34,15 +37,17 @@ class ParticipantRepositoryTests { private RoomRepository roomRepository; private Member member; + private Room room1; + private Room room3; @BeforeEach void setUp() { member = memberRepository.save(Member.builder().build()); Member otherMember = memberRepository.save(Member.builder().build()); - Room room1 = roomRepository.save(Room.builder().build()); + room1 = roomRepository.save(Room.builder().build()); Room room2 = roomRepository.save(Room.builder().build()); - Room room3 = roomRepository.save(Room.builder().build()); + room3 = roomRepository.save(Room.builder().build()); participantRepository.save(Participant.builder() .room(room1) @@ -70,6 +75,34 @@ void setUp() { ); } + @Test + @DisplayName("member가 PRESENTER나 TEAM이면 true가 반환된다.") + void existsPresenterOrTeamByMemberId_true() { + // given + + // when + boolean result = participantRepository.existsPresenterOrTeamByMemberId(room1.getId(), + member.getId()); + + // then + assertThat(result).isTrue(); + + } + + @Test + @DisplayName("member가 PRESENTER나 TEAM이 아니면 false가 반환된다.") + void existsPresenterOrTeamByMemberId_false() { + // given + + // when + boolean result = participantRepository.existsPresenterOrTeamByMemberId(room3.getId(), + member.getId()); + + // then + assertThat(result).isFalse(); + + } + @Test @DisplayName("멤버ID로 생성한방, 참여한방 수를 조회한다.") void countByMemberIdGroupByParticipantType_test() { diff --git a/src/test/java/com/oronaminc/join/question/dao/QuestionRepositoryTests.java b/src/test/java/com/oronaminc/join/question/dao/QuestionRepositoryTests.java index ba83258..dd144eb 100644 --- a/src/test/java/com/oronaminc/join/question/dao/QuestionRepositoryTests.java +++ b/src/test/java/com/oronaminc/join/question/dao/QuestionRepositoryTests.java @@ -2,6 +2,8 @@ import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; +import com.oronaminc.join.config.TestQueryDslConfig; +import com.oronaminc.join.question.domain.QuestionSort; import com.oronaminc.join.question.dto.QuestionFlatResponse; import java.util.Comparator; import java.util.List; @@ -9,6 +11,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.context.annotation.Import; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.test.context.ActiveProfiles; @@ -16,6 +19,7 @@ @DataJpaTest @ActiveProfiles("test") +@Import(TestQueryDslConfig.class) @Sql(scripts = "/question-test-data.sql") class QuestionRepositoryTests { @@ -31,9 +35,8 @@ void findByCreatedAt_success() { Long roomId = 1L; // when - List result = questionRepository.findByCreatedAt( - null, memberId, roomId, pageable - ); + List result = questionRepository.findQuestionsOrderBy( + null, null, memberId, roomId, QuestionSort.CREATEDAT, pageable); // then assertThat(result).hasSize(5); @@ -50,9 +53,8 @@ void findByEmoji_success() { Long roomId = 1L; // when - List result = questionRepository.findByEmojiCount( - null, null, memberId, roomId, pageable - ); + List result = questionRepository.findQuestionsOrderBy( + null, null, memberId, roomId, QuestionSort.EMOJI, pageable); // then assertThat(result).hasSize(5); @@ -70,9 +72,8 @@ void findByMyQuestion_success() { Long roomId = 1L; // when - List result = questionRepository.findByMyQuestion( - null, memberId, roomId, pageable - ); + List result = questionRepository.findQuestionsOrderBy( + null, null, memberId, roomId, QuestionSort.MYQUESTION, pageable); // then assertThat(result).hasSize(5); diff --git a/src/test/java/com/oronaminc/join/question/service/QuestionServiceTests.java b/src/test/java/com/oronaminc/join/question/service/QuestionServiceTests.java index 82ebce2..f8c30d4 100644 --- a/src/test/java/com/oronaminc/join/question/service/QuestionServiceTests.java +++ b/src/test/java/com/oronaminc/join/question/service/QuestionServiceTests.java @@ -15,23 +15,24 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Slice; import org.springframework.test.context.ActiveProfiles; +import com.oronaminc.join.answer.service.AnswerService; import com.oronaminc.join.global.exception.ErrorCode; import com.oronaminc.join.global.exception.ErrorException; import com.oronaminc.join.member.domain.Member; import com.oronaminc.join.member.domain.MemberType; import com.oronaminc.join.member.service.MemberReader; -import com.oronaminc.join.participant.domain.Participant; -import com.oronaminc.join.participant.domain.ParticipantType; +import com.oronaminc.join.participant.service.ParticipantReader; import com.oronaminc.join.participant.service.ParticipantService; import com.oronaminc.join.question.dao.QuestionRepository; import com.oronaminc.join.question.domain.Question; import com.oronaminc.join.question.domain.QuestionSort; import com.oronaminc.join.question.dto.QuestionAssembleResponse; -import com.oronaminc.join.question.dto.QuestionCreateRequest; import com.oronaminc.join.question.dto.QuestionFlatResponse; +import com.oronaminc.join.question.dto.QuestionRequest; import com.oronaminc.join.room.domain.Room; import com.oronaminc.join.room.domain.RoomStatus; import com.oronaminc.join.room.service.RoomReader; @@ -53,14 +54,17 @@ class QuestionServiceTests { @Mock private MemberReader memberReader; @Mock + private ParticipantReader participantReader; + @Mock private ParticipantService participantService; @Mock private QuestionReader questionReader; + @Mock + private AnswerService answerService; private Room mockRoom; private Member mockMember; - private Participant mockParticipant; - private QuestionCreateRequest request; + private QuestionRequest request; private QuestionFlatResponse mockQ1; private QuestionFlatResponse mockQ2; @@ -87,14 +91,7 @@ void setUp() { .roomStatus(RoomStatus.STARTED) .build(); - mockParticipant = Participant.builder() - .id(1L) - .room(mockRoom) - .member(mockMember) - .participantType(ParticipantType.GUEST) - .build(); - - request = new QuestionCreateRequest("질문입니다"); + request = new QuestionRequest("질문입니다", mockMember.getId()); mockQ1 = QuestionFlatResponse.builder() .questionId(1L) @@ -119,6 +116,86 @@ void setUp() { } + @Test + @DisplayName("질문 작성자이거나 관리자이면 질문이 성공적으로 삭제된다") + void delete_sucess() { + // given + Long roomId = 1L; + Long memberId = 1L; + + Question question = Question.builder().id(1L).room(mockRoom).member(mockMember) + .content("질문").build(); + + given(participantReader.existsByRoomIdAndMemberId(roomId, memberId)).willReturn(true); + given(questionReader.getByIdAndRoomId(1L, roomId)).willReturn(question); + given(participantReader.existsPresenterOrTeamByMemberId(roomId, memberId)).willReturn(true); + doNothing().when(questionRepository).deleteById(1L); + doNothing().when(answerService).deleteByQuestion(1L); + + Long deleted = questionService.delete(memberId, roomId, 1L); + + assertThat(deleted).isEqualTo(1L); + verify(questionRepository).deleteById(1L); + } + + @Test + @DisplayName("질문이 성공적으로 수정된다") + void updateQuestion_success() { + // given + Long roomId = 1L; + Long memberId = 1L; + + Question question = Question.builder().id(1L).room(mockRoom).member(mockMember) + .content("변경 전").build(); + + given(participantReader.existsByRoomIdAndMemberId(roomId, memberId)).willReturn(true); + given(questionReader.getByIdAndRoomId(1L, roomId)).willReturn(question); + + // when + Question updated = questionService.update(memberId, roomId, 1L, request); + + // then + assertThat(updated.getId()).isEqualTo(1L); + assertThat(updated.getContent()).isEqualTo("질문입니다"); + + } + + @Test + @DisplayName("잘못된 값이 들어오면 질문 수정이 실패한다") + void updateQuestion_found_fail() { + // given + Long notRoomId = 999L; + + given(questionReader.getByIdAndRoomId(1L, notRoomId)).willThrow( + new ErrorException(ErrorCode.NOT_FOUND_ROOM_QUESTION)); + + // when & then + assertThatThrownBy(() -> questionService.update(999L, notRoomId, 1L, request)) + .isInstanceOf(ErrorException.class) + .hasFieldOrPropertyWithValue("errorCode", ErrorCode.NOT_FOUND_ROOM_QUESTION); + + } + + @Test + @DisplayName("작성자가 아니면 질문 수정이 실패한다") + void updateQuestion_fail() { + // given + Long roomId = 1L; + Long notMemberId = 999L; + + Question question = Question.builder().id(1L).room(mockRoom).member(mockMember) + .content("변경 전").build(); + + given(participantReader.existsByRoomIdAndMemberId(roomId, notMemberId)).willReturn(true); + given(questionReader.getByIdAndRoomId(1L, roomId)).willReturn(question); + + // when then + assertThatThrownBy(() -> questionService.update(notMemberId, roomId, 1L, request)) + .isInstanceOf(ErrorException.class) + .hasFieldOrPropertyWithValue("errorCode", ErrorCode.UNAUTHORIZED_EDIT_QUESTION); + + } + @Test @DisplayName("최신순 질문 목록 조회") void getQuestionByCreatedAt_success() { @@ -126,17 +203,17 @@ void getQuestionByCreatedAt_success() { Long roomId = 1L; Long memberId = 1L; int size = 1; - + Pageable pageable = PageRequest.of(0, size + 1); List mockList = List.of(mockQ1, mockQ2); given(memberReader.getById(memberId)).willReturn(mockMember); given(roomReader.getById(roomId)).willReturn(mockRoom); - given(questionReader.findByCreatedAt(null, memberId, roomId, PageRequest.of(0, size + 1))) + given(questionReader.findQuestionsOrderBy(null, null, memberId, roomId, QuestionSort.CREATEDAT, pageable)) .willReturn(mockList); - - Slice result = questionService.getQuestions(QuestionSort.CREATEDAT, + Slice result = questionService.getQuestions( + QuestionSort.CREATEDAT, null, null, size, memberId, roomId); assertThat(result).isNotNull(); @@ -150,15 +227,15 @@ void getQuestionByEmoji_success() { Long roomId = 1L; Long memberId = 1L; int size = 1; + Pageable pageable = PageRequest.of(0, size + 1); List mockList = List.of(mockQ1, mockQ2); given(memberReader.getById(memberId)).willReturn(mockMember); given(roomReader.getById(roomId)).willReturn(mockRoom); - given(questionReader.findByEmojiCount(null, null, memberId, roomId, PageRequest.of(0, size + 1))) + given(questionReader.findQuestionsOrderBy(null, null, memberId, roomId, QuestionSort.EMOJI, pageable)) .willReturn(mockList); - Slice result = questionService.getQuestions(QuestionSort.EMOJI, null, null, size, memberId, roomId); @@ -173,16 +250,17 @@ void getQuestionByMyQuestion_success() { Long roomId = 1L; Long memberId = 1L; int size = 1; + Pageable pageable = PageRequest.of(0, size + 1); List mockList = List.of(mockQ1, mockQ2); given(memberReader.getById(memberId)).willReturn(mockMember); given(roomReader.getById(roomId)).willReturn(mockRoom); - given(questionReader.findByMyQuestion(null, memberId, roomId, PageRequest.of(0, size + 1))) + given(questionReader.findQuestionsOrderBy(null, null, memberId, roomId, QuestionSort.MYQUESTION, pageable)) .willReturn(mockList); - - Slice result = questionService.getQuestions(QuestionSort.MYQUESTION, + Slice result = questionService.getQuestions( + QuestionSort.MYQUESTION, null, null, size, memberId, roomId); assertThat(result).isNotNull(); @@ -223,7 +301,8 @@ void createQuestion_success() { @DisplayName("존재하지 않는 member가 들어오면 예외 발생") void createQuestion_member_fail() { // given - given(memberReader.getById(anyLong())).willThrow(new ErrorException(ErrorCode.NOT_FOUND_MEMBER)); + given(memberReader.getById(anyLong())).willThrow( + new ErrorException(ErrorCode.NOT_FOUND_MEMBER)); // when & then assertThatThrownBy(() -> questionService.create(1L, 1L, request)) @@ -237,7 +316,8 @@ void createQuestion_member_fail() { void createQuestion_room_fail() { // given given(memberReader.getById(anyLong())).willReturn(mockMember); - given(roomReader.getById(anyLong())).willThrow(new ErrorException(ErrorCode.NOT_FOUND_ROOM)); + given(roomReader.getById(anyLong())).willThrow( + new ErrorException(ErrorCode.NOT_FOUND_ROOM)); // when & then assertThatThrownBy(() -> questionService.create(1L, 1L, request)) @@ -256,9 +336,8 @@ void createQuestion_participant_fail() { given(memberReader.getById(memberId)).willReturn(mockMember); given(roomReader.getById(roomId)).willReturn(mockRoom); willThrow(new ErrorException(ErrorCode.NOT_FOUND_PARTICIPANT)) - .given(participantService) - .validateParticipant(roomId, memberId); - + .given(participantService) + .validateParticipant(roomId, memberId); // when & then assertThatThrownBy(() -> questionService.create(1L, 1L, request)) diff --git a/src/test/java/com/oronaminc/join/room/service/RoomCacheTests.java b/src/test/java/com/oronaminc/join/room/service/RoomCacheTests.java new file mode 100644 index 0000000..fd609d0 --- /dev/null +++ b/src/test/java/com/oronaminc/join/room/service/RoomCacheTests.java @@ -0,0 +1,119 @@ +package com.oronaminc.join.room.service; + +import static org.assertj.core.api.Assertions.*; +import static org.mockito.Mockito.*; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cache.Cache; +import org.springframework.cache.CacheManager; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.bean.override.mockito.MockitoSpyBean; + +import com.oronaminc.join.member.dao.MemberRepository; +import com.oronaminc.join.member.domain.Member; +import com.oronaminc.join.participant.dao.ParticipantRepository; +import com.oronaminc.join.participant.domain.Participant; +import com.oronaminc.join.participant.domain.ParticipantType; +import com.oronaminc.join.room.dao.RoomRepository; +import com.oronaminc.join.room.domain.Room; +import com.oronaminc.join.room.domain.RoomStatus; +import com.oronaminc.join.room.domain.RoomType; +import com.oronaminc.join.room.dto.RoomUpdateStatusRequest; +import com.oronaminc.join.room.util.CodeGenerator; + +@SpringBootTest +@ActiveProfiles("test") +@EnableCaching +class RoomCacheTests { + @Autowired + private RoomService roomService; + + @Autowired + private RoomReader roomReader; + + @MockitoSpyBean + private RoomRepository roomRepository; + + @Autowired + private CacheManager cacheManager; + + @Autowired + private MemberRepository memberRepository; + + @Autowired + private ParticipantRepository participantRepository; + + @BeforeEach + void setUp() { + String code; + while (true) { + String codeTest = CodeGenerator.generateCode(6); + if (!roomReader.existsBySecretCode(codeTest)) { + code = codeTest; + break; + } + } + + Room room = Room.builder() + .title("Test Room") + .description("Test Description") + .roomStatus(RoomStatus.BEFORE_START) + .roomType(RoomType.PUBLIC) + .secretCode(code) + .build(); + + roomRepository.save(room); + + Member member = Member.builder() + .build(); + + memberRepository.save(member); + + Participant participant = Participant.builder() + .room(room) + .member(member) + .participantType(ParticipantType.PRESENTER) + .build(); + + participantRepository.save(participant); + } + + @Test + void 캐시가_적용되어_두번째_조회는_DB_접근이_없어야_한다() { + Long roomId = 1L; + + Room room = roomReader.getCacheById(roomId); + + int repeat = 10; + for (int count = 0; count < repeat; count++) { + Room cacheRoom = roomReader.getCacheById(roomId); + assertThat(room).isSameAs(cacheRoom); + } + + verify(roomRepository, times(1)).findById(roomId); + + Cache roomCache = cacheManager.getCache("roomById"); + Room cached = roomCache.get(roomId, Room.class); + assertThat(cached).isNotNull(); + } + + @Test + void updateRoomStatus_호출시_캐시가_삭제되어야_한다() { + Long roomId = 1L; + Long memberId = 1L; + + roomReader.getCacheById(roomId); + + Room cachedBefore = cacheManager.getCache("roomById").get(roomId, Room.class); + assertThat(cachedBefore).isNotNull(); + + roomService.updateRoomStatus(memberId, roomId, new RoomUpdateStatusRequest(RoomStatus.STARTED)); + + Room cachedAfter = cacheManager.getCache("roomById").get(roomId, Room.class); + assertThat(cachedAfter).isNull(); + } +} \ No newline at end of file diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml index 4ea2014..c1c6fd1 100644 --- a/src/test/resources/application.yml +++ b/src/test/resources/application.yml @@ -10,3 +10,36 @@ spring: hibernate: ddl-auto: create + security: + oauth2: + client: + provider: + kakao: + authorization-uri: https://kauth.kakao.com/oauth/authorize + token-uri: https://kauth.kakao.com/oauth/token + user-info-uri: https://kapi.kakao.com/v2/user/me + user-name-attribute: id + registration: + kakao: + client-name: Kakao + client-id: KAKAO_CLIENT_ID + client-secret: KAKAO_CLIENT_SECRET + redirect-uri: KAKAO_REDIRECT_URI + authorization-grant-type: authorization_code + client-authentication-method: client_secret_post + scope: + - profile_nickname + - profile_image + - account_email + +cloud: + aws: + region: + static: ap-northeast-2 + s3: + bucket: test-bucket + stack: + auto: false + credentials: + access-key: dummy + secret-key: dummy \ No newline at end of file