work in progres

Author: thomaswoehlke

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

@@ -52,5 +52,4 @@ String addNewProjectToRootPersist(
         Model model
     );
 
-    String transformTaskIntoProjectGet(Task task);
 }

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

@@ -168,24 +168,4 @@ public String addNewProjectToRootPersist(
         userSession.setLastProjectId(project.getId());
         return project.getUrl();
     }
-
-    @Override
-    public String transformTaskIntoProjectGet(Task task) {
-        Project thisProject = new Project();
-        thisProject.setName(task.getTitle());
-        thisProject.setDescription(task.getText());
-        thisProject.setUuid(task.getUuid());
-        thisProject.setContext(task.getContext());
-        if (task.getProject() != null) {
-            long projectId = task.getProject().getId();
-            Project parentProject = projectService.findByProjectId(projectId);
-            thisProject.setParent(parentProject);
-        }
-        thisProject = projectService.saveAndFlush(thisProject);
-        task.moveToTrash();
-        task.emptyTrash();
-        taskService.updatedViaTaskstate(task);
-        log.info("tried to transform Task " + task.getId() + " to new Project " + thisProject.getId());
-        return thisProject.getUrl();
-    }
 }

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

@@ -18,4 +18,5 @@ String getTaskStatePage(
         Model model
     );
 
+    String transformTaskIntoProjectGet(Task task);
 }

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

@@ -9,6 +9,8 @@
 import org.woehlke.simpleworklist.breadcrumb.Breadcrumb;
 import org.woehlke.simpleworklist.breadcrumb.BreadcrumbService;
 import org.woehlke.simpleworklist.context.Context;
+import org.woehlke.simpleworklist.project.Project;
+import org.woehlke.simpleworklist.project.ProjectService;
 import org.woehlke.simpleworklist.session.UserSessionBean;
 
 import java.util.Locale;
@@ -19,14 +21,16 @@ public class TaskStateControllerServiceImpl implements TaskStateControllerServic
 
     private final BreadcrumbService breadcrumbService;
     private final TaskService taskService;
+    private final ProjectService projectService;
 
     @Autowired
     public TaskStateControllerServiceImpl(
         BreadcrumbService breadcrumbService,
-        TaskService taskService
-    ) {
+        TaskService taskService,
+        ProjectService projectService) {
         this.breadcrumbService = breadcrumbService;
         this.taskService = taskService;
+        this.projectService = projectService;
     }
 
     @Override
@@ -49,4 +53,23 @@ public String getTaskStatePage(
         return taskState.getTemplate();
     }
 
+    @Override
+    public String transformTaskIntoProjectGet(Task task) {
+        Project thisProject = new Project();
+        thisProject.setName(task.getTitle());
+        thisProject.setDescription(task.getText());
+        thisProject.setUuid(task.getUuid());
+        thisProject.setContext(task.getContext());
+        if (task.getProject() != null) {
+            long projectId = task.getProject().getId();
+            Project parentProject = projectService.findByProjectId(projectId);
+            thisProject.setParent(parentProject);
+        }
+        thisProject = projectService.saveAndFlush(thisProject);
+        task.moveToTrash();
+        task.emptyTrash();
+        taskService.updatedViaTaskstate(task);
+        log.info("tried to transform Task " + task.getId() + " to new Project " + thisProject.getId());
+        return thisProject.getUrl();
+    }
 }

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

@@ -27,12 +27,15 @@
 @RequestMapping(path = "/taskstate/task")
 public class TaskStateTaskController extends AbstractController {
 
+
+    private final TaskStateControllerService taskStateControllerService;
     private final TaskService taskService;
 
     @Autowired
     public TaskStateTaskController(
-        TaskService taskService
+        TaskStateControllerService taskStateControllerService, TaskService taskService
     ) {
+        this.taskStateControllerService = taskStateControllerService;
         this.taskService = taskService;
     }
 
@@ -306,7 +309,7 @@ public final String undeleteTaskGet(@PathVariable("taskId") Task task) {
     @RequestMapping(path = "/{taskId}/transform", method = RequestMethod.GET)
     public final String transformTaskIntoProjectGet(@PathVariable("taskId") Task task) {
         log.info("transformTaskIntoProjectGet");
-        return transformTaskIntoProjectGet(task);
+        return taskStateControllerService.transformTaskIntoProjectGet(task);
     }
 
     @RequestMapping(path = "/{taskId}/complete", method = RequestMethod.GET)