Changeset 2215

Timestamp:

05-04-12 20:20:34 (2 years ago)

Author:

work@…

Message:

- added testing versions of
getEventsForStudy
getSamplingEventsForStudy
getEventGroupsForStudy

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

@@ -218 +218 @@
 
     /**
+     * get all eventGroups for a study
+     *
+     * @param string deviceID
+     * @param string studyToken
+     * @param string validation md5 sum
+     */
+    def getEventGroupsForStudy = {
+        println "api::getEventGroupsForStudy: ${params}"
+
+        // fetch study
+        String studyToken   = (params.containsKey('studyToken')) ? params.studyToken : ''
+        def study           = Study.findByStudyUUID(studyToken)
+
+        // wrap result in api call validator
+        apiService.executeApiCall(params,response,'study',study,{
+            def eventGroups = apiService.flattenDomainData( study.eventGroups )
+
+            // define result
+            def result = [
+                'count'         : eventGroups.size(),
+                'eventGroups'   : eventGroups
+            ]
+
+            // set output headers
+            response.status = 200
+            response.contentType = 'application/json;charset=UTF-8'
+
+            if (params.containsKey('callback')) {
+                render "${params.callback}(${result as JSON})"
+            } else {
+                render result as JSON
+            }
+        })
+    }
+
+    /**
+     * get all events for a study
+     *
+     * @param string deviceID
+     * @param string studyToken
+     * @param string validation md5 sum
+     */
+    def getEventsForStudy = {
+        println "api::getEventsForStudy: ${params}"
+
+        // fetch study
+        String studyToken   = (params.containsKey('studyToken')) ? params.studyToken : ''
+        def study           = Study.findByStudyUUID(studyToken)
+
+        // wrap result in api call validator
+        apiService.executeApiCall(params,response,'study',study,{
+            def events = apiService.flattenDomainData( study.events )
+
+            // define result
+            def result = [
+                'count' : events.size(),
+                'events': events
+            ]
+
+            // set output headers
+            response.status = 200
+            response.contentType = 'application/json;charset=UTF-8'
+
+            if (params.containsKey('callback')) {
+                render "${params.callback}(${result as JSON})"
+            } else {
+                render result as JSON
+            }
+        })
+    }
+
+    /**
+     * get all samplingEvents for a study
+     *
+     * @param string deviceID
+     * @param string studyToken
+     * @param string validation md5 sum
+     */
+    def getSamplingEventsForStudy = {
+        println "api::getSamplingEventsForStudy: ${params}"
+
+        // fetch study
+        String studyToken   = (params.containsKey('studyToken')) ? params.studyToken : ''
+        def study           = Study.findByStudyUUID(studyToken)
+
+        // wrap result in api call validator
+        apiService.executeApiCall(params,response,'study',study,{
+            def samplingEvents = apiService.flattenDomainData( study.samplingEvents )
+            println study.samplingEvents.dump()
+
+            // define result
+            def result = [
+                    'count'         : samplingEvents.size(),
+                    'samplingEvents': samplingEvents
+            ]
+
+            // set output headers
+            response.status = 200
+            response.contentType = 'application/json;charset=UTF-8'
+
+            if (params.containsKey('callback')) {
+                render "${params.callback}(${result as JSON})"
+            } else {
+                render result as JSON
+            }
+        })
+    }
+
+    /**
      * get all samples for an assay
      *

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

@@ -107 +107 @@
         // iterate through elements
         elements.each {
-            def fields  = it.giveFields()
+            def fields  = (it.respondsTo('giveFields')) ? it.giveFields(): []
             def item    = [:]
+
+            // check if element has a name
+            ['name','description'].each { checkName ->
+                if (it.hasProperty(checkName)) item[checkName] = it[checkName]
+            }
 
             // add token