Merge pull request #193 from AtlasOfLivingAustralia/feature/issueEcodata133

Added an ActivityForm search operation AtlasOfLivingAustralia/ecodata…

Author: salomon-j

grails-app/services/au/org/ala/ecodata/forms/ActivityFormService.groovy

@@ -10,6 +10,7 @@ import org.grails.web.json.JSONObject
 class ActivityFormService {
 
     static final String ACTIVITY_FORM_PATH = '/activityForm'
+    static final String ACTIVITY_FORM_SEARCH_PATH = '/activityForm/search'
     def webService
     def grailsApplication
 
@@ -66,6 +67,21 @@ class ActivityFormService {
         model
     }
 
+    /**
+     * Returns a Map with keys: [resp:List<Map>, statusCode:<>]
+     * @param criteria Used to build a GORM criteria query, e.g. [category:'paratoo']
+     */
+    Map searchActivityForms(Map criteria) {
+        String url = grailsApplication.config.getProperty('ecodata.service.url') +
+                ACTIVITY_FORM_SEARCH_PATH
+        Map result = webService.doPost(url, criteria)
+        if (!result || result.error) {
+            result = null
+        }
+
+        result
+    }
+
     private Map missingForm(String name, Integer version) {
         String message = "No activity form found with name ${name}"
         if (version) {

grails-app/services/au/org/ala/ecodata/forms/WebService.groovy

@@ -30,4 +30,8 @@ class WebService {
     def doPostWithParams(String url, Map params) {
         [:]
     }
+
+    def doPost(String url, Map params) {
+        [:]
+    }
 }

src/test/groovy/au/org/ala/ecodata/forms/ActivityFormServiceSpec.groovy

@@ -80,4 +80,12 @@ class ActivityFormServiceSpec extends Specification implements ServiceUnitTest<A
 
         result.outputModels["Not found"] != null
     }
+
+    void "The service can interface to ecodata to search available activity forms"() {
+        when:
+        service.searchActivityForms([type:'Protocol'])
+
+        then:
+        1 * webService.doPost({it.endsWith(ActivityFormService.ACTIVITY_FORM_SEARCH_PATH)}, [type:'Protocol'])
+    }
 }