diff --git a/build.gradle b/build.gradle index 828451c..3fb9bea 100644 --- a/build.gradle +++ b/build.gradle @@ -60,6 +60,8 @@ dependencies { // 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' 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 cc6c30c..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,17 +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; @@ -33,14 +38,19 @@ public class AnswerController { ) @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 265fb45..d06e03a 100644 --- a/src/main/java/com/oronaminc/join/answer/dao/AnswerRepository.java +++ b/src/main/java/com/oronaminc/join/answer/dao/AnswerRepository.java @@ -1,10 +1,12 @@ package com.oronaminc.join.answer.dao; +import com.oronaminc.join.answer.domain.Answer; +import com.oronaminc.join.question.domain.Question; +import java.time.LocalDateTime; import java.util.List; import java.util.Optional; +import org.springframework.data.domain.Pageable; 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.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -12,24 +14,49 @@ 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 DESC, a.id DESC + """) + 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 DESC, a.id DESC + """) + 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 - """) + 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 - """) + 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 fe782ee..7abdf84 100644 --- a/src/main/java/com/oronaminc/join/answer/domain/Answer.java +++ b/src/main/java/com/oronaminc/join/answer/domain/Answer.java @@ -26,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") }) 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 191ab18..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,6 +1,7 @@ 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; @@ -13,7 +14,7 @@ public record AnswerCreateResponse( @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 index d8f4f64..36b5c9b 100644 --- a/src/main/java/com/oronaminc/join/answer/dto/AnswerDeleteResponse.java +++ b/src/main/java/com/oronaminc/join/answer/dto/AnswerDeleteResponse.java @@ -1,12 +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") - String event + 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/AnswerUpdateResponse.java b/src/main/java/com/oronaminc/join/answer/dto/AnswerUpdateResponse.java index 3248b78..11f3835 100644 --- a/src/main/java/com/oronaminc/join/answer/dto/AnswerUpdateResponse.java +++ b/src/main/java/com/oronaminc/join/answer/dto/AnswerUpdateResponse.java @@ -1,5 +1,6 @@ package com.oronaminc.join.answer.dto; +import com.oronaminc.join.websocket.common.EventType; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; @@ -8,7 +9,7 @@ public record AnswerUpdateResponse( Long answerId, @Schema(description = "수정 이벤트", example = "UPDATE") - String event, + 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 95dace3..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,15 +1,20 @@ package com.oronaminc.join.answer.mapper; import com.oronaminc.join.answer.domain.Answer; -import com.oronaminc.join.answer.dto.AnswerRequest; 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 { @@ -17,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) @@ -30,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(), @@ -51,9 +57,14 @@ public static Answer toEntity(Question question, Member member, AnswerRequest re public static AnswerUpdateResponse toAnswerUpdateResponse(Answer answer) { return AnswerUpdateResponse.builder() .answerId(answer.getId()) - .event("UPDATE") + .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 1935242..773a534 100644 --- a/src/main/java/com/oronaminc/join/answer/service/AnswerReader.java +++ b/src/main/java/com/oronaminc/join/answer/service/AnswerReader.java @@ -1,33 +1,36 @@ 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.util.List; -import java.util.Optional; - -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 java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Component; @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 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 getByQuestionId(Long questionId) { return answerRepository.findByQuestionId(questionId) .orElseThrow(() -> new ErrorException(ErrorCode.NOT_FOUND_EXIST_ANSWER)); 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 6436723..cc06dff 100644 --- a/src/main/java/com/oronaminc/join/answer/service/AnswerService.java +++ b/src/main/java/com/oronaminc/join/answer/service/AnswerService.java @@ -9,15 +9,20 @@ 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.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.time.LocalDateTime; import java.util.List; +import java.util.Set; import lombok.RequiredArgsConstructor; +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; @@ -48,18 +53,43 @@ public Answer create(Long roomId, Long memberId, Long questionId, } - @Transactional - public AnswerGetResponse getAnswer(Long roomId, Long questionId, Long memberId) { - Member member = memberReader.getById(memberId); + @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); - Answer answer = answerReader.getByQuestionId(questionId); + answerReader.getByQuestionId(questionId); + + 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(); - Long emojiCount = answer.getEmojiCount(); - boolean isEmojied = emojiReader.findByMemberIdAndTargetIdAndTargetType(member.getId(), - answer.getId(), TargetType.ANSWER).isPresent(); + return SliceUtil.toSlice(responseList, PageRequest.of(0, size)); - return AnswerMapper.toAnswerGetResponse(answer, emojiCount, isEmojied); } @Transactional 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 a4c62e9..3389a9b 100644 --- a/src/main/java/com/oronaminc/join/emoji/dao/EmojiRepository.java +++ b/src/main/java/com/oronaminc/join/emoji/dao/EmojiRepository.java @@ -2,8 +2,12 @@ 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 { @@ -16,4 +20,17 @@ Optional findByMemberIdAndTargetIdAndTargetType(Long memberId, Long targe 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/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/EmojiReader.java b/src/main/java/com/oronaminc/join/emoji/service/EmojiReader.java index 99a3552..6bf8182 100644 --- a/src/main/java/com/oronaminc/join/emoji/service/EmojiReader.java +++ b/src/main/java/com/oronaminc/join/emoji/service/EmojiReader.java @@ -5,7 +5,9 @@ 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; @@ -38,4 +40,9 @@ public boolean existsByMemberIdAndTargetIdAndTargetType(Long memberId, Long targ 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 8bdc68b..4b20cae 100644 --- a/src/main/java/com/oronaminc/join/emoji/service/EmojiService.java +++ b/src/main/java/com/oronaminc/join/emoji/service/EmojiService.java @@ -11,6 +11,7 @@ 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; @@ -46,7 +47,7 @@ public EmojiResponse createEmoji(Long memberId, EmojiRequest emojiRequest) { emojiCount = incrementEmojiCount(targetType, targetId); - return new EmojiResponse("CREATE", targetType, targetId, emojiCount); + return new EmojiResponse(EventType.CREATE, targetType, targetId, emojiCount); } @@ -62,7 +63,7 @@ public EmojiResponse deleteEmoji(Long memberId, EmojiRequest emojiRequest) { ); emojiCount = decrementEmojiCount(targetType, targetId); - return new EmojiResponse("DELETE", targetType, targetId, emojiCount); + return new EmojiResponse(EventType.DELETE, targetType, targetId, emojiCount); } 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 5fc9cd7..865658b 100644 --- a/src/main/java/com/oronaminc/join/global/exception/ErrorCode.java +++ b/src/main/java/com/oronaminc/join/global/exception/ErrorCode.java @@ -31,7 +31,6 @@ public enum ErrorCode { UNAUTHORIZED_LIMIT_PARTICIPANT("PARTICIPANT-005", "인원이 가득 차 참가할 수 없습니다.", UNAUTHORIZED), UNAUTHORIZED_NOT_JOIN_ROOM("PARTICIPANT-005", "발표방에 참여하지 않았습니다. 먼저 참여해주세요.", UNAUTHORIZED), - FILE_UPLOAD_FAILED("FILE-001", "파일 업로드에 실패하였습니다.", INTERNAL_SERVER_ERROR), NOT_FOUND_FILE("FILE-002", "존재하지 않는 파일입니다.", NOT_FOUND), MOVEMENT_FILE_FAILED("FILE-003", "파일 이동이 실패하였습니다.", INTERNAL_SERVER_ERROR), @@ -51,7 +50,6 @@ public enum ErrorCode { 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), EXPIRED_SESSION("SESSION-1203", "세션이 만료되었습니다.", UNAUTHORIZED), @@ -62,6 +60,7 @@ public enum ErrorCode { SOCKET_BAD_REQUEST_PATH("SOCKET-1002", "경로가 유효하지 않습니다.", BAD_REQUEST), SOCKET_BAD_REQUEST_MEMBER("SOCKET-1003", "회원이 유효하지 않습니다.", BAD_REQUEST), + STOMP_INVALID_DESTINATION("STOMP-001", "경로가 유효하지 않습니다.", BAD_REQUEST), CONFLICT_EMOJI("EMOJI-001", "공감 처리 중 충돌이 발생했습니다.", CONFLICT), NOT_FOUND_EMOJI("EMOJI-002", "해당 이모지가 존재하지 않습니다.", NOT_FOUND), 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/ExceptionAdvice.java b/src/main/java/com/oronaminc/join/global/exception/ExceptionAdvice.java index c166075..3572740 100644 --- a/src/main/java/com/oronaminc/join/global/exception/ExceptionAdvice.java +++ b/src/main/java/com/oronaminc/join/global/exception/ExceptionAdvice.java @@ -18,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; 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/security/AuthController.java b/src/main/java/com/oronaminc/join/member/security/AuthController.java index 08e5d1f..79e6eac 100644 --- a/src/main/java/com/oronaminc/join/member/security/AuthController.java +++ b/src/main/java/com/oronaminc/join/member/security/AuthController.java @@ -1,5 +1,8 @@ package com.oronaminc.join.member.security; + +import static com.oronaminc.join.member.util.MemberMapper.toSessionInfoResponse; + import java.util.List; import org.springframework.http.HttpStatus; @@ -46,7 +49,7 @@ public class AuthController { ) @PostMapping("/kakao") @ResponseStatus(HttpStatus.OK) - public KakaoLoginResponse kakaoLogin( + public SessionInfoResponse kakaoLogin( @RequestBody KakaoLoginRequest kakaoLoginRequest, HttpServletRequest request ) { @@ -64,7 +67,7 @@ public KakaoLoginResponse kakaoLogin( request.getSession(true).setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, context); - return new KakaoLoginResponse(memberDetails.getId()); + return toSessionInfoResponse(memberDetails); } @Operation( @@ -77,7 +80,7 @@ public KakaoLoginResponse kakaoLogin( ) @PostMapping("/guest") @ResponseStatus(HttpStatus.CREATED) - public GuestLoginResponse guestLogin(@RequestBody @Valid GuestLoginRequest guestLoginRequest, HttpServletRequest request) { + public SessionInfoResponse guestLogin(@RequestBody @Valid GuestLoginRequest guestLoginRequest, HttpServletRequest request) { MemberDetails guest = authService.loadGuest(guestLoginRequest); Authentication authentication = new UsernamePasswordAuthenticationToken( @@ -90,7 +93,7 @@ public GuestLoginResponse guestLogin(@RequestBody @Valid GuestLoginRequest guest request.getSession(true).setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, context); - return new GuestLoginResponse(guest.getId()); + return toSessionInfoResponse(guest); } @Operation( @@ -106,12 +109,7 @@ public GuestLoginResponse guestLogin(@RequestBody @Valid GuestLoginRequest guest @ResponseStatus(HttpStatus.OK) public SessionInfoResponse getSessionInfo(@AuthenticationPrincipal MemberDetails memberDetails) { - return new SessionInfoResponse( - memberDetails.getId(), - memberDetails.getName(), - memberDetails.getNickname(), - memberDetails.getRole() - ); + return toSessionInfoResponse(memberDetails); } @Operation( 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 582dac7..8332001 100644 --- a/src/main/java/com/oronaminc/join/member/security/SecurityConfig.java +++ b/src/main/java/com/oronaminc/join/member/security/SecurityConfig.java @@ -2,6 +2,8 @@ import static org.springframework.security.config.Customizer.*; +import java.util.List; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; @@ -9,6 +11,9 @@ 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.web.cors.CorsConfiguration; +import org.springframework.web.cors.CorsConfigurationSource; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import lombok.RequiredArgsConstructor; @@ -23,7 +28,7 @@ public class SecurityConfig { public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { return http .csrf(csrf -> csrf.disable()) - .cors(cors -> cors.disable()) + .cors(cors -> cors.configurationSource(corsConfigurationSource())) .authorizeHttpRequests(auth -> auth .requestMatchers( "/api/auth/guest", @@ -51,4 +56,17 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .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", "OPTIONS")); + configuration.setAllowedHeaders(List.of("*")); + + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", configuration); + return source; + } } diff --git a/src/main/java/com/oronaminc/join/member/util/MemberMapper.java b/src/main/java/com/oronaminc/join/member/util/MemberMapper.java index 7835d9b..831d3c1 100644 --- a/src/main/java/com/oronaminc/join/member/util/MemberMapper.java +++ b/src/main/java/com/oronaminc/join/member/util/MemberMapper.java @@ -1,5 +1,6 @@ package com.oronaminc.join.member.util; +import com.oronaminc.join.member.dto.SessionInfoResponse; import java.util.Map; import com.oronaminc.join.member.domain.Member; @@ -65,4 +66,13 @@ public static KakaoUserResponse toKakaoUserResponse(Map kakaoAcc .profileImageUrl((String) profile.get("profile_image_url")) .build(); } + + public static SessionInfoResponse toSessionInfoResponse(MemberDetails memberDetails) { + return new SessionInfoResponse( + memberDetails.getId(), + memberDetails.getName(), + memberDetails.getNickname(), + memberDetails.getRole() + ); + } } 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 2b86ccc..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,30 +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) + 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 + 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/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/domain/Question.java b/src/main/java/com/oronaminc/join/question/domain/Question.java index d3d7d26..d3e9caa 100644 --- a/src/main/java/com/oronaminc/join/question/domain/Question.java +++ b/src/main/java/com/oronaminc/join/question/domain/Question.java @@ -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") }) 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 index a140a2a..a3f1044 100644 --- a/src/main/java/com/oronaminc/join/question/dto/QuestionDeleteResponse.java +++ b/src/main/java/com/oronaminc/join/question/dto/QuestionDeleteResponse.java @@ -1,11 +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( - String event, + EventType event, Long questionId ) { } diff --git a/src/main/java/com/oronaminc/join/question/dto/QuestionUpdateResponse.java b/src/main/java/com/oronaminc/join/question/dto/QuestionUpdateResponse.java index efd0396..ee4388e 100644 --- a/src/main/java/com/oronaminc/join/question/dto/QuestionUpdateResponse.java +++ b/src/main/java/com/oronaminc/join/question/dto/QuestionUpdateResponse.java @@ -1,12 +1,13 @@ 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( - String event, + EventType event, Long questionId, String content 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 c12597e..7a283a1 100644 --- a/src/main/java/com/oronaminc/join/question/service/QuestionService.java +++ b/src/main/java/com/oronaminc/join/question/service/QuestionService.java @@ -45,9 +45,7 @@ public class QuestionService { 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); @@ -86,12 +84,14 @@ public Question update(Long memberId, Long roomId, Long questionId, QuestionRequ // 참여자가 아님 if (!participantReader.existsByRoomIdAndMemberId(roomId, memberId)) { - throw new ErrorException(ErrorCode.NOT_FOUND_PARTICIPANT); + throw ErrorException.of(ErrorCode.NOT_FOUND_PARTICIPANT, + "{}번 발표방에는 {}번 회원이 잠가 중이지 않습니다.", roomId, memberId); } // 작성자가 아님 if (!question.getMember().getId().equals(memberId)) { - throw new ErrorException(ErrorCode.UNAUTHORIZED_EDIT_QUESTION); + throw ErrorException.of(ErrorCode.UNAUTHORIZED_EDIT_QUESTION, + "{}번 회원은 {}번 질문을 수정할 권한이 없습니다.", memberId, questionId); } question.updateContent(request.content()); @@ -105,13 +105,15 @@ public Long delete(Long memberId, Long roomId, Long questionId) { // 참여자가 아님 if (!participantReader.existsByRoomIdAndMemberId(roomId, memberId)) { - throw new ErrorException(ErrorCode.NOT_FOUND_PARTICIPANT); + throw ErrorException.of(ErrorCode.NOT_FOUND_PARTICIPANT, + "{}번 발표방에는 {}번 회원이 잠가 중이지 않습니다.", roomId, memberId); } // 관리자가 아님 && 작성자도 아님 if (!participantReader.existsPresenterOrTeamByMemberId(roomId, memberId) && !question.getMember().getId().equals(memberId)) { - throw new ErrorException(ErrorCode.UNAUTHORIZED_DELETE_QUESTION); + throw ErrorException.of(ErrorCode.UNAUTHORIZED_DELETE_QUESTION, + "{}번 회원은 {}번 질문을 삭제할 권한이 없습니다.", memberId, questionId); } answerService.deleteByQuestion(questionId); 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 9a784f0..4a045e8 100644 --- a/src/main/java/com/oronaminc/join/question/util/QuestionMapper.java +++ b/src/main/java/com/oronaminc/join/question/util/QuestionMapper.java @@ -12,6 +12,7 @@ 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; @@ -25,7 +26,7 @@ public static Question toQuestion(Room room, Member member, QuestionRequest requ public static QuestionCreateResponse toQuestionCreateResponse (Question question) { return QuestionCreateResponse.builder() - .event("CREATE") + .event(EventType.CREATE) .questionId(question.getId()) .content(question.getContent()) .emojiCount(0L) @@ -56,7 +57,7 @@ public static QuestionAssembleResponse toQuestionListResponse(QuestionFlatRespon public static QuestionUpdateResponse toQuestionUpdateResponse(Question question) { return QuestionUpdateResponse.builder() - .event("UPDATE") + .event(EventType.UPDATE) .questionId(question.getId()) .content(question.getContent()) .build(); @@ -64,7 +65,7 @@ public static QuestionUpdateResponse toQuestionUpdateResponse(Question question) public static QuestionDeleteResponse toQuestionDeleteResponse(Long questionId) { return new QuestionDeleteResponse( - "DELETE", + EventType.DELETE, questionId ); } 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/websocket/api/AnswerWebsocketController.java b/src/main/java/com/oronaminc/join/websocket/api/AnswerWebsocketController.java index 313e60f..12350e4 100644 --- a/src/main/java/com/oronaminc/join/websocket/api/AnswerWebsocketController.java +++ b/src/main/java/com/oronaminc/join/websocket/api/AnswerWebsocketController.java @@ -11,6 +11,7 @@ import com.oronaminc.join.answer.mapper.AnswerMapper; import com.oronaminc.join.answer.service.AnswerService; import com.oronaminc.join.global.exception.ErrorException; +import com.oronaminc.join.websocket.common.EventType; import com.oronaminc.join.global.ratelimit.RateLimitService; import com.oronaminc.join.global.ratelimit.RateLimitType; import io.github.bucket4j.Bucket; @@ -84,7 +85,7 @@ public AnswerDeleteResponse delete( log.info("삭제되었습니다."); - return new AnswerDeleteResponse(answerId, "DELETE"); + return new AnswerDeleteResponse(answerId, EventType.DELETE); } private Long getMemberId(Principal principal) { 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/handshake/CustomHandshakeHandler.java b/src/main/java/com/oronaminc/join/websocket/handshake/CustomHandshakeHandler.java index 2b5b78a..9910dae 100644 --- a/src/main/java/com/oronaminc/join/websocket/handshake/CustomHandshakeHandler.java +++ b/src/main/java/com/oronaminc/join/websocket/handshake/CustomHandshakeHandler.java @@ -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 index c98a2ce..c6b25c2 100644 --- a/src/main/java/com/oronaminc/join/websocket/session/CurrentParticipantEventHandler.java +++ b/src/main/java/com/oronaminc/join/websocket/session/CurrentParticipantEventHandler.java @@ -2,6 +2,7 @@ import static com.oronaminc.join.global.exception.ErrorCode.*; +import com.oronaminc.join.global.exception.ErrorCode; import java.security.Principal; import java.util.Set; @@ -30,7 +31,7 @@ public void handleSubscribe(SessionSubscribeEvent event) { Principal principal = accessor.getUser(); if (destination == null) { - throw new ErrorException(SOCKET_BAD_REQUEST_PATH); + throw new ErrorException(STOMP_INVALID_DESTINATION); } if (!destination.startsWith(ROOM_PREFIX)) { @@ -66,7 +67,7 @@ private Long parseRoomId(String destination) { String[] parts = destination.split("/"); return Long.valueOf(parts[3]); } catch (Exception e) { - throw new ErrorException(SOCKET_BAD_REQUEST_PATH); + throw new ErrorException(STOMP_INVALID_DESTINATION); } } 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 b5f14af..9571356 100644 --- a/src/test/java/com/oronaminc/join/answer/service/AnswerServiceTests.java +++ b/src/test/java/com/oronaminc/join/answer/service/AnswerServiceTests.java @@ -3,10 +3,11 @@ 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.assertj.core.api.InstanceOfAssertFactories.LIST; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.BDDMockito.given; -import static org.mockito.BDDMockito.willThrow; import com.oronaminc.join.answer.dao.AnswerRepository; import com.oronaminc.join.answer.domain.Answer; @@ -31,7 +32,8 @@ import com.oronaminc.join.room.domain.RoomStatus; import com.oronaminc.join.room.service.RoomReader; import java.time.LocalDateTime; -import java.util.Optional; +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; @@ -39,6 +41,8 @@ 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; @ExtendWith(MockitoExtension.class) public class AnswerServiceTests { @@ -142,47 +146,102 @@ 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.getByQuestionId(1L)).willReturn(null); + 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) - .member(mockMember) - .content("답변입니다.") - .emojiCount(5L) - .version(0) - .build(); + // when + Slice response = answerService.getAnswers(1L, 1L, 1L, null, null, 10); - mockEmoji = Emoji.builder() - .id(1L) - .member(mockMember) - .targetType(TargetType.ANSWER) - .targetId(mockAnswer.getId()) - .build(); + // then + assertThat(response.getContent().get(0).answerId()).isEqualTo(100L); + assertThat(response.getContent().get(0).isEmojied()).isTrue(); + } - // 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)); + @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.getByQuestionId(1L)).willReturn(null); + given(answerReader.getAnswerByQuestionIdWithCursor(eq(1L), any(), any(), any())).willReturn( + answers); + given(emojiReader.findTargetIdsByMemberAndTargetTypeInBatch(1L, TargetType.ANSWER, + List.of(80L, 79L))) + .willReturn(Set.of()); // when - AnswerGetResponse response = answerService.getAnswer(roomId, questionId, memberId); + Slice response = answerService.getAnswers(1L, 1L, 1L, 90L, + LocalDateTime.now(), 10); // 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(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.getByQuestionId(1L)).willReturn(null); + 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.getByQuestionId(1L)).willReturn(null); + 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) + .question(mockQuestion) + .content("답변입니다") + .emojiCount(0L) + .build(); + + ReflectionTestUtils.setField(answer, "createdAt", createdAt); + return answer; } @Test 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 bea6d9d..e369c8d 100644 --- a/src/test/java/com/oronaminc/join/emoji/service/EmojiServiceTests.java +++ b/src/test/java/com/oronaminc/join/emoji/service/EmojiServiceTests.java @@ -20,6 +20,7 @@ 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; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -83,7 +84,7 @@ void toggleEmoji_createRoomEmoji_success() { new EmojiRequest(targetType, targetId)); // 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); @@ -121,7 +122,7 @@ void toggleEmoji_createQuestionEmoji_success() { new EmojiRequest(targetType, targetId)); // 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); @@ -159,7 +160,7 @@ void toggleEmoji_createAnswerEmoji_success() { new EmojiRequest(targetType, targetId)); // 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); @@ -228,7 +229,7 @@ void toggleEmoji_deleteRoomEmoji_success() { new EmojiRequest(targetType, targetId)); // 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); @@ -264,7 +265,7 @@ void toggleEmoji_deleteQuestionEmoji_success() { new EmojiRequest(targetType, targetId)); // 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); @@ -300,7 +301,7 @@ void toggleEmoji_deleteAnswerEmoji_success() { new EmojiRequest(targetType, targetId)); // 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);