diff --git a/src/main/java/com/challenge/api/service/record/response/RecordResponse.java b/src/main/java/com/challenge/api/service/record/response/RecordResponse.java index 40a3d2b..ef06859 100644 --- a/src/main/java/com/challenge/api/service/record/response/RecordResponse.java +++ b/src/main/java/com/challenge/api/service/record/response/RecordResponse.java @@ -27,7 +27,7 @@ public static RecordResponse of(Challenge challenge) { return RecordResponse.builder() .successDates( records.stream() - .map(record -> DateUtils.toDayString(record.getDate())) + .map(record -> DateUtils.toDayString(record.getSuccessDate())) .toList() ) .build(); diff --git a/src/main/java/com/challenge/api/validator/RecordValidator.java b/src/main/java/com/challenge/api/validator/RecordValidator.java index 661f73d..938c2a9 100644 --- a/src/main/java/com/challenge/api/validator/RecordValidator.java +++ b/src/main/java/com/challenge/api/validator/RecordValidator.java @@ -28,7 +28,7 @@ public class RecordValidator { */ public Record hasRecordFor(Challenge challenge, LocalDate cancelDate) { return challenge.getRecords().stream() - .filter(r -> r.getDate().equals(cancelDate)) + .filter(r -> r.getSuccessDate().equals(cancelDate)) .findFirst() .orElseThrow(() -> new GlobalException(ErrorCode.RECORD_NOT_FOUND)); } diff --git a/src/main/java/com/challenge/domain/challenge/ChallengeQueryRepository.java b/src/main/java/com/challenge/domain/challenge/ChallengeQueryRepository.java index 387ccd9..e46ce22 100644 --- a/src/main/java/com/challenge/domain/challenge/ChallengeQueryRepository.java +++ b/src/main/java/com/challenge/domain/challenge/ChallengeQueryRepository.java @@ -38,7 +38,7 @@ public boolean existsDuplicateRecordBy(Challenge challenge, LocalDate successDat Long count = queryFactory.select(record.count()) .from(record) .where(record.challenge.eq(challenge) - .and(record.date.eq(successDate))) + .and(record.successDate.eq(successDate))) .fetchOne(); return count != null && count > 0; diff --git a/src/main/java/com/challenge/domain/record/Record.java b/src/main/java/com/challenge/domain/record/Record.java index ae99dd2..5f4e5d0 100644 --- a/src/main/java/com/challenge/domain/record/Record.java +++ b/src/main/java/com/challenge/domain/record/Record.java @@ -29,7 +29,7 @@ public class Record extends BaseDateTimeEntity { private Long id; @Column(nullable = false) - private LocalDate date; + private LocalDate successDate; @Column(nullable = false) private boolean isSucceed = false; @@ -39,15 +39,15 @@ public class Record extends BaseDateTimeEntity { private Challenge challenge; @Builder - private Record(LocalDate date, boolean isSucceed, Challenge challenge) { - this.date = date; + private Record(LocalDate successDate, boolean isSucceed, Challenge challenge) { + this.successDate = successDate; this.challenge = challenge; this.isSucceed = isSucceed; } public static Record achieve(Challenge challenge, String achieveDate) { Record record = Record.builder() - .date(DateUtils.toLocalDate(achieveDate)) + .successDate(DateUtils.toLocalDate(achieveDate)) .isSucceed(true) .challenge(challenge) .build(); @@ -57,7 +57,7 @@ public static Record achieve(Challenge challenge, String achieveDate) { public Record cancel(Challenge challenge, String cancelDate) { return Record.builder() - .date(DateUtils.toLocalDate(cancelDate)) + .successDate(DateUtils.toLocalDate(cancelDate)) .isSucceed(false) .challenge(challenge) .build(); diff --git a/src/test/java/com/challenge/api/service/challenge/ChallengeServiceTest.java b/src/test/java/com/challenge/api/service/challenge/ChallengeServiceTest.java index 6cd0ac4..f2ce81a 100644 --- a/src/test/java/com/challenge/api/service/challenge/ChallengeServiceTest.java +++ b/src/test/java/com/challenge/api/service/challenge/ChallengeServiceTest.java @@ -434,7 +434,7 @@ private Category createCategory(String category) { private Record createRecord(Challenge challenge, LocalDate currentDate) { return Record.builder() .challenge(challenge) - .date(currentDate) + .successDate(currentDate) .build(); } diff --git a/src/test/java/com/challenge/api/validator/ChallengeValidatorTest.java b/src/test/java/com/challenge/api/validator/ChallengeValidatorTest.java index c7c90a3..f069a9b 100644 --- a/src/test/java/com/challenge/api/validator/ChallengeValidatorTest.java +++ b/src/test/java/com/challenge/api/validator/ChallengeValidatorTest.java @@ -127,7 +127,7 @@ private Category createCategory() { private Record createRecord(Challenge challenge, LocalDate currentDate) { return Record.builder() .challenge(challenge) - .date(currentDate) + .successDate(currentDate) .build(); } diff --git a/src/test/java/com/challenge/domain/challenge/ChallengeQueryRepositoryTest.java b/src/test/java/com/challenge/domain/challenge/ChallengeQueryRepositoryTest.java index 7eed180..de83b04 100644 --- a/src/test/java/com/challenge/domain/challenge/ChallengeQueryRepositoryTest.java +++ b/src/test/java/com/challenge/domain/challenge/ChallengeQueryRepositoryTest.java @@ -206,7 +206,7 @@ private Category createCategory() { private Record createRecord(Challenge challenge, LocalDate currentDate) { return Record.builder() .challenge(challenge) - .date(currentDate) + .successDate(currentDate) .build(); }