Use new lists API, move WebService to ecodata-client-plugin #3454

build.gradle

@@ -188,7 +188,7 @@ dependencies {
     providedCompile "io.methvin:directory-watcher:0.4.0"
 
     if (!Boolean.valueOf(inplace)) {
-        implementation "org.grails.plugins:ecodata-client-plugin:7.2.1"
+        implementation "org.grails.plugins:ecodata-client-plugin:7.3-SNAPSHOT"
     }
 }
 

grails-app/conf/application.groovy

@@ -125,9 +125,6 @@ if (!sld.polgon.default.url) {
 if (!sld.polgon.highlight.url) {
     sld.polgon.highlight.url = "http://fish.ala.org.au/data/fc-highlight.sld"
 }
-if (!lists.baseURL) {
-    lists.baseURL = "https://lists.ala.org.au"
-}
 
 //this is for SpeciesService class in Merit
 if (!bie.service.baseURL) {
@@ -207,7 +204,8 @@ if (!pdfgen.baseURL){
 
 abn.abnLookupToken = "Insert abn Token here"
 abn.abnUrl= "https://abr.business.gov.au/json/AbnDetails.aspx?abn="
-
+lists.baseURL = "https://lists-ws.test.ala.org.au"
+//lists.baseURL = "https://lists-test.ala.org.au/ws"
 esp.activities.admin = 'ESP Annual Report Submission'
 reports.initialScrollPositionDelay = 1000
 risks.scheduleCheckingPeriod = 7

grails-app/controllers/au/org/ala/merit/ProxyController.groovy

@@ -25,10 +25,6 @@ class ProxyController {
         render webService.get("${grailsApplication.config.getProperty('lists.baseURL')}/ws/speciesList?druid=${params.druid}", false)
     }
 
-    def speciesItemsForList() {
-        render webService.get("${grailsApplication.config.getProperty('lists.baseURL')}/ws/speciesListItems/${params.druid}?includeKVP=true", false)
-    }
-
     def intersect(){
         render webService.get("${grailsApplication.config.getProperty('spatial.layersUrl')}/intersect/${params.layerId}/${params.lat}/${params.lng}", false)
     }

grails-app/controllers/au/org/ala/merit/SpeciesListController.groovy

@@ -0,0 +1,18 @@
+package au.org.ala.merit
+
+import au.org.ala.ecodata.forms.SpeciesListService
+
+class SpeciesListController {
+
+    static responseFormats = ['json', 'xml']
+    private static final int DEFAULT_PAGE_SIZE = 500
+    SpeciesListService speciesListService
+
+    def speciesListItems(String druid, Integer pageSize, Integer page) {
+        if (!druid) {
+            respond null
+        }
+        List speciesList = speciesListService.speciesListItems(druid, pageSize ?: DEFAULT_PAGE_SIZE, page ?: 1)
+        respond speciesList
+    }
+}