work in progres

Author: thomaswoehlke

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

@@ -246,7 +246,7 @@ public final String projectEditPost(
                 thisProject = projectService.moveProjectToAnotherContext(thisProject, newContext);
                 userSession.setLastContextId(newContextId);
             } else {
-                thisProject = projectService.saveAndFlush(thisProject);
+                thisProject = projectService.update(thisProject);
             }
             userSession.setLastProjectId(thisProject.getId());
             model.addAttribute("userSession", userSession);

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

@@ -3,7 +3,6 @@
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.task.Task;
 import org.woehlke.simpleworklist.session.UserSessionBean;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 

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

@@ -100,15 +100,15 @@ public String addNewProjectPersist(
                 if(userSession.getLastContextId()>0) {
                     project.setContext(context);
                 }
-                project = projectService.saveAndFlush(project);
+                project = projectService.add(project);
                 projectId = project.getId();
             } else {
                 Project thisProject = projectService.findByProjectId(projectId);
                 List<Project> children = thisProject.getChildren();
                 children.add(project);
                 thisProject.setChildren(children);
                 project.setParent(thisProject);
-                project = projectService.saveAndFlush(project);
+                project = projectService.add(project);
                 projectId = project.getId();
                 log.info("project:     "+ project.toString());
                 log.info("thisProject: "+ thisProject.toString());
@@ -164,7 +164,7 @@ public String addNewProjectToRootPersist(
         Model model
     ) {
         log.info("addNewProjectToRootPersist");
-        project = projectService.saveAndFlush(project);
+        project = projectService.add(project);
         userSession.setLastProjectId(project.getId());
         return project.getUrl();
     }

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

@@ -3,25 +3,20 @@
 import java.util.List;
 
 import org.woehlke.simpleworklist.context.Context;
-//import org.woehlke.simpleworklist.user.account.UserAccount;
 
 public interface ProjectService {
 
     List<Project> findRootProjectsByContext(Context context);
 
     List<Project> findAllProjectsByContext(Context context);
 
-    //@Deprecated
-    //List<Project> findRootProjectsByUserAccount(UserAccount userAccount);
-
-    //@Deprecated
-    //List<Project> findAllProjectsByUserAccount(UserAccount user);
-
     Project moveProjectToAnotherProject(Project thisProject, Project targetProject);
 
-    Project findByProjectId(long categoryId);
+    Project findByProjectId(long projectId);
+
+    Project add(Project project);
 
-    Project saveAndFlush(Project project);
+    Project update(Project project);
 
     Project delete(Project project);
 

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

@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,7 +68,15 @@ public Project findByProjectId(long projectId) {
 
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public Project saveAndFlush(Project entity) {
+    public Project add(Project entity) {
+        log.info("saveAndFlush");
+        entity.setUuid(UUID.randomUUID().toString());
+        return projectRepository.saveAndFlush(entity);
+    }
+
+    @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+    public Project update(Project entity) {
         log.info("saveAndFlush");
         return projectRepository.saveAndFlush(entity);
     }