Removendo código duplicado através da adição de método generazante

spgroup · Feb 6, 2015 · 4243da8 · acff · Feb 9, 2015 · 4243da8
1 parent c6f39e3
commit 4243da8
Showing 1 changed file with 14 additions and 29 deletions.
diff --git a/grails-app/controllers/rgms/member/MemberController.groovy b/grails-app/controllers/rgms/member/MemberController.groovy
@@ -23,13 +23,7 @@ class MemberController {
         params.max = Math.min(params.max ? params.int('max') : 10, 100)
         def userMemberList = []
         def members = Member.list(params)
-        for (i in members) {
-            def user = User.findByAuthor(i)
-            if (user)
-                userMemberList.add([user: user, member: i])
-            else
-                userMemberList.add([member: i])
-        }
+        generateMemberList(userMemberList,members)
 
         [userMemberInstanceList: userMemberList, memberInstanceTotal: Member.count()]
     }
@@ -99,13 +93,7 @@ class MemberController {
         if(params.name){
             def members = Member.findAllByName(params.name)
 
-            for (i in members) {
-                    def user = User.findByAuthor(i)
-                    if (user)
-                        userMemberList.add([user: user, member: i])
-                    else
-                        userMemberList.add([member: i])
-            }
+            generateMemberList(userMemberList,members)
         }
 
         [userMemberInstanceList: userMemberList, memberInstanceTotal: Member.count()]
@@ -234,13 +222,7 @@ class MemberController {
             def members = Member.findAllByUniversity(params.name)
 
 
-            for (i in members) {
-                def user = User.findByAuthor(i)
-                if (user)
-                    userMemberList.add([user: user, member: i])
-                else
-                    userMemberList.add([member: i])
-            }
+            generateMemberList(userMemberList,members)
         }
         [userMemberInstanceList: userMemberList, memberInstanceTotal: Member.count()]
     }
@@ -272,17 +254,20 @@ class MemberController {
         if(params.name){
             def members = Member.findAllByEmail(params.name)
 
-
-            for (i in members) {
-                def user = User.findByAuthor(i)
-                if (user)
-                    userMemberList.add([user: user, member: i])
-                else
-                    userMemberList.add([member: i])
-            }
+            generateMemberList(userMemberList,members)
         }
         [userMemberInstanceList: userMemberList, memberInstanceTotal: Member.count()]
     }
 
+    private void generateMemberList(userMemberList, members){
+        for (i in members) {
+            def user = User.findByAuthor(i)
+            if (user)
+                userMemberList.add([user: user, member: i])
+            else
+                userMemberList.add([member: i])
+        }
+    }
+
 
 }