added delete functionality

Author: JSchraff

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

@@ -205,6 +205,14 @@ public void editWork(final Work workToBeEdited, final Work newValuedWork) {
 
    }
 
+   public void deleteWork(final Work workToBeDeleted) {
+
+      model.getPastWorkItems().removeIf(w -> (w.getId() == workToBeDeleted.getId()));
+
+      model.getWorkRepository().delete(workToBeDeleted);
+
+   }
+
    /**
     * Changes the indexes of the originalList parameter to have a consistent order.
     * 

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

@@ -46,6 +46,8 @@
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.canvas.Canvas;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ContextMenu;
@@ -216,6 +218,28 @@ private void updateReport(final LocalDate dateToShow) {
 
             contextMenu.getItems().add(editMenuItem);
 
+            final MenuItem deleteMenuItem = new MenuItem("delete");
+
+            deleteMenuItem.setOnAction(e -> {
+               final Alert alert = new Alert(AlertType.CONFIRMATION);
+               alert.setTitle("Delete Work");
+               alert.setHeaderText("You are abaout too delete the work:\n" + work.toString());
+               alert.setContentText("Are you sure?");
+               alert.initOwner(stage);
+
+               final Optional<ButtonType> result = alert.showAndWait();
+
+               result.ifPresent(buttonType -> {
+                  if (buttonType == ButtonType.OK) {
+                     controller.deleteWork(work);
+                  }
+
+                  this.update();
+               });
+            });
+
+            contextMenu.getItems().add(deleteMenuItem);
+
             clickDummy.setOnContextMenuRequested(
                   event -> contextMenu.show(clickDummy, event.getScreenX(), event.getScreenY()));
 

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

@@ -22,6 +22,7 @@
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -405,4 +406,44 @@ public void shouldNotUpdateOthersWhenWorkItemIsEdited() {
 
    }
 
+   @Test
+   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");
+      model.getPastWorkItems().add(work);
+
+      testee.deleteWork(work);
+
+      final ArgumentCaptor<Work> argument = ArgumentCaptor.forClass(Work.class);
+      Mockito.verify(mockedWorkRepository, Mockito.times(1)).delete(argument.capture());
+      assertThat("Edited work was not deleted persistently", argument.getValue(), is(work));
+
+   }
+
+   @Test
+   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");
+      model.getPastWorkItems().add(work);
+
+      testee.deleteWork(work);
+
+      assertTrue("work Items contain work when it should have been deleted", model.getPastWorkItems().isEmpty());
+
+   }
+
 }