Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	build.gradle

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    version "5.0.0"
+    version "5.1.0"
     group "au.org.ala"
 }
 
@@ -114,7 +114,7 @@ dependencies {
     implementation "org.grails.plugins:audit-logging:4.0.3"
     implementation 'dk.glasius:external-config:3.1.1'
     implementation "org.grails.plugins:ala-admin-plugin:2.3.0"
-    implementation 'au.org.ala.plugins:openapi:1.1.0'
+    implementation 'au.org.ala.plugins:openapi:1.3.0'
 
     console "org.grails:grails-console"
     profile "org.grails.profiles:web"

grails-app/conf/application.yml

@@ -112,6 +112,9 @@ uploadExternalUrlPath: http://localhost/upload
 gbifApiUrl: 'https://api.gbif.org/v1/'
 gbifUniqueKeyTerm: "http://rs.gbif.org/terms/1.0/gbifID"
 
+# country 3 digit ISO code. Non-empty value required at startup
+gbifDefaultEntityCountry:
+
 gbif:
     citations:
         lookup: "https://www.gbif.org/api/resource/search?contentType=literature&gbifDatasetKey="
@@ -189,7 +192,7 @@ security:
         enabled: false
     oidc:
         enabled: true
-        discovery-uri: 'https://auth-test.ala.org.au/cas/oidc/.well-known'
+        discoveryUri: 'change me'
         clientId: 'change me'
         secret: 'change me'
         allowUnsignedIdTokens: true
@@ -261,6 +264,7 @@ dataResource:
     contentTypesList:
         - "authoritative"
         - "behaviour"
+        - "citizen science"
         - "commercial uses"
         - "common names"
         - "conservation management"
@@ -403,6 +407,8 @@ environments:
             url: jdbc:mysql://localhost:3306/collectory?autoReconnect=true&connectTimeout=0&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Australia/Sydney
             username: specieslist
             password: "specieslist"
+            logSql: false
+        gbifDefaultEntityCountry: AUS
     test:
         grails:
             assets:
@@ -413,6 +419,7 @@ environments:
         dataSource:
             dbCreate: update
             url: jdbc:h2:mem:testDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+        gbifDefaultEntityCountry: AUS
     production:
         grails:
             assets:
@@ -442,7 +449,7 @@ environments:
 openapi:
     title: Collectory REST services
     description: REST services for interacting with the collectory webapp
-    terms: https://www.ala.org.au/terms
+    terms: https://www.ala.org.au/terms-of-use
     contact:
         name: Support
         email: [email protected]

grails-app/controllers/au/org/ala/collectory/CollectionController.groovy

@@ -1,7 +1,6 @@
 package au.org.ala.collectory
 
 import grails.converters.JSON
-import grails.validation.Validateable
 import org.springframework.validation.annotation.Validated
 
 import java.text.NumberFormat
@@ -15,6 +14,8 @@ class CollectionController extends ProviderGroupController {
     }
 
     def idGeneratorService
+    def collectionService
+    def institutionService
 
     def index = {
         redirect(action:"list")
@@ -113,9 +114,8 @@ class CollectionController extends ProviderGroupController {
      */
     def summary = {
         Collection collectionInstance = findCollection(params.id)
-        println ">> summary id = " + params.id
         if (collectionInstance) {
-            render collectionInstance.buildSummary() as JSON
+            render collectionService.buildSummary(collectionInstance) as JSON
         } else {
             log.error "Unable to find collection for id = ${params.id}"
             def error = ["error":"unable to find collection for id = " + params.id]
@@ -143,7 +143,12 @@ class CollectionController extends ProviderGroupController {
         }
         ProviderGroup pg = ProviderMap.findMatch(inst, coll)
         if (pg) {
-            render pg.buildSummary() as JSON
+            if (pg[0..1] == 'co') {
+                render collectionService.buildSummary(pg) as JSON
+            } else {
+                // institution
+                render institutionService.buildSummary(pg) as JSON
+            }
         } else {
             def error = ["error":"unable to find collection with inst code = ${inst} and coll code = ${coll}"]
             render error as JSON
@@ -205,7 +210,7 @@ class CollectionController extends ProviderGroupController {
         } else {
             collection.collectionType = (params.collectionType as JSON).toString()
         }
-        
+
         params.remove('collectionType')
 
         // special handling for keywords

grails-app/controllers/au/org/ala/collectory/CollectoryWebServicesInterceptor.groovy

@@ -33,6 +33,7 @@ class CollectoryWebServicesInterceptor {
 
     }
     boolean before() {
+
         // set default role requirement for protected ROLE_EDITOR as the same info is only available to ROLE_EDITOR via the UI.
         String requiredRole = grailsApplication.config.ROLE_EDITOR