work in progress

Author: thomaswoehlke

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

@@ -35,11 +35,17 @@ public class ProjectController extends AbstractController {
 
     private final ProjectControllerService projectControllerService;
     private final TaskService taskService;
+    private final TaskProjektService taskProjektService;
 
     @Autowired
-    public ProjectController(ProjectControllerService projectControllerService, TaskService taskService) {
+    public ProjectController(
+        ProjectControllerService projectControllerService,
+        TaskService taskService,
+        TaskProjektService taskProjektService
+    ) {
         this.projectControllerService = projectControllerService;
         this.taskService = taskService;
+        this.taskProjektService = taskProjektService;
     }
 
     @RequestMapping(path = "/task/add", method = RequestMethod.GET)
@@ -270,7 +276,8 @@ public final String projectDeleteGet(
         boolean delete = hasNoData && hasNoChildren;
         if (delete) {
             Project parent = projectService.delete(project);
-            String message = "Project is deleted. You see its parent project now."; //TODO: message to message_properties
+            //TODO: message to message_properties
+            String message = "Project is deleted. You see its parent project now.";
             //TODO: message to UserSessionBean userSession
             model.addAttribute("message", message );
             //TODO: isDeleted as message to UserSessionBean userSession
@@ -608,6 +615,6 @@ public final String transformTaskIntoProjectGet(
         userSession.setLastProjectId(thisProject.getId());
         userSession.setLastTaskState(task.getTaskState());
         userSession.setLastTaskId(task.getId());
-        return projectControllerService.transformTaskIntoProjectGet(task);
+        return taskProjektService.transformTaskIntoProjectGet(task);
     }
 }

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

@@ -35,11 +35,13 @@ public class ProjectControllerRoot extends AbstractController {
 
     private final ProjectControllerService projectControllerService;
     private final TaskService taskService;
+    private final TaskProjektService taskProjektService;
 
     @Autowired
-    public ProjectControllerRoot(ProjectControllerService projectControllerService, TaskService taskService) {
+    public ProjectControllerRoot(ProjectControllerService projectControllerService, TaskService taskService, TaskProjektService taskProjektService) {
         this.projectControllerService = projectControllerService;
         this.taskService = taskService;
+        this.taskProjektService = taskProjektService;
     }
 
     @RequestMapping(path="", method = RequestMethod.GET)
@@ -469,7 +471,7 @@ public final String transformTaskIntoProjectGet(
         userSession.setLastProjectId(rootProjectId);
         userSession.setLastTaskState(task.getTaskState());
         userSession.setLastTaskId(task.getId());
-        return projectControllerService.transformTaskIntoProjectGet(task);
+        return taskProjektService.transformTaskIntoProjectGet(task);
     }
 
     @RequestMapping(path = "/task/{taskId}/complete", method = RequestMethod.GET)

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

@@ -51,8 +51,6 @@ Project getProject(
         UserSessionBean userSession
     );
 
-    String transformTaskIntoProjectGet(Task task);
-
     void moveTaskToTaskAndChangeTaskOrderInProject(Task sourceTask, Task destinationTask);
     void moveTaskToTaskAndChangeTaskOrderInProjectRoot(Task sourceTask, Task destinationTask);
 }

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

@@ -131,28 +131,6 @@ public String addNewProjectToProjectRootPersist(
         return project.getUrl();
     }
 
-    @Override
-    public String transformTaskIntoProjectGet(@NotNull Task task) {
-        log.info("transformTaskIntoProjectGet");
-        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.add(thisProject);
-        task.setProject(null);
-        task.moveToTrash();
-        task.emptyTrash();
-        taskService.updatedViaTaskstate(task);
-        log.info("tried to transform Task " + task.getId() + " to new Project " + thisProject.getId());
-        return thisProject.getUrl();
-    }
-
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public void moveTaskToTaskAndChangeTaskOrderInProject(@NotNull Task sourceTask, @NotNull Task destinationTask ) {

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

@@ -0,0 +1,6 @@
+package org.woehlke.simpleworklist.task;
+
+public interface TaskProjektService {
+
+    String transformTaskIntoProjectGet(Task task);
+}

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

@@ -0,0 +1,46 @@
+package org.woehlke.simpleworklist.task;
+
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.woehlke.simpleworklist.project.Project;
+import org.woehlke.simpleworklist.project.ProjectService;
+
+import javax.validation.constraints.NotNull;
+
+@Slf4j
+@Service
+public class TaskProjektServiceImpl implements TaskProjektService {
+
+    private final ProjectService projectService;
+    private final TaskService taskService;
+
+    @Autowired
+    public TaskProjektServiceImpl(ProjectService projectService, TaskService taskService) {
+        this.projectService = projectService;
+        this.taskService = taskService;
+    }
+
+    @Override
+    public String transformTaskIntoProjectGet(@NotNull Task task) {
+        log.info("transformTaskIntoProjectGet");
+        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.add(thisProject);
+        task.setProject(null);
+        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

@@ -29,16 +29,17 @@
 @RequestMapping(path = "/taskstate/task")
 public class TaskStateTaskController extends AbstractController {
 
-
     private final TaskStateControllerService taskStateControllerService;
     private final TaskService taskService;
+    private final TaskProjektService taskProjektService;
 
     @Autowired
     public TaskStateTaskController(
-        TaskStateControllerService taskStateControllerService, TaskService taskService
-    ) {
+        TaskStateControllerService taskStateControllerService, TaskService taskService,
+        TaskProjektService taskProjektService) {
         this.taskStateControllerService = taskStateControllerService;
         this.taskService = taskService;
+        this.taskProjektService = taskProjektService;
     }
 
     @RequestMapping(path = "/add", method = RequestMethod.GET)
@@ -305,7 +306,7 @@ public final String undeleteTaskGet(@NotNull @PathVariable("taskId") Task task)
     @RequestMapping(path = "/{taskId}/transform", method = RequestMethod.GET)
     public final String transformTaskIntoProjectGet(@NotNull @PathVariable("taskId") Task task) {
         log.info("transformTaskIntoProjectGet");
-        return taskStateControllerService.transformTaskIntoProjectGet(task);
+        return taskProjektService.transformTaskIntoProjectGet(task);
     }
 
     @RequestMapping(path = "/{taskId}/complete", method = RequestMethod.GET)