Skip to content

update and deploy #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 10, 2022
Merged

update and deploy #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
14e4ddc
work
thomaswoehlke Sep 10, 2022
7e7c4b2
work
thomaswoehlke Sep 10, 2022
3dba367
work
thomaswoehlke Sep 10, 2022
77855b3
work
thomaswoehlke Sep 10, 2022
5bfd4bf
work
thomaswoehlke Sep 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
204 changes: 119 additions & 85 deletions pom.xml
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 10 additions & 7 deletions src/main/java/org/woehlke/java/simpleworklist/domain/db/ProjectIdController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
import org.woehlke.java.simpleworklist.domain.meso.move.MoveTaskService;
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TransformTaskIntoProjektService;
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
Expand All @@ -42,16 +43,18 @@
public class ProjectIdController extends AbstractController {

private final ProjectControllerService projectControllerService;
private final MoveTaskService moveTaskService;
private final TaskService taskService;
private final TransformTaskIntoProjektService transformTaskIntoProjektService;

@Autowired
public ProjectIdController(
ProjectControllerService projectControllerService,
TaskService taskService,
TransformTaskIntoProjektService transformTaskIntoProjektService
ProjectControllerService projectControllerService,
MoveTaskService moveTaskService, TaskService taskService,
TransformTaskIntoProjektService transformTaskIntoProjektService
) {
this.projectControllerService = projectControllerService;
this.moveTaskService = moveTaskService;
this.taskService = taskService;
this.transformTaskIntoProjektService = transformTaskIntoProjektService;
}
Expand Down Expand Up @@ -384,7 +387,7 @@ public final String moveAllCompletedToTrash(
) {
userSession.setLastProjectId(thisProject.getId());
Context context = super.getContext(userSession);
taskService.moveAllCompletedToTrash(context);
moveTaskService.moveAllCompletedToTrash(context);
model.addAttribute("userSession", userSession);
model.addAttribute("taskstateType",PROJECTS.getType());
model.addAttribute("dataPage", true);
Expand All @@ -399,7 +402,7 @@ public final String emptyTrash(
) {
userSession.setLastProjectId(thisProject.getId());
Context context = super.getContext(userSession);
taskService.emptyTrash(context);
moveTaskService.emptyTrash(context);
model.addAttribute("userSession", userSession);
model.addAttribute("taskstateType",PROJECTS.getType());
model.addAttribute("dataPage", true);
Expand Down Expand Up @@ -564,7 +567,7 @@ public final String moveTaskToAnotherProject(
@ModelAttribute("userSession") UserSessionBean userSession,
Model model
) {
task = taskService.moveTaskToRootProject(task);
task = moveTaskService.moveTaskToRootProject(task);
model.addAttribute("userSession", userSession);
model.addAttribute("taskstateType",PROJECTS.getType());
model.addAttribute("dataPage", true);
Expand All @@ -579,7 +582,7 @@ public final String moveTaskToAnotherProject(
@ModelAttribute("userSession") UserSessionBean userSession,
Model model
) {
task = taskService.moveTaskToAnotherProject(task,otherProject);
task = moveTaskService.moveTaskToAnotherProject(task,otherProject);
model.addAttribute("userSession", userSession);
model.addAttribute("taskstateType",PROJECTS.getType());
model.addAttribute("dataPage", true);
Expand Down
13 changes: 8 additions & 5 deletions src/main/java/org/woehlke/java/simpleworklist/domain/db/ProjectRootController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
import org.woehlke.java.simpleworklist.domain.meso.move.MoveTaskService;
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TransformTaskIntoProjektService;
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
Expand All @@ -41,12 +42,14 @@ public class ProjectRootController extends AbstractController {
public final static String rootProjectUrl = "redirect:/project/root";

private final ProjectControllerService projectControllerService;
private final MoveTaskService moveTaskService;
private final TaskService taskService;
private final TransformTaskIntoProjektService transformTaskIntoProjektService;

@Autowired
public ProjectRootController(ProjectControllerService projectControllerService, TaskService taskService, TransformTaskIntoProjektService transformTaskIntoProjektService) {
public ProjectRootController(ProjectControllerService projectControllerService, MoveTaskService moveTaskService, TaskService taskService, TransformTaskIntoProjektService transformTaskIntoProjektService) {
this.projectControllerService = projectControllerService;
this.moveTaskService = moveTaskService;
this.taskService = taskService;
this.transformTaskIntoProjektService = transformTaskIntoProjektService;
}
Expand Down Expand Up @@ -301,7 +304,7 @@ public final String moveTaskToProjectRoot(
@ModelAttribute("userSession") UserSessionBean userSession,
Model model
) {
task = taskService.moveTaskToRootProject(task);
task = moveTaskService.moveTaskToRootProject(task);
userSession.setLastProjectId(Project.rootProjectId);
userSession.setLastTaskState(task.getTaskState());
userSession.setLastTaskId(task.getId());
Expand All @@ -318,7 +321,7 @@ public final String moveTaskToProject(
@ModelAttribute("userSession") UserSessionBean userSession,
Model model
) {
task = taskService.moveTaskToAnotherProject(task,targetProject);
task = moveTaskService.moveTaskToAnotherProject(task,targetProject);
userSession.setLastProjectId(targetProject.getId());
userSession.setLastTaskState(task.getTaskState());
userSession.setLastTaskId(task.getId());
Expand Down Expand Up @@ -478,7 +481,7 @@ public final String moveAllCompletedToTrash(
Model model
) {
Context context = super.getContext(userSession);
taskService.moveAllCompletedToTrash(context);
moveTaskService.moveAllCompletedToTrash(context);
userSession.setLastContextId(context.getId());
userSession.setLastProjectId(Project.rootProjectId);
model.addAttribute("userSession", userSession);
Expand All @@ -493,7 +496,7 @@ public final String emptyTrash(
Model model
) {
Context context = super.getContext(userSession);
taskService.emptyTrash(context);
moveTaskService.emptyTrash(context);
userSession.setLastContextId(context.getId());
userSession.setLastProjectId(Project.rootProjectId);
model.addAttribute("userSession", userSession);
Expand Down
30 changes: 17 additions & 13 deletions src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,15 @@
import org.woehlke.java.simpleworklist.domain.db.data.Task;
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;

public interface TaskService {
import java.util.List;

Task moveTaskToInbox(Task task);
Task moveTaskToToday(Task task);
Task moveTaskToNext(Task task);
Task moveTaskToWaiting(Task task);
Task moveTaskToSomeday(Task task);
Task moveTaskToFocus(Task task);
Task moveTaskToCompleted(Task task);
Task moveTaskToTrash(Task task);
public interface TaskService {

void moveAllCompletedToTrash(Context context);
void emptyTrash(Context context);
// void moveAllCompletedToTrash(Context context);
// void emptyTrash(Context context);

Task moveTaskToRootProject(Task task);
Task moveTaskToAnotherProject(Task task, Project project);
// Task moveTaskToRootProject(Task task);
// Task moveTaskToAnotherProject(Task task, Project project);

Task addToInbox(Task task);
Task addToProject(Task task);
Expand Down Expand Up @@ -68,4 +61,15 @@ public interface TaskService {

void moveTasksUpByProject(Task sourceTask, Task destinationTask);
void moveTasksDownByProject(Task sourceTask, Task destinationTask);

Task saveAndFlush(Task task);

void deleteAll(List<Task> taskListDeleted);

void saveAll(List<Task> taskListChanged);

List<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(TaskState completed, Context context);

List<Task> findByTaskStateAndContext(TaskState trash, Context context);

}
Loading