Skip to content

Commit 5ac2a11

Browse files
thomaswoehlkethomaswoehlke
authored
Merge pull request #253 from Spring-Framework-Java-Apps/master
deployment
2 parents 6c41706 + e656b99 commit 5ac2a11

33 files changed

+1149
-561
lines changed

‎etc/TODO.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ https://www.baeldung.com/maven-enforcer-plugin
8888
# 2.3.14
8989
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
9090

91-
92-
9391
https://developer.okta.com/blog/2019/03/28/test-java-spring-boot-junit5
9492

9593
# 2.3.15
@@ -99,10 +97,16 @@ https://github.com/thymeleaf/thymeleaf-testing
9997
# 2.3.16
10098
Fixed #169, Fixed #170, Fixed #171, Fixed #172, Fixed #183
10199

102-
103100
# 2.3.17
104101
Fixed #223, Fixed #224, Fixed #225, Fixed #226, Fixed #227, Fixed #228, Fixed #229, Fixed #230, Fixed #231, Fixed #232, Fixed #233
105-
106102
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
107-
108103
Fixed #220, Fixed #221, Fixed #222
104+
105+
#2.3.18
106+
Fixed #128, Fixed #192, Fixed #193, Fixed #194, Fixed #195, Fixed #196, Fixed #197, Fixed #198, Fixed #199, Fixed #200, Fixed #239, Fixed #240
107+
108+
#2.3.19
109+
Fixed #241, Fixed #242, Fixed #243, Fixed #252
110+
111+
#2.3.20
112+

‎etc/requirements/Requirements.md

Lines changed: 52 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -17,51 +17,58 @@
1717
## F017 show /taskstate/completed
1818
## F018 show /taskstate/trash
1919

20-
## F020 Task move to /taskstate/inbox
21-
## F021 Task move to /taskstate/today
22-
## F022 Task move to /taskstate/next
23-
## F023 Task move to /taskstate/waiting
24-
## F024 Task move to /taskstate/scheduled
25-
## F025 Task move to /taskstate/someday
26-
## F026 Task move to /taskstate/focus
27-
## F027 Task move to /taskstate/completed
28-
## F028 Task move to /taskstate/trash
20+
## F020 Drag and Drop: Task move to /taskstate/inbox
21+
## F021 Drag and Drop: Task move to /taskstate/today
22+
## F022 Drag and Drop: Task move to /taskstate/next
23+
## F023 Drag and Drop: Task move to /taskstate/waiting
24+
## F024 Drag and Drop: Task move to /taskstate/scheduled
25+
## F025 Drag and Drop: Task move to /taskstate/someday
26+
## F026 Drag and Drop: Task move to /taskstate/focus
27+
## F027 Drag and Drop: Task move to /taskstate/completed
28+
## F028 Drag and Drop: Task move to /taskstate/trash
2929

30-
## F030 Taskstate: Add Task to Inbox
31-
## F031 Taskstate: Add Task to Inbox again
32-
## F032 Taskstate: Task Edit
33-
## F033 Taskstate: Task Edit Form -> change Taskstate via DropDown
34-
## F054 Taskstate: Task Edit Form -> change Project via DropDown
35-
## F035 Taskstate: Task Edit Form -> transform to Project
36-
## F036 Taskstate: Task setFocus
37-
## F037 Taskstate: Task unSetFocus
38-
## F038 Taskstate: Task complete
39-
## F039 Taskstate: Task incomplete
40-
## F040 Taskstate: Task delete
41-
## F041 Taskstate: Task undelete
30+
## F029 Drag and Drop: Task move to Project
31+
## F030 Drag and Drop: Project move to Project
4232

43-
## F050 Project/Root: Add Task
44-
## F051 Project/Root: Add SubProject
45-
## F052 Project/Root: Task Edit
46-
## F053 Project/Root: Task Edit Form -> change Taskstate via DropDown
47-
## F054 Project/Root: Task Edit Form -> change Project via DropDown
48-
## F055 Project/Root: Task Edit Form -> transform to Project
49-
## F056 Project/Root: Task setFocus
50-
## F057 Project/Root: Task unSetFocus
51-
## F058 Project/Root: Task complete
52-
## F059 Project/Root: Task incomplete
53-
## F060 Project/Root: Task delete
54-
## F061 Project/Root: Task undelete
33+
## F031 Drag and Drop: Move Task to Change Task-Order in Taskstate
34+
## F032 Drag and Drop: Move Task to Change Task-Order in Project/Root
35+
## F033 Drag and Drop: Move Task to Change Task-Order in Project/id
5536

56-
## F070 Project/id: Add Task
57-
## F071 Project/id: Add SubProject
58-
## F072 Project/id: Task Edit
59-
## F073 Project/id: Task Edit Form -> change Taskstate via DropDown
60-
## F074 Project/id: Task Edit Form -> change Project via DropDown
61-
## F075 Project/id: Task Edit Form -> transform to Project
62-
## F076 Project/id: Task setFocus
63-
## F077 Project/id: Task unSetFocus
64-
## F078 Project/id: Task complete
65-
## F079 Project/id: Task incomplete
66-
## F080 Project/id: Task delete
67-
## F081 Project/id: Task undelete
37+
## F040 Taskstate: Add Task to Inbox
38+
## F041 Taskstate: Add Task to Inbox again
39+
## F042 Taskstate: Task Edit
40+
## F043 Taskstate: Task Edit Form -> change Taskstate via DropDown
41+
## F044 Taskstate: Task Edit Form -> change Project via DropDown
42+
## F045 Taskstate: Task Edit Form -> transform to Project
43+
## F046 Taskstate: Task setFocus
44+
## F047 Taskstate: Task unSetFocus
45+
## F048 Taskstate: Task complete
46+
## F049 Taskstate: Task incomplete
47+
## F050 Taskstate: Task delete
48+
## F051 Taskstate: Task undelete
49+
50+
## F060 Project/Root: Add Task
51+
## F061 Project/Root: Add SubProject
52+
## F062 Project/Root: Task Edit
53+
## F063 Project/Root: Task Edit Form -> change Taskstate via DropDown
54+
## F064 Project/Root: Task Edit Form -> change Project via DropDown
55+
## F065 Project/Root: Task Edit Form -> transform to Project
56+
## F066 Project/Root: Task setFocus
57+
## F067 Project/Root: Task unSetFocus
58+
## F068 Project/Root: Task complete
59+
## F069 Project/Root: Task incomplete
60+
## F070 Project/Root: Task delete
61+
## F071 Project/Root: Task undelete
62+
63+
## F080 Project/id: Add Task
64+
## F081 Project/id: Add SubProject
65+
## F082 Project/id: Task Edit
66+
## F083 Project/id: Task Edit Form -> change Taskstate via DropDown
67+
## F084 Project/id: Task Edit Form -> change Project via DropDown
68+
## F085 Project/id: Task Edit Form -> transform to Project
69+
## F086 Project/id: Task setFocus
70+
## F087 Project/id: Task unSetFocus
71+
## F088 Project/id: Task complete
72+
## F089 Project/id: Task incomplete
73+
## F090 Project/id: Task delete
74+
## F091 Project/id: Task undelete

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.woehlke</groupId>
66
<artifactId>simpleworklist</artifactId>
7-
<version>2.3.18-SNAPSHOT</version>
7+
<version>2.3.20-SNAPSHOT</version>
88
<packaging>jar</packaging>
99
<parent>
1010
<groupId>org.springframework.boot</groupId>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,9 @@ protected Context getContext(UserSessionBean userSession){
147147
UserAccount thisUser = this.getUser();
148148
if(userSession == null){
149149
userSession = new UserSessionBean();
150-
long defaultContextId = thisUser.getDefaultContext().getId();
151-
userSession.setLastContextId(defaultContextId);
152150
}
151+
long defaultContextId = thisUser.getDefaultContext().getId();
152+
userSession.setLastContextId(defaultContextId);
153153
Context context = contextService.findByIdAndUserAccount(userSession.getLastContextId(), thisUser);
154154
userSession.setLastContextId(context.getId());
155155
userSession.setUserAccountid(thisUser.getId());

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,14 @@ public TestDataServiceImpl(ProjectRepository projectRepository, TaskRepository t
3838

3939
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
4040
public void createTestCategoryTreeForUserAccount(UserAccount userAccount) {
41-
List<Context> contexts = contextRepository.findByUserAccount(userAccount);
42-
Iterator<Context> iterator = contexts.iterator();
43-
Context contextWork = iterator.next();
4441
log.info("----------------------------------------------");
4542
log.info("createTestCategoryTreeForUserAccount");
4643
log.info("----------------------------------------------");
44+
log.info("userAccount: "+userAccount.toString());
45+
log.info("----------------------------------------------");
46+
Context contextWork = userAccount.getDefaultContext();
47+
log.info("contextWork: "+contextWork.toString());
48+
log.info("----------------------------------------------");
4749
Date nowDate = new Date();
4850
long now = nowDate.getTime();
4951
String name01 = "test01_" + now;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
@Getter
3636
@Setter
3737
@NoArgsConstructor
38-
@EqualsAndHashCode(callSuper = true)
38+
@EqualsAndHashCode(callSuper = true, exclude = "userAccount")
3939
@ToString(callSuper = true, exclude = "userAccount")
4040
public class Context extends AuditModel implements Serializable, ComparableById<Context> {
4141

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.woehlke.simpleworklist.context;
22

3+
import org.springframework.data.domain.Page;
4+
import org.springframework.data.domain.Pageable;
35
import org.springframework.data.jpa.repository.JpaRepository;
46
import org.springframework.stereotype.Repository;
5-
import org.woehlke.simpleworklist.context.Context;
67
import org.woehlke.simpleworklist.user.account.UserAccount;
78

89
import java.util.List;
@@ -13,7 +14,10 @@
1314
@Repository
1415
public interface ContextRepository extends JpaRepository<Context, Long> {
1516

17+
//TODO: #251 change List<Context> to Page<Context>
18+
@Deprecated
1619
List<Context> findByUserAccount(UserAccount user);
20+
Page<Context> findByUserAccount(UserAccount user, Pageable pageRequest);
1721

1822
Context findByIdAndUserAccount(long newContextId, UserAccount userAccount);
1923

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,16 @@
99
*/
1010
public interface ContextService {
1111

12+
//TODO: #251 change List<Context> to Page<Context>
13+
//TODO: rename to findByUser
1214
List<Context> getAllForUser(UserAccount user);
1315

1416
Context findByIdAndUserAccount(long newContextId, UserAccount userAccount);
1517

18+
//TODO: rename to add
1619
Context createNewContext(NewContextForm newContext, UserAccount user);
1720

21+
//TODO: rename to update
1822
Context updateContext(Context context);
1923

2024
boolean delete(Context context);

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
)
3737
@Getter
3838
@Setter
39-
@EqualsAndHashCode(callSuper = true)
40-
@ToString(callSuper = true, exclude = "children")
39+
@EqualsAndHashCode(callSuper = true, exclude = {"children","parent"})
40+
@ToString(callSuper = true, exclude = {"children","parent","description"})
4141
public class Project extends AuditModel implements Serializable, ComparableById<Project> {
4242

4343
private static final long serialVersionUID = 4566653175832872422L;
@@ -167,5 +167,9 @@ public Project addOtherProjectToChildren(Project project) {
167167
project.setParent(this);
168168
return project;
169169
}
170+
171+
public String out(){
172+
return "Project: "+name+" ("+id+")";
173+
}
170174
}
171175

0 commit comments

Comments
 (0)