deployment

etc/TODO.md

@@ -88,8 +88,6 @@ https://www.baeldung.com/maven-enforcer-plugin
 # 2.3.14
 Fixed #122, Fixed #123, Fixed #127, Fixed #130, Fixed #152, Fixed #153, Fixed #154, Fixed #155, Fixed #156, Fixed #157, Fixed #158, Fixed #159, Fixed #160, Fixed #161, Fixed #162, Fixed #163, Fixed #164, Fixed #165, Fixed #166, Fixed #167
 
-
-
 https://developer.okta.com/blog/2019/03/28/test-java-spring-boot-junit5
 
 # 2.3.15
@@ -99,10 +97,16 @@ https://github.com/thymeleaf/thymeleaf-testing
 # 2.3.16 
 Fixed #169, Fixed #170, Fixed #171, Fixed #172, Fixed #183 
 
-
 # 2.3.17
 Fixed #223, Fixed #224, Fixed #225, Fixed #226, Fixed #227, Fixed #228, Fixed #229, Fixed #230, Fixed #231, Fixed #232, Fixed #233 
-
 Fixed #201, Fixed #202, Fixed #203, Fixed #204, Fixed #205, Fixed #206, Fixed #207, Fixed #208, Fixed #209, Fixed #210, Fixed #211, Fixed #212, Fixed #213, Fixed #214, Fixed #215, Fixed #216, Fixed #217, Fixed #218, Fixed #219 
-
 Fixed #220, Fixed #221, Fixed #222 
+
+#2.3.18
+Fixed #128, Fixed #192, Fixed #193, Fixed #194, Fixed #195, Fixed #196, Fixed #197, Fixed #198, Fixed #199, Fixed #200, Fixed #239, Fixed #240
+
+#2.3.19
+Fixed #241, Fixed #242, Fixed #243, Fixed #252
+
+#2.3.20
+

etc/requirements/Requirements.md

@@ -17,51 +17,58 @@
 ## F017 show /taskstate/completed
 ## F018 show /taskstate/trash
 
-## F020 Task move to /taskstate/inbox
-## F021 Task move to /taskstate/today
-## F022 Task move to /taskstate/next
-## F023 Task move to /taskstate/waiting
-## F024 Task move to /taskstate/scheduled
-## F025 Task move to /taskstate/someday
-## F026 Task move to /taskstate/focus
-## F027 Task move to /taskstate/completed
-## F028 Task move to /taskstate/trash
+## F020 Drag and Drop: Task move to /taskstate/inbox
+## F021 Drag and Drop: Task move to /taskstate/today
+## F022 Drag and Drop: Task move to /taskstate/next
+## F023 Drag and Drop: Task move to /taskstate/waiting
+## F024 Drag and Drop: Task move to /taskstate/scheduled
+## F025 Drag and Drop: Task move to /taskstate/someday
+## F026 Drag and Drop: Task move to /taskstate/focus
+## F027 Drag and Drop: Task move to /taskstate/completed
+## F028 Drag and Drop: Task move to /taskstate/trash
 
-## F030 Taskstate: Add Task to Inbox
-## F031 Taskstate: Add Task to Inbox again
-## F032 Taskstate: Task Edit
-## F033 Taskstate: Task Edit Form -> change Taskstate via DropDown
-## F054 Taskstate: Task Edit Form -> change Project via DropDown
-## F035 Taskstate: Task Edit Form -> transform to Project
-## F036 Taskstate: Task setFocus
-## F037 Taskstate: Task unSetFocus 
-## F038 Taskstate: Task complete
-## F039 Taskstate: Task incomplete
-## F040 Taskstate: Task delete
-## F041 Taskstate: Task undelete
+## F029 Drag and Drop: Task move to Project
+## F030 Drag and Drop: Project move to Project
 
-## F050 Project/Root: Add Task
-## F051 Project/Root: Add SubProject
-## F052 Project/Root: Task Edit
-## F053 Project/Root: Task Edit Form -> change Taskstate via DropDown
-## F054 Project/Root: Task Edit Form -> change Project via DropDown
-## F055 Project/Root: Task Edit Form -> transform to Project
-## F056 Project/Root: Task setFocus
-## F057 Project/Root: Task unSetFocus
-## F058 Project/Root: Task complete
-## F059 Project/Root: Task incomplete
-## F060 Project/Root: Task delete
-## F061 Project/Root: Task undelete
+## F031 Drag and Drop: Move Task to Change Task-Order in Taskstate
+## F032 Drag and Drop: Move Task to Change Task-Order in Project/Root
+## F033 Drag and Drop: Move Task to Change Task-Order in Project/id
 
-## F070 Project/id: Add Task
-## F071 Project/id: Add SubProject
-## F072 Project/id: Task Edit
-## F073 Project/id: Task Edit Form -> change Taskstate via DropDown
-## F074 Project/id: Task Edit Form -> change Project via DropDown
-## F075 Project/id: Task Edit Form -> transform to Project
-## F076 Project/id: Task setFocus
-## F077 Project/id: Task unSetFocus
-## F078 Project/id: Task complete
-## F079 Project/id: Task incomplete
-## F080 Project/id: Task delete 
-## F081 Project/id: Task undelete
+## F040 Taskstate: Add Task to Inbox
+## F041 Taskstate: Add Task to Inbox again
+## F042 Taskstate: Task Edit
+## F043 Taskstate: Task Edit Form -> change Taskstate via DropDown
+## F044 Taskstate: Task Edit Form -> change Project via DropDown
+## F045 Taskstate: Task Edit Form -> transform to Project
+## F046 Taskstate: Task setFocus
+## F047 Taskstate: Task unSetFocus 
+## F048 Taskstate: Task complete
+## F049 Taskstate: Task incomplete
+## F050 Taskstate: Task delete
+## F051 Taskstate: Task undelete
+
+## F060 Project/Root: Add Task
+## F061 Project/Root: Add SubProject
+## F062 Project/Root: Task Edit
+## F063 Project/Root: Task Edit Form -> change Taskstate via DropDown
+## F064 Project/Root: Task Edit Form -> change Project via DropDown
+## F065 Project/Root: Task Edit Form -> transform to Project
+## F066 Project/Root: Task setFocus
+## F067 Project/Root: Task unSetFocus
+## F068 Project/Root: Task complete
+## F069 Project/Root: Task incomplete
+## F070 Project/Root: Task delete
+## F071 Project/Root: Task undelete
+
+## F080 Project/id: Add Task
+## F081 Project/id: Add SubProject
+## F082 Project/id: Task Edit
+## F083 Project/id: Task Edit Form -> change Taskstate via DropDown
+## F084 Project/id: Task Edit Form -> change Project via DropDown
+## F085 Project/id: Task Edit Form -> transform to Project
+## F086 Project/id: Task setFocus
+## F087 Project/id: Task unSetFocus
+## F088 Project/id: Task complete
+## F089 Project/id: Task incomplete
+## F090 Project/id: Task delete 
+## F091 Project/id: Task undelete

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.woehlke</groupId>
     <artifactId>simpleworklist</artifactId>
-    <version>2.3.18-SNAPSHOT</version>
+    <version>2.3.20-SNAPSHOT</version>
 	<packaging>jar</packaging>
     <parent>
         <groupId>org.springframework.boot</groupId>

src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java

@@ -147,9 +147,9 @@ protected Context getContext(UserSessionBean userSession){
         UserAccount thisUser = this.getUser();
         if(userSession == null){
             userSession = new UserSessionBean();
-            long defaultContextId = thisUser.getDefaultContext().getId();
-            userSession.setLastContextId(defaultContextId);
         }
+        long defaultContextId = thisUser.getDefaultContext().getId();
+        userSession.setLastContextId(defaultContextId);
         Context context = contextService.findByIdAndUserAccount(userSession.getLastContextId(), thisUser);
         userSession.setLastContextId(context.getId());
         userSession.setUserAccountid(thisUser.getId());

src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceImpl.java

@@ -38,12 +38,14 @@ public TestDataServiceImpl(ProjectRepository projectRepository, TaskRepository t
 
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public void createTestCategoryTreeForUserAccount(UserAccount userAccount) {
-        List<Context> contexts = contextRepository.findByUserAccount(userAccount);
-        Iterator<Context> iterator = contexts.iterator();
-        Context contextWork = iterator.next();
         log.info("----------------------------------------------");
         log.info("createTestCategoryTreeForUserAccount");
         log.info("----------------------------------------------");
+        log.info("userAccount: "+userAccount.toString());
+        log.info("----------------------------------------------");
+        Context contextWork = userAccount.getDefaultContext();
+        log.info("contextWork: "+contextWork.toString());
+        log.info("----------------------------------------------");
         Date nowDate = new Date();
         long now = nowDate.getTime();
         String name01 = "test01_" + now;

src/main/java/org/woehlke/simpleworklist/context/Context.java

@@ -35,7 +35,7 @@
 @Getter
 @Setter
 @NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode(callSuper = true, exclude = "userAccount")
 @ToString(callSuper = true, exclude = "userAccount")
 public class Context extends AuditModel implements Serializable, ComparableById<Context> {
 

src/main/java/org/woehlke/simpleworklist/context/ContextRepository.java

@@ -1,8 +1,9 @@
 package org.woehlke.simpleworklist.context;
 
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 
 import java.util.List;
@@ -13,7 +14,10 @@
 @Repository
 public interface ContextRepository extends JpaRepository<Context, Long> {
 
+    //TODO: #251 change List<Context> to Page<Context>
+    @Deprecated
     List<Context> findByUserAccount(UserAccount user);
+    Page<Context> findByUserAccount(UserAccount user, Pageable pageRequest);
 
     Context findByIdAndUserAccount(long newContextId, UserAccount userAccount);
 

src/main/java/org/woehlke/simpleworklist/context/ContextService.java

@@ -9,12 +9,16 @@
  */
 public interface ContextService {
 
+    //TODO: #251 change List<Context> to Page<Context>
+    //TODO: rename to findByUser
     List<Context> getAllForUser(UserAccount user);
 
     Context findByIdAndUserAccount(long newContextId, UserAccount userAccount);
 
+    //TODO: rename to add
     Context createNewContext(NewContextForm newContext, UserAccount user);
 
+    //TODO: rename to update
     Context updateContext(Context context);
 
     boolean delete(Context context);

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

@@ -36,8 +36,8 @@
 )
 @Getter
 @Setter
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true, exclude = "children")
+@EqualsAndHashCode(callSuper = true, exclude = {"children","parent"})
+@ToString(callSuper = true, exclude = {"children","parent","description"})
 public class Project extends AuditModel implements Serializable, ComparableById<Project> {
 
     private static final long serialVersionUID = 4566653175832872422L;
@@ -167,5 +167,9 @@ public Project addOtherProjectToChildren(Project project) {
         project.setParent(this);
         return project;
     }
+
+    public String out(){
+        return "Project: "+name+" ("+id+")";
+    }
 }