Changeset 514 for trunk/grails-app

Timestamp:

Apr 29, 2010, 5:01:51 AM (15 years ago)

Author:

gav

Message:

Added integration test for TaskSearchService.getPersonsTasks().
Extended TaskService.delete() to handle assignedPersons and assignedGroups.
Use safe collection navigation in AssignedGroupService and AssignedPersonService?.

Location:

trunk/grails-app/services

Files:

• AssignedGroupService.groovy (modified) (1 diff)
• AssignedPersonService.groovy (modified) (1 diff)
• TaskService.groovy (modified) (1 diff)

trunk/grails-app/services/AssignedGroupService.groovy

@@ -146 +146 @@
                 return fail(code:"personGroup.not.found")
 
-            result.personsInGroup = result.personGroup.persons.sort { p1, p2 -> p1.firstName.compareToIgnoreCase(p2.firstName) }
+            result.personsInGroup = result.personGroup.persons?.sort { p1, p2 -> p1.firstName.compareToIgnoreCase(p2.firstName) }
 
             result.assignedGroupInstance = new AssignedGroup()

trunk/grails-app/services/AssignedPersonService.groovy

@@ -146 +146 @@
                 return fail(code:"person.not.found")
 
-            result.groupsForPerson = result.person.personGroups.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
+            result.groupsForPerson = result.person.personGroups?.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
 
             result.assignedPersonInstance = new AssignedPerson()

trunk/grails-app/services/TaskService.groovy

@@ -254 +254 @@
             }
 
+            // Handle assignedPersons.
+            def taskAssignedPersons = AssignedPerson.findAllByTask(result.taskInstance)
+            taskAssignedPersons.each() {
+                result.taskInstance.removeFromAssignedPersons(it)
+                it.delete()
+            }
+
+            // Handle assignedGroups.
+            def taskAssignedGroups = AssignedGroup.findAllByTask(result.taskInstance)
+            taskAssignedGroups.each() {
+                result.taskInstance.removeFromAssignedGroups(it)
+                it.delete()
+            }
+
             if(result.error)
                 return result