From 1ddd40948e3b68ba7ff796f3c8ef624d8f04b1a5 Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 3 Jan 2025 13:00:02 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=A4=EB=94=94=EC=85=98=20=ED=88=AC?= =?UTF-8?q?=ED=91=9C=20-=20=ED=9A=9F=EC=88=98=20=EA=B3=84=EC=82=B0=20?= =?UTF-8?q?=EB=B0=A9=EC=8B=9D=20=EC=88=98=EC=A0=95=20-=20=EC=98=A4?= =?UTF-8?q?=EB=94=94=EC=85=98=20=EC=A7=80=EC=9B=90=EC=9E=90=EB=B3=84=20?= =?UTF-8?q?=ED=95=98=EB=A3=A8=2010=EA=B0=9C=20->=20=EC=A0=84=EC=B2=B4=20?= =?UTF-8?q?=ED=88=AC=ED=91=9C=20=ED=9A=9F=EC=88=98=20=ED=95=98=EB=A3=A8=20?= =?UTF-8?q?10=EA=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/audition/vote/AuditionVoteRepository.kt | 7 ++----- .../sodalive/audition/vote/AuditionVoteService.kt | 5 ++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/audition/vote/AuditionVoteRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/audition/vote/AuditionVoteRepository.kt index 2a5d61a..584ed3d 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/audition/vote/AuditionVoteRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/audition/vote/AuditionVoteRepository.kt @@ -9,9 +9,8 @@ import java.time.LocalDateTime interface AuditionVoteRepository : JpaRepository, AuditionVoteQueryRepository interface AuditionVoteQueryRepository { - fun countByMemberIdAndApplicantIdAndVoteDateRange( + fun countByMemberIdAndVoteDateRange( memberId: Long, - applicantId: Long, startDate: LocalDateTime, endDate: LocalDateTime ): Int @@ -20,9 +19,8 @@ interface AuditionVoteQueryRepository { class AuditionVoteQueryRepositoryImpl( private val queryFactory: JPAQueryFactory ) : AuditionVoteQueryRepository { - override fun countByMemberIdAndApplicantIdAndVoteDateRange( + override fun countByMemberIdAndVoteDateRange( memberId: Long, - applicantId: Long, startDate: LocalDateTime, endDate: LocalDateTime ): Int { @@ -31,7 +29,6 @@ class AuditionVoteQueryRepositoryImpl( .from(auditionVote) .where( auditionVote.member.id.eq(memberId) - .and(auditionVote.applicant.id.eq(applicantId)) .and(auditionVote.createdAt.between(startDate, endDate)) ) .fetch() diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/audition/vote/AuditionVoteService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/audition/vote/AuditionVoteService.kt index a897527..34261ea 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/audition/vote/AuditionVoteService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/audition/vote/AuditionVoteService.kt @@ -36,15 +36,14 @@ class AuditionVoteService( val startDate = startOfDayClient.withZoneSameInstant(ZoneOffset.UTC).toLocalDateTime() val endDate = endOfDayClient.withZoneSameInstant(ZoneOffset.UTC).toLocalDateTime() - val voteCount = repository.countByMemberIdAndApplicantIdAndVoteDateRange( + val voteCount = repository.countByMemberIdAndVoteDateRange( memberId = member.id!!, - applicantId = applicantId, startDate = startDate, endDate = endDate ) if (voteCount > 10) { - throw SodaException("오늘 해당 지원자에게 할 수 있는 최대 투표수를 초과하였습니다.\n내일 다시 투표해 주세요.") + throw SodaException("오늘 응원은 여기까지!\n하루 최대 10회까지 응원이 가능합니다.\n내일 다시 이용해주세요.") } if (voteCount > 0) {