URL PATH of Actions - Controller Methods Refactoring

Author: thomaswoehlke

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

@@ -27,10 +27,12 @@
 public class TaskController extends AbstractController {
 
     private final TaskMoveService taskMoveService;
+    private final TaskControllerService taskControllerService;
 
     @Autowired
-    public TaskController(TaskMoveService taskMoveService) {
+    public TaskController(TaskMoveService taskMoveService, TaskControllerService taskControllerService) {
         this.taskMoveService = taskMoveService;
+        this.taskControllerService = taskControllerService;
     }
 
     @RequestMapping(path = "/{taskId}/edit", method = RequestMethod.GET)
@@ -169,4 +171,56 @@ public final String transformTaskIntoProjectGet(@PathVariable("taskId") Task tas
         return "redirect:/taskstate/inbox";
     }
 
+    @RequestMapping(path = "/{taskId}/complete", method = RequestMethod.GET)
+    public final String setDoneTaskGet(
+        @PathVariable("taskId") Task task
+    ) {
+        if(task != null){
+            long maxOrderIdTaskState = taskMoveService.getMaxOrderIdTaskState(TaskState.COMPLETED,task.getContext());
+            task.setOrderIdTaskState(++maxOrderIdTaskState);
+            taskService.complete(task);
+        }
+        return "redirect:/taskstate/completed";
+    }
+
+    @RequestMapping(path = "/{taskId}/incomplete/", method = RequestMethod.GET)
+    public final String unsetDoneTaskGet(
+        @PathVariable("taskId") Task task
+    ) {
+        if(task !=null) {
+            taskService.incomplete(task);
+            long maxOrderIdTaskState = taskMoveService.getMaxOrderIdTaskState(task.getTaskState(),task.getContext());
+            task.setOrderIdTaskState(++maxOrderIdTaskState);
+            taskService.saveAndFlush(task);
+            return "redirect:/taskstate/"+task.getTaskState().name().toLowerCase();
+        } else {
+            return "redirect:/taskstate/inbox";
+        }
+    }
+
+    @RequestMapping(path = "/{taskId}/setfocus/", method = RequestMethod.GET)
+    public final String setFocusGet(
+        @PathVariable("taskId") Task task,
+        @RequestParam(required=false) String back
+    ){
+        if(task !=null) {
+            taskService.setFocus(task);
+            return taskControllerService.getView(task,back);
+        } else {
+            return "redirect:/taskstate/inbox";
+        }
+    }
+
+    @RequestMapping(path = "/{taskId}/unsetfocus", method = RequestMethod.GET)
+    public final String unsetFocusGet(
+        @PathVariable("taskId") Task task,
+        @RequestParam(required=false) String back
+    ){
+        if(task !=null) {
+            taskService.unsetFocus(task);
+            return taskControllerService.getView(task,back);
+        } else {
+            return "redirect:/taskstate/inbox";
+        }
+    }
 }

src/main/java/org/woehlke/simpleworklist/taskstate/TaskStateMoveController.java

@@ -11,7 +11,6 @@
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.task.Task;
-import org.woehlke.simpleworklist.task.TaskControllerService;
 import org.woehlke.simpleworklist.task.TaskEnergy;
 import org.woehlke.simpleworklist.task.TaskTime;
 import org.woehlke.simpleworklist.user.UserSessionBean;
@@ -31,15 +30,12 @@
 public class TaskStateMoveController extends AbstractController {
 
     private final TaskMoveService taskMoveService;
-    private final TaskControllerService taskControllerService;
 
     @Autowired
     public TaskStateMoveController(
-        TaskMoveService taskMoveService,
-        TaskControllerService taskControllerService
+        TaskMoveService taskMoveService
     ) {
         this.taskMoveService = taskMoveService;
-        this.taskControllerService = taskControllerService;
     }
 
     @RequestMapping(path = "/add", method = RequestMethod.GET)
@@ -215,57 +211,4 @@ public final String emptyTrash(
         return "redirect:/taskstate/trash";
     }
 
-    @RequestMapping(path = "/{taskId}/complete", method = RequestMethod.GET)
-    public final String setDoneTaskGet(
-        @PathVariable("taskId") Task task
-    ) {
-        if(task != null){
-            long maxOrderIdTaskState = taskMoveService.getMaxOrderIdTaskState(TaskState.COMPLETED,task.getContext());
-            task.setOrderIdTaskState(++maxOrderIdTaskState);
-            taskService.complete(task);
-        }
-        return "redirect:/taskstate/completed";
-    }
-
-    @RequestMapping(path = "/{taskId}/incomplete/", method = RequestMethod.GET)
-    public final String unsetDoneTaskGet(
-        @PathVariable("taskId") Task task
-    ) {
-        if(task !=null) {
-            taskService.incomplete(task);
-            long maxOrderIdTaskState = taskMoveService.getMaxOrderIdTaskState(task.getTaskState(),task.getContext());
-            task.setOrderIdTaskState(++maxOrderIdTaskState);
-            taskService.saveAndFlush(task);
-            return "redirect:/taskstate/"+task.getTaskState().name().toLowerCase();
-        } else {
-            return "redirect:/taskstate/inbox";
-        }
-    }
-
-    @RequestMapping(path = "/{taskId}/setfocus/", method = RequestMethod.GET)
-    public final String setFocusGet(
-        @PathVariable("taskId") Task task,
-        @RequestParam(required=false) String back
-    ){
-        if(task !=null) {
-            taskService.setFocus(task);
-            return taskControllerService.getView(task,back);
-        } else {
-            return "redirect:/taskstate/inbox";
-        }
-    }
-
-    @RequestMapping(path = "/{taskId}/unsetfocus", method = RequestMethod.GET)
-    public final String unsetFocusGet(
-        @PathVariable("taskId") Task task,
-        @RequestParam(required=false) String back
-    ){
-        if(task !=null) {
-            taskService.unsetFocus(task);
-            return taskControllerService.getView(task,back);
-        } else {
-            return "redirect:/taskstate/inbox";
-        }
-    }
-
 }

src/main/resources/templates/taskstate/inbox.html

@@ -16,7 +16,7 @@ <h1>
                 <span th:utext="#{tasks.inbox.h1}">Inbox</span>
             </h1>
             <div id="tw-content-title-actionbuttons">
-                <a class="btn btn-sm btn-primary" role="button" th:href="@{/task/add}">
+                <a class="btn btn-sm btn-primary" role="button" th:href="@{/taskstate/task/add}">
                     <i class="fas fa-plus-square"></i>
                     <span th:utext="#{tasks.inbox.addTask}">Add Task</span>
                 </a>