Merge pull request #809 from AtlasOfLivingAustralia/hotfix_download_f…

…ields Hotfix download fields
AtlasOfLivingAustralia · Jun 6, 2023 · 6105262 · 6105262
2 parents c56b956 + 4001a58
commit 6105262
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -41,7 +41,7 @@ repositories {
 
 group = 'au.org.ala'
 
-version = '3.1.6'
+version = '3.1.7'
 
 
 boolean inplace = false

diff --git a/src/main/java/au/org/ala/biocache/dao/SearchDAOImpl.java b/src/main/java/au/org/ala/biocache/dao/SearchDAOImpl.java
@@ -730,7 +730,8 @@ public DownloadHeaders writeResultsFromIndexToStream(final DownloadRequestDTO do
         dd.resetCounts();
 
         // prepare requested download fields (defaults, substitutions)
-        prepareRequestedFields(downloadParams, !(dd.getAlaUser() == null || dd.getAlaUser().getRoles().isEmpty()));
+        boolean hasSensitiveRecordAccess = downloadService.getSensitiveFq(dd.getAlaUser() == null ? Collections.emptySet() : dd.getAlaUser().getRoles()) != null;
+        prepareRequestedFields(downloadParams, hasSensitiveRecordAccess);
 
         // prepare headers
         DownloadHeaders downloadHeaders = prepareHeaders(downloadParams);

diff --git a/src/main/java/au/org/ala/biocache/dto/OccurrenceIndex.java b/src/main/java/au/org/ala/biocache/dto/OccurrenceIndex.java
@@ -305,7 +305,14 @@ public class OccurrenceIndex {
             "sensitive_day",
             "sensitive_eventID",
             "sensitive_eventTime",
-            "sensitive_footprintWKT"};
+            "sensitive_footprintWKT",
+            "sensitive_locationRemarks",
+            "sensitive_month",
+            "sensitive_verbatimCoordinates",
+            "sensitive_verbatimEventDate",
+            "sensitive_verbatimLatitude",
+            "sensitive_verbatimLocality",
+            "sensitive_verbatimLongitude"};
     public static final String[] notSensitiveSOLRHdr = {LONGITUDE, LATITUDE, LOCALITY, EVENT_DATE, EVENT_DATE_END, GRID_REFERENCE, COORDINATE_UNCERTAINTY, DAY, EVENT_ID, FOOTPRINT_WKT};
     public static final String CONTAINS_SENSITIVE_PATTERN = StringUtils.join(sensitiveSOLRHdr, "|");