Skip to content

Commit 6457443

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 359f347 commit 6457443

File tree

6 files changed

+112
-86
lines changed

6 files changed

+112
-86
lines changed

‎src/main/java/org/woehlke/java/simpleworklist/domain/meso/TaskMove2TaskController.java‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package org.woehlke.java.simpleworklist.domain.meso;
2+
3+
import lombok.extern.slf4j.Slf4j;
4+
import org.springframework.beans.factory.annotation.Autowired;
5+
import org.springframework.stereotype.Controller;
6+
import org.springframework.ui.Model;
7+
import org.springframework.web.bind.annotation.ModelAttribute;
8+
import org.springframework.web.bind.annotation.PathVariable;
9+
import org.springframework.web.bind.annotation.RequestMapping;
10+
import org.springframework.web.bind.annotation.RequestMethod;
11+
import org.woehlke.java.simpleworklist.domain.AbstractController;
12+
import org.woehlke.java.simpleworklist.domain.db.data.Task;
13+
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
14+
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskMove2TaskService;
15+
16+
import javax.validation.constraints.NotNull;
17+
18+
@Slf4j
19+
@Controller
20+
@RequestMapping(path = "/taskstate/task")
21+
public class TaskMove2TaskController extends AbstractController {
22+
23+
private final TaskMove2TaskService taskMove2TaskService;
24+
25+
@Autowired
26+
public TaskMove2TaskController(TaskMove2TaskService taskMove2TaskService) {
27+
this.taskMove2TaskService = taskMove2TaskService;
28+
}
29+
30+
@RequestMapping(path = "/{taskId}/changeorderto/{destinationTaskId}", method = RequestMethod.GET)
31+
public String changeTaskOrderId(
32+
@NotNull @PathVariable("taskId") Task sourceTask,
33+
@NotNull @PathVariable("destinationTaskId") Task destinationTask,
34+
@NotNull @ModelAttribute("userSession") UserSessionBean userSession,
35+
Model model
36+
){
37+
log.info("------------- changeTaskOrderId -------------");
38+
log.info("source Task: "+sourceTask.toString());
39+
log.info("---------------------------------------------");
40+
log.info("destination Task: "+destinationTask.toString());
41+
log.info("---------------------------------------------");
42+
taskMove2TaskService.moveTaskToTaskAndChangeTaskOrderInTaskstate(sourceTask, destinationTask);
43+
userSession.setLastTaskState(sourceTask.getTaskState());
44+
model.addAttribute("userSession", userSession);
45+
model.addAttribute("dataPage", true);
46+
return sourceTask.getTaskState().getUrl();
47+
}
48+
49+
}

‎src/main/java/org/woehlke/java/simpleworklist/domain/meso/TaskStateTaskController.java‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.woehlke.java.simpleworklist.domain.db.data.Task;
1515
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
1616
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
17-
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.MoveTaskToTaskInTaskstateService;
1817
import org.woehlke.java.simpleworklist.domain.db.data.TaskState;
1918
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskStateTaskControllerService;
2019
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TransformTaskIntoProjektService;
@@ -38,17 +37,14 @@
3837
@RequestMapping(path = "/taskstate/task")
3938
public class TaskStateTaskController extends AbstractController {
4039

41-
private final MoveTaskToTaskInTaskstateService moveTaskToTaskInTaskstateService;
4240
private final TransformTaskIntoProjektService transformTaskIntoProjektService;
4341
private final TaskStateTaskControllerService taskStateTaskControllerService;
4442

4543
@Autowired
4644
public TaskStateTaskController(
47-
MoveTaskToTaskInTaskstateService moveTaskToTaskInTaskstateService,
4845
TransformTaskIntoProjektService transformTaskIntoProjektService,
4946
TaskStateTaskControllerService taskStateTaskControllerService
5047
) {
51-
this.moveTaskToTaskInTaskstateService = moveTaskToTaskInTaskstateService;
5248
this.transformTaskIntoProjektService = transformTaskIntoProjektService;
5349
this.taskStateTaskControllerService = taskStateTaskControllerService;
5450
}
@@ -187,25 +183,6 @@ public final String editTaskPost(
187183
}
188184
}
189185

190-
@RequestMapping(path = "/{taskId}/changeorderto/{destinationTaskId}", method = RequestMethod.GET)
191-
public String changeTaskOrderId(
192-
@NotNull @PathVariable("taskId") Task sourceTask,
193-
@NotNull @PathVariable("destinationTaskId") Task destinationTask,
194-
@NotNull @ModelAttribute("userSession") UserSessionBean userSession,
195-
Model model
196-
){
197-
log.info("------------- changeTaskOrderId -------------");
198-
log.info("source Task: "+sourceTask.toString());
199-
log.info("---------------------------------------------");
200-
log.info("destination Task: "+destinationTask.toString());
201-
log.info("---------------------------------------------");
202-
moveTaskToTaskInTaskstateService.moveTaskToTaskAndChangeTaskOrderInTaskstate(sourceTask, destinationTask);
203-
userSession.setLastTaskState(sourceTask.getTaskState());
204-
model.addAttribute("userSession", userSession);
205-
model.addAttribute("dataPage", true);
206-
return sourceTask.getTaskState().getUrl();
207-
}
208-
209186
@RequestMapping(path = "/{taskId}/delete", method = RequestMethod.GET)
210187
public final String deleteTaskGet(
211188
@NotNull @PathVariable("taskId") Task task,
@@ -246,7 +223,7 @@ public final String transformTaskIntoProjectGet(
246223
}
247224

248225
@RequestMapping(path = "/{taskId}/complete", method = RequestMethod.GET)
249-
public final String setDoneTaskGet(
226+
public final String setCompletedTaskGet(
250227
@NotNull @PathVariable("taskId") Task task,
251228
@NotNull @ModelAttribute("userSession") UserSessionBean userSession,
252229
Model model
@@ -263,7 +240,7 @@ public final String setDoneTaskGet(
263240
}
264241

265242
@RequestMapping(path = "/{taskId}/incomplete", method = RequestMethod.GET)
266-
public final String unsetDoneTaskGet(
243+
public final String unsetCompletedTaskGet(
267244
@NotNull @PathVariable("taskId") Task task,
268245
@NotNull @ModelAttribute("userSession") UserSessionBean userSession,
269246
Model model

‎src/main/java/org/woehlke/java/simpleworklist/domain/meso/taskworkflow/MoveTaskToTaskInTaskstateService.java‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/main/java/org/woehlke/java/simpleworklist/domain/meso/taskworkflow/MoveTaskToTaskInTaskstateServiceImpl.java‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package org.woehlke.java.simpleworklist.domain.meso.taskworkflow;
2+
3+
import org.woehlke.java.simpleworklist.domain.db.data.Task;
4+
5+
public interface TaskMove2TaskService {
6+
7+
void moveTaskToTaskAndChangeTaskOrderInTaskstate(Task sourceTask, Task destinationTask);
8+
9+
}

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

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
package org.woehlke.java.simpleworklist.domain.meso.taskworkflow;
2+
3+
import lombok.extern.slf4j.Slf4j;
4+
import org.springframework.beans.factory.annotation.Autowired;
5+
import org.springframework.stereotype.Service;
6+
import org.springframework.transaction.annotation.Propagation;
7+
import org.springframework.transaction.annotation.Transactional;
8+
import org.woehlke.java.simpleworklist.domain.db.data.Task;
9+
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
10+
11+
import javax.validation.constraints.NotNull;
12+
13+
@Slf4j
14+
@Service
15+
public class TaskMove2TaskServiceImpl implements TaskMove2TaskService {
16+
17+
private final TaskService taskService;
18+
19+
@Autowired
20+
public TaskMove2TaskServiceImpl(TaskService taskService) {
21+
this.taskService = taskService;
22+
}
23+
24+
@Override
25+
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
26+
public void moveTaskToTaskAndChangeTaskOrderInTaskstate(@NotNull Task sourceTask, @NotNull Task destinationTask ) {
27+
log.info("-------------------------------------------------------------------------------");
28+
log.info(" START: moveTaskToTask AndChangeTaskOrder In Taskstate ");
29+
log.info(" "+sourceTask.getTaskState().name());
30+
log.info(" "+sourceTask.outProject()+" -> "+destinationTask.outProject());
31+
log.info("-------------------------------------------------------------------------------");
32+
boolean notEqualsId = ! sourceTask.equalsById(destinationTask);
33+
boolean notEquals = ! sourceTask.equalsByUniqueConstraint(destinationTask);
34+
boolean sameContext = sourceTask.hasSameContextAs(destinationTask);
35+
boolean sameTaskType = sourceTask.hasSameTaskTypetAs(destinationTask);
36+
boolean go = notEqualsId && notEquals && sameContext && sameTaskType;
37+
if ( go ) {
38+
boolean srcIsBelowDestinationTask = sourceTask.isBelowByTaskState(destinationTask);
39+
if (srcIsBelowDestinationTask) {
40+
this.taskService.moveTasksDownByTaskState( sourceTask, destinationTask );
41+
} else {
42+
this.taskService.moveTasksUpByTaskState( sourceTask, destinationTask );
43+
}
44+
}
45+
log.info("-------------------------------------------------------------------------------");
46+
log.info(" DONE: moveTaskToTask AndChangeTaskOrder In Taskstate ");
47+
log.info(" "+sourceTask.getTaskState().name());
48+
log.info(" "+sourceTask.outProject()+" -> "+destinationTask.outProject());
49+
log.info("-------------------------------------------------------------------------------");
50+
}
51+
52+
}

0 commit comments

Comments
 (0)