Changed bulkUpdate to use DataSetSummaryService #3174

AtlasOfLivingAustralia · May 6, 2024 · bd7494f · bd7494f
1 parent b9419ec
commit bd7494f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/grails-app/services/au/org/ala/merit/DataSetSummaryService.groovy b/grails-app/services/au/org/ala/merit/DataSetSummaryService.groovy
@@ -6,6 +6,7 @@ import org.apache.http.HttpStatus
 class DataSetSummaryService {
 
     static String DATA_SET_PATH_PREFIX = 'dataSetSummary/'
+    static String BULK_UPDATE_PATH = 'bulkUpdate/'
     WebService webService
     GrailsApplication grailsApplication
 
@@ -29,6 +30,12 @@ class DataSetSummaryService {
         webService.doPost(url, dataSet)
     }
 
+    Map bulkUpdateDataSets(String projectId, List dataSets) {
+        String url = grailsApplication.config.getProperty('ecodata.baseUrl')+
+                DATA_SET_PATH_PREFIX+BULK_UPDATE_PATH+projectId
+        webService.doPost(url, [dataSets:dataSets])
+    }
+
     Map deleteDataSet(String projectId, String dataSetId) {
         String url = grailsApplication.config.getProperty('ecodata.baseUrl')+DATA_SET_PATH_PREFIX+projectId+'/'+dataSetId
         int status = webService.doDelete(url)

diff --git a/grails-app/services/au/org/ala/merit/ProjectService.groovy b/grails-app/services/au/org/ala/merit/ProjectService.groovy
@@ -43,6 +43,7 @@ class ProjectService  {
     ProjectConfigurationService projectConfigurationService
     def programService
     LockService lockService
+    DataSetSummaryService dataSetSummaryService
 
     def get(id, levelOfDetail = "", includeDeleted = false) {
 
@@ -2120,13 +2121,15 @@ class ProjectService  {
      * @return
      */
     Map bulkUpdateDataSetSummaries(String projectId, String reportId, List dataSetIds, Map properties) {
-        boolean dirty = false
+
         List errors = []
         Map project = get(projectId)
+        List<Map> toUpdate = []
         dataSetIds?.each { String dataSetId ->
 
             Map dataSet = project.custom?.dataSets?.find{it.dataSetId == dataSetId}
             if (dataSet) {
+                boolean dirty = false
                 // Associate the data set with the report
                 if (!dataSet.reportId) {
                     dataSet.reportId = reportId
@@ -2150,6 +2153,9 @@ class ProjectService  {
                         dirty = true
                     }
                 }
+                if (dirty) {
+                    toUpdate << dataSet
+                }
             }
             else {
                 errors << "Report ${reportId} references data set ${dataSetId} which does not exist in project ${projectId}"
@@ -2161,13 +2167,13 @@ class ProjectService  {
         }.each {
             it.reportId = null
             it.publicationStatus = null
-            dirty = true
+            toUpdate << it
         }
 
         Map result = [:]
-        if (dirty) {
+        if (toUpdate) {
             // Save the changes to the data sets
-            result = updateUnchecked(project.projectId, [custom: project.custom])
+            result = dataSetSummaryService.bulkUpdateDataSets(projectId, toUpdate)
             if (result?.error) {
                 errors << result.error
             }