Skip to content

Commit 7071eed

Browse files
thomaswoehlkethomaswoehlke
committed
work in progress
1 parent a4223c9 commit 7071eed

File tree

2 files changed

+33
-2
lines changed

2 files changed

+33
-2
lines changed

‎src/main/java/org/woehlke/simpleworklist/project/Project.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
@Getter
3838
@Setter
3939
@EqualsAndHashCode(callSuper = true, exclude = {"children","parent"})
40-
@ToString(callSuper = true, exclude = {"children","parent"})
40+
@ToString(callSuper = true, exclude = {"children","parent","description"})
4141
public class Project extends AuditModel implements Serializable, ComparableById<Project> {
4242

4343
private static final long serialVersionUID = 4566653175832872422L;

‎src/main/java/org/woehlke/simpleworklist/task/TaskServiceImpl.java‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,9 @@ private long getMaxOrderIdTaskStateFor(@NotNull TaskState taskState, @NotNull Co
416416
* @param destinationTask
417417
*/
418418
private void moveTasksDownByTaskState(@NotNull Task sourceTask, @NotNull Task destinationTask ) {
419+
log.info("-------------------------------------------------------------------------------");
420+
log.info(" moveTasks DOWN By TaskState: "+sourceTask.getId() +" -> "+ destinationTask.getId());
421+
log.info("-------------------------------------------------------------------------------");
419422
TaskState taskState = sourceTask.getTaskState();
420423
Context context = sourceTask.getContext();
421424
long lowerOrderIdTaskState = sourceTask.getOrderIdTaskState();
@@ -434,9 +437,15 @@ private void moveTasksDownByTaskState(@NotNull Task sourceTask, @NotNull Task de
434437
tasks.add(sourceTask);
435438
tasks.add(destinationTask);
436439
taskRepository.saveAll(tasks);
440+
log.info("-------------------------------------------------------------------------------");
441+
log.info(" DONE: moveTasks DOWN By TaskState("+taskState.name()+"): "+sourceTask.getId() +" -> "+ destinationTask.getId());
442+
log.info("-------------------------------------------------------------------------------");
437443
}
438444

439445
private void moveTasksUpByProjectRoot(@NotNull Task sourceTask, @NotNull Task destinationTask ) {
446+
log.info("-------------------------------------------------------------------------------");
447+
log.info(" moveTasks UP By ProjectRoot: "+sourceTask.getId() +" -> "+ destinationTask.getId());
448+
log.info("-------------------------------------------------------------------------------");
440449
Context context = sourceTask.getContext();
441450
long lowerOrderIdProject = destinationTask.getOrderIdProject();
442451
long higherOrderIdProject = sourceTask.getOrderIdProject();
@@ -453,9 +462,15 @@ private void moveTasksUpByProjectRoot(@NotNull Task sourceTask, @NotNull Task de
453462
tasks.add(sourceTask);
454463
tasks.add(destinationTask);
455464
taskRepository.saveAll(tasks);
465+
log.info("-------------------------------------------------------------------------------");
466+
log.info(" DONE: moveTasks UP By ProjectRoot: "+sourceTask.getId() +" -> "+ destinationTask.getId());
467+
log.info("-------------------------------------------------------------------------------");
456468
}
457469

458470
private void moveTasksDownByProjectRoot(@NotNull Task sourceTask, @NotNull Task destinationTask) {
471+
log.info("-------------------------------------------------------------------------------");
472+
log.info(" moveTasks DOWN By ProjectRoot: "+sourceTask.getId() +" -> "+ destinationTask.getId());
473+
log.info("-------------------------------------------------------------------------------");
459474
Context context = sourceTask.getContext();
460475
long lowerOrderIdProject = sourceTask.getOrderIdProject();
461476
long higherOrderIdProject = destinationTask.getOrderIdProject();
@@ -472,11 +487,17 @@ private void moveTasksDownByProjectRoot(@NotNull Task sourceTask, @NotNull Task
472487
tasks.add(sourceTask);
473488
tasks.add(destinationTask);
474489
taskRepository.saveAll(tasks);
490+
log.info("-------------------------------------------------------------------------------");
491+
log.info(" moveTasks DOWN By ProjectRoot: "+sourceTask.getId() +" -> "+ destinationTask.getId());
492+
log.info("-------------------------------------------------------------------------------");
475493
}
476494

477495
private void moveTasksUpByProject(@NotNull Task sourceTask, @NotNull Task destinationTask ) {
478-
Context context = sourceTask.getContext();
479496
Project project = sourceTask.getProject();
497+
log.info("-------------------------------------------------------------------------------");
498+
log.info(" moveTasks UP By Project("+project.getId()+"):" +sourceTask.getId() +" -> "+ destinationTask.getId());
499+
log.info("-------------------------------------------------------------------------------");
500+
Context context = sourceTask.getContext();
480501
long lowerOrderIdProject = destinationTask.getOrderIdProject();
481502
long higherOrderIdProject = sourceTask.getOrderIdProject();
482503
List<Task> tasks = taskRepository.getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
@@ -493,11 +514,18 @@ private void moveTasksUpByProject(@NotNull Task sourceTask, @NotNull Task destin
493514
tasks.add(sourceTask);
494515
tasks.add(destinationTask);
495516
taskRepository.saveAll(tasks);
517+
log.info("-------------------------------------------------------------------------------");
518+
log.info(" DONE: moveTasks UP By Project("+project.getId()+"):" +sourceTask.getId() +" -> "+ destinationTask.getId());
519+
log.info("-------------------------------------------------------------------------------");
520+
496521
}
497522

498523
private void moveTasksDownByProject(@NotNull Task sourceTask, @NotNull Task destinationTask) {
499524
Context context = sourceTask.getContext();
500525
Project project = sourceTask.getProject();
526+
log.info("-------------------------------------------------------------------------------");
527+
log.info(" moveTasks DOWN By Project("+project.getId()+"):" +sourceTask.getId() +" -> "+ destinationTask.getId());
528+
log.info("-------------------------------------------------------------------------------");
501529
long lowerOrderIdProject = sourceTask.getOrderIdProject();
502530
long higherOrderIdProject = destinationTask.getOrderIdProject();
503531
List<Task> tasks = taskRepository.getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
@@ -514,6 +542,9 @@ private void moveTasksDownByProject(@NotNull Task sourceTask, @NotNull Task dest
514542
tasks.add(sourceTask);
515543
tasks.add(destinationTask);
516544
taskRepository.saveAll(tasks);
545+
log.info("-------------------------------------------------------------------------------");
546+
log.info(" moveTasks DOWN By Project("+project.getId()+"):" +sourceTask.getId() +" -> "+ destinationTask.getId());
547+
log.info("-------------------------------------------------------------------------------");
517548
}
518549

519550
@Override

0 commit comments

Comments
 (0)