Changeset 2193

Timestamp:

Mar 30, 2012, 11:42:54 AM (12 years ago)

Author:

work@…

Message:

• added getAssayData api call

Location:

trunk/grails-app

Files:

• controllers/api/ApiController.groovy (modified) (1 diff)
• services/api/ApiService.groovy (modified) (2 diffs)

trunk/grails-app/controllers/api/ApiController.groovy

@@ -233 +233 @@
 //            );
 
-            def json = ApiService.getMeasurements(assay, user)
-
-
             // define result
             def result = [
-                'bla': 'hoi',
-                'json' : json
+                'measurements'  : ApiService.getMeasurements(assay, user),
+                'data'          : ApiService.getMeasurementData(assay, user),
+                'metaData'      : ApiService.getMeasurementMetaData(assay, user)
             ]
 

trunk/grails-app/services/api/ApiService.groovy

@@ -19 +19 @@
 import dbnp.authentication.SecUser
 
-class ApiService {
+class ApiService implements Serializable {
     // the shared secret used to validate api calls
     static final String API_SECRET = "th!s_sH0uld^Pr0bab7y_m0v3_t%_th3_uSeR_d0Ma!n_ins7ead!"
@@ -109 +109 @@
         return json
     }
+
+    def getMeasurementData(Assay assay, SecUser user) {
+        def serviceURL = "${assay.module.url}/rest/getMeasurementData"
+        def serviceArguments = "assayToken=${assay.assayUUID}&verbose=true"
+
+        // call module method
+        def json = moduleCommunicationService.callModuleMethod(
+                assay.module.url,
+                serviceURL,
+                serviceArguments,
+                "POST",
+                user
+        );
+
+        return json
+    }
+
+    def getMeasurementMetaData(Assay assay, SecUser user) {
+        def serviceURL = "${assay.module.url}/rest/getMeasurementMetaData"
+        def serviceArguments = "assayToken=${assay.assayUUID}"
+
+        // call module method
+        def json = moduleCommunicationService.callModuleMethod(
+                assay.module.url,
+                serviceURL,
+                serviceArguments,
+                "POST",
+                user
+        );
+
+        return json
+    }
 }