work

Author: thomaswoehlke

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

@@ -47,8 +47,8 @@ public interface TaskRepository extends JpaRepository<Task, Long> {
     @Query(name="findByTaskStateSomeday")
     List<Task> findByTaskStateSomeday(@Param("context") Context context);
 
-    Page<Task> findByFocusIsTrue(Context context, Pageable request);
-    List<Task> findByFocusIsTrue(Context context);
+    Page<Task> findByFocusIsTrueAndContext(Context context, Pageable request);
+    List<Task> findByFocusIsTrueAndContext(Context context);
 
     @Query(name="findByTaskStateCompleted")
     Page<Task> findByTaskStateCompleted(@Param("context") Context context, Pageable request);

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

@@ -306,7 +306,7 @@ public List<Task> findByTaskStateSomeday(Context context) {
 
   @Override
   public List<Task> findByFocus(Context context) {
-    return taskRepository.findByFocusIsTrue(context);
+    return taskRepository.findByFocusIsTrueAndContext(context);
   }
 
   @Override
@@ -361,7 +361,7 @@ public Page<Task> findByTaskStateSomeday(Context context, Pageable request) {
 
   @Override
   public Page<Task> findByFocus(Context context, Pageable request) {
-    return taskRepository.findByFocusIsTrue(context, request);
+    return taskRepository.findByFocusIsTrueAndContext(context, request);
   }
 
   @Override