work in progres

Author: thomaswoehlke

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

@@ -155,7 +155,7 @@ public final String projectAddProjectGet(
         log.info("private addNewProjectGet (GET) projectId="+projectId);
         Context context = super.getContext(userSession);
         projectControllerService.addNewProject(projectId, userSession, context, locale, model);
-        return "project/id/add/project";
+        return "project/id/project/add";
     }
 
     @RequestMapping(path = "/project/add", method = {RequestMethod.POST})
@@ -175,7 +175,7 @@ public final String projectAddProjectPost(
             result,
             locale,
             model ,
-            "/add/project"
+            "project/id/project/add"
         );
     }
 
@@ -191,8 +191,8 @@ public final String projectMoveToProjectGet(
         userSession.setLastProjectId(thisProject.getId());
         model.addAttribute("userSession",userSession);
         Project targetProject = projectService.findByProjectId(targetProjectId);
-        projectService.moveProjectToAnotherProject(thisProject, targetProject );
-        return "redirect:/project/" + thisProject.getId();
+        thisProject = projectService.moveProjectToAnotherProject(thisProject, targetProject );
+        return thisProject.getUrl();
     }
 
     @RequestMapping(path = "/edit", method = RequestMethod.GET)
@@ -225,29 +225,32 @@ public final String projectEditPost(
         Context context = super.getContext(userSession);
         UserAccount thisUser = context.getUserAccount();
         model.addAttribute("userSession", userSession);
+        Project thisProject;
         if (result.hasErrors()) {
             for (ObjectError e : result.getAllErrors()) {
                 log.info(e.toString());
             }
-            Project thisProject = projectService.findByProjectId(projectId);
+            thisProject = projectService.findByProjectId(projectId);
             Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShowOneProject(thisProject,locale);
             model.addAttribute("breadcrumb", breadcrumb);
             return "project/id/edit";
         } else {
-            Project thisProject = projectService.findByProjectId(project.getId());
+            thisProject = projectService.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);
-                projectService.moveProjectToAnotherContext(thisProject, newContext);
-                model.addAttribute("userSession", new UserSessionBean(newContextId));
+                thisProject = projectService.moveProjectToAnotherContext(thisProject, newContext);
+                userSession.setLastContextId(newContextId);
             } else {
-                projectService.saveAndFlush(thisProject);
+                thisProject = projectService.saveAndFlush(thisProject);
             }
-            return "redirect:/project/" + projectId;
+            userSession.setLastProjectId(thisProject.getId());
+            model.addAttribute("userSession", userSession);
+            return thisProject.getUrl();
         }
     }
 

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

@@ -17,7 +17,7 @@ public interface ProjectService {
     //@Deprecated
     //List<Project> findAllProjectsByUserAccount(UserAccount user);
 
-    void moveProjectToAnotherProject(Project thisProject, Project targetProject);
+    Project moveProjectToAnotherProject(Project thisProject, Project targetProject);
 
     Project findByProjectId(long categoryId);
 

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

@@ -121,7 +121,7 @@ private List<Project> getAllChildrenOfProject(Project thisProject) {
 
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public void moveProjectToAnotherProject(
+    public Project moveProjectToAnotherProject(
         Project thisProject,
         Project targetProject
     ) {
@@ -132,6 +132,6 @@ public void moveProjectToAnotherProject(
             projectRepository.saveAndFlush(oldParent);
         }
         thisProject.setParent(targetProject);
-        projectRepository.saveAndFlush(thisProject);
+        return projectRepository.saveAndFlush(thisProject);
     }
 }