Changeset 251 for trunk/grails-app/services/TaskService.groovy

Timestamp:

Dec 28, 2009, 1:10:24 AM (14 years ago)

Author:

gav

Message:

Record a taskModification for changes to assignedGroups and assignedPersons as per ticket #35.

File:

• trunk/grails-app/services/TaskService.groovy (modified) (5 diffs)

trunk/grails-app/services/TaskService.groovy

@@ -8 +8 @@
 
     def personService
+    def assignedGroupService
+    def assignedPersonService
 
     /**
@@ -60 +62 @@
                 //Add the assignedGroups, provided by a new ArrayList(task.assignedGroups)
                 if(params.assignedGroups) {
-                    def assignedGroupInstance
+                    def assignedGroupsResult
+                    def assignedGroupParams = [:]
                     params.assignedGroups.each() {
-                        assignedGroupInstance = new AssignedGroup(personGroup: it.personGroup,
-                                                                                                        task: taskInstance,
-                                                                                                        estimatedHour: it.estimatedHour,
-                                                                                                        estimatedMinute: it.estimatedMinute)
-
-                        if(!assignedGroupInstance.save()) {
+
+                        assignedGroupParams = [personGroup: it.personGroup,
+                                                                    task: taskInstance,
+                                                                    estimatedHour: it.estimatedHour,
+                                                                    estimatedMinute: it.estimatedMinute]
+
+                        assignedGroupsResult = assignedGroupService.save(assignedGroupParams)
+
+                        if(assignedGroupsResult.error) {
                             status.setRollbackOnly()
                             taskInstance.errors.rejectValue("assignedGroups", "task.assignedGroups.failedToSave")
@@ -73 +79 @@
                             return result
                         }
+
                     }
                 }
@@ -78 +85 @@
                 //Add the assignedPersons, provided by a new ArrayList(task.assignedPersons)
                 if(params.assignedPersons) {
-                    def assignedPersonInstance
+                    def assignedPersonsResult
+                    def assignedPersonsParams = [:]
                     params.assignedPersons.each() {
-                        assignedPersonInstance = new AssignedPerson(person: it.person,
-                                                                                                            task: taskInstance,
-                                                                                                            estimatedHour: it.estimatedHour,
-                                                                                                            estimatedMinute: it.estimatedMinute)
-
-                        if(!assignedPersonInstance.save()) {
+
+                        assignedPersonsParams = [person: it.person,
+                                                                    task: taskInstance,
+                                                                    estimatedHour: it.estimatedHour,
+                                                                    estimatedMinute: it.estimatedMinute]
+
+                        assignedPersonsResult = assignedPersonService.save(assignedPersonsParams)
+
+                        if(assignedPersonsResult.error) {
                             status.setRollbackOnly()
                             taskInstance.errors.rejectValue("assignedPersons", "task.assignedPersons.failedToSave")
@@ -91 +102 @@
                             return result
                         }
+
                     }
                 }