Skip to content

Commit dca6c83

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 350ec4b commit dca6c83

File tree

1 file changed

+40
-30
lines changed

1 file changed

+40
-30
lines changed

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

Lines changed: 40 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
1212
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskState;
1313

14-
import javax.validation.constraints.NotNull;
1514
import java.util.ArrayList;
1615
import java.util.List;
1716

@@ -27,34 +26,7 @@ public TaskMove2TaskServiceImpl(TaskService taskService) {
2726
}
2827

2928
@Override
30-
public void moveTaskToTaskAndChangeTaskOrderInTaskstate(Task sourceTask, Task destinationTask ) {
31-
log.info("-------------------------------------------------------------------------------");
32-
log.info(" START: moveTaskToTask AndChangeTaskOrder In Taskstate ");
33-
log.info(" "+sourceTask.getTaskState().name());
34-
log.info(" "+sourceTask.outProject()+" -> "+destinationTask.outProject());
35-
log.info("-------------------------------------------------------------------------------");
36-
boolean notEqualsId = ! sourceTask.equalsById(destinationTask);
37-
boolean notEquals = ! sourceTask.equalsByUniqueConstraint(destinationTask);
38-
boolean sameContext = sourceTask.hasSameContextAs(destinationTask);
39-
boolean sameTaskType = sourceTask.hasSameTaskTypetAs(destinationTask);
40-
boolean go = notEqualsId && notEquals && sameContext && sameTaskType;
41-
if ( go ) {
42-
boolean srcIsBelowDestinationTask = sourceTask.isBelowByTaskState(destinationTask);
43-
if (srcIsBelowDestinationTask) {
44-
this.moveTasksDownByTaskState( sourceTask, destinationTask );
45-
} else {
46-
this.moveTasksUpByTaskState( sourceTask, destinationTask );
47-
}
48-
}
49-
log.info("-------------------------------------------------------------------------------");
50-
log.info(" DONE: moveTaskToTask AndChangeTaskOrder In Taskstate ");
51-
log.info(" "+sourceTask.getTaskState().name());
52-
log.info(" "+sourceTask.outProject()+" -> "+destinationTask.outProject());
53-
log.info("-------------------------------------------------------------------------------");
54-
}
55-
56-
57-
@Override
29+
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
5830
public void moveTasksUpByProjectRoot(Task sourceTask, Task destinationTask ) {
5931
log.info("-------------------------------------------------------------------------------");
6032
log.info(" moveTasks UP By ProjectRoot: "+sourceTask.getId() +" -> "+ destinationTask.getId());
@@ -84,6 +56,7 @@ public void moveTasksUpByProjectRoot(Task sourceTask, Task destinationTask ) {
8456
}
8557

8658
@Override
59+
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
8760
public void moveTasksDownByProjectRoot(Task sourceTask, Task destinationTask) {
8861
log.info("-------------------------------------------------------------------------------");
8962
log.info(" START moveTasks UP By Project Root");
@@ -115,6 +88,7 @@ public void moveTasksDownByProjectRoot(Task sourceTask, Task destinationTask) {
11588
}
11689

11790
@Override
91+
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
11892
public void moveTasksUpByProject(Task sourceTask, Task destinationTask ) {
11993
Project project = sourceTask.getProject();
12094
log.info("-------------------------------------------------------------------------------");
@@ -147,6 +121,7 @@ public void moveTasksUpByProject(Task sourceTask, Task destinationTask ) {
147121
}
148122

149123
@Override
124+
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
150125
public void moveTasksDownByProject(Task sourceTask, Task destinationTask) {
151126
Project project = sourceTask.getProject();
152127
log.info("-------------------------------------------------------------------------------");
@@ -178,7 +153,39 @@ public void moveTasksDownByProject(Task sourceTask, Task destinationTask) {
178153
}
179154

180155
@Override
156+
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
157+
public void moveTaskToTaskAndChangeTaskOrderInTaskstate(Task sourceTask, Task destinationTask ) {
158+
log.info("-------------------------------------------------------------------------------");
159+
log.info(" START: moveTaskToTask AndChangeTaskOrder In Taskstate ");
160+
log.info(" "+sourceTask.getTaskState().name());
161+
log.info(" "+sourceTask.outProject()+" -> "+destinationTask.outProject());
162+
log.info("-------------------------------------------------------------------------------");
163+
boolean notEqualsId = ! sourceTask.equalsById(destinationTask);
164+
boolean notEquals = ! sourceTask.equalsByUniqueConstraint(destinationTask);
165+
boolean sameContext = sourceTask.hasSameContextAs(destinationTask);
166+
boolean sameTaskType = sourceTask.hasSameTaskTypetAs(destinationTask);
167+
boolean go = notEqualsId && notEquals && sameContext && sameTaskType;
168+
if ( go ) {
169+
boolean srcIsBelowDestinationTask = sourceTask.isBelowByTaskState(destinationTask);
170+
if (srcIsBelowDestinationTask) {
171+
this.moveTasksDownByTaskState( sourceTask, destinationTask );
172+
} else {
173+
this.moveTasksUpByTaskState( sourceTask, destinationTask );
174+
}
175+
}
176+
log.info("-------------------------------------------------------------------------------");
177+
log.info(" DONE: moveTaskToTask AndChangeTaskOrder In Taskstate ");
178+
log.info(" "+sourceTask.getTaskState().name());
179+
log.info(" "+sourceTask.outProject()+" -> "+destinationTask.outProject());
180+
log.info("-------------------------------------------------------------------------------");
181+
}
182+
183+
@Override
184+
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
181185
public void moveTasksUpByTaskState(Task sourceTask, Task destinationTask ) {
186+
log.info("-------------------------------------------------------------------------------");
187+
log.info(" moveTasks UP By TaskState: "+sourceTask.getId() +" -> "+ destinationTask.getId());
188+
log.info("-------------------------------------------------------------------------------");
182189
TaskState taskState = sourceTask.getTaskState();
183190
Context context = sourceTask.getContext();
184191
final long lowerOrderIdTaskState = destinationTask.getOrderIdTaskState();
@@ -202,11 +209,14 @@ public void moveTasksUpByTaskState(Task sourceTask, Task destinationTask ) {
202209
log.info(sourceTask.outTaskstate());
203210
tasksMoved.add(sourceTask);
204211
taskService.saveAll(tasksMoved);
212+
log.info("-------------------------------------------------------------------------------");
213+
log.info(" DONE: moveTasks UP By TaskState("+taskState.name()+"): "+sourceTask.getId() +" -> "+ destinationTask.getId());
214+
log.info("-------------------------------------------------------------------------------");
205215
}
206216

207217

208218
@Override
209-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
219+
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
210220
public void moveTasksDownByTaskState(Task sourceTask, Task destinationTask ) {
211221
log.info("-------------------------------------------------------------------------------");
212222
log.info(" moveTasks DOWN By TaskState: "+sourceTask.getId() +" -> "+ destinationTask.getId());

0 commit comments

Comments
 (0)