work in progress

Author: thomaswoehlke

src/main/java/org/woehlke/simpleworklist/project/ProjectController.java

@@ -310,7 +310,7 @@ public final String projectDeleteGet(
     }
 
     @RequestMapping(path = "/task/{taskId}/changeorderto/{destinationTaskId}", method = RequestMethod.GET)
-    public String projectTaskChangeOrderToTaskGet(
+    public String moveTaskToTaskAndChangeTaskOrderInProject(
         @PathVariable("projectId") Project thisProject,
         @PathVariable("taskId") Task sourceTask,
         @PathVariable("destinationTaskId") Task destinationTask,
@@ -326,7 +326,7 @@ public String projectTaskChangeOrderToTaskGet(
         log.info("-------------------------------------------------");
         log.info("  destination Task: "+destinationTask.toString());
         log.info("-------------------------------------------------");
-        taskService.moveOrderIdProject(sourceTask, destinationTask);
+        taskService.moveTaskToTaskAndChangeTaskOrderInProject(sourceTask, destinationTask);
         log.info("  DONE: taskMoveService.moveOrderIdProject");
         log.info("-------------------------------------------------");
         return thisProject.getUrl();

src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java

@@ -279,7 +279,7 @@ public String changeTaskOrderId(
         log.info("---------------------------------------------");
         log.info("destination Task: "+destinationTask.toString());
         log.info("---------------------------------------------");
-        taskService.moveOrderIdTaskState(sourceTask, destinationTask);
+        taskService.moveTaskToTaskAndChangeTaskOrderInProjectRoot(sourceTask, destinationTask);
         userSession.setLastProjectId(rootProjectId);
         userSession.setLastTaskState(sourceTask.getTaskState());
         userSession.setLastTaskId(sourceTask.getId());

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

@@ -33,7 +33,8 @@ public interface TaskService {
     void moveAllCompletedToTrash(Context context);
     void emptyTrash(Context context);
 
-    void moveOrderIdTaskState(Task sourceTask, Task destinationTask);
-    void moveOrderIdProject(Task sourceTask, Task destinationTask);
-    void moveOrderIdRootProject(Task sourceTask, Task destinationTask);
+
+    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

@@ -310,7 +310,7 @@ public long getMaxOrderIdProject(@NotNull Project project, @NotNull Context cont
 
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public void moveOrderIdTaskState(@NotNull Task sourceTask, @NotNull Task destinationTask ) {
+    public void moveTaskToTaskAndChangeTaskOrderInTaskstate(@NotNull Task sourceTask, @NotNull Task destinationTask ) {
         boolean notEqualsId = ! sourceTask.equalsById(destinationTask);
         boolean notEquals = ! sourceTask.equalsByUniqueConstraint(destinationTask);
         boolean sameContext = sourceTask.hasSameContextAs(destinationTask);
@@ -330,7 +330,7 @@ public void moveOrderIdTaskState(@NotNull Task sourceTask, @NotNull Task destina
 
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public void moveOrderIdRootProject(@NotNull Task sourceTask,@NotNull Task destinationTask ) {
+    public void moveTaskToTaskAndChangeTaskOrderInProjectRoot(@NotNull Task sourceTask, @NotNull Task destinationTask ) {
         boolean sourceTaskRoot = destinationTask.isInRootProject();
         boolean destinationTaskRoot = destinationTask.isInRootProject();
         boolean sameContext = sourceTask.hasSameContextAs(destinationTask);
@@ -357,7 +357,7 @@ public long getMaxOrderIdRootProject(@NotNull Context context) {
 
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public void moveOrderIdProject(@NotNull Task sourceTask, @NotNull Task destinationTask ) {
+    public void moveTaskToTaskAndChangeTaskOrderInProject(@NotNull Task sourceTask, @NotNull Task destinationTask ) {
         Project project = sourceTask.getProject();
         boolean okProject = destinationTask.hasProject(project);
         boolean sameContext = sourceTask.hasSameContextAs(destinationTask);

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

@@ -196,7 +196,7 @@ public String changeTaskOrderId(
         log.info("---------------------------------------------");
         log.info("destination Task: "+destinationTask.toString());
         log.info("---------------------------------------------");
-        taskService.moveOrderIdTaskState(sourceTask, destinationTask);
+        taskService.moveTaskToTaskAndChangeTaskOrderInTaskstate(sourceTask, destinationTask);
         return sourceTask.getTaskState().getUrl();
     }