work in progress

Author: thomaswoehlke

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

@@ -81,6 +81,7 @@ public String addNewProjectToProjectIdPersist(
         } else {
             Project thisProject = projectService.findByProjectId(projectId);
             project = thisProject.addOtherProjectToChildren(project);
+            project.setContext(context);
             project = projectService.add(project);
             thisProject = projectService.update(thisProject);
             log.info("project:     "+ project.toString());
@@ -129,6 +130,7 @@ public String addNewProjectToProjectRootPersist(
         Model model
     ) {
         log.info("addNewProjectToRootPersist");
+        project.setContext(context);
         project = projectService.add(project);
         userSession.setLastProjectId(project.getId());
         model.addAttribute("userSession", userSession);

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

@@ -81,11 +81,13 @@ public Project findByProjectId(@Min(1L) long projectId) {
     public Project add(@NotNull Project entity) {
         log.info("saveAndFlush");
         entity.setUuid(UUID.randomUUID().toString());
+        /*
         if(entity.getContext()!=null){
             if(entity.getContext().getUuid() == null){
                 entity.getContext().setUuid(UUID.randomUUID().toString());
             }
         }
+        */
         return projectRepository.saveAndFlush(entity);
     }
 

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

@@ -10,6 +10,7 @@
 import org.woehlke.simpleworklist.user.session.UserSessionBean;
 
 import javax.validation.constraints.NotNull;
+import java.util.UUID;
 
 @Slf4j
 @Service
@@ -32,13 +33,13 @@ public String 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.setContext(task.getContext());
         thisProject = projectService.add(thisProject);
         task.setProject(null);
         task.moveToTrash();