Changeset 934 for trunk/src/groovy/dbnp/rest/common/CommunicationManager.groovy

Timestamp:

Oct 8, 2010, 2:47:23 PM (13 years ago)

Author:

j.saito@…

Message:

Adjusted CommunicationManager? to match closer with CommunicationManager? in SAM.
Added support for "token" notation of REST services directly in Study and Assay domain classes.
Cleaned up and tested communication further.

File:

• trunk/src/groovy/dbnp/rest/common/CommunicationManager.groovy (modified) (5 diffs)

trunk/src/groovy/dbnp/rest/common/CommunicationManager.groovy

@@ -30 +30 @@
     def public static DSPServerURL  = "http://localhost:8080/gscf"
 
-     
+
 
     /**
@@ -109 +109 @@
                         def map = [:]
                     def args = strangeGroovyArgs[0]        // groovy nests the parameters of the methods in some other array
-                        for( i in 0..(params.size-1) ) {
-                                def param = params[i]
-                            map[param] = args[i]
-                        }
+
+                        if(params.size > 0 )
+                        {
+                                for( i in 0..(params.size-1) ) {
+                                        def param = params[i]
+                                        map[param] = args[i]
+                                }
+                        }
+
                         return closure( getRestResource( serverURL, restName, map ) )
                 }
@@ -154 +159 @@
         def url = GSCFServerURL + '/rest'
                 addRestWrapper( url , 'getStudies' )
-                addRestWrapper( url , 'getSubjects', ['externalStudyID'] )
-                addRestWrapper( url , 'getAssays',   ['externalStudyID'] )
-                addRestWrapper( url , 'getSamples',  ['externalAssayID'] )
-    }
+        addRestWrapper( url , 'getSubjects', ['studyToken'] )
+                addRestWrapper( url , 'getAssays',   ['studyToken','moduleURL'] )
+                addRestWrapper( url , 'getSamples',  ['assayToken'] )
+        }
 
 
@@ -173 +178 @@
                 // register method that links to the SAM view for showing a SimpleAssay 
         // parameters: externalAssayID
-                addViewWrapper( 'getAssayShowURL', url, 'simpleAssay/showByExternalID', ['externalAssayID'] )
+                addViewWrapper( 'getAssayShowURL', url, 'simpleAssay/show', ['externalAssayID'] )
 
                 // register method that links to the SAM view for editing a SimpleAssay 
@@ -192 +197 @@
                 //                               ["studies":[NuGO PPS human study], 
                 //               "samples":[[ [...], dbnp.studycapturing.Sample: 1]]]
-                def closure1 = { map ->
-                    def studies = []
-                    def samples = []
+                def closure = { map -> 
+                    def studies = []    
+                    def assays  = []    
                         def studiesHQ = "from dbnp.studycapturing.Study as s where s.code=?"
                         map['studyIds'].each { studies.add( dbnp.studycapturing.Study.find(studiesHQ,[it]) ) }
-                        map['Samples'].each { samSample ->
-                                def sampleID = samSample['externalSampleID']
-                            def sampleHQ = "from dbnp.studycapturing.Sample as a where a.externalSampleID='${sampleID}'"
-                                def sample = dbnp.studycapturing.Sample.find(sampleHQ)
-                                samples.add( [samSample,sample] )
-                        }
-                        return [studies:studies, samples:samples]
-                }
-
-                addRestWrapper( url+'/rest', 'getQueryResult',  ['query'], closure1 )
+                        map['assays'].each { samAssay ->
+                                def assayID = samAssay['externalAssayID']
+                            def assayHQ = "from dbnp.studycapturing.Assay as a where a.externalAssayID='${assayID}'"
+                                def assay = dbnp.studycapturing.Assay.find(assayHQ)
+                                assays.add( [samAssay,assay] )
+                        } 
+                        return [studies:studies, assays:assays] 
+                }
+
+                addRestWrapper( url+'/rest', 'getQueryResult',  ['query'], closure )