Merge remote-tracking branch 'origin/release/4.6' into feature/issue965

grails-app/conf/application.groovy

@@ -1490,4 +1490,4 @@ paratoo.defaultPlotLayoutViewModels = [
                         ]
                 ]
         ]
-
+paratoo.species.specialCases = ["Other", "N/A"]

grails-app/services/au/org/ala/ecodata/ParatooService.groovy

@@ -479,12 +479,13 @@ class ParatooService {
                 formVersion      : activityForm.formVersion,
                 description      : "Activity submitted by monitor",
                 projectId        : collection.projectId,
-                publicationStatus: "published",
+                publicationStatus: PublicationStatus.PUBLISHED,
                 siteId           : dataSet.siteId,
                 startDate        : dataSet.startDate,
                 endDate          : dataSet.endDate,
                 plannedStartDate : dataSet.startDate,
                 plannedEndDate   : dataSet.endDate,
+                progress         : Activity.FINISHED,
                 externalIds      : [new ExternalId(idType: ExternalId.IdType.MONITOR_MINTED_COLLECTION_ID, externalId: dataSet.dataSetId)],
                 userId           : userId,
                 outputs          : [[
@@ -2106,9 +2107,15 @@ class ParatooService {
         }
 
         result.name = result.commonName ? result.scientificName ? "${result.scientificName} (${result.commonName})" : result.commonName : result.scientificName
-
-        // record is only created if guid is present
-        result.guid = result.guid ?: Record.UNMATCHED_GUID
+        List specialCases = grailsApplication.config.getProperty("paratoo.species.specialCases", List)
+        // do not create record for special cases
+        if (specialCases.contains(name)) {
+            result.remove("guid")
+        }
+        else {
+            // record is only created if guid is present
+            result.guid = result.guid ?: Record.UNMATCHED_GUID
+        }
         result
     }
 }

src/test/groovy/au/org/ala/ecodata/ParatooServiceSpec.groovy

@@ -44,6 +44,7 @@ class ParatooServiceSpec extends MongoSpec implements ServiceUnitTest<ParatooSer
         setupData()
 
         grailsApplication.config.paratoo.location.excluded = ['location.vegetation-association-nvis']
+        grailsApplication.config.paratoo.species.specialCase = ["Other"]
         service.grailsApplication = grailsApplication
         service.webService = webService
         service.siteService = siteService
@@ -740,6 +741,17 @@ class ParatooServiceSpec extends MongoSpec implements ServiceUnitTest<ParatooSer
         result == [name: "Frogs", scientificName: "", guid: "A_GUID", commonName: "Frogs", taxonRank: "Class"]
         1 * speciesReMatchService.searchByName(_) >> null
         1 * speciesReMatchService.searchByName(_, false, true) >> null
+
+        when: // Do not create record when value equals special cases. Therefore, removes guid.
+        result = service.transformSpeciesName("Other")
+        outputSpeciesId = result.remove("outputSpeciesId")
+
+        then:
+        outputSpeciesId != null
+        result == [name: "Other", scientificName: null, commonName: "Other", taxonRank: null]
+        1 * speciesReMatchService.searchByName(_) >> null
+        1 * speciesReMatchService.searchByName(_, false, true) >> null
+
     }
 
     void "buildTreeFromParentChildRelationships should build tree correctly"() {