bugfixing

Author: thomaswoehlke

src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdController.java

@@ -40,16 +40,14 @@
 public class ProjectIdController extends AbstractController {
 
   private final ProjectControllerService projectControllerService;
-  private final ProjectService projectService;
   private final TaskMoveService taskMoveService;
   private final TaskService taskService;
   private final ContextService contextService;
   private final BreadcrumbService breadcrumbService;
 
   @Autowired
-  public ProjectIdController(ProjectControllerService projectControllerService, ProjectService projectService, TaskMoveService taskMoveService, TaskService taskService, ContextService contextService, BreadcrumbService breadcrumbService) {
+  public ProjectIdController(ProjectControllerService projectControllerService, TaskMoveService taskMoveService, TaskService taskService, ContextService contextService, BreadcrumbService breadcrumbService) {
     this.projectControllerService = projectControllerService;
-    this.projectService = projectService;
     this.taskMoveService = taskMoveService;
     this.taskService = taskService;
     this.contextService = contextService;
@@ -171,24 +169,24 @@ public final String projectEditPost(
       for (ObjectError e : result.getAllErrors()) {
         log.info(e.toString());
       }
-      thisProject = projectService.findByProjectId(projectId);
+      thisProject = projectControllerService.findByProjectId(projectId);
       Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShoProjectId(thisProject, locale, userSession);
       model.addAttribute("breadcrumb", breadcrumb);
       model.addAttribute("userSession", userSession);
       return "project/id/edit";
     } else {
-      thisProject = projectService.findByProjectId(project.getId());
+      thisProject = projectControllerService.findByProjectId(project.getId());
       thisProject.setName(project.getName());
       thisProject.setDescription(project.getDescription());
       Context newContext = project.getContext();
       boolean contextChanged = (newContext.getId().longValue() != thisProject.getContext().getId().longValue());
       if (contextChanged) {
         long newContextId = newContext.getId();
         newContext = contextService.findByIdAndUserAccount(newContextId, thisUser);
-        thisProject = projectService.moveProjectToAnotherContext(thisProject, newContext);
+        thisProject = projectControllerService.moveProjectToAnotherContext(thisProject, newContext);
         userSession.setLastContextId(newContextId);
       } else {
-        thisProject = projectService.update(thisProject);
+        thisProject = projectControllerService.update(thisProject);
       }
       userSession.setLastProjectId(thisProject.getId());
       model.addAttribute("userSession", userSession);
@@ -210,7 +208,7 @@ public final String projectDeleteGet(
     boolean hasNoChildren = project.hasNoChildren();
     boolean delete = hasNoData && hasNoChildren;
     if (delete) {
-      Project parent = projectService.delete(project);
+      Project parent = projectControllerService.delete(project);
       //TODO: message to message_properties
       String message = "Project is deleted. You see its parent project now.";
       //TODO: message to UserSessionBean userSession
@@ -260,8 +258,8 @@ public final String projectMoveToProjectGet(
   ) {
     userSession.setLastProjectId(thisProject.getId());
     model.addAttribute("userSession", userSession);
-    Project targetProject = projectService.findByProjectId(targetProjectId);
-    thisProject = projectService.moveProjectToAnotherProject(thisProject, targetProject);
+    Project targetProject = projectControllerService.findByProjectId(targetProjectId);
+    thisProject = projectControllerService.moveProjectToAnotherProject(thisProject, targetProject);
     model.addAttribute("userSession", userSession);
     model.addAttribute("taskstateType", PROJECTS.getSlug());
     model.addAttribute("dataPage", true);

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/project/ProjectService.java

@@ -4,24 +4,28 @@
 import org.springframework.data.domain.Pageable;
 import org.woehlke.java.simpleworklist.domain.db.data.Context;
 import org.woehlke.java.simpleworklist.domain.db.data.Project;
+import org.woehlke.java.simpleworklist.domain.db.data.Task;
 
 import java.util.List;
 
 public interface ProjectService {
 
     Project add(Project project);
     Project update(Project project);
-    Project delete(Project project);
+    void delete(Project project);
+
+
+    List<Task> findByProject(Project thisProject);
 
     List<Project> findRootProjectsByContext(Context context);
     Page<Project> findRootProjectsByContext(Context context, Pageable pageRequest);
 
     List<Project> findAllProjectsByContext(Context context);
     Page<Project> findAllProjectsByContext(Context context, Pageable pageRequest);
 
-    Project moveProjectToAnotherProject(Project thisProject, Project targetProject);
-    Project moveProjectToAnotherContext(Project thisProject, Context newContext);
-
     Project getReferenceById(long projectId);
     Project findByProjectId(long projectId);
+
+
+    List<Project> getAllChildrenOfProject(Project thisProject);
 }

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/project/ProjectServiceImpl.java

@@ -86,73 +86,33 @@ public Project update(@NotNull Project entity) {
 
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public Project delete(@NotNull Project thisProject) {
+    public void delete(@NotNull Project thisProject) {
         log.info("delete");
-        Project oldParent = thisProject.getParent();
-        if (oldParent != null) {
-            oldParent.getChildren().remove(thisProject);
-            projectRepository.saveAndFlush(oldParent);
-        }
         projectRepository.delete(thisProject);
-        return oldParent;
     }
 
-    @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public Project moveProjectToAnotherContext(@NotNull Project thisProject, @NotNull Context newContext) {
-        log.info("----------------------------------------------------");
-        log.info("moveProjectToAnotherContext: Project: "+ thisProject.toString());
-        log.info("----------------------------------------------------");
-        log.info("moveProjectToAnotherContext: newContext: "+ newContext.toString());
-        log.info("----------------------------------------------------");
-        thisProject.setParent(null);
-        thisProject = projectRepository.saveAndFlush(thisProject);
-        //TODO: remove Recursion, remove unbounded Recursion and List instead of Page.
-        List<Project> listProject = getAllChildrenOfProject(thisProject);
-        for(Project childProject : listProject){
-            List<Task> tasksOfChildProject = taskRepository.findByProject(childProject);
-            for(Task task:tasksOfChildProject){
-                task.setContext(newContext);
-            }
-            childProject.setContext(newContext);
-            taskRepository.saveAll(tasksOfChildProject);
-            projectRepository.saveAndFlush(childProject);
-        }
-        return thisProject;
-    }
+  @Override
+  public List<Task> findByProject(Project thisProject) {
+    return taskRepository.findByProject(thisProject);
+  }
+
 
   @Override
   public Project getReferenceById(long projectId) {
     return projectRepository.getReferenceById(projectId);
   }
 
-  //TODO: remove Recursion, remove unbounded Recursion and List instead of Page.
-    @Deprecated
-    private List<Project> getAllChildrenOfProject(@NotNull Project thisProject) {
+
+  @Override
+  public List<Project> getAllChildrenOfProject(@NotNull Project thisProject) {
         log.info("getAllChildrenOfProject");
         List<Project> childrenOfProject = new ArrayList<>();
         childrenOfProject.add(thisProject);
         for(Project p : thisProject.getChildren()){
-            //TODO: remove Recursion, remove unbounded Recursion and List instead of Page.
             List<Project> getNextGeneration = getAllChildrenOfProject(p);
             childrenOfProject.addAll(getNextGeneration);
         }
         return childrenOfProject;
     }
 
-    @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public Project moveProjectToAnotherProject(
-        @NotNull Project thisProject,
-        @NotNull Project targetProject
-    ) {
-        log.info("moveProjectToAnotherProject");
-        Project oldParent = thisProject.getParent();
-        if (oldParent != null) {
-            oldParent.getChildren().remove(thisProject);
-            projectRepository.saveAndFlush(oldParent);
-        }
-        thisProject.setParent(targetProject);
-        return projectRepository.saveAndFlush(thisProject);
-    }
 }

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskService.java

@@ -23,6 +23,7 @@ public interface TaskService {
     List<Task> findByTaskStateTrash(Context context);
     List<Task> findByTaskStateDeleted(Context context);
     List<Task> findByTaskStateProjects(Context context);
+    List<Task> findByProjectId(Project thisProject);
 
     Page<Task> findByTaskStateInbox(Context context, Pageable request);
     Page<Task> findByTaskStateToday(Context context, Pageable request);

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskServiceImpl.java

@@ -142,6 +142,11 @@ public List<Task> findByTaskStateProjects(Context context) {
     return taskRepository.findByTaskStateProjects(context);
   }
 
+  @Override
+  public List<Task> findByProjectId(Project thisProject) {
+    return taskRepository.findByProject(thisProject);
+  }
+
   @Override
   public Page<Task> findByTaskStateInbox(Context context, Pageable request) {
     return taskRepository.findByTaskStateInbox(context, request);

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

@@ -10,6 +10,7 @@
 import org.woehlke.java.simpleworklist.domain.db.data.Task;
 import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
 
+import java.util.List;
 import java.util.Locale;
 
 public interface ProjectControllerService {
@@ -54,10 +55,17 @@ Project getProject(
         UserSessionBean userSession
     );
 
+    Project add(Project project);
+    Project update(Project project);
+    Project delete(Project project);
+
     void moveTaskToTaskAndChangeTaskOrderInProjectId(Task sourceTask, Task destinationTask);
     void moveTaskToTaskAndChangeTaskOrderInProjectRoot(Task sourceTask, Task destinationTask);
 
     Project findByProjectId(long projectId);
     Page<Task> findByProject(Project thisProject, Pageable pageable);
+    List<Task> findByProject(Project thisProject);
 
+    Project moveProjectToAnotherProject(Project thisProject, Project targetProject);
+    Project moveProjectToAnotherContext(Project thisProject, Context newContext);
 }