Skip to content

Commit e4568ec

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 653904c commit e4568ec

File tree

5 files changed

+15
-11
lines changed

5 files changed

+15
-11
lines changed

‎etc/TODO.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@
7474
* Issue #235 Project/Root: Task Edit Form -> change Project via DropDown
7575
* Issue #236 Project/id: Task Edit Form -> change Project via DropDown
7676

77-
78-
7977
wontfix #251, wontfix #224, wontfix #245, wontfix #246
78+
79+
## snapshot
80+
*
81+
* Pixel-Layout: Add Task - Action Buttons #374

‎src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskServiceImpl.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,19 @@ public Task findOne(@Min(1L) long taskId) {
6565
}
6666

6767
@Override
68+
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
6869
public Task saveAndFlush(Task task) {
6970
return taskRepository.saveAndFlush(task);
7071
}
7172

7273
@Override
74+
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
7375
public void deleteAll(List<Task> taskListDeleted) {
7476
taskRepository.deleteAll(taskListDeleted);
7577
}
7678

7779
@Override
80+
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
7881
public void saveAll(List<Task> taskListChanged) {
7982
taskRepository.saveAll(taskListChanged);
8083
}
@@ -210,16 +213,19 @@ public Task findTopByProjectIsNullAndContextOrderByOrderIdProjectDesc(Context co
210213
}
211214

212215
@Override
216+
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
213217
public List<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(long lowerOrderIdTaskState, long higherOrderIdTaskState, TaskState taskState, Context context) {
214218
return taskRepository.getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask( lowerOrderIdTaskState, higherOrderIdTaskState, taskState, context);
215219
}
216220

217221
@Override
222+
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
218223
public List<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(long lowerOrderIdProject, long higherOrderIdProject, Context context) {
219224
return taskRepository.getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(lowerOrderIdProject,higherOrderIdProject,context);
220225
}
221226

222227
@Override
228+
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
223229
public List<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(long lowerOrderIdProject, long higherOrderIdProject, Project project) {
224230
return taskRepository.getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(lowerOrderIdProject, higherOrderIdProject, project);
225231
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ Project getProject(
5858
void moveTaskToTaskAndChangeTaskOrderInProjectRoot(Task sourceTask, Task destinationTask);
5959

6060
Project findByProjectId(long projectId);
61-
6261
Page<Task> findByProject(Project thisProject, Pageable pageable);
6362

6463
}

‎src/main/java/org/woehlke/java/simpleworklist/domain/db/data/project/ProjectControllerServiceImpl.java renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/meso/project/ProjectControllerServiceImpl.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.domain.db.data.project;
1+
package org.woehlke.java.simpleworklist.domain.meso.project;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.beans.factory.annotation.Autowired;
@@ -11,9 +11,9 @@
1111
import org.springframework.validation.BindingResult;
1212
import org.woehlke.java.simpleworklist.domain.db.data.Project;
1313
import org.woehlke.java.simpleworklist.domain.db.data.Context;
14+
import org.woehlke.java.simpleworklist.domain.db.data.project.ProjectService;
1415
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.Breadcrumb;
1516
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.BreadcrumbService;
16-
import org.woehlke.java.simpleworklist.domain.meso.project.ProjectControllerService;
1717
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
1818
import org.woehlke.java.simpleworklist.domain.db.data.Task;
1919
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
@@ -65,6 +65,7 @@ public void addNewProjectToProjectIdForm(
6565
model.addAttribute("userSession", userSession);
6666
}
6767

68+
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
6869
public String addNewProjectToProjectIdPersist(
6970
@Min(1L) long projectId,
7071
@NotNull UserSessionBean userSession,
@@ -120,6 +121,7 @@ public Project getProject(
120121
}
121122

122123
@Override
124+
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
123125
public void addNewProjectToProjectRootForm(
124126
@NotNull UserSessionBean userSession,
125127
@NotNull Context context,
@@ -141,6 +143,7 @@ public void addNewProjectToProjectRootForm(
141143
}
142144

143145
@Override
146+
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
144147
public String addNewProjectToProjectRootPersist(
145148
@NotNull UserSessionBean userSession,
146149
@NotNull Project project,

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public TaskMove2TaskServiceImpl(TaskService taskService) {
2727
}
2828

2929
@Override
30-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
3130
public void moveTaskToTaskAndChangeTaskOrderInTaskstate(@NotNull Task sourceTask, @NotNull Task destinationTask ) {
3231
log.info("-------------------------------------------------------------------------------");
3332
log.info(" START: moveTaskToTask AndChangeTaskOrder In Taskstate ");
@@ -56,7 +55,6 @@ public void moveTaskToTaskAndChangeTaskOrderInTaskstate(@NotNull Task sourceTask
5655

5756

5857
@Override
59-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
6058
public void moveTasksUpByProjectRoot(Task sourceTask, Task destinationTask ) {
6159
log.info("-------------------------------------------------------------------------------");
6260
log.info(" moveTasks UP By ProjectRoot: "+sourceTask.getId() +" -> "+ destinationTask.getId());
@@ -86,7 +84,6 @@ public void moveTasksUpByProjectRoot(Task sourceTask, Task destinationTask ) {
8684
}
8785

8886
@Override
89-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
9087
public void moveTasksDownByProjectRoot(Task sourceTask, Task destinationTask) {
9188
log.info("-------------------------------------------------------------------------------");
9289
log.info(" START moveTasks UP By Project Root");
@@ -118,7 +115,6 @@ public void moveTasksDownByProjectRoot(Task sourceTask, Task destinationTask) {
118115
}
119116

120117
@Override
121-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
122118
public void moveTasksUpByProject(Task sourceTask, Task destinationTask ) {
123119
Project project = sourceTask.getProject();
124120
log.info("-------------------------------------------------------------------------------");
@@ -151,7 +147,6 @@ public void moveTasksUpByProject(Task sourceTask, Task destinationTask ) {
151147
}
152148

153149
@Override
154-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
155150
public void moveTasksDownByProject(Task sourceTask, Task destinationTask) {
156151
Project project = sourceTask.getProject();
157152
log.info("-------------------------------------------------------------------------------");
@@ -183,7 +178,6 @@ public void moveTasksDownByProject(Task sourceTask, Task destinationTask) {
183178
}
184179

185180
@Override
186-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
187181
public void moveTasksUpByTaskState(Task sourceTask, Task destinationTask ) {
188182
TaskState taskState = sourceTask.getTaskState();
189183
Context context = sourceTask.getContext();

0 commit comments

Comments
 (0)