Skip to content

Commit 9af3680

Browse files
thomaswoehlkethomaswoehlke
committed
fixed #368 ProjectId: drag and drop: move task up,
fixed #369 ProjectId: drag and drop: move task down, fixed #370 ProjectRoot: drag and drop: move task up, fixed #371 ProjectRoot: drag and drop: move task down, fixed #372 TaskState: drag and drop: move task up, fixed #373 TaskState: drag and drop: move task down
1 parent dca6c83 commit 9af3680

File tree

8 files changed

+33
-36
lines changed

8 files changed

+33
-36
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
@@ -285,7 +285,7 @@ public String moveTaskToTaskAndChangeTaskOrderInProject(
285285
log.info("-------------------------------------------------");
286286
log.info(" destination Task: " + destinationTask.toString());
287287
log.info("-------------------------------------------------");
288-
projectControllerService.moveTaskToTaskAndChangeTaskOrderInProject(sourceTask, destinationTask);
288+
projectControllerService.moveTaskToTaskAndChangeTaskOrderInProjectId(sourceTask, destinationTask);
289289
log.info(" DONE: taskMoveService.moveOrderIdProject");
290290
log.info("-------------------------------------------------");
291291
model.addAttribute("userSession", userSession);

‎src/main/java/org/woehlke/java/simpleworklist/domain/TaskMove2TaskController.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.Task;
1312
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
1413
import org.woehlke.java.simpleworklist.domain.meso.task.TaskMove2TaskService;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ public interface TaskService {
5353

5454
List<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(long lowerOrderIdTaskState, long higherOrderIdTaskState, TaskState taskState, Context context);
5555
List<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(long lowerOrderIdProject, long higherOrderIdProject, Context context);
56-
List<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(long lowerOrderIdProject, long higherOrderIdProject, Project project);
56+
List<Task> getTasksByOrderIdProjectIdBetweenLowerTaskAndHigherTask(long lowerOrderIdProject, long higherOrderIdProject, Project project);
5757

5858
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,20 +213,20 @@ public Task findTopByProjectIsNullAndContextOrderByOrderIdProjectDesc(Context co
213213
}
214214

215215
@Override
216-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
216+
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
217217
public List<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(long lowerOrderIdTaskState, long higherOrderIdTaskState, TaskState taskState, Context context) {
218218
return taskRepository.getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask( lowerOrderIdTaskState, higherOrderIdTaskState, taskState, context);
219219
}
220220

221221
@Override
222-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
222+
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
223223
public List<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(long lowerOrderIdProject, long higherOrderIdProject, Context context) {
224224
return taskRepository.getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(lowerOrderIdProject,higherOrderIdProject,context);
225225
}
226226

227227
@Override
228-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
229-
public List<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(long lowerOrderIdProject, long higherOrderIdProject, Project project) {
228+
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
229+
public List<Task> getTasksByOrderIdProjectIdBetweenLowerTaskAndHigherTask(long lowerOrderIdProject, long higherOrderIdProject, Project project) {
230230
return taskRepository.getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(lowerOrderIdProject, higherOrderIdProject, project);
231231
}
232232

‎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
@@ -54,7 +54,7 @@ Project getProject(
5454
UserSessionBean userSession
5555
);
5656

57-
void moveTaskToTaskAndChangeTaskOrderInProject(Task sourceTask, Task destinationTask);
57+
void moveTaskToTaskAndChangeTaskOrderInProjectId(Task sourceTask, Task destinationTask);
5858
void moveTaskToTaskAndChangeTaskOrderInProjectRoot(Task sourceTask, Task destinationTask);
5959

6060
Project findByProjectId(long projectId);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ public String addNewProjectToProjectRootPersist(
162162
}
163163

164164
@Override
165-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
166-
public void moveTaskToTaskAndChangeTaskOrderInProject(@NotNull Task sourceTask, @NotNull Task destinationTask ) {
165+
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
166+
public void moveTaskToTaskAndChangeTaskOrderInProjectId(@NotNull Task sourceTask, @NotNull Task destinationTask ) {
167167
Project project = sourceTask.getProject();
168168
log.info("-------------------------------------------------------------------------------");
169169
log.info(" START: moveTaskToTaskAndChangeTaskOrderInProject ");
@@ -179,9 +179,9 @@ public void moveTaskToTaskAndChangeTaskOrderInProject(@NotNull Task sourceTask,
179179
log.info(" srcIsBelowDestinationTask: "+srcIsBelowDestinationTask);
180180
log.info("-------------------------------------------------------------------------------");
181181
if (srcIsBelowDestinationTask) {
182-
this.taskMove2TaskService.moveTasksDownByProject(sourceTask, destinationTask);
182+
this.taskMove2TaskService.moveTasksDownByProjectId(sourceTask, destinationTask);
183183
} else {
184-
this.taskMove2TaskService.moveTasksUpByProject(sourceTask, destinationTask);
184+
this.taskMove2TaskService.moveTasksUpByProjectId(sourceTask, destinationTask);
185185
}
186186
}
187187
log.info("-------------------------------------------------------------------------------");
@@ -192,7 +192,7 @@ public void moveTaskToTaskAndChangeTaskOrderInProject(@NotNull Task sourceTask,
192192
}
193193

194194
@Override
195-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
195+
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
196196
public void moveTaskToTaskAndChangeTaskOrderInProjectRoot(@NotNull Task sourceTask, @NotNull Task destinationTask ) {
197197
log.info("-------------------------------------------------------------------------------");
198198
log.info(" START: moveTaskToTaskAndChangeTaskOrderIn Project Root");

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ public interface TaskMove2TaskService {
99
void moveTasksUpByProjectRoot(Task sourceTask, Task destinationTask);
1010
void moveTasksDownByProjectRoot(Task sourceTask, Task destinationTask);
1111

12-
void moveTasksUpByProject(Task sourceTask, Task destinationTask);
13-
void moveTasksDownByProject(Task sourceTask, Task destinationTask);
12+
void moveTasksUpByProjectId(Task sourceTask, Task destinationTask);
13+
void moveTasksDownByProjectId(Task sourceTask, Task destinationTask);
1414

1515
/**
1616
* Before: sourceTask is dragged from above down to destinationTask, so sourceTask is above destinationTask.

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

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.beans.factory.annotation.Autowired;
55
import org.springframework.stereotype.Service;
6-
import org.springframework.transaction.annotation.Propagation;
7-
import org.springframework.transaction.annotation.Transactional;
86
import org.woehlke.java.simpleworklist.domain.db.data.Context;
97
import org.woehlke.java.simpleworklist.domain.db.data.Project;
108
import org.woehlke.java.simpleworklist.domain.db.data.Task;
@@ -26,10 +24,10 @@ public TaskMove2TaskServiceImpl(TaskService taskService) {
2624
}
2725

2826
@Override
29-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
27+
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
3028
public void moveTasksUpByProjectRoot(Task sourceTask, Task destinationTask ) {
3129
log.info("-------------------------------------------------------------------------------");
32-
log.info(" moveTasks UP By ProjectRoot: "+sourceTask.getId() +" -> "+ destinationTask.getId());
30+
log.info(" moveTasks UP By ProjectRoot: "+sourceTask.toString() +" -> "+ destinationTask.toString());
3331
log.info("-------------------------------------------------------------------------------");
3432
Context context = sourceTask.getContext();
3533
long lowerOrderIdProject = destinationTask.getOrderIdProject();
@@ -51,12 +49,12 @@ public void moveTasksUpByProjectRoot(Task sourceTask, Task destinationTask ) {
5149
tasksMoved.add(destinationTask);
5250
taskService.saveAll(tasksMoved);
5351
log.info("-------------------------------------------------------------------------------");
54-
log.info(" DONE: moveTasks UP By ProjectRoot: "+sourceTask.getId() +" -> "+ destinationTask.getId());
52+
log.info(" DONE: moveTasks UP By ProjectRoot: "+sourceTask.toString() +" -> "+ destinationTask.toString());
5553
log.info("-------------------------------------------------------------------------------");
5654
}
5755

5856
@Override
59-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
57+
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
6058
public void moveTasksDownByProjectRoot(Task sourceTask, Task destinationTask) {
6159
log.info("-------------------------------------------------------------------------------");
6260
log.info(" START moveTasks UP By Project Root");
@@ -88,16 +86,16 @@ public void moveTasksDownByProjectRoot(Task sourceTask, Task destinationTask) {
8886
}
8987

9088
@Override
91-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
92-
public void moveTasksUpByProject(Task sourceTask, Task destinationTask ) {
89+
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
90+
public void moveTasksUpByProjectId(Task sourceTask, Task destinationTask ) {
9391
Project project = sourceTask.getProject();
9492
log.info("-------------------------------------------------------------------------------");
95-
log.info(" START moveTasks UP By Project("+project.out()+"):");
93+
log.info(" START moveTasks UP By ProjectId("+project.out()+"):");
9694
log.info(" "+sourceTask.outProject() +" -> "+ destinationTask.outProject());
9795
log.info("-------------------------------------------------------------------------------");
9896
long lowerOrderIdProject = destinationTask.getOrderIdProject();
9997
long higherOrderIdProject = sourceTask.getOrderIdProject();
100-
List<Task> tasks = taskService.getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
98+
List<Task> tasks = taskService.getTasksByOrderIdProjectIdBetweenLowerTaskAndHigherTask(
10199
lowerOrderIdProject,
102100
higherOrderIdProject,
103101
project
@@ -121,16 +119,16 @@ public void moveTasksUpByProject(Task sourceTask, Task destinationTask ) {
121119
}
122120

123121
@Override
124-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
125-
public void moveTasksDownByProject(Task sourceTask, Task destinationTask) {
122+
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
123+
public void moveTasksDownByProjectId(Task sourceTask, Task destinationTask) {
126124
Project project = sourceTask.getProject();
127125
log.info("-------------------------------------------------------------------------------");
128-
log.info(" START moveTasks DOWN By Project("+project.out()+"):");
126+
log.info(" START moveTasks DOWN By ProjectId("+project.out()+"):");
129127
log.info(" "+sourceTask.outProject() +" -> "+ destinationTask.outProject());
130128
log.info("-------------------------------------------------------------------------------");
131129
final long lowerOrderIdProject = sourceTask.getOrderIdProject();
132130
final long higherOrderIdProject = destinationTask.getOrderIdProject();
133-
List<Task> tasks = taskService.getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
131+
List<Task> tasks = taskService.getTasksByOrderIdProjectIdBetweenLowerTaskAndHigherTask(
134132
lowerOrderIdProject,
135133
higherOrderIdProject,
136134
project
@@ -153,7 +151,7 @@ public void moveTasksDownByProject(Task sourceTask, Task destinationTask) {
153151
}
154152

155153
@Override
156-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
154+
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
157155
public void moveTaskToTaskAndChangeTaskOrderInTaskstate(Task sourceTask, Task destinationTask ) {
158156
log.info("-------------------------------------------------------------------------------");
159157
log.info(" START: moveTaskToTask AndChangeTaskOrder In Taskstate ");
@@ -181,12 +179,12 @@ public void moveTaskToTaskAndChangeTaskOrderInTaskstate(Task sourceTask, Task de
181179
}
182180

183181
@Override
184-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
182+
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
185183
public void moveTasksUpByTaskState(Task sourceTask, Task destinationTask ) {
184+
TaskState taskState = sourceTask.getTaskState();
186185
log.info("-------------------------------------------------------------------------------");
187-
log.info(" moveTasks UP By TaskState: "+sourceTask.getId() +" -> "+ destinationTask.getId());
186+
log.info(" moveTasks UP By TaskState("+taskState.name()+"): "+sourceTask.getId() +" -> "+ destinationTask.getId());
188187
log.info("-------------------------------------------------------------------------------");
189-
TaskState taskState = sourceTask.getTaskState();
190188
Context context = sourceTask.getContext();
191189
final long lowerOrderIdTaskState = destinationTask.getOrderIdTaskState();
192190
final long higherOrderIdTaskState = sourceTask.getOrderIdTaskState();
@@ -216,12 +214,12 @@ public void moveTasksUpByTaskState(Task sourceTask, Task destinationTask ) {
216214

217215

218216
@Override
219-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
217+
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
220218
public void moveTasksDownByTaskState(Task sourceTask, Task destinationTask ) {
219+
TaskState taskState = sourceTask.getTaskState();
221220
log.info("-------------------------------------------------------------------------------");
222-
log.info(" moveTasks DOWN By TaskState: "+sourceTask.getId() +" -> "+ destinationTask.getId());
221+
log.info(" moveTasks DOWN By TaskState("+taskState.name()+"): "+sourceTask.getId() +" -> "+ destinationTask.getId());
223222
log.info("-------------------------------------------------------------------------------");
224-
TaskState taskState = sourceTask.getTaskState();
225223
Context context = sourceTask.getContext();
226224
long lowerOrderIdTaskState = sourceTask.getOrderIdTaskState();
227225
long higherOrderIdTaskState = destinationTask.getOrderIdTaskState();

0 commit comments

Comments
 (0)