Skip to content

Commit 3be46fc

Browse files
thomaswoehlkethomaswoehlke
committed
work in progress
1 parent 085835b commit 3be46fc

File tree

6 files changed

+35
-60
lines changed

6 files changed

+35
-60
lines changed

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,11 @@ public class ProjectController extends AbstractController {
3535

3636
private final ProjectControllerService projectControllerService;
3737
private final TaskService taskService;
38-
private final TaskStateControllerService taskStateControllerService;
3938

4039
@Autowired
41-
public ProjectController(ProjectControllerService projectControllerService, TaskService taskService, TaskStateControllerService taskStateControllerService) {
40+
public ProjectController(ProjectControllerService projectControllerService, TaskService taskService) {
4241
this.projectControllerService = projectControllerService;
4342
this.taskService = taskService;
44-
this.taskStateControllerService = taskStateControllerService;
4543
}
4644

4745
@RequestMapping(path = "/task/add", method = RequestMethod.GET)
@@ -189,9 +187,8 @@ public final String projectMoveToProjectGet(
189187
@PathVariable("projectId") Project thisProject,
190188
@PathVariable long targetProjectId,
191189
@ModelAttribute("userSession") UserSessionBean userSession,
192-
Locale locale, Model model
190+
Model model
193191
) {
194-
Context context = super.getContext(userSession);
195192
userSession.setLastProjectId(thisProject.getId());
196193
model.addAttribute("userSession",userSession);
197194
Project targetProject = projectService.findByProjectId(targetProjectId);
@@ -266,9 +263,8 @@ public final String projectDeleteGet(
266263
Locale locale,
267264
Model model
268265
) {
269-
//Context context = super.getContext(userSession);
270266
userSession.setLastProjectId(project.getId());
271-
//model.addAttribute("userSession", userSession);//TODO: really?
267+
model.addAttribute("userSession", userSession);
272268
boolean hasNoData = taskService.projectHasNoTasks(project);
273269
boolean hasNoChildren = project.hasNoChildren();
274270
boolean delete = hasNoData && hasNoChildren;
@@ -326,7 +322,7 @@ public String moveTaskToTaskAndChangeTaskOrderInProject(
326322
log.info("-------------------------------------------------");
327323
log.info(" destination Task: "+destinationTask.toString());
328324
log.info("-------------------------------------------------");
329-
taskService.moveTaskToTaskAndChangeTaskOrderInProject(sourceTask, destinationTask);
325+
projectControllerService.moveTaskToTaskAndChangeTaskOrderInProject(sourceTask, destinationTask);
330326
log.info(" DONE: taskMoveService.moveOrderIdProject");
331327
log.info("-------------------------------------------------");
332328
return thisProject.getUrl();
@@ -612,6 +608,6 @@ public final String transformTaskIntoProjectGet(
612608
userSession.setLastProjectId(thisProject.getId());
613609
userSession.setLastTaskState(task.getTaskState());
614610
userSession.setLastTaskId(task.getId());
615-
return taskStateControllerService.transformTaskIntoProjectGet(task);
611+
return projectControllerService.transformTaskIntoProjectGet(task);
616612
}
617613
}

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

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,11 @@ public class ProjectControllerRoot extends AbstractController {
3535

3636
private final ProjectControllerService projectControllerService;
3737
private final TaskService taskService;
38-
private final TaskStateControllerService taskStateControllerService;
3938

4039
@Autowired
41-
public ProjectControllerRoot(ProjectControllerService projectControllerService, TaskService taskService, TaskStateControllerService taskStateControllerService) {
40+
public ProjectControllerRoot(ProjectControllerService projectControllerService, TaskService taskService) {
4241
this.projectControllerService = projectControllerService;
4342
this.taskService = taskService;
44-
this.taskStateControllerService = taskStateControllerService;
4543
}
4644

4745
@RequestMapping(path="", method = RequestMethod.GET)
@@ -160,20 +158,7 @@ public final String projectRootTaskAddPost(
160158
model.addAttribute("task", task);
161159
return "project/root/task/add";
162160
} else {
163-
task.setRootProject();
164-
/*
165-
if(task.getDueDate()==null){
166-
task.setTaskState(TaskState.INBOX);
167-
} else {
168-
task.setTaskState(TaskState.SCHEDULED);
169-
}
170-
*/
171-
task.unsetFocus();
172161
task.setContext(context);
173-
long maxOrderIdProject = taskService.getMaxOrderIdRootProject(context);
174-
task.setOrderIdProject(++maxOrderIdProject);
175-
long maxOrderIdTaskState = taskService.getMaxOrderIdTaskState(task.getTaskState(),task.getContext());
176-
task.setOrderIdTaskState(++maxOrderIdTaskState);
177162
task = taskService.addToRootProject(task);
178163
log.info(task.toString());
179164
return rootProjectUrl;
@@ -254,7 +239,7 @@ public final String editTaskPost(
254239
userSession.setLastContextId(thisContext.getId());
255240
return "project/root/task/edit";
256241
} else {
257-
task.unsetFocus();
242+
//task.unsetFocus();
258243
task.setRootProject();
259244
Task persistentTask = taskService.findOne(task.getId());
260245
persistentTask.merge(task);
@@ -279,7 +264,7 @@ public String changeTaskOrderId(
279264
log.info("---------------------------------------------");
280265
log.info("destination Task: "+destinationTask.toString());
281266
log.info("---------------------------------------------");
282-
taskService.moveTaskToTaskAndChangeTaskOrderInProjectRoot(sourceTask, destinationTask);
267+
projectControllerService.moveTaskToTaskAndChangeTaskOrderInProjectRoot(sourceTask, destinationTask);
283268
userSession.setLastProjectId(rootProjectId);
284269
userSession.setLastTaskState(sourceTask.getTaskState());
285270
userSession.setLastTaskId(sourceTask.getId());
@@ -484,7 +469,7 @@ public final String transformTaskIntoProjectGet(
484469
userSession.setLastProjectId(rootProjectId);
485470
userSession.setLastTaskState(task.getTaskState());
486471
userSession.setLastTaskId(task.getId());
487-
return taskStateControllerService.transformTaskIntoProjectGet(task);
472+
return projectControllerService.transformTaskIntoProjectGet(task);
488473
}
489474

490475
@RequestMapping(path = "/task/{taskId}/complete", method = RequestMethod.GET)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ Project getProject(
5151
UserSessionBean userSession
5252
);
5353

54+
String transformTaskIntoProjectGet(Task task);
55+
5456
void moveTaskToTaskAndChangeTaskOrderInProject(Task sourceTask, Task destinationTask);
5557
void moveTaskToTaskAndChangeTaskOrderInProjectRoot(Task sourceTask, Task destinationTask);
5658
}

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,28 @@ public String addNewProjectToProjectRootPersist(
131131
return project.getUrl();
132132
}
133133

134+
@Override
135+
public String transformTaskIntoProjectGet(@NotNull Task task) {
136+
log.info("transformTaskIntoProjectGet");
137+
Project thisProject = new Project();
138+
thisProject.setName(task.getTitle());
139+
thisProject.setDescription(task.getText());
140+
thisProject.setUuid(task.getUuid());
141+
thisProject.setContext(task.getContext());
142+
if (task.getProject() != null) {
143+
long projectId = task.getProject().getId();
144+
Project parentProject = projectService.findByProjectId(projectId);
145+
thisProject.setParent(parentProject);
146+
}
147+
thisProject = projectService.add(thisProject);
148+
task.setProject(null);
149+
task.moveToTrash();
150+
task.emptyTrash();
151+
taskService.updatedViaTaskstate(task);
152+
log.info("tried to transform Task " + task.getId() + " to new Project " + thisProject.getId());
153+
return thisProject.getUrl();
154+
}
155+
134156
@Override
135157
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
136158
public void moveTaskToTaskAndChangeTaskOrderInProject(@NotNull Task sourceTask, @NotNull Task destinationTask ) {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,5 @@ String getTaskStatePage(
1818
Model model
1919
);
2020

21-
String transformTaskIntoProjectGet(Task task);
22-
2321
void moveTaskToTaskAndChangeTaskOrderInTaskstate(Task sourceTask, Task destinationTask);
2422
}

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

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,10 @@
1111
import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb;
1212
import org.woehlke.simpleworklist.application.breadcrumb.BreadcrumbService;
1313
import org.woehlke.simpleworklist.context.Context;
14-
import org.woehlke.simpleworklist.project.Project;
1514
import org.woehlke.simpleworklist.project.ProjectService;
1615
import org.woehlke.simpleworklist.user.session.UserSessionBean;
1716

1817
import javax.validation.constraints.NotNull;
19-
import java.util.ArrayList;
20-
import java.util.Date;
21-
import java.util.List;
2218
import java.util.Locale;
2319

2420
@Slf4j
@@ -27,17 +23,14 @@ public class TaskStateControllerServiceImpl implements TaskStateControllerServic
2723

2824
private final BreadcrumbService breadcrumbService;
2925
private final TaskService taskService;
30-
private final ProjectService projectService;
3126

3227
@Autowired
3328
public TaskStateControllerServiceImpl(
3429
BreadcrumbService breadcrumbService,
35-
TaskService taskService,
36-
ProjectService projectService)
37-
{
30+
TaskService taskService
31+
) {
3832
this.breadcrumbService = breadcrumbService;
3933
this.taskService = taskService;
40-
this.projectService = projectService;
4134
}
4235

4336
@Override
@@ -60,27 +53,6 @@ public String getTaskStatePage(
6053
return taskState.getTemplate();
6154
}
6255

63-
@Override
64-
public String transformTaskIntoProjectGet(@NotNull Task task) {
65-
Project thisProject = new Project();
66-
thisProject.setName(task.getTitle());
67-
thisProject.setDescription(task.getText());
68-
thisProject.setUuid(task.getUuid());
69-
thisProject.setContext(task.getContext());
70-
if (task.getProject() != null) {
71-
long projectId = task.getProject().getId();
72-
Project parentProject = projectService.findByProjectId(projectId);
73-
thisProject.setParent(parentProject);
74-
}
75-
thisProject = projectService.add(thisProject);
76-
task.setProject(null);
77-
task.moveToTrash();
78-
task.emptyTrash();
79-
taskService.updatedViaTaskstate(task);
80-
log.info("tried to transform Task " + task.getId() + " to new Project " + thisProject.getId());
81-
return thisProject.getUrl();
82-
}
83-
8456
@Override
8557
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
8658
public void moveTaskToTaskAndChangeTaskOrderInTaskstate(@NotNull Task sourceTask, @NotNull Task destinationTask ) {

0 commit comments

Comments
 (0)