Skip to content

Commit 196a424

Browse files
thomaswoehlkethomaswoehlke
authored
Merge pull request #365 from Spring-Framework-Java-Apps/master
update and deploy
2 parents b68c975 + 5bfd4bf commit 196a424

File tree

8 files changed

+458
-299
lines changed

8 files changed

+458
-299
lines changed

‎pom.xml

Lines changed: 119 additions & 85 deletions
Large diffs are not rendered by default.

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
2121
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
2222
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
23+
import org.woehlke.java.simpleworklist.domain.meso.move.MoveTaskService;
2324
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
2425
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TransformTaskIntoProjektService;
2526
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
@@ -42,16 +43,18 @@
4243
public class ProjectIdController extends AbstractController {
4344

4445
private final ProjectControllerService projectControllerService;
46+
private final MoveTaskService moveTaskService;
4547
private final TaskService taskService;
4648
private final TransformTaskIntoProjektService transformTaskIntoProjektService;
4749

4850
@Autowired
4951
public ProjectIdController(
50-
ProjectControllerService projectControllerService,
51-
TaskService taskService,
52-
TransformTaskIntoProjektService transformTaskIntoProjektService
52+
ProjectControllerService projectControllerService,
53+
MoveTaskService moveTaskService, TaskService taskService,
54+
TransformTaskIntoProjektService transformTaskIntoProjektService
5355
) {
5456
this.projectControllerService = projectControllerService;
57+
this.moveTaskService = moveTaskService;
5558
this.taskService = taskService;
5659
this.transformTaskIntoProjektService = transformTaskIntoProjektService;
5760
}
@@ -384,7 +387,7 @@ public final String moveAllCompletedToTrash(
384387
) {
385388
userSession.setLastProjectId(thisProject.getId());
386389
Context context = super.getContext(userSession);
387-
taskService.moveAllCompletedToTrash(context);
390+
moveTaskService.moveAllCompletedToTrash(context);
388391
model.addAttribute("userSession", userSession);
389392
model.addAttribute("taskstateType",PROJECTS.getType());
390393
model.addAttribute("dataPage", true);
@@ -399,7 +402,7 @@ public final String emptyTrash(
399402
) {
400403
userSession.setLastProjectId(thisProject.getId());
401404
Context context = super.getContext(userSession);
402-
taskService.emptyTrash(context);
405+
moveTaskService.emptyTrash(context);
403406
model.addAttribute("userSession", userSession);
404407
model.addAttribute("taskstateType",PROJECTS.getType());
405408
model.addAttribute("dataPage", true);
@@ -564,7 +567,7 @@ public final String moveTaskToAnotherProject(
564567
@ModelAttribute("userSession") UserSessionBean userSession,
565568
Model model
566569
) {
567-
task = taskService.moveTaskToRootProject(task);
570+
task = moveTaskService.moveTaskToRootProject(task);
568571
model.addAttribute("userSession", userSession);
569572
model.addAttribute("taskstateType",PROJECTS.getType());
570573
model.addAttribute("dataPage", true);
@@ -579,7 +582,7 @@ public final String moveTaskToAnotherProject(
579582
@ModelAttribute("userSession") UserSessionBean userSession,
580583
Model model
581584
) {
582-
task = taskService.moveTaskToAnotherProject(task,otherProject);
585+
task = moveTaskService.moveTaskToAnotherProject(task,otherProject);
583586
model.addAttribute("userSession", userSession);
584587
model.addAttribute("taskstateType",PROJECTS.getType());
585588
model.addAttribute("dataPage", true);

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
2222
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
2323
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
24+
import org.woehlke.java.simpleworklist.domain.meso.move.MoveTaskService;
2425
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
2526
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TransformTaskIntoProjektService;
2627
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
@@ -41,12 +42,14 @@ public class ProjectRootController extends AbstractController {
4142
public final static String rootProjectUrl = "redirect:/project/root";
4243

4344
private final ProjectControllerService projectControllerService;
45+
private final MoveTaskService moveTaskService;
4446
private final TaskService taskService;
4547
private final TransformTaskIntoProjektService transformTaskIntoProjektService;
4648

4749
@Autowired
48-
public ProjectRootController(ProjectControllerService projectControllerService, TaskService taskService, TransformTaskIntoProjektService transformTaskIntoProjektService) {
50+
public ProjectRootController(ProjectControllerService projectControllerService, MoveTaskService moveTaskService, TaskService taskService, TransformTaskIntoProjektService transformTaskIntoProjektService) {
4951
this.projectControllerService = projectControllerService;
52+
this.moveTaskService = moveTaskService;
5053
this.taskService = taskService;
5154
this.transformTaskIntoProjektService = transformTaskIntoProjektService;
5255
}
@@ -301,7 +304,7 @@ public final String moveTaskToProjectRoot(
301304
@ModelAttribute("userSession") UserSessionBean userSession,
302305
Model model
303306
) {
304-
task = taskService.moveTaskToRootProject(task);
307+
task = moveTaskService.moveTaskToRootProject(task);
305308
userSession.setLastProjectId(Project.rootProjectId);
306309
userSession.setLastTaskState(task.getTaskState());
307310
userSession.setLastTaskId(task.getId());
@@ -318,7 +321,7 @@ public final String moveTaskToProject(
318321
@ModelAttribute("userSession") UserSessionBean userSession,
319322
Model model
320323
) {
321-
task = taskService.moveTaskToAnotherProject(task,targetProject);
324+
task = moveTaskService.moveTaskToAnotherProject(task,targetProject);
322325
userSession.setLastProjectId(targetProject.getId());
323326
userSession.setLastTaskState(task.getTaskState());
324327
userSession.setLastTaskId(task.getId());
@@ -478,7 +481,7 @@ public final String moveAllCompletedToTrash(
478481
Model model
479482
) {
480483
Context context = super.getContext(userSession);
481-
taskService.moveAllCompletedToTrash(context);
484+
moveTaskService.moveAllCompletedToTrash(context);
482485
userSession.setLastContextId(context.getId());
483486
userSession.setLastProjectId(Project.rootProjectId);
484487
model.addAttribute("userSession", userSession);
@@ -493,7 +496,7 @@ public final String emptyTrash(
493496
Model model
494497
) {
495498
Context context = super.getContext(userSession);
496-
taskService.emptyTrash(context);
499+
moveTaskService.emptyTrash(context);
497500
userSession.setLastContextId(context.getId());
498501
userSession.setLastProjectId(Project.rootProjectId);
499502
model.addAttribute("userSession", userSession);

‎src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskService.java

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,15 @@
77
import org.woehlke.java.simpleworklist.domain.db.data.Task;
88
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
99

10-
public interface TaskService {
10+
import java.util.List;
1111

12-
Task moveTaskToInbox(Task task);
13-
Task moveTaskToToday(Task task);
14-
Task moveTaskToNext(Task task);
15-
Task moveTaskToWaiting(Task task);
16-
Task moveTaskToSomeday(Task task);
17-
Task moveTaskToFocus(Task task);
18-
Task moveTaskToCompleted(Task task);
19-
Task moveTaskToTrash(Task task);
12+
public interface TaskService {
2013

21-
void moveAllCompletedToTrash(Context context);
22-
void emptyTrash(Context context);
14+
// void moveAllCompletedToTrash(Context context);
15+
// void emptyTrash(Context context);
2316

24-
Task moveTaskToRootProject(Task task);
25-
Task moveTaskToAnotherProject(Task task, Project project);
17+
// Task moveTaskToRootProject(Task task);
18+
// Task moveTaskToAnotherProject(Task task, Project project);
2619

2720
Task addToInbox(Task task);
2821
Task addToProject(Task task);
@@ -68,4 +61,15 @@ public interface TaskService {
6861

6962
void moveTasksUpByProject(Task sourceTask, Task destinationTask);
7063
void moveTasksDownByProject(Task sourceTask, Task destinationTask);
64+
65+
Task saveAndFlush(Task task);
66+
67+
void deleteAll(List<Task> taskListDeleted);
68+
69+
void saveAll(List<Task> taskListChanged);
70+
71+
List<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(TaskState completed, Context context);
72+
73+
List<Task> findByTaskStateAndContext(TaskState trash, Context context);
74+
7175
}

0 commit comments

Comments
 (0)