Changeset 2195

Timestamp:

30-03-12 11:57:20 (2 years ago)

Author:

work@…

Message:

- added getAssayData api call

Location:

trunk/grails-app

Files:

• controllers/api/ApiController.groovy (modified) (2 diffs)
• services/api/ApiService.groovy (modified) (2 diffs)
• views/api/index.gsp (modified) (2 diffs)

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

@@ -185 +185 @@
         } else {
             def assays = apiService.flattenDomainData( study.assays )
-            
+
             // define result
             def result = [
@@ -223 +223 @@
             response.sendError(401, 'Unauthorized')
         } else {
-            def serviceURL = "${assay.module.url}/rest/getMeasurements"
-            def serviceArguments = "assayToken=${assayToken}"
-            def measurements = moduleCommunicationService.callModuleMethod(
-                    assay.module.url,
-                    serviceURL,
-                    serviceArguments,
-                    "POST",
-                    user
-            );
+//            def serviceURL = "${assay.module.url}/rest/getMeasurements"
+//            def serviceArguments = "assayToken=${assayToken}"
+//            def measurements = moduleCommunicationService.callModuleMethod(
+//                    assay.module.url,
+//                    serviceURL,
+//                    serviceArguments,
+//                    "POST",
+//                    user
+//            );
 
             // define result
             def result = [
-                    'measurements'  : measurements
+                    'measurements'  : apiService.getMeasurements(assay, user)
 //                'measurements'  : ApiService.getMeasurements(assay, user),
 //                'data'          : ApiService.getMeasurementData(assay, user),

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

@@ -22 +22 @@
     // the shared secret used to validate api calls
     static final String API_SECRET = "th!s_sH0uld^Pr0bab7y_m0v3_t%_th3_uSeR_d0Ma!n_ins7ead!"
-    static transactional = true
+    static transactional = false
     def moduleCommunicationService
 
@@ -62 +62 @@
      */
     def flattenDomainData(List elements) {
-        println elements.class
         def items = []
 

trunk/grails-app/views/api/index.gsp

@@ -63 +63 @@
     <li><a href="#getSubjectsForStudy">getSubjectsForStudy</a> - fetch all subjects in a given study</li>
     <li><a href="#getAssaysForStudy">getAssaysForStudy</a> - fetch all assays in a given study</li>
+    <li><a href="#getAssayData">getAssayData</a> - fetch all measurement data for a given assay</li>
 
 <a name="authenticate"></a>
@@ -277 +278 @@
     </blockquote>
 </p>
+
+<a name="getAssayData"></a>
+<h1>getAssaysData</h1>
+<h3>url: <g:createLink controller="api" action="getAssaysData" absolute="true" /></h3>
+<p>
+    Returns the measurement data for a particular assay
+
+<h2>Request parameters</h2>
+<table>
+    <thead>
+    <th>argument</th>
+    <th>type</th>
+    <th>length</th>
+    <th>description</th>
+    <th>example</th>
+    <th>required</th>
+    </thead>
+    <tr>
+        <td>deviceID</td>
+        <td>string</td>
+        <td>36 (max)</td>
+        <td>a unique ID of the client device / application performing the call</td>
+        <td>9ae87836-d38d-4b86-be6a-eff93f2b049a</td>
+        <td>yes</td>
+    </tr>
+    <tr>
+        <td>validation</td>
+        <td>string</td>
+        <td>-</td>
+        <td><a href="http://www.miraclesalad.com/webtools/md5.php" target="_new">md5sum</a>( token + sequence + shared secret )</td>
+        <td>9ae87836d38d4b86be6aeff93f2b049a</td>
+        <td>yes</td>
+    </tr>
+    <tr>
+        <td>assayToken</td>
+        <td>string</td>
+        <td>255</td>
+        <td>assay token (see getAssays)</td>
+        <td>b6e0c6f4-d8db-4a43-91fa-a157d2d492f0</td>
+        <td>yes</td>
+    </tr>
+</table>
+
+<h2>example reply</h2>
+<blockquote>
+...todo...
+</blockquote>
+</p>
+
 </div>
 </body>