Changeset 600 for trunk/grails-app/controllers/RestController.groovy

Timestamp:

Jun 23, 2010, 10:25:48 AM (9 years ago)

Author:

jahn

Message:

Added event.name to getSamples() REST resource.

File:

• trunk/grails-app/controllers/RestController.groovy (modified) (4 diffs)

trunk/grails-app/controllers/RestController.groovy

@@ -40 +40 @@
         */
         def getStudies = {
-                List studies = [] 
+                List studies = [] 
                 Study.list().each { study ->
-                    studies.push( [ 'externalStudyID': study.code, 'name':study.title ] )
-                }
-                render studies as JSON 
+                        studies.push( [ 'externalStudyID': study.code, 'name':study.title ] )
+                }
+                render studies as JSON 
         }
 
@@ -58 +58 @@
         */
         def getSubjects = {
-                List subjects = [] 
+                List subjects = [] 
                 if( params.externalStudyID ) {
-                        def id = params.externalStudyID
+                        def id = params.externalStudyID
                         def study = Study.find( "from Study as s where s.code=?", [id])
                         if(study) study.subjects.each { subjects.push it.name }
-                }
-                render subjects as JSON 
+                }
+                render subjects as JSON 
         }
 
@@ -78 +78 @@
         */
         def getAssays = {
-                List assays = [] 
+                List assays = [] 
                 if( params.externalStudyID ) {
-                        def id = Long.parseLong(params.externalStudyID)
+                        def id = Long.parseLong(params.externalStudyID)
                         def study = Study.find( "from Study as s where s.code=?", [id])
-                        if(study) study.assays.each{ assay -> assays.push assay.externalAssayID }
+                        if(study) study.assays.each{ assay -> assays.push assay.externalAssayID }
                 }
-                render assays as JSON 
+                render assays as JSON 
         }
 
@@ -92 +92 @@
         * Provide all samples of a given Assay. The result is an enriched list with additional informatin on a sample. 
         *
-        * Example for calling this resource: http://localhost:8080/gscf/rest/getAssays/json?externalStudyID=2
-        *
+        * Example for calling this resource: http://localhost:8080/gscf/rest/getAssays/json?externalStudyID=2
+        *
         * @param  assayID (externalAssayID of some Assay in GSCF)
         * @return list of element of  Sample.name x Sample.material x Sample.subject.name x Sample.Event.name x Sample.Event.time
         */
         def getSamples = {
-                def items = []
+                def items = []
                 if( params.externalAssayID ) {
-                        def id = Long.parseLong(params.externalAssayID)
+                        def id = Long.parseLong(params.externalAssayID)
                         Assay.find( "from Assay as a where externalAssayID=?",[id]).getSamples().each { sample ->
                                 def item = [ 
-                                        'name'            : sample.name,
-                                        'material'        : sample.material.name,
-                                        'subject'         : sample.parentSubject.name,
-                                        //'event'         : sample.parentEvent.name,  // get the freaking name 
-                                        'startTime'       : sample.parentEvent.startTime
+                                        'name'          : sample.name,
+                                        'material'      : sample.material.name,
+                                        'subject'       : sample.parentSubject.name,
+                                        'event'         : sample.parentEvent.template.name,  // get the freaking name 
+                                        'startTime'     : sample.parentEvent.startTime
                                 ] 
                                 items.push item 
-                        }
+                        }
                 }
-                render items as JSON
+                render items as JSON
         }