Added _profile param to BDR query #3169

Author: chrisala

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

@@ -13,6 +13,7 @@ class DataSetController {
     ProjectService projectService
     DataSetSummaryService dataSetSummaryService
     BdrService bdrService
+    WebService webService
 
     // Note that authorization is done against a project, so the project id must be supplied to the method.
     @PreAuthorise(accessLevel = 'editor')
@@ -158,6 +159,24 @@ class DataSetController {
         render response as JSON
     }
 
+    @PreAuthorise(accessLevel = 'admin')
+    def downloadProjectDataSets(String id, String format) {
+        if (!id) {
+            render status: HttpStatus.NOT_FOUND
+            return
+        }
+        List supportedFormats = grailsApplication.config.getProperty('bdr.dataSet.formats', List)
+        if (!format) {
+            format = supportedFormats[0]
+        }
+        if (!format in supportedFormats) {
+            render status: HttpStatus.BAD_REQUEST
+            return
+        }
+
+        bdrService.downloadProjectDataSet(id, format, response)
+    }
+
     @PreAuthorise(accessLevel = 'admin')
     def download(String id, String dataSetId, String format) {
         Map projectData = projectData(id)

grails-app/services/au/org/ala/merit/BdrService.groovy

@@ -39,16 +39,26 @@ class BdrService {
 
     AccessTokenCache accessTokenCache
 
+    void downloadProjectDataSet(String projectId, String format, HttpServletResponse response) {
+        String query = (projectQuery    (projectId) as JSON).toString()
+        executeBdrQuery(query, format, response)
+    }
+
     void downloadDataSet(String projectId, String dataSetId, String format, HttpServletResponse response) {
+        String query = (dataSetQuery(dataSetId) as JSON).toString()
+        executeBdrQuery(query, format, response)
+    }
+
+    private void executeBdrQuery(String query, String format, HttpServletResponse response) {
         String azureToken = getAzureAccessToken()
 
         String bdrBaseUrl = grailsApplication.config.getProperty('bdr.api.url')
         Integer readTimeout = grailsApplication.config.getProperty('bdr.api.readTimeout', Integer, 60000)
         format = URLEncoder.encode(format, 'UTF-8')
         String url = bdrBaseUrl+'/cql?_mediatype='+format
-        String query = (dataSetQuery(dataSetId) as JSON).toString()
         String encodedQuery = URLEncoder.encode(query, "UTF-8")
 
+        url+="&_profile="+"bdr-feature-human"
         url+="&filter="+encodedQuery
 
         log.info("Downloading data set from BDR: $url")
@@ -89,7 +99,7 @@ class BdrService {
         accessToken.getToken()
     }
 
-    private Map dataSetQuery(String dataSetId) {
+    private static Map dataSetQuery(String dataSetId) {
         Map query = [
                 "op": "and",
                 "args": [
@@ -100,6 +110,17 @@ class BdrService {
         query
     }
 
+    private static Map projectQuery(String projectId) {
+        Map query = [
+                "op": "and",
+                "args": [
+                        ["op":"=","args":[["property":"https://schema.org/isPartOf"], "https://linked.data.gov.au/dataset/bdr/"+projectId]],
+                        ["op":"=","args":[["property":"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"],"http://www.opengis.net/ont/geosparql#Feature"]]
+                ]
+        ]
+        query
+    }
+
 
     String getTokenFromCognitoIdentityPool(String userToken) {