Changeset 1455

Timestamp:

Jan 28, 2011, 1:41:02 PM (12 years ago)

Author:

s.h.sikkema@…

Message:

Using moduleCommunicationService now to fetch measurement data from module

Location:

trunk

Files:

• grails-app/controllers/dbnp/studycapturing/AssayController.groovy (modified) (1 diff)
• grails-app/services/dbnp/authentication/AuthenticationService.groovy (modified) (1 diff)
• grails-app/services/dbnp/modules/ModuleCommunicationService.groovy (modified) (1 diff)
• grails-app/services/dbnp/studycapturing/AssayService.groovy (modified) (5 diffs)
• grails-app/views/pilot/show.gsp (modified) (1 diff)
• test/unit/dbnp/studycapturing/AssayControllerTests.groovy (modified) (1 diff)
• test/unit/dbnp/studycapturing/AssayServiceTests.groovy (added)

trunk/grails-app/controllers/dbnp/studycapturing/AssayController.groovy

@@ -160 +160 @@
         } catch (Exception e) {
 
-            flash.errorMessage = e.cause?.message ?: e.message
+            flash.errorMessage = e.message
             redirect action: 'selectAssay'
 

trunk/grails-app/services/dbnp/authentication/AuthenticationService.groovy

@@ -54 +54 @@
     public boolean logOffRemotely( String consumer, String token ) {
         def user = getSessionAuthenticatedUser(consumer, token)
-        
+
         if( user ) {
             user.refresh()

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

@@ -15 +15 @@
 package dbnp.modules
 
-import nl.grails.plugins.gdt.*
 import dbnp.studycapturing.*
 import grails.converters.*
+import javax.servlet.http.HttpServletResponse
 
 class ModuleCommunicationService implements Serializable {

trunk/grails-app/services/dbnp/studycapturing/AssayService.groovy

@@ -23 +23 @@
     boolean transactional = true
     def authenticationService
+    def moduleCommunicationService
 
     /**
@@ -36 +37 @@
      * @return The assay data structure as described above.
      */
-    def collectAssayData(assay, consumer) {
-
-        def path = "/rest/getMeasurementData?assayToken=$assay.token"
+    def collectAssayData(assay, consumer) throws Exception {
+
+        def path = "/rest/getMeasurementData?assayToken=$assay.assayUUID"
 
         // check whether module is reachable
-        if (!isModuleReachable(consumer, path)) {
+        if (!moduleCommunicationService.isModuleReachable(consumer)) {
 
             throw new Exception('Module is not reachable')
@@ -143 +144 @@
     }
 
-    def isModuleReachable(consumer, path) {
-
-        def connection = "$consumer$path".toURL().openConnection()
-        try {
-            connection.responseCode == HttpServletResponse.SC_OK
-        } catch(e) { false }
-        
-    }
-
     /**
      * Retrieves module measurement data through a rest call to the module
@@ -161 +153 @@
     def requestModuleMeasurements(consumer, path) {
 
-        // create a random session token that will be used to allow to module to
-        // sync with gscf prior to presenting the measurement data
-        def sessionToken = UUID.randomUUID().toString()
-
-        if (!authenticationService.isLoggedIn()) {
-            // should not happen because we can only get here when a user is
-            // logged in...
-            throw new Exception('User is not logged in.')
-        }
-
-        // put the session token to work
-        authenticationService.logInRemotely( consumer, sessionToken, authenticationService.getLoggedInUser() )
-
-        // Gather measurement data from the module
-        try {
-
-            def restResponse = "$consumer$path&sessionToken=$sessionToken".toURL().text
-
-        } catch (e) {
-
-            throw new Exception("Module did not respond to request for measurements. Cause: $e")
-            
-        }
-
-        def (sampleTokens, measurementTokens, moduleData) = JSON.parse( restResponse )
-
-        // Dispose of the ephemeral session token
-        authenticationService.logOffRemotely(consumer, sessionToken)
+        def (sampleTokens, measurementTokens, moduleData) = moduleCommunicationService.callModuleRestMethodJSON(consumer, consumer+path)
+
+        if (!sampleTokens?.size()) return []
 
         def lastDataIndex   = moduleData.size() - 1
@@ -242 +209 @@
                 data.each { category ->
 
-                    if (category.value != [:]) {
+                    if (category.value.size()) {
 
                         // put category keys into first row separated by null values

trunk/grails-app/views/pilot/show.gsp

@@ -63 +63 @@
                                                                 linkDest="${createLink(action:'show', id:studyInstance.id)}"
                                                                 linkText='Go back to GSCF'
-                                                                frameSource="${assay.module.url}/assay/showByToken?id=${assay.externalAssayID}&sessionToken=${session.id}"
+                                                                frameSource="${assay.module.url}/assay/showByToken?id=${assay.giveUUID()}&sessionToken=${session.id}"
                                                                 pageTitle="Assay View in Module">
                                                                 ${assay.name}

trunk/test/unit/dbnp/studycapturing/AssayControllerTests.groovy

@@ -43 +43 @@
         controller.assayService = [
 
-                collectAssayData:                   {a, b -> def e = new Exception('msga'); e.metaClass.cause = new Exception('msg1'); throw e },
-                exportColumnWiseDataToExcelFile:    {a, b -> def e = new Exception('msgb'); e.metaClass.cause = new Exception('msg2'); throw e }
+                collectAssayData:                   {a, b -> throw new Exception('msg1') },
+                exportColumnWiseDataToExcelFile:    {a, b -> throw new Exception('msg2') }
 
         ]