Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/challenge/domain/record/Record.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
Expand All @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ private Category createCategory() {
private Record createRecord(Challenge challenge, LocalDate currentDate) {
return Record.builder()
.challenge(challenge)
.date(currentDate)
.successDate(currentDate)
.build();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ private Category createCategory() {
private Record createRecord(Challenge challenge, LocalDate currentDate) {
return Record.builder()
.challenge(challenge)
.date(currentDate)
.successDate(currentDate)
.build();
}

Expand Down
Loading