Skip to content

Commit 6643d0c

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent ae3d292 commit 6643d0c

File tree

2 files changed

+138
-119
lines changed

2 files changed

+138
-119
lines changed

‎src/main/java/org/woehlke/java/simpleworklist/domain/AbstractController.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
package org.woehlke.java.simpleworklist.domain;
22

3-
import org.springframework.ui.Model;
3+
import org.springframework.beans.factory.annotation.Autowired;
44
import org.springframework.web.bind.annotation.ModelAttribute;
55
import org.springframework.web.bind.annotation.SessionAttributes;
6+
67
import org.woehlke.java.simpleworklist.domain.db.data.Project;
78
import org.woehlke.java.simpleworklist.domain.db.data.project.ProjectService;
8-
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
99
import org.woehlke.java.simpleworklist.domain.db.data.Context;
10-
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
1110
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskState;
1211
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
1312
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
1413
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
1514
import org.woehlke.java.simpleworklist.domain.db.data.context.ContextService;
1615
import org.woehlke.java.simpleworklist.domain.db.user.chat.ChatMessageService;
17-
18-
import org.springframework.beans.factory.annotation.Autowired;
16+
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
1917
import org.woehlke.java.simpleworklist.domain.security.login.LoginSuccessService;
2018

2119
import javax.validation.constraints.NotNull;
@@ -33,11 +31,6 @@ public abstract class AbstractController {
3331
@Autowired
3432
private ContextService contextService;
3533

36-
/*
37-
@Autowired
38-
private TaskService taskService;
39-
*/
40-
4134
@Autowired
4235
private ProjectService projectService;
4336

@@ -50,9 +43,7 @@ public abstract class AbstractController {
5043

5144
@ModelAttribute("allProjects")
5245
public final List<Project> getAllProjects(
53-
@ModelAttribute("userSession") UserSessionBean userSession //,
54-
// BindingResult result, //TODO: remove
55-
// Model model //TODO: remove
46+
@ModelAttribute("userSession") UserSessionBean userSession
5647
) {
5748
userSession = updateUserSession(userSession);
5849
Context context = this.getContext(userSession);

‎src/main/plantuml/Simpleworklist__Service_Classes_Controller.puml

Lines changed: 134 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -6,111 +6,52 @@ left to right direction
66

77
scale 1200 width
88

9-
AbstractController <|-- UserSelfserviceController
10-
AbstractController <|-- TaskStateTabController
11-
AbstractController <|-- TaskStateTaskController
9+
ErrorController <|-- ApplicationErrorController
10+
AbstractController <|-- ContextController
1211
AbstractController <|-- ProjectIdController
12+
AbstractController <|-- ProjectIdTaskController
13+
AbstractController <|-- ProjectIdTaskMoveController
1314
AbstractController <|-- ProjectRootController
14-
AbstractController <|-- ContextController
15-
AbstractController <|-- ChatMessageController
16-
ErrorController <|-- ApplicationErrorController
17-
18-
abstract class AbstractController {
19-
List<Project> getAllCategories(UserSessionBean userSession)
20-
List<Project> getRootCategories(UserSessionBean userSession)
21-
int getNumberOfNewIncomingMessages()
22-
List<TaskEnergy> getListTaskEnergy()
23-
List<TaskTime> getListTaskTime()
24-
List<Context> getContexts()
25-
List<TaskState> getTaskStates()
26-
String getCurrentContext(UserSessionBean userSession)
27-
boolean refreshMessagePage()
28-
UserAccount getUser()
29-
Context getContext(UserSessionBean userSession)
30-
UserSessionBean getNewUserSession()
31-
UserSessionBean updateUserSession(UserSessionBean userSession)
32-
}
33-
34-
class UserSelfserviceController {
35-
String userProfileAndMenu(Pageable request, UserSessionBean userSession)
36-
String userNameForm(UserSessionBean userSession)
37-
String userNameStore(UserChangeNameForm username, UserSessionBean userSession)
38-
String userPasswordForm(UserSessionBean userSession)
39-
String userPasswordStore(UserChangePasswordForm userChangePasswordForm,UserSessionBean userSession)
40-
String userContextsForm(UserSessionBean userSession)
41-
String userContextsSave(UserChangeDefaultContextForm thisUser, UserSessionBean userSession)
42-
String userNewContextGet(UserSessionBean userSession)
43-
String userNewContextPost(newContext, UserSessionBean userSession)
44-
String userContextEditGet(Context context,UserSessionBean userSession)
45-
String userContextEditPost(NewContextForm editContext, UserSessionBean userSession)
46-
String userDeleteContextGet(Context context, UserSessionBean userSession)
47-
String userLanguageGet(UserSessionBean userSession)
48-
String userLanguagePost(UserChangeLanguageForm userChangeLanguageForm, UserSessionBean userSession)
49-
}
50-
51-
class UserLoginController {
52-
String loginGet()
53-
String loginPost(LoginForm loginForm)
54-
String logoutPage(SessionStatus status, HttpServletRequest request, HttpServletResponse response)
55-
}
15+
AbstractController <|-- SearchController
16+
AbstractController <|-- TaskLifecycleController
17+
AbstractController <|-- TaskMove2TaskController
18+
AbstractController <|-- TaskMoveController
19+
AbstractController <|-- TaskStateTabController
20+
AbstractController <|-- UserChatMessageController
21+
AbstractController <|-- UserSelfserviceController
5622

57-
class UserPasswordRecoveryController {
58-
String passwordForgottenForm()
59-
String passwordForgottenPost(UserRegistrationForm userRegistrationForm)
60-
String enterNewPasswordFormular(String confirmId)
61-
String enterNewPasswordPost(UserAccountForm userAccountForm, String confirmId)
62-
}
6323

64-
class UserRegistrationController {
65-
String registerGet()
66-
String registerPost(UserRegistrationForm userRegistrationForm)
67-
String registerConfirmGet(String confirmId)
68-
String registerConfirmPost(String confirmId, UserAccountForm userAccountFor)
24+
abstract class AbstractController {
25+
- ContextService contextService
26+
- ProjectService projectService
27+
- ChatMessageService chatMessageService
28+
- LoginSuccessService loginSuccessService
29+
30+
String getCurrentContext(UserSessionBean userSession)
31+
List<Project> getAllProjects(UserSessionBean userSession)
32+
List<Project> getRootCategories(UserSessionBean userSession)
33+
int getNumberOfNewIncomingMessages()
34+
List<Context> getContexts()
35+
List<TaskEnergy> getListTaskEnergy()
36+
List<TaskTime> getListTaskTime()
37+
List<TaskState> getTaskStates()
38+
boolean refreshMessagePage()
39+
- UserAccount getUser()
40+
- Context getContext(UserSessionBean userSession)
41+
- UserSessionBean getNewUserSession()
42+
- UserSessionBean updateUserSession(UserSessionBean userSession)
6943
}
7044

71-
class TestDataController {
72-
String createTestCategoryTree()
45+
class ApplicationErrorController {
46+
String handleError( HttpServletRequest request )
47+
String getErrorPath()
7348
}
74-
75-
class TaskStateTabController {
76-
String inbox(Pageable pageable, UserSessionBean userSession)
77-
String today(Pageable pageable, UserSessionBean userSession)
78-
String next(Pageable pageable, UserSessionBean userSession)
79-
String waiting(Pageable pageable, UserSessionBean userSession)
80-
String scheduled(Pageable pageable, UserSessionBean userSession)
81-
String someday(Pageable pageable, UserSessionBean userSession)
82-
String completed(Pageable pageable, UserSessionBean userSession)
83-
String trash(Pageable pageable, UserSessionBean userSession)
84-
String deleted(Pageable pageable, UserSessionBean userSession)
85-
String focus(Pageable pageable, UserSessionBean userSession)
49+
class ContextController {
50+
String switchContxt(Context newContext, UserSessionBean userSession)
8651
}
87-
88-
class TaskStateTaskController {
89-
String addNewTaskToInboxGet(UserSessionBean userSession)
90-
String addNewTaskToInboxPost(UserSessionBean userSession, Task task)
91-
String editTaskGet(Task task, UserSessionBean userSession)
92-
String editTaskPost(long taskId, Task task, UserSessionBean userSession)
93-
String changeTaskOrderId(Task sourceTask, Task destinationTask, UserSessionBean userSession)
94-
String moveTaskToAnotherProject(Task task, Project project,UserSessionBean userSession)
95-
String moveTaskToInbox(Task task, UserSessionBean userSession)
96-
String moveTaskToToday(Task task, UserSessionBean userSession)
97-
String moveTaskToNext(Task task, UserSessionBean userSession)
98-
String moveTaskToWaiting(Task task, UserSessionBean userSession)
99-
String moveTaskToSomeday(Task task, UserSessionBean userSession)
100-
String moveTaskToFocus(Task task, UserSessionBean userSession)
101-
String moveTaskToCompleted(Task task, UserSessionBean userSession)
102-
String moveTaskToTrash(Task task, UserSessionBean userSession)
103-
String moveAllCompletedToTrash(Task task, UserSessionBean userSession)
104-
String emptyTrash(UserSessionBean userSession)
105-
String deleteTaskGet(Task task, UserSessionBean userSession)
106-
String undeleteTaskGet(Task task, UserSessionBean userSession)
107-
String transformTaskIntoProjectGet()
108-
String setDoneTaskGet(Task task, UserSessionBean userSession)
109-
String unsetDoneTaskGet(Task task, UserSessionBean userSession)
110-
String setFocusGet(Task task, UserSessionBean userSession)
111-
String unsetFocusGet(Task task, UserSessionBean userSession)
52+
class PagesController {
53+
String renderPageInformation(UserSessionBean userSession)
11254
}
113-
11455
class ProjectIdController {
11556
String projectTaskAddGet(Project thisProject, UserSessionBean userSession)
11657
String projectTaskAddPost(long projectId, UserSessionBean userSession, Task task)
@@ -124,6 +65,7 @@ class ProjectIdController {
12465
String moveTaskToTaskAndChangeTaskOrderInProject(Project thisProject, Task sourceTask, Task destinationTask,UserSessionBean userSession)
12566
String moveAllCompletedToTrash(Project thisProject, UserSessionBean userSession)
12667
String emptyTrash(Project thisProject, UserSessionBean userSession)
68+
12769
String editTaskGet( Project thisProject, Task task, UserSessionBean userSession)
12870
String editTaskPost(Project thisProject, long taskId, Task task, UserSessionBean userSession)
12971
String setDoneTaskGet(Project thisProject, UserSessionBean userSession, Task task)
@@ -142,9 +84,21 @@ class ProjectIdController {
14284
String moveTaskToTrash(Project thisProject, UserSessionBean userSession, Task task)
14385
String transformTaskIntoProjectGet(Project thisProject, Task task, UserSessionBean userSession)
14486
}
145-
87+
class ProjectIdTaskController {}
88+
class ProjectIdTaskMoveController {
89+
String moveTaskToInbox(Task task, UserSessionBean userSession)
90+
String moveTaskToToday(Task task, UserSessionBean userSession)
91+
String moveTaskToNext(Task task, UserSessionBean userSession)
92+
String moveTaskToWaiting(Task task, UserSessionBean userSession)
93+
String moveTaskToSomeday(Task task, UserSessionBean userSession)
94+
String moveTaskToFocus(Task task, UserSessionBean userSession)
95+
String moveTaskToCompleted(Task task, UserSessionBean userSession)
96+
String moveTaskToTrash(Task task, UserSessionBean userSession)
97+
String moveAllCompletedToTrash(Task task, UserSessionBean userSession)
98+
String emptyTrash(Task task, UserSessionBean userSession)
99+
}
146100
class ProjectRootController {
147-
String projectRoot( Pageable pageable, String message, boolean isDeleted, UserSessionBean userSession)
101+
String projectRoot(Pageable pageable, String message, boolean isDeleted, UserSessionBean userSession)
148102
String projectRootAddProjectGet(UserSessionBean userSession)
149103
String projectRootAddProjectPost(Project project, UserSessionBean userSession)
150104
String projectRootTaskAddGet(UserSessionBean userSession)
@@ -153,7 +107,8 @@ class ProjectRootController {
153107
String editTaskPost(long taskId,Task task, UserSessionBean userSession)
154108
String changeTaskOrderId(Task sourceTask, Task destinationTask, UserSessionBean userSession)
155109
String moveTaskToProjectRoot(Task task, UserSessionBean userSession)
156-
String moveTaskToProject(Task task, Project targetProject, UserSessionBean userSession)
110+
String moveTaskToProjectId(Task task, Project targetProject, UserSessionBean userSession)
111+
157112
String moveTaskToInbox(Task task, UserSessionBean userSession)
158113
String moveTaskToToday(Task task, UserSessionBean userSession)
159114
String moveTaskToNext(Task task, UserSessionBean userSession)
@@ -162,8 +117,7 @@ class ProjectRootController {
162117
String moveTaskToFocus(Task task, UserSessionBean userSession)
163118
String moveTaskToCompleted(Task task, UserSessionBean userSession)
164119
String moveTaskToTrash(Task task, UserSessionBean userSession)
165-
String moveAllCompletedToTrash(Task task, UserSessionBean userSession)
166-
String emptyTrash(Task task, UserSessionBean userSession)
120+
167121
String deleteTaskGet(Task task, UserSessionBean userSession)
168122
String undeleteTaskGet(Task task, UserSessionBean userSession)
169123
String transformTaskIntoProjectGet(Task task, UserSessionBean userSession)
@@ -172,14 +126,88 @@ class ProjectRootController {
172126
String setFocusGet(Task task, UserSessionBean userSession)
173127
String unsetFocusGet(Task task, UserSessionBean userSession)
174128
}
175-
176-
class ContextController {
177-
String switchContxt(Context newContext, UserSessionBean userSession)
129+
class SearchController {}
130+
class TaskLifecycleController {
131+
String addNewTaskToInboxGet(UserSessionBean userSession)
132+
String addNewTaskToInboxPost(UserSessionBean userSession, Task task)
133+
String editTaskGet(Task task, UserSessionBean userSession)
134+
String editTaskPost(long taskId, Task task, UserSessionBean userSession)
135+
String deleteTaskGet(Task task, UserSessionBean userSession)
136+
String undeleteTaskGet(Task task, UserSessionBean userSession)
137+
String transformTaskIntoProjectGet()
138+
String setCompletedTaskGet(Task task, UserSessionBean userSession)
139+
String unsetCompletedTaskGet(Task task, UserSessionBean userSession)
140+
String setFocusGet(Task task, UserSessionBean userSession)
141+
String unsetFocusGet(Task task, UserSessionBean userSession)
178142
}
179-
180-
class ChatMessageController {
143+
class TaskMove2TaskController {
144+
String changeTaskOrderId( Task sourceTask, Task destinationTask, UserSessionBean userSession )
145+
}
146+
class TaskMoveController {
147+
String moveTaskToAnotherProject(Task task, Project project,UserSessionBean userSession)
148+
String moveTaskToRootProject(Task task, Project project,UserSessionBean userSession)
149+
String moveTaskToInbox(Task task, UserSessionBean userSession)
150+
String moveTaskToToday(Task task, UserSessionBean userSession)
151+
String moveTaskToNext(Task task, UserSessionBean userSession)
152+
String moveTaskToWaiting(Task task, UserSessionBean userSession)
153+
String moveTaskToSomeday(Task task, UserSessionBean userSession)
154+
String moveTaskToFocus(Task task, UserSessionBean userSession)
155+
String moveTaskToCompleted(Task task, UserSessionBean userSession)
156+
String moveTaskToTrash(Task task, UserSessionBean userSession)
157+
String moveAllCompletedToTrash(Task task, UserSessionBean userSession)
158+
String emptyTrash(UserSessionBean userSession)
159+
}
160+
class TaskStateTabController {
161+
String inbox(Pageable pageable, UserSessionBean userSession)
162+
String today(Pageable pageable, UserSessionBean userSession)
163+
String next(Pageable pageable, UserSessionBean userSession)
164+
String waiting(Pageable pageable, UserSessionBean userSession)
165+
String scheduled(Pageable pageable, UserSessionBean userSession)
166+
String someday(Pageable pageable, UserSessionBean userSession)
167+
String completed(Pageable pageable, UserSessionBean userSession)
168+
String trash(Pageable pageable, UserSessionBean userSession)
169+
String deleted(Pageable pageable, UserSessionBean userSession)
170+
String focus(Pageable pageable, UserSessionBean userSession)
171+
}
172+
class TestDataController {
173+
String createTestCategoryTree()
174+
}
175+
class UserChatMessageController {
181176
String getLastMessagesBetweenCurrentAndOtherUser( UserAccount otherUser, Pageable request, UserSessionBean userSession)
182177
String sendNewMessageToOtherUser(UserAccount otherUser, ChatMessageForm chatMessageForm, Pageable request, UserSessionBean userSession)
183178
}
179+
class UserLoginController {
180+
String loginGet()
181+
String loginPost(LoginForm loginForm)
182+
String logoutPage(SessionStatus status, HttpServletRequest request, HttpServletResponse response)
183+
}
184+
class UserPasswordRecoveryController {
185+
String passwordForgottenForm()
186+
String passwordForgottenPost(UserRegistrationForm userRegistrationForm)
187+
String enterNewPasswordFormular(String confirmId)
188+
String enterNewPasswordPost(UserAccountForm userAccountForm, String confirmId)
189+
}
190+
class UserRegistrationController {
191+
String registerGet()
192+
String registerPost(UserRegistrationForm userRegistrationForm)
193+
String registerConfirmGet(String confirmId)
194+
String registerConfirmPost(String confirmId, UserAccountForm userAccountFor)
195+
}
196+
class UserSelfserviceController {
197+
String userProfileAndMenu(Pageable request, UserSessionBean userSession)
198+
String userNameForm(UserSessionBean userSession)
199+
String userNameStore(UserChangeNameForm username, UserSessionBean userSession)
200+
String userPasswordForm(UserSessionBean userSession)
201+
String userPasswordStore(UserChangePasswordForm userChangePasswordForm,UserSessionBean userSession)
202+
String userContextsForm(UserSessionBean userSession)
203+
String userContextsSave(UserChangeDefaultContextForm thisUser, UserSessionBean userSession)
204+
String userNewContextGet(UserSessionBean userSession)
205+
String userNewContextPost(newContext, UserSessionBean userSession)
206+
String userContextEditGet(Context context,UserSessionBean userSession)
207+
String userContextEditPost(NewContextForm editContext, UserSessionBean userSession)
208+
String userDeleteContextGet(Context context, UserSessionBean userSession)
209+
String userLanguageGet(UserSessionBean userSession)
210+
String userLanguagePost(UserChangeLanguageForm userChangeLanguageForm, UserSessionBean userSession)
211+
}
184212

185213
@enduml

0 commit comments

Comments
 (0)