Changeset 2192

Timestamp:

Mar 30, 2012, 11:34:46 AM (11 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) (4 diffs)

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

@@ -223 +223 @@
             response.sendError(401, 'Unauthorized')
         } else {
-//            def assays = apiService.flattenDomainData( study.assays )
-
-            def serviceURL = "${assay.module.url}/rest/getMeasurements"
-            def serviceArguments = "assayToken=${assayToken}"
-
-//            def callModuleMethod( String consumer, String restUrl, String args = null, String requestMethod = "GET", SecUser remoteUser = null) {
-
-            def json = moduleCommunicationService.callModuleMethod(
-                    assay.module.url,
-                    serviceURL,
-                    serviceArguments,
-                    "POST",
-                    user
-            );
+//            def serviceURL = "${assay.module.url}/rest/getMeasurements"
+//            def serviceArguments = "assayToken=${assayToken}"
+//            def json = moduleCommunicationService.callModuleMethod(
+//                    assay.module.url,
+//                    serviceURL,
+//                    serviceArguments,
+//                    "POST",
+//                    user
+//            );
+
+            def json = ApiService.getMeasurements(assay, user)
 
 

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

@@ -16 +16 @@
 
 import java.security.MessageDigest
+import dbnp.studycapturing.Assay
+import dbnp.authentication.SecUser
 
 class ApiService {
@@ -21 +23 @@
     static final String API_SECRET = "th!s_sH0uld^Pr0bab7y_m0v3_t%_th3_uSeR_d0Ma!n_ins7ead!"
     static transactional = true
+    def moduleCommunicationService
 
     /**
@@ -50 +53 @@
         }
     }
-    
 
-    def flattenDomainData(elements) {
+    /**
+     * flatten domain data to relevant data to return in an api
+     * call and not to expose domain internals
+     *
+     * @param elements
+     * @return
+     */
+    def flattenDomainData(List elements) {
         println elements.class
         def items = []
@@ -84 +93 @@
         return items
     }
+
+    def getMeasurements(Assay assay, SecUser user) {
+        def serviceURL = "${assay.module.url}/rest/getMeasurements"
+        def serviceArguments = "assayToken=${assay.assayUUID}"
+
+        // call module method
+        def json = moduleCommunicationService.callModuleMethod(
+                assay.module.url,
+                serviceURL,
+                serviceArguments,
+                "POST",
+                user
+        );
+
+        return json
+    }
 }