Skip to content

Commit 653904c

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 38e11a9 commit 653904c

File tree

11 files changed

+241
-234
lines changed

11 files changed

+241
-234
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.springframework.web.bind.annotation.*;
1313
import org.woehlke.java.simpleworklist.domain.db.data.Project;
1414
import org.woehlke.java.simpleworklist.domain.db.data.context.ContextService;
15-
import org.woehlke.java.simpleworklist.domain.db.data.project.ProjectControllerService;
15+
import org.woehlke.java.simpleworklist.domain.meso.project.ProjectControllerService;
1616
import org.woehlke.java.simpleworklist.domain.db.data.Context;
1717
import org.woehlke.java.simpleworklist.domain.db.data.Task;
1818
import org.woehlke.java.simpleworklist.domain.db.data.project.ProjectService;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.woehlke.java.simpleworklist.domain.db.data.Project;
1313
import org.woehlke.java.simpleworklist.domain.db.data.Task;
1414
import org.woehlke.java.simpleworklist.domain.db.data.context.ContextService;
15-
import org.woehlke.java.simpleworklist.domain.db.data.project.ProjectControllerService;
15+
import org.woehlke.java.simpleworklist.domain.meso.project.ProjectControllerService;
1616
import org.woehlke.java.simpleworklist.domain.db.data.project.ProjectService;
1717
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
1818
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskState;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.springframework.validation.ObjectError;
1414
import org.springframework.web.bind.annotation.*;
1515
import org.woehlke.java.simpleworklist.domain.db.data.Project;
16-
import org.woehlke.java.simpleworklist.domain.db.data.project.ProjectControllerService;
16+
import org.woehlke.java.simpleworklist.domain.meso.project.ProjectControllerService;
1717
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
1818
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.Breadcrumb;
1919
import org.woehlke.java.simpleworklist.domain.db.data.Context;

‎src/main/java/org/woehlke/java/simpleworklist/domain/db/data/project/ProjectControllerServiceImpl.java‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313
import org.woehlke.java.simpleworklist.domain.db.data.Context;
1414
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.Breadcrumb;
1515
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.BreadcrumbService;
16+
import org.woehlke.java.simpleworklist.domain.meso.project.ProjectControllerService;
1617
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
1718
import org.woehlke.java.simpleworklist.domain.db.data.Task;
1819
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
1920
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
21+
import org.woehlke.java.simpleworklist.domain.meso.task.TaskMove2TaskService;
2022

2123
import javax.validation.constraints.Min;
2224
import javax.validation.constraints.NotNull;
@@ -31,15 +33,17 @@ public class ProjectControllerServiceImpl implements ProjectControllerService {
3133
private final ProjectService projectService;
3234
private final BreadcrumbService breadcrumbService;
3335
private final TaskService taskService;
36+
private final TaskMove2TaskService taskMove2TaskService;
3437

3538
@Autowired
3639
public ProjectControllerServiceImpl(
37-
ProjectService projectService,
38-
BreadcrumbService breadcrumbService,
39-
TaskService taskService) {
40+
ProjectService projectService,
41+
BreadcrumbService breadcrumbService,
42+
TaskService taskService, TaskMove2TaskService taskMove2TaskService) {
4043
this.projectService = projectService;
4144
this.breadcrumbService = breadcrumbService;
4245
this.taskService = taskService;
46+
this.taskMove2TaskService = taskMove2TaskService;
4347
}
4448

4549
public void addNewProjectToProjectIdForm(
@@ -172,9 +176,9 @@ public void moveTaskToTaskAndChangeTaskOrderInProject(@NotNull Task sourceTask,
172176
log.info(" srcIsBelowDestinationTask: "+srcIsBelowDestinationTask);
173177
log.info("-------------------------------------------------------------------------------");
174178
if (srcIsBelowDestinationTask) {
175-
this.taskService.moveTasksDownByProject(sourceTask, destinationTask);
179+
this.taskMove2TaskService.moveTasksDownByProject(sourceTask, destinationTask);
176180
} else {
177-
this.taskService.moveTasksUpByProject(sourceTask, destinationTask);
181+
this.taskMove2TaskService.moveTasksUpByProject(sourceTask, destinationTask);
178182
}
179183
}
180184
log.info("-------------------------------------------------------------------------------");
@@ -201,9 +205,9 @@ public void moveTaskToTaskAndChangeTaskOrderInProjectRoot(@NotNull Task sourceTa
201205
log.info(" srcIsBelowDestinationTask: "+srcIsBelowDestinationTask);
202206
log.info("-------------------------------------------------------------------------------");
203207
if (srcIsBelowDestinationTask) {
204-
this.taskService.moveTasksDownByProjectRoot(sourceTask, destinationTask);
208+
this.taskMove2TaskService.moveTasksDownByProjectRoot(sourceTask, destinationTask);
205209
} else {
206-
this.taskService.moveTasksUpByProjectRoot(sourceTask, destinationTask);
210+
this.taskMove2TaskService.moveTasksUpByProjectRoot(sourceTask, destinationTask);
207211
}
208212
}
209213
log.info("-------------------------------------------------------------------------------");

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,27 +43,18 @@ public interface TaskService {
4343

4444
boolean projectHasNoTasks(Project project);
4545

46-
void moveTasksUpByProjectRoot(Task sourceTask, Task destinationTask);
47-
void moveTasksDownByProjectRoot(Task sourceTask, Task destinationTask);
48-
49-
void moveTasksUpByProject(Task sourceTask, Task destinationTask);
50-
void moveTasksDownByProject(Task sourceTask, Task destinationTask);
51-
5246
Task saveAndFlush(Task task);
5347
void saveAll(List<Task> taskListChanged);
5448
void deleteAll(List<Task> taskListDeleted);
5549

56-
5750
List<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(TaskState taskState, Context context);
5851

5952
Task findTopByTaskStateAndContextOrderByOrderIdTaskStateDesc(TaskState taskState, Context context);
6053
Task findTopByProjectAndContextOrderByOrderIdProjectDesc(Project project, Context context);
6154
Task findTopByProjectIsNullAndContextOrderByOrderIdProjectDesc(Context context);
6255

6356
List<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(long lowerOrderIdTaskState, long higherOrderIdTaskState, TaskState taskState, Context context);
64-
65-
void moveTasksUpByTaskState(Task sourceTask, Task destinationTask);
66-
67-
void moveTasksDownByTaskState(Task sourceTask, Task destinationTask);
57+
List<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(long lowerOrderIdProject, long higherOrderIdProject, Context context);
58+
List<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(long lowerOrderIdProject, long higherOrderIdProject, Project project);
6859

6960
}

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

Lines changed: 4 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -64,133 +64,6 @@ public Task findOne(@Min(1L) long taskId) {
6464
}
6565
}
6666

67-
@Override
68-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
69-
public void moveTasksUpByProjectRoot(Task sourceTask, Task destinationTask ) {
70-
log.info("-------------------------------------------------------------------------------");
71-
log.info(" moveTasks UP By ProjectRoot: "+sourceTask.getId() +" -> "+ destinationTask.getId());
72-
log.info("-------------------------------------------------------------------------------");
73-
Context context = sourceTask.getContext();
74-
long lowerOrderIdProject = destinationTask.getOrderIdProject();
75-
long higherOrderIdProject = sourceTask.getOrderIdProject();
76-
List<Task> tasks = taskRepository.getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
77-
lowerOrderIdProject,
78-
higherOrderIdProject,
79-
context
80-
);
81-
List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
82-
for(Task task:tasks){
83-
task.moveUpByProject();
84-
log.info(task.outProject());
85-
tasksMoved.add(task);
86-
}
87-
sourceTask.setOrderIdProject(lowerOrderIdProject);
88-
destinationTask.moveUpByProject();
89-
tasksMoved.add(sourceTask);
90-
tasksMoved.add(destinationTask);
91-
taskRepository.saveAll(tasksMoved);
92-
log.info("-------------------------------------------------------------------------------");
93-
log.info(" DONE: moveTasks UP By ProjectRoot: "+sourceTask.getId() +" -> "+ destinationTask.getId());
94-
log.info("-------------------------------------------------------------------------------");
95-
}
96-
97-
@Override
98-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
99-
public void moveTasksDownByProjectRoot(Task sourceTask, Task destinationTask) {
100-
log.info("-------------------------------------------------------------------------------");
101-
log.info(" START moveTasks UP By Project Root");
102-
log.info(" "+sourceTask.outProject() +" -> "+ destinationTask.outProject());
103-
log.info("-------------------------------------------------------------------------------");
104-
Context context = sourceTask.getContext();
105-
final long lowerOrderIdProject = sourceTask.getOrderIdProject();
106-
final long higherOrderIdProject = destinationTask.getOrderIdProject();
107-
List<Task> tasks = taskRepository.getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
108-
lowerOrderIdProject,
109-
higherOrderIdProject,
110-
context
111-
);
112-
List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
113-
for(Task task:tasks){
114-
task.moveDownByProject();
115-
log.info(task.outProject());
116-
tasksMoved.add(task);
117-
}
118-
sourceTask.setOrderIdProject(higherOrderIdProject);
119-
destinationTask.moveDownByProject();
120-
tasksMoved.add(sourceTask);
121-
tasksMoved.add(destinationTask);
122-
taskRepository.saveAll(tasksMoved);
123-
log.info("-------------------------------------------------------------------------------");
124-
log.info(" DONE moveTasks UP By Project Root");
125-
log.info(" "+sourceTask.outProject() +" -> "+ destinationTask.outProject());
126-
log.info("-------------------------------------------------------------------------------");
127-
}
128-
129-
@Override
130-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
131-
public void moveTasksUpByProject(Task sourceTask, Task destinationTask ) {
132-
Project project = sourceTask.getProject();
133-
log.info("-------------------------------------------------------------------------------");
134-
log.info(" START moveTasks UP By Project("+project.out()+"):");
135-
log.info(" "+sourceTask.outProject() +" -> "+ destinationTask.outProject());
136-
log.info("-------------------------------------------------------------------------------");
137-
long lowerOrderIdProject = destinationTask.getOrderIdProject();
138-
long higherOrderIdProject = sourceTask.getOrderIdProject();
139-
List<Task> tasks = taskRepository.getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
140-
lowerOrderIdProject,
141-
higherOrderIdProject,
142-
project
143-
);
144-
List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
145-
for(Task task:tasks){
146-
task.moveUpByProject();
147-
log.info(task.outProject());
148-
tasksMoved.add(task);
149-
}
150-
sourceTask.setOrderIdProject(lowerOrderIdProject);
151-
destinationTask.moveUpByProject();
152-
tasksMoved.add(sourceTask);
153-
tasksMoved.add(destinationTask);
154-
taskRepository.saveAll(tasksMoved);
155-
log.info("-------------------------------------------------------------------------------");
156-
log.info(" DONE moveTasks UP By Project("+project.out()+"):");
157-
log.info(" "+sourceTask.outProject() +" -> "+ destinationTask.outProject());
158-
log.info("-------------------------------------------------------------------------------");
159-
160-
}
161-
162-
@Override
163-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
164-
public void moveTasksDownByProject(Task sourceTask, Task destinationTask) {
165-
Project project = sourceTask.getProject();
166-
log.info("-------------------------------------------------------------------------------");
167-
log.info(" START moveTasks DOWN By Project("+project.out()+"):");
168-
log.info(" "+sourceTask.outProject() +" -> "+ destinationTask.outProject());
169-
log.info("-------------------------------------------------------------------------------");
170-
final long lowerOrderIdProject = sourceTask.getOrderIdProject();
171-
final long higherOrderIdProject = destinationTask.getOrderIdProject();
172-
List<Task> tasks = taskRepository.getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
173-
lowerOrderIdProject,
174-
higherOrderIdProject,
175-
project
176-
);
177-
List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
178-
for(Task task:tasks){
179-
task.moveDownByProject();
180-
log.info(task.outProject());
181-
tasksMoved.add(task);
182-
}
183-
sourceTask.setOrderIdProject(higherOrderIdProject);
184-
destinationTask.moveDownByProject();
185-
tasksMoved.add(sourceTask);
186-
tasksMoved.add(destinationTask);
187-
taskRepository.saveAll(tasksMoved);
188-
log.info("-------------------------------------------------------------------------------");
189-
log.info(" DONE smoveTasks DOWN By Project("+project.out()+"):");
190-
log.info(" "+sourceTask.outProject() +" -> "+ destinationTask.outProject());
191-
log.info("-------------------------------------------------------------------------------");
192-
}
193-
19467
@Override
19568
public Task saveAndFlush(Task task) {
19669
return taskRepository.saveAndFlush(task);
@@ -342,13 +215,13 @@ public List<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(long l
342215
}
343216

344217
@Override
345-
public void moveTasksUpByTaskState(Task sourceTask, Task destinationTask) {
346-
218+
public List<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(long lowerOrderIdProject, long higherOrderIdProject, Context context) {
219+
return taskRepository.getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(lowerOrderIdProject,higherOrderIdProject,context);
347220
}
348221

349222
@Override
350-
public void moveTasksDownByTaskState(Task sourceTask, Task destinationTask) {
351-
223+
public List<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(long lowerOrderIdProject, long higherOrderIdProject, Project project) {
224+
return taskRepository.getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(lowerOrderIdProject, higherOrderIdProject, project);
352225
}
353226

354227
}

‎src/main/java/org/woehlke/java/simpleworklist/domain/db/data/project/ProjectControllerService.java‎ renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/meso/project/ProjectControllerService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.domain.db.data.project;
1+
package org.woehlke.java.simpleworklist.domain.meso.project;
22

33
import org.springframework.data.domain.Page;
44
import org.springframework.data.domain.Pageable;

‎src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskMove2TaskService.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,27 @@ public interface TaskMove2TaskService {
66

77
void moveTaskToTaskAndChangeTaskOrderInTaskstate(Task sourceTask, Task destinationTask);
88

9+
void moveTasksUpByProjectRoot(Task sourceTask, Task destinationTask);
10+
void moveTasksDownByProjectRoot(Task sourceTask, Task destinationTask);
11+
12+
void moveTasksUpByProject(Task sourceTask, Task destinationTask);
13+
void moveTasksDownByProject(Task sourceTask, Task destinationTask);
14+
15+
/**
16+
* Before: sourceTask is dragged from above down to destinationTask, so sourceTask is above destinationTask.
17+
* After: sourceTask is placed to the position of destinationTask, all tasks between old position of sourceTask
18+
* and destinationTask are moved one position up; destinationTask is the next Task above sourceTask.
19+
* @param sourceTask Task
20+
* @param destinationTask Task
21+
*/
22+
void moveTasksUpByTaskState(Task sourceTask, Task destinationTask);
23+
24+
/**
25+
* Before: sourceTask is dragged from below up to destinationTask, so sourceTask is below destinationTask.
26+
* After: sourceTask is placed to the position of destinationTask, all tasks between old position of sourceTask
27+
* are moved one position down; destinationTask is the next Task below sourceTask.
28+
* @param sourceTask Task
29+
* @param destinationTask Task
30+
*/
31+
void moveTasksDownByTaskState(Task sourceTask, Task destinationTask);
932
}

0 commit comments

Comments
 (0)