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
@@ -0,0 +1,13 @@
package devkor.ontime_back.entity;

import lombok.Getter;
import lombok.RequiredArgsConstructor;

@Getter
@RequiredArgsConstructor
public enum DoneStatus {
LATE, // 지각종료 - latenesstime > 0
NORMAL, // 지각 안 한 종료 - latenesstime = 0
ABNORMAL, // 비정상종료 - latenesstime = -2
NOT_ENDED // 종료되지 않음 - latenesstime = -1
}
14 changes: 14 additions & 0 deletions ontime-back/src/main/java/devkor/ontime_back/entity/Schedule.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ public class Schedule {

private Boolean isStarted; // 버튼누름여부

@Enumerated(EnumType.STRING)
private DoneStatus doneStatus;

private Integer scheduleSpareTime; // 스케줄 별 여유시간

private Integer latenessTime; // 지각 시간 (NULL이면 약속 전, 0이면 약속 성공, N(양수)면 N분 지각)
Expand All @@ -73,6 +76,17 @@ public void startSchedule() {

public void updateLatenessTime(Integer latenessTime) {
this.latenessTime = latenessTime;

if (latenessTime > 0) {
this.doneStatus = DoneStatus.LATE;
} else if (latenessTime == 0) {
this.doneStatus = DoneStatus.NORMAL;
} else if (latenessTime == -1) {
this.doneStatus = DoneStatus.NOT_ENDED;
}
else {
this.doneStatus = DoneStatus.ABNORMAL;
}
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
ALTER TABLE schedule ADD COLUMN done_status VARCHAR(255);

-- lateness_time > 0 → 'LATE'
UPDATE schedule
SET done_status = 'LATE'
WHERE lateness_time > 0;

-- lateness_time = 0 → 'NORMAL'
UPDATE schedule
SET done_status = 'NORMAL'
WHERE lateness_time = 0;

-- lateness_time = -1 → 'NOT_ENDED'
UPDATE schedule
SET done_status = 'NOT_ENDED'
WHERE lateness_time = -1;

-- lateness_time = -2 → 'ABNORMAL'
UPDATE schedule
SET done_status = 'ABNORMAL'
WHERE lateness_time = -2;