Skip to content

Commit c246620

Browse files
thomaswoehlkethomaswoehlke
committed
work in progres
1 parent 0c1c659 commit c246620

File tree

10 files changed

+147
-192
lines changed

10 files changed

+147
-192
lines changed

‎src/main/java/org/woehlke/simpleworklist/error/MyErrorController.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33

44
import lombok.extern.slf4j.Slf4j;
5+
import org.springframework.boot.autoconfigure.web.servlet.error.AbstractErrorController;
6+
import org.springframework.boot.autoconfigure.web.servlet.error.ErrorViewResolver;
7+
import org.springframework.boot.web.servlet.error.ErrorAttributes;
58
import org.springframework.boot.web.servlet.error.ErrorController;
69
import org.springframework.http.HttpStatus;
710
import org.springframework.stereotype.Controller;

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@
1212
import org.springframework.web.bind.annotation.*;
1313
import org.woehlke.simpleworklist.common.AbstractController;
1414
import org.woehlke.simpleworklist.context.Context;
15-
import org.woehlke.simpleworklist.task.Task;
16-
import org.woehlke.simpleworklist.task.TaskEnergy;
17-
import org.woehlke.simpleworklist.task.TaskTime;
18-
import org.woehlke.simpleworklist.task.TaskMoveService;
19-
import org.woehlke.simpleworklist.task.TaskState;
15+
import org.woehlke.simpleworklist.task.*;
2016
import org.woehlke.simpleworklist.user.account.UserAccount;
2117
import org.woehlke.simpleworklist.breadcrumb.Breadcrumb;
2218
import org.woehlke.simpleworklist.user.UserSessionBean;
@@ -35,12 +31,12 @@
3531
public class ProjectController extends AbstractController {
3632

3733
private final ProjectControllerService projectControllerService;
38-
private final TaskMoveService taskMoveService;
34+
private final TaskService taskService;
3935

4036
@Autowired
41-
public ProjectController(ProjectControllerService projectControllerService, TaskMoveService taskMoveService) {
37+
public ProjectController(ProjectControllerService projectControllerService, TaskService taskService) {
4238
this.projectControllerService = projectControllerService;
43-
this.taskMoveService = taskMoveService;
39+
this.taskService = taskService;
4440
}
4541

4642
@RequestMapping(path="/root", method = RequestMethod.GET)
@@ -164,9 +160,9 @@ public final String addNewTaskToRootProjectPost(
164160
*/
165161
task.unsetFocus();
166162
task.setContext(context);
167-
long maxOrderIdProject = taskMoveService.getMaxOrderIdRootProject(context);
163+
long maxOrderIdProject = taskService.getMaxOrderIdRootProject(context);
168164
task.setOrderIdProject(++maxOrderIdProject);
169-
long maxOrderIdTaskState = taskMoveService.getMaxOrderIdTaskState(task.getTaskState(),task.getContext());
165+
long maxOrderIdTaskState = taskService.getMaxOrderIdTaskState(task.getTaskState(),task.getContext());
170166
task.setOrderIdTaskState(++maxOrderIdTaskState);
171167
task = taskService.addToRootProject(task);
172168
log.info(task.toString());
@@ -391,9 +387,9 @@ public String changeTaskOrderIdWithinAProject(
391387
boolean rootProject = sourceTask.isInRootProject();
392388
returnUrl = "redirect:/project/0";
393389
if(rootProject){
394-
taskMoveService.moveOrderIdRootProject(sourceTask, destinationTask);
390+
taskService.moveOrderIdRootProject(sourceTask, destinationTask);
395391
} else {
396-
taskMoveService.moveOrderIdProject(sourceTask, destinationTask);
392+
taskService.moveOrderIdProject(sourceTask, destinationTask);
397393
log.info(" DONE: taskMoveService.moveOrderIdProject (2)");
398394
returnUrl = "redirect:/project/" + sourceTask.getProject().getId();
399395
}
@@ -463,9 +459,9 @@ public final String addNewTaskToProjectPost(
463459
}
464460
task.setFocus(false);
465461
task.setContext(context);
466-
long maxOrderIdProject = taskMoveService.getMaxOrderIdProject(task.getProject(),context);
462+
long maxOrderIdProject = taskService.getMaxOrderIdProject(task.getProject(),context);
467463
task.setOrderIdProject(++maxOrderIdProject);
468-
long maxOrderIdTaskState = taskMoveService.getMaxOrderIdTaskState(task.getTaskState(),task.getContext());
464+
long maxOrderIdTaskState = taskService.getMaxOrderIdTaskState(task.getTaskState(),task.getContext());
469465
task.setOrderIdTaskState(++maxOrderIdTaskState);
470466
task = taskService.addToProject(task);
471467
log.info(task.toString());

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.woehlke.simpleworklist.task;
22

33
import java.io.Serializable;
4+
import java.util.ArrayList;
45
import java.util.Date;
56

67
import javax.persistence.*;
@@ -17,6 +18,9 @@
1718
import javax.validation.constraints.NotBlank;
1819

1920
import org.hibernate.validator.constraints.SafeHtml;
21+
import org.springframework.data.domain.Page;
22+
import org.springframework.data.domain.PageImpl;
23+
import org.springframework.data.domain.Pageable;
2024
import org.springframework.format.annotation.DateTimeFormat;
2125
import org.woehlke.simpleworklist.context.Context;
2226
import org.woehlke.simpleworklist.project.Project;
@@ -370,4 +374,8 @@ public void merge(Task task) {
370374
this.setTaskEnergy(task.taskEnergy);
371375
this.setTaskTime(task.taskTime);
372376
}
377+
378+
public static Page<Task> getEmptyPage(Pageable request){
379+
return new PageImpl<Task>(new ArrayList<Task>(),request,0L);
380+
}
373381
}

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

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

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

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

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

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,33 @@
77

88
public interface TaskService {
99

10-
Page<Task> findbyTaskstate(TaskState taskState, Context context, Pageable request);
11-
10+
Task findOne(long taskId);
1211
boolean projectHasNoTasks(Project project);
1312

14-
Page<Task> getEmptyPage(Pageable request);
13+
Page<Task> findbyTaskstate(TaskState taskState, Context context, Pageable request);
1514

1615
Page<Task> findByProject(Project thisProject, Pageable request);
17-
1816
Page<Task> findByRootProject(Context context, Pageable request);
1917

20-
Task findOne(long taskId);
18+
long getMaxOrderIdTaskState(TaskState taskState, Context context);
19+
long getMaxOrderIdRootProject(Context context);
20+
long getMaxOrderIdProject(Project project, Context context);
21+
22+
2123

2224
Task addToInbox(Task task);
2325
Task addToRootProject(Task task);
26+
Task addToProject(Task task);
2427

2528
Task updatedViaTaskstate(Task task);
2629
Task updatedViaProject(Task task);
2730

28-
Task addToProject(Task task);
31+
Task moveTaskToRootProject(Task task);
32+
Task moveTaskToAnotherProject(Task task, Project project);
33+
void moveAllCompletedToTrash(Context context);
34+
void emptyTrash(Context context);
35+
36+
void moveOrderIdTaskState(Task sourceTask, Task destinationTask);
37+
void moveOrderIdProject(Task sourceTask, Task destinationTask);
38+
void moveOrderIdRootProject(Task sourceTask, Task destinationTask);
2939
}

src/main/java/org/woehlke/simpleworklist/task/TaskMoveServiceImpl.java renamed to src/main/java/org/woehlke/simpleworklist/task/TaskServiceImpl.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.beans.factory.annotation.Autowired;
55
import org.springframework.data.domain.Page;
6-
import org.springframework.data.domain.PageImpl;
76
import org.springframework.data.domain.Pageable;
87
import org.springframework.stereotype.Service;
98
import org.springframework.transaction.annotation.Propagation;
@@ -18,12 +17,12 @@
1817

1918
@Slf4j
2019
@Service
21-
public class TaskMoveServiceImpl implements TaskMoveService, TaskService {
20+
public class TaskServiceImpl implements TaskService {
2221

2322
private final TaskRepository taskRepository;
2423

2524
@Autowired
26-
public TaskMoveServiceImpl( TaskRepository taskRepository ) {
25+
public TaskServiceImpl(TaskRepository taskRepository ) {
2726
this.taskRepository = taskRepository;
2827
}
2928

@@ -40,12 +39,6 @@ public Page<Task> findbyTaskstate(TaskState taskState, Context context, Pageable
4039
return taskRepository.findByTaskStateAndContext(taskState, context, request);
4140
}
4241

43-
@Override
44-
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
45-
public Page<Task> getEmptyPage(Pageable request){
46-
return new PageImpl<Task>(new ArrayList<Task>(),request,0L);
47-
}
48-
4942
@Override
5043
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
5144
public Page<Task> findByProject(Project thisProject, Pageable request) {
@@ -54,7 +47,7 @@ public Page<Task> findByProject(Project thisProject, Pageable request) {
5447
log.info("thisProject: "+thisProject);
5548
log.info("---------------------------------");
5649
if(thisProject == null){
57-
return this.getEmptyPage(request);
50+
return Task.getEmptyPage(request);
5851
} else {
5952
return taskRepository.findByProject(thisProject,request);
6053
}
@@ -65,7 +58,7 @@ public Page<Task> findByProject(Project thisProject, Pageable request) {
6558
public Page<Task> findByRootProject(Context context, Pageable request) {
6659
log.info("findByRootProject: ");
6760
if(context == null){
68-
return this.getEmptyPage(request);
61+
return Task.getEmptyPage(request);
6962
} else {
7063
return taskRepository.findByProjectIsNullAndContext(context, request);
7164
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,16 @@ public enum TaskState implements Serializable {
2121
TRASH("fas fa-trash-alt"),
2222
DELETED("fas fa-trash-alt");
2323

24-
TaskState(final String icon) {
24+
private String icon;
25+
26+
TaskState(final String icon){
2527
this.icon=icon;
2628
}
2729

30+
public String getIcon(){
31+
return icon;
32+
}
33+
2834
public int getId(){
2935
return this.ordinal();
3036
}
@@ -33,23 +39,17 @@ public String getValue(){
3339
return this.name();
3440
}
3541

36-
public String getCode() {
42+
public String getCode(){
3743
return "layout.page."+this.name().toLowerCase();
3844
}
3945

40-
public String getUrl() {
46+
public String getUrl(){
4147
return "redirect:/taskstate/"+this.name().toLowerCase();
4248
}
4349

4450
public static List<TaskState> list() {
4551
return Arrays.asList(values());
4652
}
4753

48-
public String getIcon() {
49-
return icon;
50-
}
51-
52-
private String icon;
53-
5454
private static final long serialVersionUID = 0L;
5555
}

0 commit comments

Comments
 (0)