Skip to content

Commit 920dd74

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

File tree

5 files changed

+91
-21
lines changed

5 files changed

+91
-21
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.woehlke.simpleworklist.context;
22

3+
import org.springframework.data.domain.Page;
4+
import org.springframework.data.domain.Pageable;
35
import org.springframework.data.jpa.repository.JpaRepository;
46
import org.springframework.stereotype.Repository;
5-
import org.woehlke.simpleworklist.context.Context;
67
import org.woehlke.simpleworklist.user.account.UserAccount;
78

89
import java.util.List;
@@ -13,7 +14,10 @@
1314
@Repository
1415
public interface ContextRepository extends JpaRepository<Context, Long> {
1516

17+
//TODO: change List<Context> to Page<Context>
18+
@Deprecated
1619
List<Context> findByUserAccount(UserAccount user);
20+
Page<Context> findByUserAccount(UserAccount user, Pageable pageRequest);
1721

1822
Context findByIdAndUserAccount(long newContextId, UserAccount userAccount);
1923

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,23 @@
22

33
import java.util.List;
44

5+
import org.springframework.data.domain.Page;
6+
import org.springframework.data.domain.Pageable;
57
import org.springframework.data.jpa.repository.JpaRepository;
68
import org.springframework.stereotype.Repository;
79
import org.woehlke.simpleworklist.context.Context;
810

911
@Repository
1012
public interface ProjectRepository extends JpaRepository<Project, Long> {
1113

14+
//TODO: #245 change List<Project> to Page<Project>
15+
@Deprecated
1216
List<Project> findByContext(Context context);
17+
Page<Project> findByContext(Context context, Pageable pageRequest);
1318

19+
//TODO: #245 change List<Project> to Page<Project>
20+
@Deprecated
1421
List<Project> findByParentIsNullAndContext(Context context);
22+
Page<Project> findByParentIsNullAndContext(Context context, Pageable pageRequest);
1523

1624
}

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

Lines changed: 59 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,39 @@
1414
@Repository
1515
public interface TaskRepository extends JpaRepository<Task, Long> {
1616

17+
//TODO: #244 change List<Task> to Page<Task>
18+
@Deprecated
1719
List<Task> findByProject(Project thisProject);
18-
1920
Page<Task> findByProject(Project thisProject, Pageable pageable);
20-
2121
Page<Task> findByFocusAndContext(boolean focus, Context context, Pageable request);
22-
2322
Page<Task> findByProjectIsNullAndContext(Context context, Pageable request);
2423

24+
//TODO: #244 change List<Task> to Page<Task>
25+
@Deprecated
2526
List<Task> findByContext(Context context);
27+
Page<Task> findByContext(Context context, Pageable pageable);
2628

27-
Task findTopByTaskStateAndContextOrderByOrderIdTaskStateDesc(TaskState inbox, Context context);
28-
29-
Task findTopByProjectAndContextOrderByOrderIdProjectIsNullDesc(Context context);
30-
29+
Task findTopByTaskStateAndContextOrderByOrderIdTaskStateDesc(TaskState taskState, Context context);
30+
Task findTopByProjectIsNullAndContextOrderByOrderIdProjectDesc(Context context);
3131
Task findTopByProjectAndContextOrderByOrderIdProjectDesc(Project project, Context context);
3232

33-
Page<Task> findByTaskStateAndContext(TaskState taskState, Context context, Pageable request);
34-
33+
//TODO: #244 change List<Task> to Page<Task>>
34+
@Deprecated
3535
List<Task> findByTaskStateAndContext(TaskState taskState, Context context);
36+
Page<Task> findByTaskStateAndContext(TaskState taskState, Context context, Pageable request);
3637

37-
List<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(TaskState taskState, Context context);
38+
//TODO: #244 change List<Task> to Page<Task>
39+
@Deprecated
40+
List<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(
41+
TaskState taskState, Context context
42+
);
43+
Page<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(
44+
TaskState taskState, Context context, Pageable request
45+
);
3846

47+
//TODO: #244 change List<Task> to Page<Task>
48+
//TODO: move the JQL Query-String to Entity as Prepared Statement
49+
@Deprecated
3950
@Query("select t from Task t"
4051
+ " where t.orderIdTaskState > :lowerOrderIdTaskState and t.orderIdTaskState < :higherOrderIdTaskState"
4152
+ " and t.taskState = :taskState and t.context = :context")
@@ -45,17 +56,43 @@ List<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(
4556
@Param("taskState") TaskState taskState,
4657
@Param("context") Context context
4758
);
59+
//TODO: move the JQL Query-String to Entity as Prepared Statement
60+
@Query("select t from Task t"
61+
+ " where t.orderIdTaskState > :lowerOrderIdTaskState and t.orderIdTaskState < :higherOrderIdTaskState"
62+
+ " and t.taskState = :taskState and t.context = :context")
63+
Page<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(
64+
@Param("lowerOrderIdTaskState") long lowerOrderIdTaskState,
65+
@Param("higherOrderIdTaskState") long higherOrderIdTaskState,
66+
@Param("taskState") TaskState taskState,
67+
@Param("context") Context context,
68+
Pageable request
69+
);
4870

71+
//TODO: #244 change List<Task> to Page<Task>
72+
//TODO: move the JQL Query-String to Entity as Prepared Statement
73+
@Deprecated
4974
@Query("select t from Task t"
5075
+ " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
51-
+ " and t.project = :project and t.context = :context ")
76+
+ " and t.project = :project")
5277
List<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
78+
@Param("lowerOrderIdProject") long lowerOrderIdProject,
79+
@Param("higherOrderIdProject") long higherOrderIdProject,
80+
@Param("project") Project project
81+
);
82+
//TODO: move the JQL Query-String to Entity as Prepared Statement
83+
@Query("select t from Task t"
84+
+ " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
85+
+ " and t.project = :project")
86+
Page<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
5387
@Param("lowerOrderIdProject") long lowerOrderIdProject,
5488
@Param("higherOrderIdProject") long higherOrderIdProject,
5589
@Param("project") Project project,
56-
@Param("context") Context context
90+
Pageable request
5791
);
5892

93+
//TODO: move from List<Task> to Page<Task>
94+
//TODO: move the JQL Query-String to Entity as Prepared Statement
95+
@Deprecated
5996
@Query("select t from Task t"
6097
+ " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
6198
+ " and t.project is null and t.context = :context ")
@@ -64,5 +101,15 @@ List<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
64101
@Param("higherOrderIdProject") long higherOrderIdProject,
65102
@Param("context") Context context
66103
);
104+
//TODO: move the JQL Query-String to Entity as Prepared Statement
105+
@Query("select t from Task t"
106+
+ " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
107+
+ " and t.project is null and t.context = :context ")
108+
Page<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
109+
@Param("lowerOrderIdProject") long lowerOrderIdProject,
110+
@Param("higherOrderIdProject") long higherOrderIdProject,
111+
@Param("context") Context context,
112+
Pageable request
113+
);
67114

68115
}

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public long getMaxOrderIdProject(@NotNull Project project, @NotNull Context cont
244244
@Override
245245
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
246246
public long getMaxOrderIdProjectRoot(@NotNull Context context) {
247-
Task task = taskRepository.findTopByProjectAndContextOrderByOrderIdProjectIsNullDesc(
247+
Task task = taskRepository.findTopByProjectIsNullAndContextOrderByOrderIdProjectDesc(
248248
context
249249
);
250250
return (task==null) ? 0 : task.getOrderIdProject();
@@ -382,14 +382,12 @@ public void moveTasksUpByProject(@NotNull Task sourceTask, @NotNull Task destina
382382
log.info(" START moveTasks UP By Project("+project.out()+"):");
383383
log.info(" "+sourceTask.outProject() +" -> "+ destinationTask.outProject());
384384
log.info("-------------------------------------------------------------------------------");
385-
Context context = sourceTask.getContext();
386385
long lowerOrderIdProject = destinationTask.getOrderIdProject();
387386
long higherOrderIdProject = sourceTask.getOrderIdProject();
388387
List<Task> tasks = taskRepository.getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
389388
lowerOrderIdProject,
390389
higherOrderIdProject,
391-
project,
392-
context
390+
project
393391
);
394392
List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
395393
for(Task task:tasks){
@@ -412,7 +410,6 @@ public void moveTasksUpByProject(@NotNull Task sourceTask, @NotNull Task destina
412410
@Override
413411
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
414412
public void moveTasksDownByProject(@NotNull Task sourceTask, @NotNull Task destinationTask) {
415-
Context context = sourceTask.getContext();
416413
Project project = sourceTask.getProject();
417414
log.info("-------------------------------------------------------------------------------");
418415
log.info(" START moveTasks DOWN By Project("+project.out()+"):");
@@ -423,8 +420,7 @@ public void moveTasksDownByProject(@NotNull Task sourceTask, @NotNull Task desti
423420
List<Task> tasks = taskRepository.getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
424421
lowerOrderIdProject,
425422
higherOrderIdProject,
426-
project,
427-
context
423+
project
428424
);
429425
List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
430426
for(Task task:tasks){

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

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

19-
String JQL = "select m from User2UserMessage m where (m.sender = :thisUser and m.receiver = :otherUser) or (m.sender = :otherUser and m.receiver = :thisUser)";
19+
//TODO: move the JQL Query-String to Entity as Prepared Statement
20+
String JQL = "select m from User2UserMessage m "
21+
+ "where (m.sender = :thisUser and m.receiver = :otherUser) "
22+
+ "or (m.sender = :otherUser and m.receiver = :thisUser)";
2023

2124
@Query(JQL)
2225
Page<User2UserMessage> findAllMessagesBetweenCurrentAndOtherUser(
@@ -25,12 +28,24 @@ Page<User2UserMessage> findAllMessagesBetweenCurrentAndOtherUser(
2528
Pageable request
2629
);
2730

31+
//TODO: change List<Project> to Page<Project>
32+
@Deprecated
2833
List<User2UserMessage> findByReceiverAndReadByReceiver(
2934
UserAccount receiver,
3035
boolean readByReceiver
3136
);
37+
Page<User2UserMessage> findByReceiverAndReadByReceiver(
38+
UserAccount receiver,
39+
boolean readByReceiver,
40+
Pageable request
41+
);
3242

43+
//TODO: change List<User2UserMessage> to Page<User2UserMessage>
44+
@Deprecated
3345
List<User2UserMessage> findBySenderAndReceiverAndReadByReceiver(
3446
UserAccount sender, UserAccount receiver, boolean readByReceiver
3547
);
48+
Page<User2UserMessage> findBySenderAndReceiverAndReadByReceiver(
49+
UserAccount sender, UserAccount receiver, boolean readByReceiver, Pageable request
50+
);
3651
}

0 commit comments

Comments
 (0)