Skip to content

Commit c396da9

Browse files
thomaswoehlkethomaswoehlke
committed
work in progress
1 parent 920dd74 commit c396da9

File tree

11 files changed

+83
-23
lines changed

11 files changed

+83
-23
lines changed

‎src/main/java/org/woehlke/simpleworklist/context/ContextRepository.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@Repository
1515
public interface ContextRepository extends JpaRepository<Context, Long> {
1616

17-
//TODO: change List<Context> to Page<Context>
17+
//TODO: #251 change List<Context> to Page<Context>
1818
@Deprecated
1919
List<Context> findByUserAccount(UserAccount user);
2020
Page<Context> findByUserAccount(UserAccount user, Pageable pageRequest);

‎src/main/java/org/woehlke/simpleworklist/context/ContextService.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,16 @@
99
*/
1010
public interface ContextService {
1111

12+
//TODO: #251 change List<Context> to Page<Context>
13+
//TODO: rename to findByUser
1214
List<Context> getAllForUser(UserAccount user);
1315

1416
Context findByIdAndUserAccount(long newContextId, UserAccount userAccount);
1517

18+
//TODO: rename to add
1619
Context createNewContext(NewContextForm newContext, UserAccount user);
1720

21+
//TODO: rename to update
1822
Context updateContext(Context context);
1923

2024
boolean delete(Context context);

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,21 @@
22

33
import java.util.List;
44

5+
import org.springframework.data.domain.Page;
6+
import org.springframework.data.domain.Pageable;
57
import org.woehlke.simpleworklist.context.Context;
68

79
public interface ProjectService {
810

9-
List<Project> findRootProjectsByContext(Context context);
11+
//TODO: #245 change List<Project> to Page<Project>
12+
@Deprecated
13+
// List<Project> findRootProjectsByContext(Context context);
14+
Page<Project> findRootProjectsByContext(Context context, Pageable pageRequest);
1015

11-
List<Project> findAllProjectsByContext(Context context);
16+
//TODO: #245 change List<Project> to Page<Project>
17+
@Deprecated
18+
// List<Project> findAllProjectsByContext(Context context);
19+
Page<Project> findAllProjectsByContext(Context context, Pageable pageRequest);
1220

1321
Project moveProjectToAnotherProject(Project thisProject, Project targetProject);
1422

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

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import lombok.extern.slf4j.Slf4j;
88
import org.springframework.beans.factory.annotation.Autowired;
99

10+
import org.springframework.data.domain.Page;
11+
import org.springframework.data.domain.Pageable;
1012
import org.springframework.stereotype.Service;
1113
import org.springframework.transaction.annotation.Propagation;
1214
import org.springframework.transaction.annotation.Transactional;
@@ -34,18 +36,36 @@ public ProjectServiceImpl(
3436
this.taskRepository = taskRepository;
3537
}
3638

37-
@Override
39+
//TODO: #245 change List<Project> to Page<Project>
40+
@Deprecated
41+
//@Override
3842
public List<Project> findRootProjectsByContext(@NotNull Context context) {
3943
log.info("findRootProjectsByContext");
44+
//TODO: #245 change List<Project> to Page<Project>
4045
return projectRepository.findByParentIsNullAndContext(context);
4146
}
4247

4348
@Override
49+
public Page<Project> findRootProjectsByContext(@NotNull Context context, Pageable pageRequest) {
50+
log.info("findRootProjectsByContext");
51+
return projectRepository.findByParentIsNullAndContext(context,pageRequest);
52+
}
53+
54+
//TODO: #245 change List<Project> to Page<Project>
55+
@Deprecated
56+
//@Override
4457
public List<Project> findAllProjectsByContext(@NotNull Context context) {
4558
log.info("findAllProjectsByContext");
59+
//TODO: #245 change List<Project> to Page<Project>
4660
return projectRepository.findByContext(context);
4761
}
4862

63+
@Override
64+
public Page<Project> findAllProjectsByContext(Context context, Pageable pageRequest) {
65+
log.info("findAllProjectsByContext");
66+
return projectRepository.findByContext(context,pageRequest);
67+
}
68+
4969
@Override
5070
public Project findByProjectId(@Min(1L) long projectId) {
5171
log.info("findByProjectId");
@@ -94,6 +114,7 @@ public Project moveProjectToAnotherContext(@NotNull Project thisProject, @NotNul
94114
log.info("----------------------------------------------------");
95115
thisProject.setParent(null);
96116
thisProject = projectRepository.saveAndFlush(thisProject);
117+
//TODO: remove Recursion, remove unbounded Recursion and List instead of Page.
97118
List<Project> listProject = getAllChildrenOfProject(thisProject);
98119
for(Project childProject : listProject){
99120
List<Task> tasksOfChildProject = taskRepository.findByProject(childProject);
@@ -107,15 +128,18 @@ public Project moveProjectToAnotherContext(@NotNull Project thisProject, @NotNul
107128
return thisProject;
108129
}
109130

131+
//TODO: remove Recursion, remove unbounded Recursion and List instead of Page.
132+
@Deprecated
110133
private List<Project> getAllChildrenOfProject(@NotNull Project thisProject) {
111134
log.info("getAllChildrenOfProject");
112-
List<Project> retVal = new ArrayList<>();
113-
retVal.add(thisProject);
135+
List<Project> childrenOfProject = new ArrayList<>();
136+
childrenOfProject.add(thisProject);
114137
for(Project p : thisProject.getChildren()){
138+
//TODO: remove Recursion, remove unbounded Recursion and List instead of Page.
115139
List<Project> getNextGeneration = getAllChildrenOfProject(p);
116-
retVal.addAll(getNextGeneration);
140+
childrenOfProject.addAll(getNextGeneration);
117141
}
118-
return retVal;
142+
return childrenOfProject;
119143
}
120144

121145
@Override

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Page<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(
4545
);
4646

4747
//TODO: #244 change List<Task> to Page<Task>
48-
//TODO: move the JQL Query-String to Entity as Prepared Statement
48+
//TODO: #249 move the JQL Query-String to Entity as Prepared Statement
4949
@Deprecated
5050
@Query("select t from Task t"
5151
+ " where t.orderIdTaskState > :lowerOrderIdTaskState and t.orderIdTaskState < :higherOrderIdTaskState"
@@ -56,7 +56,7 @@ List<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(
5656
@Param("taskState") TaskState taskState,
5757
@Param("context") Context context
5858
);
59-
//TODO: move the JQL Query-String to Entity as Prepared Statement
59+
//TODO: #249 move the JQL Query-String to Entity as Prepared Statement
6060
@Query("select t from Task t"
6161
+ " where t.orderIdTaskState > :lowerOrderIdTaskState and t.orderIdTaskState < :higherOrderIdTaskState"
6262
+ " and t.taskState = :taskState and t.context = :context")
@@ -69,7 +69,7 @@ Page<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(
6969
);
7070

7171
//TODO: #244 change List<Task> to Page<Task>
72-
//TODO: move the JQL Query-String to Entity as Prepared Statement
72+
//TODO: #249 move the JQL Query-String to Entity as Prepared Statement
7373
@Deprecated
7474
@Query("select t from Task t"
7575
+ " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
@@ -79,7 +79,7 @@ List<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
7979
@Param("higherOrderIdProject") long higherOrderIdProject,
8080
@Param("project") Project project
8181
);
82-
//TODO: move the JQL Query-String to Entity as Prepared Statement
82+
//TODO: #249 move the JQL Query-String to Entity as Prepared Statement
8383
@Query("select t from Task t"
8484
+ " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
8585
+ " and t.project = :project")
@@ -90,8 +90,8 @@ Page<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
9090
Pageable request
9191
);
9292

93-
//TODO: move from List<Task> to Page<Task>
94-
//TODO: move the JQL Query-String to Entity as Prepared Statement
93+
//TODO: #244 move from List<Task> to Page<Task>
94+
//TODO: #249 move the JQL Query-String to Entity as Prepared Statement
9595
@Deprecated
9696
@Query("select t from Task t"
9797
+ " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
@@ -101,7 +101,7 @@ List<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
101101
@Param("higherOrderIdProject") long higherOrderIdProject,
102102
@Param("context") Context context
103103
);
104-
//TODO: move the JQL Query-String to Entity as Prepared Statement
104+
//TODO: #249 move the JQL Query-String to Entity as Prepared Statement
105105
@Query("select t from Task t"
106106
+ " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
107107
+ " and t.project is null and t.context = :context ")

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@ public interface TaskService {
3030
Task updatedViaProject(Task task);
3131
Task updatedViaProjectRoot(Task task);
3232

33+
//TODO: rename to findById
3334
Task findOne(long taskId);
3435
Page<Task> findbyTaskstate(TaskState taskState, Context context, Pageable request);
3536
Page<Task> findByProject(Project thisProject, Pageable request);
37+
//TODO: rename to findByProjectRoot
3638
Page<Task> findByRootProject(Context context, Pageable request);
3739

3840
boolean projectHasNoTasks(Project project);

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public TaskServiceImpl(TaskRepository taskRepository ) {
3232
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
3333
public boolean projectHasNoTasks(Project project) {
3434
log.info("projectHasNoTasks");
35+
//TODO: #244 change List<Task> to Page<Task>
3536
return taskRepository.findByProject(project).isEmpty();
3637
}
3738

@@ -194,6 +195,7 @@ public void moveAllCompletedToTrash(@NotNull Context context) {
194195
context
195196
);
196197
long newOrderIdTaskState = maxOrderIdTaskState;
198+
//TODO: #244 change List<Task> to Page<Task>
197199
List<Task> taskListCompleted = taskRepository.findByTaskStateAndContextOrderByOrderIdTaskStateAsc(
198200
TaskState.COMPLETED,
199201
context
@@ -209,10 +211,12 @@ public void moveAllCompletedToTrash(@NotNull Context context) {
209211
@Override
210212
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
211213
public void emptyTrash(@NotNull Context context) {
214+
//TODO: #244 change List<Task> to Page<Task>
212215
List<Task> taskList = taskRepository.findByTaskStateAndContext(
213216
TaskState.TRASH,
214217
context
215218
);
219+
//TODO: #244 change List<Task> to Page<Task>
216220
List<Task> taskListChanged = new ArrayList<>(taskList.size());
217221
for(Task task: taskList){
218222
task.emptyTrash();
@@ -257,12 +261,14 @@ public void moveTasksUpByTaskState(@NotNull Task sourceTask, @NotNull Task desti
257261
Context context = sourceTask.getContext();
258262
final long lowerOrderIdTaskState = destinationTask.getOrderIdTaskState();
259263
final long higherOrderIdTaskState = sourceTask.getOrderIdTaskState();
264+
//TODO: #244 change List<Task> to Page<Task>
260265
List<Task> tasks = taskRepository.getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(
261266
lowerOrderIdTaskState,
262267
higherOrderIdTaskState,
263268
taskState,
264269
context
265270
);
271+
//TODO: #244 change List<Task> to Page<Task>
266272
List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
267273
for(Task task:tasks){
268274
task.moveUpByTaskState();
@@ -289,12 +295,14 @@ public void moveTasksDownByTaskState(@NotNull Task sourceTask, @NotNull Task des
289295
Context context = sourceTask.getContext();
290296
long lowerOrderIdTaskState = sourceTask.getOrderIdTaskState();
291297
long higherOrderIdTaskState = destinationTask.getOrderIdTaskState();
298+
//TODO: #244 change List<Task> to Page<Task>
292299
List<Task> tasks = taskRepository.getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(
293300
lowerOrderIdTaskState,
294301
higherOrderIdTaskState,
295302
taskState,
296303
context
297304
);
305+
//TODO: #244 change List<Task> to Page<Task>
298306
List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
299307
for(Task task:tasks){
300308
task.moveDownByTaskState();
@@ -321,11 +329,13 @@ public void moveTasksUpByProjectRoot(@NotNull Task sourceTask, @NotNull Task des
321329
Context context = sourceTask.getContext();
322330
long lowerOrderIdProject = destinationTask.getOrderIdProject();
323331
long higherOrderIdProject = sourceTask.getOrderIdProject();
332+
//TODO: #244 change List<Task> to Page<Task>
324333
List<Task> tasks = taskRepository.getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
325334
lowerOrderIdProject,
326335
higherOrderIdProject,
327336
context
328337
);
338+
//TODO: #244 change List<Task> to Page<Task>
329339
List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
330340
for(Task task:tasks){
331341
task.moveUpByProject();
@@ -352,11 +362,13 @@ public void moveTasksDownByProjectRoot(@NotNull Task sourceTask, @NotNull Task d
352362
Context context = sourceTask.getContext();
353363
final long lowerOrderIdProject = sourceTask.getOrderIdProject();
354364
final long higherOrderIdProject = destinationTask.getOrderIdProject();
365+
//TODO: #244 change List<Task> to Page<Task>
355366
List<Task> tasks = taskRepository.getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
356367
lowerOrderIdProject,
357368
higherOrderIdProject,
358369
context
359370
);
371+
//TODO: #244 change List<Task> to Page<Task>
360372
List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
361373
for(Task task:tasks){
362374
task.moveDownByProject();
@@ -384,11 +396,13 @@ public void moveTasksUpByProject(@NotNull Task sourceTask, @NotNull Task destina
384396
log.info("-------------------------------------------------------------------------------");
385397
long lowerOrderIdProject = destinationTask.getOrderIdProject();
386398
long higherOrderIdProject = sourceTask.getOrderIdProject();
399+
//TODO: #244 change List<Task> to Page<Task>
387400
List<Task> tasks = taskRepository.getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
388401
lowerOrderIdProject,
389402
higherOrderIdProject,
390403
project
391404
);
405+
//TODO: #244 change List<Task> to Page<Task>
392406
List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
393407
for(Task task:tasks){
394408
task.moveUpByProject();
@@ -417,11 +431,13 @@ public void moveTasksDownByProject(@NotNull Task sourceTask, @NotNull Task desti
417431
log.info("-------------------------------------------------------------------------------");
418432
final long lowerOrderIdProject = sourceTask.getOrderIdProject();
419433
final long higherOrderIdProject = destinationTask.getOrderIdProject();
434+
//TODO: #244 change List<Task> to Page<Task>
420435
List<Task> tasks = taskRepository.getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
421436
lowerOrderIdProject,
422437
higherOrderIdProject,
423438
project
424439
);
440+
//TODO: #244 change List<Task> to Page<Task>
425441
List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
426442
for(Task task:tasks){
427443
task.moveDownByProject();

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
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.ProjectService;
1514
import org.woehlke.simpleworklist.user.session.UserSessionBean;
1615

1716
import javax.validation.constraints.NotNull;

‎src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageRepository.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
@Repository
1717
public interface User2UserMessageRepository extends JpaRepository<User2UserMessage, Long> {
1818

19-
//TODO: move the JQL Query-String to Entity as Prepared Statement
19+
//TODO: #247 move the JQL Query-String to Entity as Prepared Statement
2020
String JQL = "select m from User2UserMessage m "
2121
+ "where (m.sender = :thisUser and m.receiver = :otherUser) "
2222
+ "or (m.sender = :otherUser and m.receiver = :thisUser)";
@@ -28,7 +28,7 @@ Page<User2UserMessage> findAllMessagesBetweenCurrentAndOtherUser(
2828
Pageable request
2929
);
3030

31-
//TODO: change List<Project> to Page<Project>
31+
//TODO: #246 change List<Project> to Page<Project>
3232
@Deprecated
3333
List<User2UserMessage> findByReceiverAndReadByReceiver(
3434
UserAccount receiver,
@@ -40,7 +40,7 @@ Page<User2UserMessage> findByReceiverAndReadByReceiver(
4040
Pageable request
4141
);
4242

43-
//TODO: change List<User2UserMessage> to Page<User2UserMessage>
43+
//TODO: #246 change List<User2UserMessage> to Page<User2UserMessage>
4444
@Deprecated
4545
List<User2UserMessage> findBySenderAndReceiverAndReadByReceiver(
4646
UserAccount sender, UserAccount receiver, boolean readByReceiver

‎src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageService.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,16 @@
99
*/
1010
public interface User2UserMessageService {
1111

12-
void sendNewUserMessage(UserAccount thisUser, UserAccount otherUser, User2UserMessageFormBean user2UserMessageFormBean);
12+
User2UserMessage sendNewUserMessage(
13+
UserAccount thisUser,
14+
UserAccount otherUser,
15+
User2UserMessageFormBean user2UserMessageFormBean
16+
);
1317

1418
int getNumberOfNewIncomingMessagesForUser(UserAccount user);
1519

16-
Page<User2UserMessage> readAllMessagesBetweenCurrentAndOtherUser(UserAccount receiver, UserAccount sender, Pageable request);
20+
Page<User2UserMessage> readAllMessagesBetweenCurrentAndOtherUser(
21+
UserAccount receiver, UserAccount sender, Pageable request
22+
);
1723

1824
}

0 commit comments

Comments
 (0)