Changeset 700 for trunk

Timestamp:

Nov 1, 2010, 11:29:11 AM (14 years ago)

Author:

gav

Message:

Fix lazy initialization bug and optimise fetching in AssignedGroupService.

File:

• trunk/grails-app/services/AssignedGroupService.groovy (modified) (6 diffs)

trunk/grails-app/services/AssignedGroupService.groovy

@@ +1 @@
+import org.hibernate.FetchMode as FM
+
 class AssignedGroupService {
 
@@ -47 +49 @@
         }
 
-        result.assignedGroupInstance = AssignedGroup.get(params.id)
+        result.assignedGroupInstance = AssignedGroup.createCriteria().get {
+            idEq(params.id.toLong())
+            fetchMode("personGroup", FM.EAGER)
+            fetchMode("personGroup.persons", FM.EAGER)
+        }
 
         if(!result.assignedGroupInstance)
@@ -71 +77 @@
             }
 
-            result.personGroup = PersonGroup.get(params.personGroup.id)
+            result.personGroup = PersonGroup.createCriteria().get {
+                idEq(params.personGroup.id.toLong())
+                fetchMode("persons", FM.EAGER)
+            }
 
             // Prevent a null property reference.
@@ -140 +149 @@
             }
 
-            result.personGroup = PersonGroup.get(params.personGroup.id)
+            result.personGroup = PersonGroup.createCriteria().get {
+                idEq(params.personGroup.id.toLong())
+                fetchMode("persons", FM.EAGER)
+            }
 
             // Prevent a null property reference.
@@ -146 +158 @@
                 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()
@@ -178 +190 @@
         }
 
-        result.personGroup = PersonGroup.get(params.personGroup?.id)
+        if(!params.personGroup?.id?.isLong())
+            return fail(code:"default.not.found")
+
+        result.personGroup = PersonGroup.createCriteria().get {
+            idEq(params.personGroup.id.toLong())
+            fetchMode("persons", FM.EAGER)
+        }
 
         if(!result.personGroup)