reworked Day Switching logic in Controller, removed field creation_date of Work and replaced it with date of starttime

Author: Jan Schraff

src/main/java/de/doubleslash/keeptime/Main.java

@@ -136,7 +136,7 @@ private void initialiseApplication(final Stage primaryStage) throws Exception {
       readSettings();
 
       final List<Work> todaysWorkItems = model.getWorkRepository()
-            .findByCreationDateOrderByStartTimeAsc(LocalDate.now());
+            .findByStartDateOrderByStartTimeAsc(LocalDate.now());
       LOG.info("Found {} past work items", todaysWorkItems.size());
       model.getPastWorkItems().addAll(todaysWorkItems);
 

src/main/java/de/doubleslash/keeptime/controller/Controller.java

@@ -64,26 +64,35 @@ public void changeProject(final Project newProject) {
 
    public void changeProject(final Project newProject, final long minusSeconds) {
 
-      final LocalDateTime now = dateProvider.dateTimeNow().minusSeconds(minusSeconds);
+      final LocalDateTime workEnd = dateProvider.dateTimeNow().minusSeconds(minusSeconds);
+      final LocalDate today = dateProvider.dateTimeNow().toLocalDate();
 
-      saveCurrentWork(now);
+      final Work oldWork = saveCurrentWork(workEnd);
+
+      if (oldWork != null && !today.isEqual(oldWork.getStartTime().toLocalDate())) {
+         LOG.info("Removing projects with other creation date than today '{}' from list.", today);
+         final int sizeBefore = model.getPastWorkItems().size();
+         model.getPastWorkItems().removeIf(w -> !today.isEqual(w.getStartTime().toLocalDate()));
+         LOG.debug("Removed '{}' work items from past work items.", sizeBefore - model.getPastWorkItems().size());
+      }
 
       // Start new work
-      final Work work = new Work(now.toLocalDate(), now, now.plusSeconds(minusSeconds), newProject, "");
+      final Work newWork = new Work(workEnd, workEnd.plusSeconds(minusSeconds), newProject, "");
+
+      model.getPastWorkItems().add(newWork);
 
-      model.getPastWorkItems().add(work);
+      model.activeWorkItem.set(newWork);
 
-      model.activeWorkItem.set(work);
    }
 
-   public void saveCurrentWork(final LocalDateTime now) {
+   public Work saveCurrentWork(final LocalDateTime workEnd) {
       final Work currentWork = model.activeWorkItem.get();
 
       if (currentWork == null) {
-         return;
+         return null;
       }
 
-      currentWork.setEndTime(now);
+      currentWork.setEndTime(workEnd);
       if (currentWork.getNotes().isEmpty()) {
          currentWork.setNotes("- No notes -");
       }
@@ -95,14 +104,8 @@ public void saveCurrentWork(final LocalDateTime now) {
             currentWork.getEndTime(), time, currentWork.getProject().getName(), currentWork.getNotes());
 
       // Save in db
-      model.getWorkRepository().save(currentWork);
+      return model.getWorkRepository().save(currentWork);
 
-      if (currentWork != null && !now.toLocalDate().isEqual(currentWork.getCreationDate())) {
-         LOG.info("Removing projects with other creation date than today '{}' from list.", now.toLocalDate());
-         final int sizeBefore = model.getPastWorkItems().size();
-         model.getPastWorkItems().removeIf(w -> !now.toLocalDate().isEqual(w.getCreationDate()));
-         LOG.debug("Removed '{}' work items from past work items.", sizeBefore - model.getPastWorkItems().size());
-      }
    }
 
    public void addNewProject(final Project project) {
@@ -204,7 +207,6 @@ public void editProject(final Project projectToBeUpdated, final Project newValue
    public void editWork(final Work workToBeEdited, final Work newValuedWork) {
       LOG.info("Changing work '{}' to '{}'.", workToBeEdited, newValuedWork);
 
-      workToBeEdited.setCreationDate(newValuedWork.getCreationDate());
       workToBeEdited.setStartTime(newValuedWork.getStartTime());
       workToBeEdited.setEndTime(newValuedWork.getEndTime());
       workToBeEdited.setNotes(newValuedWork.getNotes());
@@ -216,7 +218,7 @@ public void editWork(final Work workToBeEdited, final Work newValuedWork) {
       model.getPastWorkItems().removeIf(w -> (w.getId() == workToBeEdited.getId()));
       // add if started today
       final LocalDate dateNow = dateProvider.dateTimeNow().toLocalDate();
-      if (dateNow.equals(editedWork.getCreationDate())) {
+      if (dateNow.equals(editedWork.getStartTime().toLocalDate())) {
          model.getPastWorkItems().add(editedWork);
       }
 
@@ -233,13 +235,13 @@ public void deleteWork(final Work workToBeDeleted) {
     * Changes the indexes of the originalList parameter to have a consistent order.
     * 
     * @param originalList
-    *           list of all projects to adapt the indexes for
+    *                          list of all projects to adapt the indexes for
     * @param changedProject
-    *           the project which has changed which already has the new index
+    *                          the project which has changed which already has the new index
     * @param oldIndex
-    *           the old index of the changed project
+    *                          the old index of the changed project
     * @param newIndex
-    *           the new index of the changed project (which the projects also already has)
+    *                          the new index of the changed project (which the projects also already has)
     * @return all projects whose index has been adapted
     */
    List<Project> resortProjectIndexes(final List<Project> originalList, final Project changedProject,
@@ -276,9 +278,9 @@ List<Project> resortProjectIndexes(final List<Project> originalList, final Proje
     * Decreases all indexes by one, after the removed index
     * 
     * @param originalList
-    *           list of all projects to adapt the indexes for
+    *                        list of all projects to adapt the indexes for
     * @param removedIndex
-    *           the index which has been removed
+    *                        the index which has been removed
     * @return all projects whose index has been adapted
     */
    List<Project> adaptProjectIndexesAfterRemoving(final List<Project> originalList, final int removedIndex) {

src/main/java/de/doubleslash/keeptime/model/Work.java

@@ -16,7 +16,6 @@
 
 package de.doubleslash.keeptime.model;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 import javax.persistence.Column;
@@ -36,8 +35,6 @@ public class Work {
    @Column(name = "id", updatable = false, nullable = false)
    private long id;
 
-   // TODO revise CreationDate Logic to use Date of StartTime
-   private LocalDate creationDate;
    private LocalDateTime startTime;
    private LocalDateTime endTime;
 
@@ -49,10 +46,8 @@ public class Work {
    public Work() {
    }
 
-   public Work(final LocalDate creationDate, final LocalDateTime startTime, final LocalDateTime endTime,
-         final Project project, final String notes) {
+   public Work(final LocalDateTime startTime, final LocalDateTime endTime, final Project project, final String notes) {
       super();
-      this.creationDate = creationDate;
       this.startTime = startTime;
       this.endTime = endTime;
       this.project = project;
@@ -63,14 +58,6 @@ public long getId() {
       return id;
    }
 
-   public LocalDate getCreationDate() {
-      return creationDate;
-   }
-
-   public void setCreationDate(final LocalDate creationDate) {
-      this.creationDate = creationDate;
-   }
-
    public LocalDateTime getStartTime() {
       return startTime;
    }
@@ -105,8 +92,8 @@ public void setNotes(final String notes) {
 
    @Override
    public String toString() {
-      return "Work [id=" + id + ", creationDate=" + creationDate + ", startTime=" + startTime + ", endTime=" + endTime
-            + ", projectName=" + project.getName() + ", notes=" + notes + "]";
+      return "Work [id=" + id + ", startTime=" + startTime + ", endTime=" + endTime + ", projectName="
+            + project.getName() + ", notes=" + notes + "]";
    }
 
 }

src/main/java/de/doubleslash/keeptime/model/repos/WorkRepository.java

@@ -20,12 +20,14 @@
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import de.doubleslash.keeptime.model.Work;
 
 @Repository
 public interface WorkRepository extends JpaRepository<Work, Long> {
 
-   List<Work> findByCreationDateOrderByStartTimeAsc(LocalDate creationDate);
+   @Query(value = "SELECT * FROM work WHERE CAST(start_time AS DATE) = ?1 ORDER BY start_time ASC", nativeQuery = true)
+   List<Work> findByStartDateOrderByStartTimeAsc(LocalDate creationDate);
 }

src/main/java/de/doubleslash/keeptime/view/ManageWorkController.java

@@ -267,8 +267,7 @@ private void setColor(final Node object, final Color color) {
 
    public Work getWorkFromUserInput() {
 
-      return new Work(startDatePicker.getValue(),
-            LocalDateTime.of(startDatePicker.getValue(), startTimeSpinner.getValue()),
+      return new Work(LocalDateTime.of(startDatePicker.getValue(), startTimeSpinner.getValue()),
             LocalDateTime.of(endDatePicker.getValue(), endTimeSpinner.getValue()), selectedProject,
             noteTextArea.getText());
    }

src/main/java/de/doubleslash/keeptime/view/ReportController.java

@@ -194,7 +194,7 @@ private void updateReport(final LocalDate dateToShow) {
 
       this.currentDayLabel.setText(DateFormatter.toDayDateString(this.currentReportDate));
       final List<Work> currentWorkItems = model.getWorkRepository()
-            .findByCreationDateOrderByStartTimeAsc(this.currentReportDate);
+            .findByStartDateOrderByStartTimeAsc(this.currentReportDate);
 
       colorTimeLine.update(currentWorkItems, controller.calcSeconds(currentWorkItems));
 
@@ -259,7 +259,7 @@ private void loadCalenderWidget() {
          @Override
          public void updateItem(final LocalDate item, final boolean empty) {
             super.updateItem(item, empty);
-            if (model.getWorkRepository().findByCreationDateOrderByStartTimeAsc(item).isEmpty()) {
+            if (model.getWorkRepository().findByStartDateOrderByStartTimeAsc(item).isEmpty()) {
                setDisable(true);
                setStyle(FX_BACKGROUND_COLOR_NOT_WORKED);
             }

src/test/java/de/doubleslash/keeptime/controller/ControllerTest.java

@@ -24,7 +24,6 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -231,6 +230,7 @@ public void changeProjectSameDayTest() {
 
    @Test
    public void changeProjectOtherDayTest() {
+      Mockito.when(mockedWorkRepository.save(Mockito.any(Work.class))).thenAnswer(i -> i.getArguments()[0]);
       final LocalDateTime firstProjectDateTime = LocalDateTime.now();
       final LocalDateTime secondProjectDateTime = firstProjectDateTime.plusDays(1); // project is create the next day
 
@@ -253,7 +253,7 @@ public void changeProjectOtherDayTest() {
          }
          return true;
       }));
-      assertThat("'1st project' should be in the past work items", model.getPastWorkItems().size(), is(1));
+      assertThat("'2nd project' should be in the past work items", model.getPastWorkItems().size(), is(1));
       assertThat("The project should be  '2ndProject'", model.getPastWorkItems().get(0).getProject(),
             is(secondProject));
       assertThat("'2ndProject' should be the active work project", model.activeWorkItem.get().getProject(),
@@ -293,7 +293,7 @@ public void changeProjectOtherDayWithTimeTest() {
             is(secondProject));
       final Work work = model.activeWorkItem.get();
       assertThat("'2ndProject' should be the active work project", work.getProject(), is(secondProject));
-      assertThat(work.getCreationDate(), is(firstProjectDateTime.toLocalDate()));
+      assertThat(work.getStartTime().toLocalDate(), is(firstProjectDateTime.toLocalDate()));
       assertThat(work.getStartTime(), is(firstProjectPlusOneHour));
    }
 
@@ -304,18 +304,15 @@ public void shouldCalculateSecondsCorrectlyWhenWorkItemsAreGiven() {
       final Project nonworkProject1 = new Project("nonworkProject1", "An even better description", Color.RED, false, 2);
       final Project nonworkProject2 = new Project("nonworkProject2", "The best description", Color.RED, false, 3);
 
-      final LocalDate localDateNow = LocalDate.now();
       final LocalDateTime localDateTimeMorning = LocalDateTime.now().withHour(4);
 
       final List<Work> workItems = new ArrayList<>(4);
-      workItems.add(new Work(localDateNow, localDateTimeMorning.plusHours(0), localDateTimeMorning.plusHours(1),
-            workProject1, ""));
-      workItems.add(new Work(localDateNow, localDateTimeMorning.plusHours(1), localDateTimeMorning.plusHours(2),
-            workProject2, ""));
-      workItems.add(new Work(localDateNow, localDateTimeMorning.plusHours(2), localDateTimeMorning.plusHours(3),
-            nonworkProject1, ""));
-      workItems.add(new Work(localDateNow, localDateTimeMorning.plusHours(3), localDateTimeMorning.plusHours(4),
-            nonworkProject2, ""));
+      workItems.add(new Work(localDateTimeMorning.plusHours(0), localDateTimeMorning.plusHours(1), workProject1, ""));
+      workItems.add(new Work(localDateTimeMorning.plusHours(1), localDateTimeMorning.plusHours(2), workProject2, ""));
+      workItems
+            .add(new Work(localDateTimeMorning.plusHours(2), localDateTimeMorning.plusHours(3), nonworkProject1, ""));
+      workItems
+            .add(new Work(localDateTimeMorning.plusHours(3), localDateTimeMorning.plusHours(4), nonworkProject2, ""));
 
       model.getAllProjects().addAll(workProject1, workProject2, nonworkProject1, nonworkProject2);
       model.getPastWorkItems().addAll(workItems);
@@ -342,22 +339,20 @@ public void shouldUpdateWorkItemPersistentlyWhenWorkItemIsEdited() {
       final Project project1 = new Project("workProject1", "Some description", Color.RED, true, 0);
       model.getAllProjects().add(project1);
 
-      final LocalDate localDateNow = LocalDate.now();
       final LocalDateTime localDateTimeMorning = LocalDateTime.now().withHour(4);
 
-      final Work originalWork = new Work(localDateNow, localDateTimeMorning.plusHours(0),
-            localDateTimeMorning.plusHours(1), project1, "originalWork");
+      final Work originalWork = new Work(localDateTimeMorning.plusHours(0), localDateTimeMorning.plusHours(1), project1,
+            "originalWork");
       model.getPastWorkItems().add(originalWork);
 
-      final Work newWork = new Work(localDateNow, localDateTimeMorning.plusHours(1), localDateTimeMorning.plusHours(2),
-            project1, "updated");
+      final Work newWork = new Work(localDateTimeMorning.plusHours(1), localDateTimeMorning.plusHours(2), project1,
+            "updated");
 
       testee.editWork(originalWork, newWork);
 
       final Work testWork = model.getPastWorkItems().get(0);
       assertThat("Start time was not updated", testWork.getStartTime(), equalTo(newWork.getStartTime()));
       assertThat("End timewas not updated", testWork.getEndTime(), equalTo(newWork.getEndTime()));
-      assertThat("CreationDate was not updated", testWork.getCreationDate(), equalTo(newWork.getCreationDate()));
       assertThat("Notes were not updated", testWork.getNotes(), equalTo(newWork.getNotes()));
       assertThat("Project was not updated", testWork.getProject(), equalTo(newWork.getProject()));
 
@@ -376,21 +371,20 @@ public void shouldNotUpdateOthersWhenWorkItemIsEdited() {
       final Project project1 = new Project("workProject1", "Some description", Color.RED, true, 0);
       model.getAllProjects().add(project1);
 
-      final LocalDate localDateNow = LocalDate.now();
       final LocalDateTime localDateTimeMorning = LocalDateTime.now().withHour(4);
 
-      final Work notToBeUpdatedWork = new Work(localDateNow, localDateTimeMorning.plusHours(0),
-            localDateTimeMorning.plusHours(1), project1, "originalWork");
+      final Work notToBeUpdatedWork = new Work(localDateTimeMorning.plusHours(0), localDateTimeMorning.plusHours(1),
+            project1, "originalWork");
       ReflectionTestUtils.setField(notToBeUpdatedWork, "id", 1);
       model.getPastWorkItems().add(notToBeUpdatedWork);
 
-      final Work originalWork = new Work(localDateNow, localDateTimeMorning.plusHours(1),
-            localDateTimeMorning.plusHours(2), project1, "originalWork");
+      final Work originalWork = new Work(localDateTimeMorning.plusHours(1), localDateTimeMorning.plusHours(2), project1,
+            "originalWork");
       ReflectionTestUtils.setField(originalWork, "id", 2);
       model.getPastWorkItems().add(originalWork);
 
-      final Work newWork = new Work(localDateNow, localDateTimeMorning.plusHours(3), localDateTimeMorning.plusHours(4),
-            project1, "updated");
+      final Work newWork = new Work(localDateTimeMorning.plusHours(3), localDateTimeMorning.plusHours(4), project1,
+            "updated");
       ReflectionTestUtils.setField(newWork, "id", 3);
 
       testee.editWork(originalWork, newWork);
@@ -412,11 +406,10 @@ public void shouldDeleteWorkPersistentlyWhenWorkIsDeleted() {
       final Project project1 = new Project("workProject1", "Some description", Color.RED, true, 0);
       model.getAllProjects().add(project1);
 
-      final LocalDate localDateNow = LocalDate.now();
       final LocalDateTime localDateTimeMorning = LocalDateTime.now().withHour(4);
 
-      final Work work = new Work(localDateNow, localDateTimeMorning.plusHours(0), localDateTimeMorning.plusHours(1),
-            project1, "originalWork");
+      final Work work = new Work(localDateTimeMorning.plusHours(0), localDateTimeMorning.plusHours(1), project1,
+            "originalWork");
       model.getPastWorkItems().add(work);
 
       testee.deleteWork(work);
@@ -433,11 +426,10 @@ public void shouldRemoveWorkFromPastWorkItemsWhenWorkIsDeleted() {
       final Project project1 = new Project("workProject1", "Some description", Color.RED, true, 0);
       model.getAllProjects().add(project1);
 
-      final LocalDate localDateNow = LocalDate.now();
       final LocalDateTime localDateTimeMorning = LocalDateTime.now().withHour(4);
 
-      final Work work = new Work(localDateNow, localDateTimeMorning.plusHours(0), localDateTimeMorning.plusHours(1),
-            project1, "originalWork");
+      final Work work = new Work(localDateTimeMorning.plusHours(0), localDateTimeMorning.plusHours(1), project1,
+            "originalWork");
       model.getPastWorkItems().add(work);
 
       testee.deleteWork(work);