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

Timestamp:

Nov 7, 2010, 10:08:01 PM (10 years ago)

Author:

j.saito@…

Message:

Added TemplateFields? to be returned in getSamples REST resource.

File:

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

trunk/grails-app/controllers/RestController.groovy

@@ -33 +33 @@
         def beforeInterceptor = [action:this.&auth,except:["isUser"]]
         def credentials
-        def requestUser // = SecUser.findByUsername( "user" )
+        def requestUser
 
         /**
@@ -42 +42 @@
          * @param       consumer        consumer name of the calling module
          * @param       token           token for the authenticated user (e.g. session_id)
-         * @return true if the user is remotely logged in, false otherwise
+         * @return  true if the user is remotely logged in, false otherwise
          */
         private def auth() {
@@ -144 +144 @@
                 studies.each { study ->
                         if(study) {
+                                def user = AuthenticationService.getRemotelyLoggedInUser( params.consumer, params.token )
                                 // Check whether the person is allowed to read the data of this study
                                 if( !study.canRead(AuthenticationService.getRemotelyLoggedInUser( params.consumer, params.token ))) {
@@ -257 +258 @@
                         if(study) {
                                 // Check whether the person is allowed to read the data of this study
+                                /*
                                 if( !study.canRead(AuthenticationService.getRemotelyLoggedInUser( params.consumer, params.token ))) {
                                         response.sendError(401)
                                         return false
                                 }
+                                */
 
                                 def assays = []
@@ -326 +329 @@
          * @return 'event' (the name of the template of the SamplingEvent describing the sampling)
          * @return 'startTime' (the time the sample was taken relative to the start of the study, as a string)
+         * @return additional template fields are returned
          * 
          * 
@@ -370 +374 @@
                         def assay = Assay.find( "from Assay as a where externalAssayID=?",[params.assayToken])
                         if( assay )  {
-                                if( params.sampleToken ) {
+                                def samples = assay.getSamples() // on all samples
+
+                                if( params.sampleToken ) {       // or on a subset of samples?
                                         def sampleTokens = (params.sampleToken instanceof String) ? 
                                                 [params.sampleToken] : params.sampleToken
-                                                assay.getSamples().each { sample ->
-                                                if( sampleTokens.find{ it == sample.name } ) {
-                                                        def item = [ 
-                                                                'sampleToken' : sample.name,
-                                                                'material'        : sample.material?.name,
-                                                                'subject'         : sample.parentSubject?.name,
-                                                                'event'           : sample.parentEvent?.template?.name,
-                                                                'startTime'       : sample.parentEvent?.getStartTimeString()
-                                                        ]
-                                                        items.push item 
+                                        samples = []
+                                        sampleTokens.each{ sampleToken ->
+                                                assay.getSamples().find{ sample -> sampleToken == sample.name } 
+                                        }
+                                }
+
+                                samples.each { sample ->
+
+                                        def item = [ 
+                                                'material'        : sample.material?.name,
+                                                'subject'         : sample.parentSubject?.name,
+                                                'event'           : sample.parentEvent?.template?.name,
+                                                'startTime'       : sample.parentEvent?.getStartTimeString()
+                                        ]
+
+                                        sample.giveFields().each { field ->
+                                                def name = field.name
+                                                def value = sample.getFieldValue( name )
+                                                if(name!='material')
+                                                {
+                                                        item[name]=value
                                                 }
                                         }
-                                }
-                                else {
-                                        assay.getSamples().each { sample ->
-                                                def item = [ 
-                                                        'sampleToken' : sample.name,
-                                                        'material'        : sample.material?.name,
-                                                        'subject'         : sample.parentSubject?.name,
-                                                        'event'           : sample.parentEvent?.template?.name,
-                                                        'startTime'       : sample.parentEvent?.getStartTimeString()
-                                                ]
-                                                items.push item 
-                                        }
+                                        items.push item 
                                 }
                         }
@@ -402 +408 @@
                 render items as JSON
         }
+
+
+
+
+
 
 
@@ -433 +444 @@
                 }
     }
+
+
+
+
+
+
 }