work

Author: thomaswoehlke

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

@@ -85,29 +85,21 @@ public Task addToRootProject( @Valid Task task) {
   @Override
   @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
   public long getMaxOrderIdTaskState(TaskState taskState, Context context) {
-    Task task = taskService.findTopByTaskStateAndContextOrderByOrderIdTaskStateDesc(
-      taskState,
-      context
-    );
+    Task task = taskService.findTopByTaskStateAndContextOrderByOrderIdTaskStateDesc(taskState, context);
     return (task==null) ? 0 : task.getOrderIdTaskState();
   }
 
   @Override
   @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
-  public long getMaxOrderIdProject( Project project,Context context) {
-    Task task = taskService.findTopByProjectAndContextOrderByOrderIdProjectDesc(
-      project,
-      context
-    );
+  public long getMaxOrderIdProject(Project project,Context context) {
+    Task task = taskService.findTopByProjectAndContextOrderByOrderIdProjectDesc(project,context);
     return (task==null) ? 0 : task.getOrderIdProject();
   }
 
   @Override
   @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
-  public long getMaxOrderIdProjectRoot( Context context) {
-    Task task = taskService.findTopByProjectIsNullAndContextOrderByOrderIdProjectDesc(
-      context
-    );
+  public long getMaxOrderIdProjectRoot(Context context) {
+    Task task = taskService.findTopByProjectIsNullAndContextOrderByOrderIdProjectDesc(context);
     return (task==null) ? 0 : task.getOrderIdProject();
   }
 

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

@@ -45,10 +45,7 @@ public Task moveTaskToAnotherProject( @Valid Task task, @Valid Project project)
     boolean okContext = task.hasSameContextAs(project);
     if(okContext) {
       task.moveTaskToAnotherProject(project);
-      long maxOrderIdProject = taskLifecycleService.getMaxOrderIdProject(
-        task.getProject(),
-        task.getContext()
-      );
+      long maxOrderIdProject = taskLifecycleService.getMaxOrderIdProject(task.getProject(),task.getContext());
       task.setOrderIdProject(++maxOrderIdProject);
       taskService.saveAndFlush(task);
     }
@@ -59,9 +56,7 @@ public Task moveTaskToAnotherProject( @Valid Task task, @Valid Project project)
   @Override
   @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
   public Task moveTaskToInbox(Task task) {
-    long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(
-      TaskState.INBOX,
-      task.getContext()
+    long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.INBOX, task.getContext()
     );
     task.moveToInbox();
     task.setOrderIdTaskState(++newOrderIdTaskState);
@@ -74,10 +69,7 @@ public Task moveTaskToInbox(Task task) {
   @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
   public Task moveTaskToToday(Task task) {
     Date now = new Date();
-    long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(
-      TaskState.TODAY,
-      task.getContext()
-    );
+    long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.TODAY,task.getContext());
     task.moveToToday();
     task.setOrderIdTaskState(++newOrderIdTaskState);
     task = taskService.saveAndFlush(task);
@@ -88,10 +80,7 @@ public Task moveTaskToToday(Task task) {
   @Override
   @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
   public Task moveTaskToNext(Task task) {
-    long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(
-      TaskState.NEXT,
-      task.getContext()
-    );
+    long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.NEXT,task.getContext());
     task.moveToNext();
     task.setOrderIdTaskState(++newOrderIdTaskState);
     task = taskService.saveAndFlush(task);
@@ -102,10 +91,7 @@ public Task moveTaskToNext(Task task) {
   @Override
   @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
   public Task moveTaskToWaiting(Task task) {
-    long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(
-      TaskState.WAITING,
-      task.getContext()
-    );
+    long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.WAITING,task.getContext());
     task.moveToWaiting();
     task.setOrderIdTaskState(++newOrderIdTaskState);
     task = taskService.saveAndFlush(task);
@@ -116,10 +102,7 @@ public Task moveTaskToWaiting(Task task) {
   @Override
   @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
   public Task moveTaskToSomeday(Task task) {
-    long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(
-      TaskState.SOMEDAY,
-      task.getContext()
-    );
+    long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.SOMEDAY,task.getContext());
     task.moveToSomeday();
     task.setOrderIdTaskState(++newOrderIdTaskState);
     task = taskService.saveAndFlush(task);
@@ -130,9 +113,7 @@ public Task moveTaskToSomeday(Task task) {
   @Override
   @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
   public Task moveTaskToFocus(Task task) {
-    long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(
-      TaskState.FOCUS,
-      task.getContext()
+    long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.FOCUS,task.getContext()
     );
     task.moveToFocus();
     task.setOrderIdTaskState(++newOrderIdTaskState);
@@ -144,9 +125,7 @@ public Task moveTaskToFocus(Task task) {
   @Override
   @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
   public Task moveTaskToCompleted(Task task) {
-    long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(
-      TaskState.COMPLETED,
-      task.getContext()
+    long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.COMPLETED,task.getContext()
     );
     task.moveToCompletedTasks();
     task.setOrderIdTaskState(++newOrderIdTaskState);
@@ -158,10 +137,7 @@ public Task moveTaskToCompleted(Task task) {
   @Override
   @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
   public Task moveTaskToTrash(Task task) {
-    long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(
-      TaskState.TRASH,
-      task.getContext()
-    );
+    long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.TRASH, task.getContext());
     task.moveToTrash();
     task.setOrderIdTaskState(++newOrderIdTaskState);
     task = taskService.saveAndFlush(task);
@@ -189,14 +165,14 @@ public void moveAllCompletedToTrash( Context context) {
   @Override
   @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
   public void emptyTrash( Context context) {
-    List<Task> taskList = taskService.findByTaskStateAndContext(TaskState.TRASH, context);
+    List<Task> taskList = taskService.findByTaskStateTrash(context);
     List<Task> taskListChanged = new ArrayList<>(taskList.size());
     for(Task task: taskList){
       task.emptyTrash();
       taskListChanged.add(task);
     }
     taskService.saveAll(taskListChanged);
-    List<Task> taskListDeleted = taskService.findByTaskStateAndContext(TaskState.DELETED,context);
+    List<Task> taskListDeleted = taskService.findByTaskStateDeleted(context);
     taskService.deleteAll(taskListDeleted);
   }
 }