Changeset 1941

Timestamp:

Jun 27, 2011, 2:57:45 PM (11 years ago)

Author:

robert@…

Message:

• Implemented getStudyVersions rest call to assist module synchronization
• Removed debug println statements

Location:

trunk/grails-app

Files:

• controllers/RestController.groovy (modified) (3 diffs)
• services/dbnp/modules/ModuleNotificationService.groovy (modified) (2 diffs)

trunk/grails-app/controllers/RestController.groovy

@@ -136 +136 @@
          */
         def getStudies = {
-
+                def user = authenticationService.getRemotelyLoggedInUser( params.consumer, params.token )
+                
                 List returnStudies = []
                 List studies = []
@@ -169 +170 @@
                 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 ))) {
@@ -243 +243 @@
         }
 
+        /**
+        * REST resource for data modules.
+        * Consumer and token should be supplied via URL parameters.
+        * Provides the version number of all studies readable by this user
+        *
+        * @param        consumer        consumer name of the calling module
+        * @param        token           token for the authenticated user (e.g. session_id)
+        * @return  JSON object list containing studies with 'studyToken', and 'version'
+        *
+        * A 404 error might occur if the study doesn't exist, and a 401 error if the user is not
+        * authorized to access this study.
+        *
+        * Example. REST call with one studyToken.
+        *
+        * Call: http://localhost:8080/gscf/rest/getStudyVersions
+        *
+        * Result: [{"studyToken":"PPSH","version":31},{"studyToken":"Other study", "version":3}]
+        */
+   def getStudyVersions = {
+           // Check which user has been logged in
+           def user = authenticationService.getRemotelyLoggedInUser( params.consumer, params.token )
+           
+           def jsonList = []
+           
+                Study.giveReadableStudies( user ).each { study ->
+                        if(study) {
+                                jsonList << [studyToken:study.giveUUID(), version: study.version]
+                        }
+                }
+
+                // set output header to json
+                response.contentType = 'application/json'
+
+                render jsonList as JSON
+   }
+
+        
         /**
          * REST resource for data modules.

trunk/grails-app/services/dbnp/modules/ModuleNotificationService.groovy

@@ -41 +41 @@
                         return
                         
-                log.info( "Invalidate " + study.code )
+                log.info( "Invalidate " + study )
 
-                def modules = AssayModule.findByNotify(true);
+                def modules = AssayModule.findAllByNotify(true);
                 
                 // If no modules are set to notify, return
@@ -85 +85 @@
                 Thread.start { 
                         urls.each { url ->
+                                log.info( "GSCF NOTIFY MODULE OF STUDY CHANGE: ${url}")
                                 try {
                                         def connection = url.toURL().openConnection()