♻️ : change calculation of the duration of a job

gaia-app · Oct 25, 2019 · 5847f55 · 5847f55
1 parent d383cee
commit 5847f55
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 22 deletions.
diff --git a/src/main/java/io/codeka/gaia/stacks/bo/Job.java b/src/main/java/io/codeka/gaia/stacks/bo/Job.java
@@ -2,12 +2,11 @@
 
 import io.codeka.gaia.teams.User;
 import org.springframework.data.mongodb.core.mapping.DBRef;
-import org.springframework.util.CollectionUtils;
 
+import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.UUID;
 
 /**
@@ -47,6 +46,11 @@ public void end(JobStatus jobStatus) {
         this.status = jobStatus;
     }
 
+    public void proceed(JobStatus jobStatus) {
+        this.endDateTime = null;
+        this.status = jobStatus;
+    }
+
     public void reset() {
         this.status = null;
         this.startDateTime = null;
@@ -127,12 +131,9 @@ public void setUser(User user) {
     }
 
     public Long getExecutionTime() {
-        if (CollectionUtils.isEmpty(this.steps)) {
+        if (this.startDateTime == null || this.endDateTime == null) {
             return null;
         }
-        return this.steps.stream()
-                .map(Step::getExecutionTime)
-                .filter(Objects::nonNull)
-                .reduce(null, (a, b) -> a == null ? b : a + b);
+        return Duration.between(this.startDateTime, this.endDateTime).toMillis();
     }
 }
diff --git a/src/main/java/io/codeka/gaia/stacks/workflow/state/PlanFinishedState.java b/src/main/java/io/codeka/gaia/stacks/workflow/state/PlanFinishedState.java
@@ -12,7 +12,7 @@ public class PlanFinishedState implements JobState {
     @Override
     public void apply(JobWorkflow jobWorkflow) {
         var job = jobWorkflow.getJob();
-        job.setStatus(JobStatus.APPLY_STARTED);
+        job.proceed(JobStatus.APPLY_STARTED);
 
         var step = new Step(StepType.APPLY, job.getId());
         job.getSteps().add(step);

diff --git a/src/test/java/io/codeka/gaia/stacks/bo/JobTest.java b/src/test/java/io/codeka/gaia/stacks/bo/JobTest.java
@@ -3,6 +3,7 @@
 import io.codeka.gaia.teams.User;
 import org.junit.jupiter.api.Test;
 
+import java.time.Duration;
 import java.time.LocalDateTime;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -116,6 +117,31 @@ void reset_shouldResetSteps() {
         assertThat(job.getSteps()).isNotNull().isEmpty();
     }
 
+    @Test
+    void proceed_shouldSetStatus() {
+        // given
+        var job = new Job();
+
+        // when
+        job.proceed(JobStatus.APPLY_STARTED);
+
+        // then
+        assertEquals(JobStatus.APPLY_STARTED, job.getStatus());
+    }
+
+    @Test
+    void proceed_shouldResetEndDateTime() {
+        // given
+        var job = new Job();
+        job.setEndDateTime(LocalDateTime.now());
+
+        // when
+        job.proceed(null);
+
+        // then
+        assertNull(job.getEndDateTime());
+    }
+
     @Test
     void job_shouldSetId() {
         var job = new Job(null, null, null);
@@ -154,28 +180,25 @@ void job_shouldSetUser() {
     }
 
     @Test
-    void getExecutionTime_shouldReturnSumOfStepExecutionTime() {
+    void getExecutionTime_shouldReturnDuration_betweenStartDateTime_andEndDateTime() {
         // given
         var job = new Job();
-        var step = new Step();
-        step.setExecutionTime(10L);
-        job.getSteps().add(step);
-        step = new Step();
-        step.setExecutionTime(20L);
-        job.getSteps().add(step);
-        job.getSteps().add(new Step());
+        job.setStartDateTime(LocalDateTime.now());
+        job.setEndDateTime(LocalDateTime.now());
+        var timer = Duration.between(job.getStartDateTime(), job.getEndDateTime()).toMillis();
 
         // when
         var result = job.getExecutionTime();
 
         // then
-        assertEquals(30L, result);
+        assertThat(result).isNotNull().isEqualTo(timer);
     }
 
     @Test
-    void getExecutionTime_shouldReturnNullIfNoSteps() {
+    void getExecutionTime_shouldReturnNull_whenStartDateTimeIsNull() {
         // given
         var job = new Job();
+        job.setEndDateTime(LocalDateTime.now());
 
         // when
         var result = job.getExecutionTime();
@@ -185,12 +208,10 @@ void getExecutionTime_shouldReturnNullIfNoSteps() {
     }
 
     @Test
-    void getExecutionTime_shouldReturnNullIfNoStepsWithExecutionTime() {
+    void getExecutionTime_shouldReturnNull_whenEndDateTimeIsNull() {
         // given
         var job = new Job();
-        job.getSteps().add(new Step());
-        job.getSteps().add(new Step());
-        job.getSteps().add(new Step());
+        job.setStartDateTime(LocalDateTime.now());
 
         // when
         var result = job.getExecutionTime();