Changeset 512 for trunk

Timestamp:

Apr 28, 2010, 11:14:56 PM (15 years ago)

Author:

gav

Message:

Refactor TaskSearchService.getTasks() to use HQL and avoid bug in ticket #64, also extend associated tests.

Location:

trunk

Files:

• grails-app/services/TaskSearchService.groovy (modified) (1 diff)
• test/integration/TaskSearchServiceTests.groovy (modified) (1 diff)

trunk/grails-app/services/TaskSearchService.groovy

@@ -157 +157 @@
     */
     def getTasks(params, startDate=null, endDate=null) {
-        params.max = Math.min(params?.max?.toInteger() ?: 10, paramsMax)
-        params.offset = params?.offset?.toInteger() ?: 0
-        params.sort = params?.sort ?: "attentionFlag"
-        params.order = params?.order ?: "desc"
-
-        startDate = startDate ?: dateUtilService.today
-        endDate = endDate ?: dateUtilService.tomorrow
-
-        def taskInstanceList = Task.createCriteria().list(
-            max: params.max,
-            offset: params.offset,
-            sort: params.sort, 
-            order: params.order) {
-                lt("targetStartDate", endDate)
-                ge("targetCompletionDate", startDate)
-                eq("trash", false)
-            } // createCriteria
-    } // getTasks()
+        def paginateParams = [:]
+        paginateParams.max = Math.min(params?.max?.toInteger() ?: 10, paramsMax)
+        paginateParams.offset = params?.offset?.toInteger() ?: 0
+
+        def sort = "task." + (params?.sort ?: "attentionFlag")
+        def order = params?.order == "asc" ? "asc" : "desc"
+        def orderBy = " order by " + sort + ' ' + order
+
+        def namedParams = [:]
+        namedParams.startDate = startDate ?: dateUtilService.today
+        namedParams.endDate = endDate ?: dateUtilService.tomorrow
+
+        def baseQuery = "from Task as task \
+                                        where (task.trash = false \
+                                                    and task.targetStartDate < :endDate \
+                                                    and task.targetCompletionDate >= :startDate \
+                                        )"
+
+        def searchQuery = "select distinct task " + baseQuery + orderBy
+        def list = Task.executeQuery(searchQuery, namedParams, paginateParams)
+
+        def countQuery = "select count(distinct task) as taskCount " + baseQuery
+        def totalCount = Task.executeQuery(countQuery, namedParams)[0].toInteger()
+
+        def taskInstanceList = new PagedResultList(list, totalCount)
+        return taskInstanceList
+    } // getPTasks()
 
     /**

trunk/test/integration/TaskSearchServiceTests.groovy

@@ -70 +70 @@
 
         // Tasks in the trash should not be returned.
-        tasks[0].trash = true
-        tasks[0].save(flush:true)
+        taskA.trash = true
+        taskA.save(flush:true)
         assert taskSearchService.getTasks([:]).totalCount == taskCount - 1
-        tasks[1].trash = true
-        tasks[1].save(flush:true)
+        taskB.trash = true
+        taskB.save(flush:true)
         assert taskSearchService.getTasks([:]).totalCount == taskCount - 2
 
         // Restored tasks should be returned.
-        tasks[0].trash = false
-        tasks[0].save(flush:true)
+        taskA.trash = false
+        taskA.save(flush:true)
         assert taskSearchService.getTasks([:]).totalCount == taskCount - 1
-        tasks[1].trash = false
-        tasks[1].save(flush:true)
+        taskB.trash = false
+        taskB.save(flush:true)
         assert taskSearchService.getTasks([:]).totalCount == taskCount
 
         // Tomorrows tasks should not be returned.
-        tasks[0].targetStartDate = dateUtilService.tomorrow
-        tasks[0].targetCompletionDate = dateUtilService.tomorrow
-        tasks[0].save(flush:true)
+        taskA.targetStartDate = dateUtilService.tomorrow
+        taskA.targetCompletionDate = dateUtilService.tomorrow
+        taskA.save(flush:true)
         assert taskSearchService.getTasks([:]).totalCount == taskCount - 1
 
+        // Tomorrows tasks should be returned, if we ask for them.
+        assert taskSearchService.getTasks([:], dateUtilService.today, dateUtilService.tomorrow+1).totalCount == taskCount
+
         // Yesterdays tasks should not be returned.
-        tasks[0].targetStartDate = dateUtilService.yesterday
-        tasks[0].targetCompletionDate = dateUtilService.yesterday
-        tasks[0].save(flush:true)
+        taskA.targetStartDate = dateUtilService.yesterday
+        taskA.targetCompletionDate = dateUtilService.yesterday
+        taskA.save(flush:true)
         assert taskSearchService.getTasks([:]).totalCount == taskCount - 1
 
+        // Yesterdays tasks should be returned, if we ask for them.
+        assert taskSearchService.getTasks([:], dateUtilService.yesterday, dateUtilService.tomorrow).totalCount == taskCount
+
         // Tasks that span today should be returned.
-        tasks[0].targetStartDate = dateUtilService.yesterday
-        tasks[0].targetCompletionDate = dateUtilService.tomorrow
-        tasks[0].save(flush:true)
+        taskA.targetStartDate = dateUtilService.yesterday
+        taskA.targetCompletionDate = dateUtilService.tomorrow
+        taskA.save(flush:true)
         assert taskSearchService.getTasks([:]).totalCount == taskCount
     } // testGetTasks()