work in progress

Author: thomaswoehlke

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

@@ -54,4 +54,13 @@ List<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
         @Param("context") Context context
     );
 
+    @Query("select t from Task t"
+        + " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
+        + " and t.project is null and t.context = :context ")
+    List<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
+        @Param("lowerOrderIdProject") long lowerOrderIdProject,
+        @Param("higherOrderIdProject") long higherOrderIdProject,
+        @Param("context") Context context
+    );
+
 }

src/main/java/org/woehlke/simpleworklist/task/TaskService.java

@@ -33,7 +33,6 @@ public interface TaskService {
     void moveAllCompletedToTrash(Context context);
     void emptyTrash(Context context);
 
-
     void moveTaskToTaskAndChangeTaskOrderInTaskstate(Task sourceTask, Task destinationTask);
     void moveTaskToTaskAndChangeTaskOrderInProject(Task sourceTask, Task destinationTask);
     void moveTaskToTaskAndChangeTaskOrderInProjectRoot(Task sourceTask, Task destinationTask);

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

@@ -315,11 +315,9 @@ public void moveTaskToTaskAndChangeTaskOrderInTaskstate(@NotNull Task sourceTask
         boolean notEquals = ! sourceTask.equalsByUniqueConstraint(destinationTask);
         boolean sameContext = sourceTask.hasSameContextAs(destinationTask);
         boolean sameTaskType = sourceTask.hasSameTaskTypetAs(destinationTask);
-        boolean srcIsBelowDestinationTask  = sourceTask.isBelowByTaskState(destinationTask);
-        if (
-                notEqualsId && notEquals &&
-                sameContext && sameTaskType
-        ) {
+        boolean go = notEqualsId && notEquals && sameContext && sameTaskType;
+        if ( go ) {
+            boolean srcIsBelowDestinationTask  = sourceTask.isBelowByTaskState(destinationTask);
             if (srcIsBelowDestinationTask) {
                 this.moveTasksDownByTaskState( sourceTask, destinationTask );
             } else {
@@ -335,12 +333,13 @@ public void moveTaskToTaskAndChangeTaskOrderInProjectRoot(@NotNull Task sourceTa
         boolean destinationTaskRoot = destinationTask.isInRootProject();
         boolean sameContext = sourceTask.hasSameContextAs(destinationTask);
         boolean sameProject = sourceTask.hasSameProjectAs(destinationTask);
-        boolean srcIsBelowDestinationTask  = sourceTask.isBelowByProject(destinationTask);
-        if (sameContext && sameProject && sourceTaskRoot && destinationTaskRoot) {
+        boolean go = sameContext && sameProject && sourceTaskRoot && destinationTaskRoot;
+        if ( go ) {
+            boolean srcIsBelowDestinationTask  = sourceTask.isBelowByProject(destinationTask);
             if (srcIsBelowDestinationTask) {
-                this.moveTasksDownByProject(sourceTask, destinationTask);
+                this.moveTasksDownByProjectRoot(sourceTask, destinationTask);
             } else {
-                this.moveTasksUpByProject(sourceTask, destinationTask);
+                this.moveTasksUpByProjectRoot(sourceTask, destinationTask);
             }
         }
     }
@@ -437,6 +436,44 @@ private void moveTasksDownByTaskState(@NotNull Task sourceTask, @NotNull Task de
         taskRepository.saveAll(tasks);
     }
 
+    private void moveTasksUpByProjectRoot(@NotNull Task sourceTask, @NotNull Task destinationTask ) {
+        Context context = sourceTask.getContext();
+        long lowerOrderIdProject = destinationTask.getOrderIdProject();
+        long higherOrderIdProject = sourceTask.getOrderIdProject();
+        List<Task> tasks = taskRepository.getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
+            lowerOrderIdProject,
+            higherOrderIdProject,
+            context
+        );
+        for(Task task:tasks){
+            task.moveUpByProject();
+        }
+        sourceTask.setOrderIdProject(destinationTask.getOrderIdProject());
+        destinationTask.moveUpByProject();
+        tasks.add(sourceTask);
+        tasks.add(destinationTask);
+        taskRepository.saveAll(tasks);
+    }
+
+    private void moveTasksDownByProjectRoot(@NotNull Task sourceTask, @NotNull Task destinationTask) {
+        Context context = sourceTask.getContext();
+        long lowerOrderIdProject = sourceTask.getOrderIdProject();
+        long higherOrderIdProject = destinationTask.getOrderIdProject();
+        List<Task> tasks = taskRepository.getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
+            lowerOrderIdProject,
+            higherOrderIdProject,
+            context
+        );
+        for(Task task:tasks){
+            task.moveDownByProject();
+        }
+        sourceTask.setOrderIdProject(destinationTask.getOrderIdProject());
+        destinationTask.moveDownByProject();
+        tasks.add(sourceTask);
+        tasks.add(destinationTask);
+        taskRepository.saveAll(tasks);
+    }
+
     private void moveTasksUpByProject(@NotNull Task sourceTask, @NotNull Task destinationTask ) {
         Context context = sourceTask.getContext();
         Project project = sourceTask.getProject();