work

Author: thomaswoehlke

src/main/java/org/woehlke/java/simpleworklist/domain/task/Task.java

@@ -85,6 +85,14 @@
             + " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
             + " and t.project is null and t.context = :context ",
         lockMode = LockModeType.READ
+    ),
+    @NamedQuery(
+      name = "findByTaskStateTrashAndContext",
+      query = "select t from Task t " +
+        "where t.taskState = org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState.TRASH " +
+        "or t.taskState = org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState.DELETED " +
+        "and t.context = :context",
+      lockMode = LockModeType.READ
     )
 })
 @Getter

src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskRepository.java

@@ -30,6 +30,9 @@ public interface TaskRepository extends JpaRepository<Task, Long> {
     List<Task> findByTaskStateAndContext(TaskState taskState, Context context);
     Page<Task> findByTaskStateAndContext(TaskState taskState, Context context, Pageable request);
 
+    @Query(name="findByTaskStateTrashAndContext")
+    Page<Task> findByTaskStateTrashAndContext(@Param("context") Context context, Pageable request);
+
     List<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(
         TaskState taskState, Context context
     );

src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskServiceImpl.java

@@ -44,11 +44,15 @@ public Page<Task> findbyTaskstate(
         @NotNull Context context,
         @NotNull Pageable request
     ) {
-        if(taskState == TaskState.FOCUS){
-            return taskRepository.findByFocusAndContext(true,context,request);
-        }else {
-            return taskRepository.findByTaskStateAndContext(taskState, context, request);
-        }
+      switch (taskState){
+        case FOCUS:
+          return taskRepository.findByFocusAndContext(true, context, request);
+        case TRASH:
+        case DELETED:
+          return taskRepository.findByTaskStateTrashAndContext(context, request);
+        default:
+          return taskRepository.findByTaskStateAndContext(taskState, context, request);
+      }
     }
 
     @Override

src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTabController.java

@@ -131,6 +131,16 @@ public final String trash(
             context, pageable, userSession, locale, model);
     }
 
+    @RequestMapping(path = "/deleted", method = RequestMethod.GET)
+    public final String deleted(
+      @PageableDefault(sort = "orderIdTaskState", direction = Sort.Direction.DESC) Pageable pageable,
+      @NotNull @ModelAttribute("userSession") UserSessionBean userSession,
+      Locale locale,
+      Model model
+    ) {
+      return trash(pageable, userSession, locale, model);
+    }
+
     @RequestMapping(path = "/focus", method = RequestMethod.GET)
     public final String focus(
         @PageableDefault(sort = "orderIdTaskState", direction = Sort.Direction.DESC) Pageable pageable,