AtlasOfLivingAustralia/fieldcapture#3430

- added new facets to support electorates and states from geographic info property and sites
AtlasOfLivingAustralia · Feb 5, 2025 · dc3b4da · dc3b4da
1 parent 417537d
commit dc3b4da
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 16 deletions.
diff --git a/grails-app/conf/data/mapping.json b/grails-app/conf/data/mapping.json
@@ -223,6 +223,12 @@
         "services": {
           "type": "keyword"
         },
+        "autoElectFacet": {
+          "type": "keyword"
+        },
+        "autoStateFacet": {
+          "type": "keyword"
+        },
         "extent":{
           "properties": {
             "geometry": {

diff --git a/grails-app/controllers/au/org/ala/ecodata/ProjectController.groovy b/grails-app/controllers/au/org/ala/ecodata/ProjectController.groovy
@@ -329,7 +329,7 @@ class ProjectController {
             render status:400, text: "projectId is a required parameter"
         } else {
             Map project = projectService.get(params.projectId)
-            asJson projectService.findStateAndElectorateForProject(project)
+            asJson projectService.findAndFormatStatesAndElectoratesForProject(project)
         }
     }
 

diff --git a/grails-app/services/au/org/ala/ecodata/ElasticSearchService.groovy b/grails-app/services/au/org/ala/ecodata/ElasticSearchService.groovy
@@ -1167,6 +1167,9 @@ class ElasticSearchService {
                 it.remove('periodTargets')
                 it.remove('outcomeTargets')
             } // Not useful for searching and is causing issues with the current mapping.
+
+            // add algorithmically generated or manually selected states and electorates of a project
+            projectMap << projectService.findStateAndElectorateForProject(projectMap)
         } else {
             projectMap.sites = siteService.findAllNonPrivateSitesForProjectId(project.projectId, SiteService.FLAT)
             // GeoServer requires a single attribute with project area. Cannot use `sites` property (above) since it has

diff --git a/grails-app/services/au/org/ala/ecodata/ProjectService.groovy b/grails-app/services/au/org/ala/ecodata/ProjectService.groovy
@@ -1248,13 +1248,35 @@ class ProjectService {
         []
     }
 
+    Map findAndFormatStatesAndElectoratesForProject(Map project) {
+        Map result = findStateAndElectorateForProject (project)
+        if(!result) {
+            return [:]
+        }
+
+        List elect = result.remove('autoElectFacet') as List
+        List state = result.remove('autoStateFacet') as List
+
+        if (state) {
+            result["primarystate"] = state.pop()
+            result["otherstate"] = state?.join("; ")
+        }
+
+        if (elect) {
+            result["primaryelect"] = elect.pop()
+            result["otherelect"] = elect.join("; ")
+        }
+
+        result
+    }
+
     /**
      * Find primary/other state(s)/electorate(s) for a project.
      * 1. If isDefault is true, use manually assigned state(s)/electorate(s) i.e project.geographicInfo.
      * 2. If isDefault is false or missing, use the state(s)/electorate(s) from sites using site precedence.
      * 3. If isDefault is false and there are no sites, use manual state(s)/electorate(s) in project.geographicInfo.
      */
-    Map findStateAndElectorateForProject(Map project) {
+    Map findStateAndElectorateForProject (Map project) {
         Map result = [:]
         if(project == null) {
             return result
@@ -1271,8 +1293,7 @@ class ProjectService {
                 if (facetName.name) {
                     List intersectionValues = intersections[layer]
                     if (intersectionValues) {
-                        result["primary${facetName.name}"] = intersectionValues.pop()
-                        result["other${facetName.name}"] = intersectionValues.join("; ")
+                        result["auto${facetName.name.capitalize()}Facet"] = intersectionValues
                     }
                 }
                 else
@@ -1283,14 +1304,12 @@ class ProjectService {
         //isDefault is true or false and no sites.
         if (geographicInfo) {
             // load from manually assigned electorates/states
-            if (!result.containsKey("primaryelect")) {
-                result["primaryelect"] = geographicInfo.primaryElectorate
-                result["otherelect"] = geographicInfo.otherElectorates?.join("; ")
+            if (!result.containsKey("autoElectFacet")) {
+                result["autoElectFacet"] = (geographicInfo.primaryElectorate ? [geographicInfo.primaryElectorate] : []) + geographicInfo.otherElectorates
             }
 
-            if (!result.containsKey("primarystate")) {
-                result["primarystate"] = geographicInfo.primaryState
-                result["otherstate"] = geographicInfo.otherStates?.join("; ")
+            if (!result.containsKey("autoStateFacet")) {
+                result["autoStateFacet"] = (geographicInfo.primaryState ? [geographicInfo.primaryState] : []) + geographicInfo.otherStates
             }
         }
 

diff --git a/src/main/groovy/au/org/ala/ecodata/reporting/ProjectXlsExporter.groovy b/src/main/groovy/au/org/ala/ecodata/reporting/ProjectXlsExporter.groovy
@@ -336,7 +336,7 @@ class ProjectXlsExporter extends ProjectExporter {
     }
 
     private void addPrimaryAndOtherIntersections (Map project) {
-        Map result = projectService.findStateAndElectorateForProject(project) ?: [:]
+        Map result = projectService.findAndFormatStatesAndElectoratesForProject(project) ?: [:]
         project << result
     }
 

diff --git a/src/test/groovy/au/org/ala/ecodata/ProjectServiceSpec.groovy b/src/test/groovy/au/org/ala/ecodata/ProjectServiceSpec.groovy
@@ -1118,7 +1118,7 @@ class ProjectServiceSpec extends MongoSpec implements ServiceUnitTest<ProjectSer
         metadataService.getGeographicFacetConfig("layer2", _) >> [name: "elect", grouped: false]
 
         when:
-        Map result = service.findStateAndElectorateForProject(project)
+        Map result = service.findAndFormatStatesAndElectoratesForProject(project)
 
         then:
         result.primarystate == "state1"
@@ -1142,7 +1142,7 @@ class ProjectServiceSpec extends MongoSpec implements ServiceUnitTest<ProjectSer
 
 
         when:
-        Map result = service.findStateAndElectorateForProject(project)
+        Map result = service.findAndFormatStatesAndElectoratesForProject(project)
 
         then:
         result.primarystate == "ACT"
@@ -1157,7 +1157,7 @@ class ProjectServiceSpec extends MongoSpec implements ServiceUnitTest<ProjectSer
         Map project = [geographicInfo: [isDefault: true, primaryState: "ACT", otherStates: ['NSW', 'VIC'], primaryElectorate: "Bean", otherElectorates: ['Canberra', 'Fenner']]]
 
         when:
-        Map result = service.findStateAndElectorateForProject(project)
+        Map result = service.findAndFormatStatesAndElectoratesForProject(project)
 
         then:
         result.primarystate == "ACT"
@@ -1169,7 +1169,7 @@ class ProjectServiceSpec extends MongoSpec implements ServiceUnitTest<ProjectSer
     def "findStateAndElectorateForProject should return empty map if project is null"() {
         when:
         Map project = null
-        Map result = service.findStateAndElectorateForProject(project)
+        Map result = service.findAndFormatStatesAndElectoratesForProject(project)
 
         then:
         result.isEmpty()

diff --git a/src/test/groovy/au/org/ala/ecodata/reporting/ProjectXlsExporterSpec.groovy b/src/test/groovy/au/org/ala/ecodata/reporting/ProjectXlsExporterSpec.groovy
@@ -230,7 +230,7 @@ class ProjectXlsExporterSpec extends Specification implements GrailsUnitTest {
         setup:
         String sheet = "Electorate Coord"
         Map project = project()
-        projectService.findStateAndElectorateForProject(_) >> ["primarystate": "ACT", "otherstate": null, "primaryelect": "bean", "otherelect": "fenner; canberra"]
+        projectService.findAndFormatStatesAndElectoratesForProject(_) >> ["primarystate": "ACT", "otherstate": null, "primaryelect": "bean", "otherelect": "fenner; canberra"]
 
         when:
         projectXlsExporter.export(project)