fixed test and removed duplicate Workitems in Timeline

Author: JSchraff

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

@@ -187,19 +187,21 @@ 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);
 
+      model.getPastWorkItems().removeIf(w -> (w.getId() == workToBeEdited.getId()));
+
       workToBeEdited.setCreationDate(newValuedWork.getCreationDate());
       workToBeEdited.setStartTime(newValuedWork.getStartTime());
       workToBeEdited.setEndTime(newValuedWork.getEndTime());
       workToBeEdited.setNotes(newValuedWork.getNotes());
       workToBeEdited.setProject(newValuedWork.getProject());
 
+      final Work editedWork = model.getWorkRepository().save(workToBeEdited);
+
       final LocalDate dateNow = dateProvider.dateTimeNow().toLocalDate();
-      if (dateNow.equals(workToBeEdited.getCreationDate())) {
-         model.getPastWorkItems().add(workToBeEdited);
+      if (dateNow.equals(editedWork.getCreationDate())) {
+         model.getPastWorkItems().add(editedWork);
       }
 
-      model.getWorkRepository().save(workToBeEdited);
-
    }
 
    /**

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

@@ -35,6 +35,9 @@
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.springframework.test.util.ReflectionTestUtils;
 
 import de.doubleslash.keeptime.common.DateProvider;
 import de.doubleslash.keeptime.model.Model;
@@ -334,6 +337,14 @@ public void shouldCalculateSecondsCorrectlyWhenWorkItemsAreGiven() {
    @Test
    public void shouldUpdateWorkItemPersistentlyWhenWorkItemIsEdited() {
       Mockito.when(mockedDateProvider.dateTimeNow()).thenReturn(LocalDateTime.now());
+      Mockito.when(mockedWorkRepository.save(Mockito.any(Work.class))).thenAnswer(new Answer<Work>() {
+
+         @Override
+         public Work answer(final InvocationOnMock invocation) {
+            final Object[] args = invocation.getArguments();
+            return (Work) args[0];
+         }
+      });
 
       final Project project1 = new Project("workProject1", "Some description", Color.RED, true, 0);
       model.getAllProjects().add(project1);
@@ -366,6 +377,13 @@ public void shouldUpdateWorkItemPersistentlyWhenWorkItemIsEdited() {
    @Test
    public void shouldNotUpdateOthersWhenWorkItemIsEdited() {
       Mockito.when(mockedDateProvider.dateTimeNow()).thenReturn(LocalDateTime.now());
+      Mockito.when(mockedWorkRepository.save(Mockito.any(Work.class))).thenAnswer(new Answer<Work>() {
+         @Override
+         public Work answer(final InvocationOnMock invocation) {
+            final Object[] args = invocation.getArguments();
+            return (Work) args[0];
+         }
+      });
 
       final Project project1 = new Project("workProject1", "Some description", Color.RED, true, 0);
       model.getAllProjects().add(project1);
@@ -375,14 +393,17 @@ public void shouldNotUpdateOthersWhenWorkItemIsEdited() {
 
       final Work notToBeUpdatedWork = new Work(localDateNow, 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");
+      ReflectionTestUtils.setField(originalWork, "id", 2);
       model.getPastWorkItems().add(originalWork);
 
       final Work newWork = new Work(localDateNow, localDateTimeMorning.plusHours(3), localDateTimeMorning.plusHours(4),
             project1, "updated");
+      ReflectionTestUtils.setField(newWork, "id", 3);
 
       testee.editWork(originalWork, newWork);