work

Author: thomaswoehlke

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

@@ -154,7 +154,7 @@ public final String focus(
     ) {
         Context context = super.getContext(userSession);
         return taskStateTabControllerService.getTaskStatePageFocus(
-            true, context, pageable, userSession, locale, model
+            context, pageable, userSession, locale, model
         );
     }
 

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/Task.java

@@ -118,14 +118,14 @@
     @NamedQuery(
       name = "findByTaskStateCompleted",
       query = "select t from Task t " +
-        "where t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.FOCUS " +
+        "where t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.COMPLETED " +
         "and t.context = :context",
       lockMode = LockModeType.READ
     ),
     @NamedQuery(
       name = "findByTaskStateDeleted",
       query = "select t from Task t " +
-        "where t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.COMPLETED " +
+        "where t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.DELETED " +
         "and t.context = :context",
       lockMode = LockModeType.READ
     ),

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

@@ -47,8 +47,8 @@ public interface TaskRepository extends JpaRepository<Task, Long> {
     @Query(name="findByTaskStateSomeday")
     List<Task> findByTaskStateSomeday(@Param("context") Context context);
 
-    Page<Task> findByFocus(boolean focus, Context context, Pageable request);
-    List<Task> findByFocus(boolean focus, Context context);
+    Page<Task> findByFocusIsTrue(Context context, Pageable request);
+    List<Task> findByFocusIsTrue(Context context);
 
     @Query(name="findByTaskStateCompleted")
     Page<Task> findByTaskStateCompleted(@Param("context") Context context, Pageable request);

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskService.java

@@ -19,7 +19,7 @@ public interface TaskService {
     List<Task> findByTaskStateWaiting(Context context);
     List<Task> findByTaskStateScheduled(Context context);
     List<Task> findByTaskStateSomeday(Context context);
-    List<Task> findByFocus(boolean focus, Context context);
+    List<Task> findByFocus(Context context);
     List<Task> findByTaskStateCompleted(Context context);
     List<Task> findByTaskStateTrash(Context context);
     List<Task> findByTaskStateDeleted(Context context);
@@ -31,7 +31,7 @@ public interface TaskService {
     Page<Task> findByTaskStateWaiting(Context context, Pageable request);
     Page<Task> findByTaskStateScheduled(Context context, Pageable request);
     Page<Task> findByTaskStateSomeday(Context context, Pageable request);
-    Page<Task> findByFocus(boolean focus, Context context, Pageable request);
+    Page<Task> findByFocus(Context context, Pageable request);
     Page<Task> findByTaskStateCompleted(Context context, Pageable request);
     Page<Task> findByTaskStateTrash(Context context, Pageable request);
     Page<Task> findByTaskStateDeleted(Context context, Pageable request);

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

@@ -305,8 +305,8 @@ public List<Task> findByTaskStateSomeday(Context context) {
   }
 
   @Override
-  public List<Task> findByFocus(boolean focus, Context context) {
-    return taskRepository.findByFocus(focus, context);
+  public List<Task> findByFocus(Context context) {
+    return taskRepository.findByFocusIsTrue(context);
   }
 
   @Override
@@ -360,8 +360,8 @@ public Page<Task> findByTaskStateSomeday(Context context, Pageable request) {
   }
 
   @Override
-  public Page<Task> findByFocus(boolean focus, Context context, Pageable request) {
-    return taskRepository.findByFocus(focus, context, request);
+  public Page<Task> findByFocus(Context context, Pageable request) {
+    return taskRepository.findByFocusIsTrue(context, request);
   }
 
   @Override

src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskMove2TaskServiceImpl.java

@@ -7,7 +7,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.java.simpleworklist.domain.db.data.Task;
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
-import org.woehlke.java.simpleworklist.domain.meso.task.TaskMove2TaskService;
 
 import javax.validation.constraints.NotNull;
 

src/main/java/org/woehlke/java/simpleworklist/domain/meso/taskstate/TaskStateTabControllerService.java

@@ -52,7 +52,6 @@ String getTaskStatePageScheduled(
   );
 
   String getTaskStatePageFocus(
-    boolean focus,
     Context context,
     Pageable pageRequest,
     UserSessionBean userSession,

src/main/java/org/woehlke/java/simpleworklist/domain/meso/taskstate/TaskStateTabControllerServiceImpl.java

@@ -139,11 +139,11 @@ public String getTaskStatePageScheduled(
   }
 
   @Override
-  public String getTaskStatePageFocus(boolean focus, Context context, Pageable pageRequest, UserSessionBean userSession, Locale locale, Model model) {
+  public String getTaskStatePageFocus( Context context, Pageable pageRequest, UserSessionBean userSession, Locale locale, Model model) {
     log.info("getTaskStatePage");
     TaskState taskState = TaskState.FOCUS;
     userSession.setLastTaskState(taskState);
-    Page<Task> taskPage = taskService.findByFocus(focus, context, pageRequest);
+    Page<Task> taskPage = taskService.findByFocus( context, pageRequest);
     Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForTaskstate(taskState,locale,userSession);
     model.addAttribute("breadcrumb", breadcrumb);
     model.addAttribute("taskPage", taskPage);