Changeset 2198

Timestamp:

Mar 30, 2012, 12:43:56 PM (11 years ago)

Author:

work@…

Message:

• added getAssayData api call
• disable validation on development and ci

Location:

trunk/grails-app

Files:

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

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

@@ -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
-//            );
-
             // define result
             def result = [
-                    'measurements'  : apiService.getMeasurements(assay, user),
-//                'measurements'  : ApiService.getMeasurements(assay, user),
+                'measurements'  : apiService.getMeasurements(assay, user),
                 'data'          : apiService.getMeasurementData(assay, user),
                 'metaData'      : apiService.getMeasurementMetaData(assay, user)

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

@@ -32 +32 @@
      */
     def validateRequest(String deviceID, String validation) {
-        return true
+        // disable validation check on development and ci
+        if (['development', 'ci'].contains(grails.util.GrailsUtil.environment)) {
+            return true
+        }
 
         // get token for this device ID