Changeset 511 for trunk

Timestamp:

Apr 28, 2010, 5:02:11 PM (15 years ago)

Author:

gav

Message:

Adjust TaskSearchService.getPersonsTasks() so that if a person created it and is leadPerson then that task is returned.
Started on integration tests for TaskSearchService.

Location:

trunk

Files:

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

trunk/grails-app/services/TaskSearchService.groovy

@@ -204 +204 @@
                                         left join assignedGroupOfTask.personGroup as personGroup \
                                         left join personGroup.persons as assignedPersonViaGroup \
+                                        left join task.taskModifications as taskModification \
+                                        left join taskModification.person as createdBy \
+                                        left join taskModification.taskModificationType as taskModificationType \
                                         where (task.trash = false \
-                                                    and task.approved = true \
+                                                    and task.targetStartDate < :endDate \
+                                                    and task.targetCompletionDate >= :startDate \
                                                     and ( \
-                                                            task.targetStartDate < :endDate \
-                                                            and task.targetCompletionDate >= :startDate \
+                                                        (taskModificationType.id = 1 \
+                                                        and createdBy = :person \
+                                                        and task.leadPerson = :person) \
+                                                        or ( \
+                                                            task.approved = true \
+                                                            and ( \
+                                                                task.leadPerson = :person \
+                                                                or assignedPerson = :person \
+                                                                or assignedPersonViaGroup = :person \
+                                                            ) \
                                                         ) \
-                                                    and ( \
-                                                            task.leadPerson = :person \
-                                                            or assignedPerson = :person \
-                                                            or assignedPersonViaGroup = :person \
-                                                            ) \
-                                                    )"
+                                                    ) \
+                                        )"
 
         def searchQuery = "select distinct task " + baseQuery + orderBy