Changeset 945

Timestamp:

14-10-10 19:57:16 (6 years ago)

Author:

j.saito@…

Message:

Sorted out sources for null-pointer exceptions.

File:

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

trunk/grails-app/controllers/RestController.groovy

@@ -41 +41 @@
          */
         private def auth() {
-
             credentials = BasicAuthentication.credentialsFromRequest(request)           
-                requestUser = AuthenticationService.authenticateUser(credentials.u, credentials.p)
+        requestUser = AuthenticationService.authenticateUser(credentials.u, credentials.p)
                 
-                // we circumvene the user
                 if(!requestUser) {
                     response.sendError(403)
@@ -66 +64 @@
                 credentials = BasicAuthentication.credentialsFromRequest(request)
                 def reqUser = AuthenticationService.authenticateUser(credentials.u, credentials.p)
-
-                if (reqUser) {
-                        isUser = true
-                }
-                else {
-                        isUser = false
-                }
+                isUser = reqUser ? true : false
                 def reply = ['authenticated':isUser]
                 render reply as JSON
         }
+
 
         /**
@@ -159 +152 @@
                 if( params.assayToken ) {
                         def assay = Assay.find( "from Assay as a where externalAssayID=?",[params.assayToken])
-                        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 
+                        if( assay )  {
+                                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 
+                                }
                         }
                 }
@@ -194 +189 @@
                 if( params.studyToken ) {
                         def study = Study.find( "from Study as s where code=?",[params.studyToken])
-                        study.giveFields().each { field ->
-                                def name = field.name
-                                def value = study.getFieldValue( name )
-                                items[name] = value
+                        if(study) {
+                                study.giveFields().each { field ->
+                                        def name = field.name
+                                        def value = study.getFieldValue( name )
+                                        items[name] = value
+                                }
                         }
         }
@@ -222 +219 @@
                 if( params.assayToken ) {
                         def assay = Assay.find( "from Assay as a where externalAssayID=?",[params.assayToken])
-                        assay.giveFields().each { field ->
-                                def name = field.name
-                                def value = assay.getFieldValue( name )
-                                items[name] = value
+                        if(assay) {
+                                assay.giveFields().each { field ->
+                                        def name = field.name
+                                        def value = assay.getFieldValue( name )
+                                        items[name] = value
+                                }
                         }
         }
@@ -259 +258 @@
                 if( params.assayToken && params.sampleToken ) {
                         def assay = Assay.find( "from Assay as a where externalAssayID=?",[params.assayToken])
-                        assay.getSamples().each { sample ->
-                                if( sample.name == params.sampleToken ) {
-                                        items = [ 
-                                                '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 )
-                                                items[name] = value
-                        }
+                        if(assay) {
+                                assay.getSamples().each { sample ->
+                                        if( sample.name == params.sampleToken ) {
+                                                        items = [ 
+                                                        '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 )
+                                                        items[name] = value
+                                }
+                                        }
                                 }
                         }
@@ -278 +279 @@
 
         def getAuthorizationLevel = {
-                // Warning: this case is only for testing! 
-                // The code below should be used until the
-                // authorization works. 
-                /*if( params.isOwner || params.isEditor || params.Owner ) {
-                        return render ['isReader':params.isOwner, 
-                                'isEditor':params.isEditor, 'isOwner':params.isOwner] as JSON
-                }*/
-
                 // in future the users authorization level will be based on authorization model         
                 if( params.studyToken ) {
@@ -292 +285 @@
                         if(study) study.subjects.each { subjects.push it.name }
                 }
-
-                /*def user
-                if( params.user ) {
-                        def id = params.user
-                        user = users.find( "from User as u where u.code=?", [id])
-                }*/
 
                 def perm = study.getPermissions(requestUser)