Skip to content

Commit 96bffa2

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 65b7154 commit 96bffa2

11 files changed

+131
-85
lines changed

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

Lines changed: 34 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -38,38 +38,45 @@
3838
@SessionAttributes({"userSession","locale"})
3939
public abstract class AbstractController {
4040

41-
@Autowired
42-
protected SimpleworklistProperties simpleworklistProperties;
41+
/*
42+
@Autowired
43+
protected SimpleworklistProperties simpleworklistProperties;
44+
*/
4345

4446
@Autowired
45-
protected ProjectService projectService;
47+
protected ContextService contextService;
4648

4749
@Autowired
4850
protected TaskService taskService;
4951

5052
@Autowired
51-
protected UserAccountService userAccountService;
53+
protected ProjectService projectService;
5254

55+
/*
56+
@Autowired
57+
protected UserAccountService userAccountService;
58+
*/
59+
/*
5360
@Autowired
5461
protected UserAuthorizationService userAuthorizationService;
62+
*/
5563

5664
@Autowired
5765
protected ChatMessageService chatMessageService;
5866

5967
@Autowired
6068
protected LoginSuccessService loginSuccessService;
6169

62-
@Autowired
63-
protected ContextService contextService;
64-
70+
/*
6571
@Autowired
6672
protected BreadcrumbService breadcrumbService;
73+
*/
6774

6875
@ModelAttribute("allProjects")
6976
public final List<Project> getAllCategories(
70-
@ModelAttribute("userSession") UserSessionBean userSession,
71-
BindingResult result, //TODO: remove
72-
Model model //TODO: remove
77+
@ModelAttribute("userSession") UserSessionBean userSession //,
78+
// BindingResult result, //TODO: remove
79+
// Model model //TODO: remove
7380
) {
7481
userSession = updateUserSession(userSession);
7582
Context context = this.getContext(userSession);
@@ -91,24 +98,26 @@ public final int getNumberOfNewIncomingMessages(){
9198
return chatMessageService.getNumberOfNewIncomingMessagesForUser(user);
9299
}
93100

94-
@ModelAttribute("listTaskEnergy")
95-
public final List<TaskEnergy> getListTaskEnergy(){
96-
return TaskEnergy.list();
97-
}
98-
99-
@ModelAttribute("listTaskTime")
100-
public final List<TaskTime> getListTaskTime(){
101-
return TaskTime.list();
102-
}
103-
104101
@ModelAttribute("contexts")
105102
public final List<Context> getContexts(){
106103
UserAccount user = this.getUser();
107104
return contextService.getAllForUser(user);
108105
}
109106

110-
@ModelAttribute("listTaskState")
107+
@ModelAttribute("listTaskEnergy")
108+
public final List<TaskEnergy> getListTaskEnergy(){
109+
return TaskEnergy.list();
110+
}
111+
112+
@ModelAttribute("listTaskTime")
113+
public final List<TaskTime> getListTaskTime(){
114+
return TaskTime.list();
115+
}
116+
117+
/*
118+
@ModelAttribute("listTaskState")
111119
public final List<TaskState> getTaskStates(){
120+
112121
TaskState[] listTaskStateArray = {
113122
INBOX,
114123
TODAY,
@@ -119,12 +128,15 @@ public final List<TaskState> getTaskStates(){
119128
FOCUS,
120129
COMPLETED
121130
};
131+
122132
List<TaskState> listTaskState = new ArrayList<>(listTaskStateArray.length);
133+
123134
for(TaskState taskState:listTaskStateArray){
124135
listTaskState.add(taskState);
125136
}
126137
return listTaskState;
127138
}
139+
*/
128140

129141
@ModelAttribute("context")
130142
public final String getCurrentContext(
@@ -165,6 +177,7 @@ protected Context getContext(@NotNull final UserSessionBean userSession){
165177
return context;
166178
}
167179

180+
@Deprecated
168181
protected UserSessionBean getNewUserSession(){
169182
UserAccount thisUser = this.getUser();
170183
long userAccountid = thisUser.getId();
@@ -185,46 +198,6 @@ protected UserSessionBean updateUserSession(UserSessionBean userSession){
185198
return userSession;
186199
}
187200

188-
protected Project addProjectFromTaskToModel(Task task, Model model){
189-
Project thisProject;
190-
if (task.getProject() == null || task.getProject().getId() == null || task.getProject().getId() == 0L) {
191-
thisProject = new Project();
192-
thisProject.setId(0L);
193-
} else {
194-
thisProject = task.getProject();
195-
}
196-
model.addAttribute("thisProject", thisProject);
197-
Project lastProject;
198-
if (task.getLastProject() == null || task.getLastProject().getId() == null || task.getLastProject().getId() == 0L) {
199-
lastProject = new Project();
200-
lastProject.setId(0L);
201-
} else {
202-
lastProject = task.getLastProject();
203-
}
204-
model.addAttribute("lastProject", lastProject);
205-
return thisProject;
206-
}
207-
208-
protected Task addProject(Task task){
209-
Task persistentTask = taskService.findOne(task.getId());
210-
if (task.getProject() == null || task.getProject().getId() == null || task.getProject().getId() == 0L) {
211-
persistentTask.setProject(null);
212-
if (persistentTask.getProject() == null || persistentTask.getProject().getId() == null || persistentTask.getProject().getId() == 0L) {
213-
persistentTask.setLastProject(null);
214-
} else {
215-
persistentTask.setLastProject(persistentTask.getProject());
216-
}
217-
} else {
218-
persistentTask.setProject(task.getProject());
219-
if (persistentTask.getProject() == null || persistentTask.getProject().getId() == null || persistentTask.getProject().getId() == 0L) {
220-
persistentTask.setLastProject(null);
221-
} else {
222-
persistentTask.setLastProject(persistentTask.getProject());
223-
}
224-
}
225-
persistentTask.merge(task);
226-
return persistentTask;
227-
}
228201

229202
/*
230203
protected Context getContext(UserSessionBean userSession){

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.woehlke.java.simpleworklist.domain.db.data.Task;
1717
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
1818
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.Breadcrumb;
19+
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.BreadcrumbService;
1920
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
2021
import org.woehlke.java.simpleworklist.domain.meso.task.TaskMoveService;
2122

@@ -38,10 +39,13 @@ public class ProjectIdController extends AbstractController {
3839
private final ProjectControllerService projectControllerService;
3940
private final TaskMoveService taskMoveService;
4041

42+
private final BreadcrumbService breadcrumbService;
43+
4144
@Autowired
42-
public ProjectIdController(ProjectControllerService projectControllerService, TaskMoveService taskMoveService ) {
45+
public ProjectIdController(ProjectControllerService projectControllerService, TaskMoveService taskMoveService, BreadcrumbService breadcrumbService) {
4346
this.projectControllerService = projectControllerService;
4447
this.taskMoveService = taskMoveService;
48+
this.breadcrumbService = breadcrumbService;
4549
}
4650

4751
@RequestMapping(path = "", method = RequestMethod.GET)

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.springframework.validation.FieldError;
99
import org.springframework.validation.ObjectError;
1010
import org.springframework.web.bind.annotation.*;
11-
import org.woehlke.java.simpleworklist.domain.AbstractController;
1211
import org.woehlke.java.simpleworklist.domain.db.data.Context;
1312
import org.woehlke.java.simpleworklist.domain.db.data.Project;
1413
import org.woehlke.java.simpleworklist.domain.db.data.Task;
@@ -18,6 +17,7 @@
1817
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
1918
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
2019
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.Breadcrumb;
20+
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.BreadcrumbService;
2121
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
2222
import org.woehlke.java.simpleworklist.domain.meso.task.TaskLifecycleService;
2323

@@ -35,10 +35,13 @@ public class ProjectIdTaskController extends AbstractController {
3535
private final ProjectControllerService projectControllerService;
3636
private final TaskLifecycleService taskLifecycleService;
3737

38+
private final BreadcrumbService breadcrumbService;
39+
3840
@Autowired
39-
public ProjectIdTaskController(ProjectControllerService projectControllerService, TaskLifecycleService taskLifecycleService) {
41+
public ProjectIdTaskController(ProjectControllerService projectControllerService, TaskLifecycleService taskLifecycleService, BreadcrumbService breadcrumbService) {
4042
this.projectControllerService = projectControllerService;
4143
this.taskLifecycleService = taskLifecycleService;
44+
this.breadcrumbService = breadcrumbService;
4245
}
4346

4447
@RequestMapping(path = "/add", method = RequestMethod.GET)
@@ -180,7 +183,7 @@ public final String editTaskPost(
180183
}
181184
UserAccount userAccount = loginSuccessService.retrieveCurrentUser();
182185
List<Context> contexts = contextService.getAllForUser(userAccount);
183-
task = addProject(task);
186+
task = taskLifecycleService.addProject(task);
184187
Context thisContext = task.getContext();
185188
Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShoProjectId(thisProject, locale, userSession);
186189
model.addAttribute("breadcrumb", breadcrumb);
@@ -196,7 +199,7 @@ public final String editTaskPost(
196199
return "project/id/task/edit";
197200
} else {
198201
task.setLastProject(thisProject);
199-
Task persistentTask = addProject(task);
202+
Task persistentTask = taskLifecycleService.addProject(task);
200203
persistentTask.merge(task);
201204
task = taskLifecycleService.updatedViaProject(persistentTask);
202205
userSession.setLastProjectId(Project.rootProjectId);

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
import org.springframework.validation.FieldError;
1313
import org.springframework.validation.ObjectError;
1414
import org.springframework.web.bind.annotation.*;
15-
import org.woehlke.java.simpleworklist.domain.AbstractController;
1615
import org.woehlke.java.simpleworklist.domain.db.data.Project;
1716
import org.woehlke.java.simpleworklist.domain.db.data.project.ProjectControllerService;
1817
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.Breadcrumb;
1918
import org.woehlke.java.simpleworklist.domain.db.data.Context;
2019
import org.woehlke.java.simpleworklist.domain.db.data.Task;
2120
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
2221
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
22+
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.BreadcrumbService;
2323
import org.woehlke.java.simpleworklist.domain.meso.task.TaskLifecycleService;
2424
import org.woehlke.java.simpleworklist.domain.meso.task.TaskMoveService;
2525
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskState;
@@ -44,15 +44,18 @@ public class ProjectRootController extends AbstractController {
4444
private final TaskLifecycleService taskLifecycleService;
4545
private final TaskMoveService taskMoveService;
4646

47+
private final BreadcrumbService breadcrumbService;
48+
4749
@Autowired
4850
public ProjectRootController(
4951
ProjectControllerService projectControllerService,
5052
TaskMoveService taskMoveService,
51-
TaskLifecycleService taskLifecycleService
52-
) {
53+
TaskLifecycleService taskLifecycleService,
54+
BreadcrumbService breadcrumbService) {
5355
this.projectControllerService = projectControllerService;
5456
this.taskMoveService = taskMoveService;
5557
this.taskLifecycleService = taskLifecycleService;
58+
this.breadcrumbService = breadcrumbService;
5659
}
5760

5861
@RequestMapping(path="", method = RequestMethod.GET)
@@ -203,7 +206,7 @@ public final String editTaskGet(
203206
UserAccount userAccount = loginSuccessService.retrieveCurrentUser();
204207
List<Context> contexts = contextService.getAllForUser(userAccount);
205208
Context thisContext = thisTask.getContext();
206-
Project thisProject = addProjectFromTaskToModel( thisTask, model );
209+
Project thisProject = taskLifecycleService.addProjectFromTaskToModel( thisTask, model );
207210
Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForTaskstate(thisTask.getTaskState(),locale,userSession);
208211
model.addAttribute("breadcrumb", breadcrumb);
209212
model.addAttribute("thisProject", thisProject); //TODO: remove?
@@ -247,9 +250,9 @@ public final String editTaskPost(
247250
}
248251
UserAccount userAccount = loginSuccessService.retrieveCurrentUser();
249252
List<Context> contexts = contextService.getAllForUser(userAccount);
250-
thisTask = addProject(thisTask);
253+
thisTask = taskLifecycleService.addProject(thisTask);
251254
Context thisContext = thisTask.getContext();
252-
Project thisProject = addProjectFromTaskToModel( thisTask, model );
255+
Project thisProject = taskLifecycleService.addProjectFromTaskToModel( thisTask, model );
253256
//thisProject.setId(0L);
254257
Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShoProjectId(thisProject, locale, userSession);
255258
model.addAttribute("breadcrumb", breadcrumb);
@@ -266,7 +269,7 @@ public final String editTaskPost(
266269
} else {
267270
//task.unsetFocus();
268271
thisTask.setLastProject(null);
269-
Task persistentTask = addProject(thisTask);
272+
Task persistentTask = taskLifecycleService.addProject(thisTask);
270273
thisTask = taskLifecycleService.updatedViaProjectRoot(persistentTask);
271274
userSession.setLastProjectId(Project.rootProjectId);
272275
userSession.setLastTaskState(thisTask.getTaskState());

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
import org.springframework.web.bind.annotation.RequestMapping;
88
import org.springframework.web.bind.annotation.RequestMethod;
99
import org.springframework.web.bind.annotation.RequestParam;
10-
import org.woehlke.java.simpleworklist.domain.AbstractController;
1110
import org.woehlke.java.simpleworklist.domain.db.data.Context;
1211
import org.woehlke.java.simpleworklist.domain.db.search.service.SearchService;
1312
import org.woehlke.java.simpleworklist.domain.db.search.SearchResult;
1413
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.Breadcrumb;
14+
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.BreadcrumbService;
1515
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
1616

1717
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,9 +28,12 @@ public class SearchController extends AbstractController {
2828

2929
private final SearchService searchService;
3030

31+
private final BreadcrumbService breadcrumbService;
32+
3133
@Autowired
32-
public SearchController(SearchService searchService) {
34+
public SearchController(SearchService searchService, BreadcrumbService breadcrumbService) {
3335
this.searchService = searchService;
36+
this.breadcrumbService = breadcrumbService;
3437
}
3538

3639
@RequestMapping(path = "", method = RequestMethod.GET)

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
import org.springframework.validation.FieldError;
88
import org.springframework.validation.ObjectError;
99
import org.springframework.web.bind.annotation.*;
10-
import org.woehlke.java.simpleworklist.domain.AbstractController;
1110
import org.woehlke.java.simpleworklist.domain.db.data.Project;
1211
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.Breadcrumb;
1312
import org.woehlke.java.simpleworklist.domain.db.data.Context;
1413
import org.woehlke.java.simpleworklist.domain.db.data.Task;
1514
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
1615
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
1716
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskState;
17+
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.BreadcrumbService;
1818
import org.woehlke.java.simpleworklist.domain.meso.task.TaskLifecycleService;
1919
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
2020
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
@@ -38,9 +38,12 @@ public class TaskLifecycleController extends AbstractController {
3838

3939
private final TaskLifecycleService taskLifecycleService;
4040

41+
private final BreadcrumbService breadcrumbService;
42+
4143
@Autowired
42-
public TaskLifecycleController(TaskLifecycleService taskLifecycleService) {
44+
public TaskLifecycleController(TaskLifecycleService taskLifecycleService, BreadcrumbService breadcrumbService) {
4345
this.taskLifecycleService = taskLifecycleService;
46+
this.breadcrumbService = breadcrumbService;
4447
}
4548

4649
@RequestMapping(path = "/add", method = RequestMethod.GET)
@@ -113,7 +116,7 @@ public final String editTaskGet(
113116
Locale locale, Model model
114117
) {
115118
log.info("editTaskGet");
116-
addProjectFromTaskToModel( task, model );
119+
taskLifecycleService.addProjectFromTaskToModel( task, model );
117120
UserAccount userAccount = loginSuccessService.retrieveCurrentUser();
118121
List<Context> contexts = contextService.getAllForUser(userAccount);
119122
Context thisContext = task.getContext();
@@ -158,7 +161,7 @@ public final String editTaskPost(
158161
//Task persistentTask = taskService.findOne(taskId);
159162
UserAccount userAccount = loginSuccessService.retrieveCurrentUser();
160163
List<Context> contexts = contextService.getAllForUser(userAccount);
161-
Project thisProject = addProjectFromTaskToModel( task, model );
164+
Project thisProject = taskLifecycleService.addProjectFromTaskToModel( task, model );
162165
// task = addProject(task);
163166
Context thisContext = task.getContext();
164167
Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShoProjectId(thisProject,locale,userSession);
@@ -170,7 +173,7 @@ public final String editTaskPost(
170173
return "taskstate/task/edit";
171174
} else {
172175
task.unsetFocus();
173-
Task persistentTask = addProject(task);
176+
Task persistentTask = taskLifecycleService.addProject(task);
174177
task = taskLifecycleService.updatedViaTaskstate(persistentTask);
175178
model.addAttribute("userSession", userSession);
176179
return task.getTaskState().getUrlPathRedirect();

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.springframework.web.bind.annotation.PathVariable;
99
import org.springframework.web.bind.annotation.RequestMapping;
1010
import org.springframework.web.bind.annotation.RequestMethod;
11-
import org.woehlke.java.simpleworklist.domain.AbstractController;
1211
import org.woehlke.java.simpleworklist.domain.db.data.Context;
1312
import org.woehlke.java.simpleworklist.domain.db.data.Project;
1413
import org.woehlke.java.simpleworklist.domain.db.data.Task;

0 commit comments

Comments
 (0)