Add externalIds to Activity #823

AtlasOfLivingAustralia · Feb 27, 2024 · 90e4b10 · 90e4b10
1 parent a1d5a0b
commit 90e4b10
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/grails-app/domain/au/org/ala/ecodata/Activity.groovy b/grails-app/domain/au/org/ala/ecodata/Activity.groovy
@@ -39,8 +39,11 @@ class Activity {
         projectActivityId index: true
         bulkImportId index: true
         version false
+        externalIds index:true
     }
 
+    static hasMany = [externalIds:ExternalId]
+
     ObjectId id
     String activityId
     String status = 'active'
@@ -54,6 +57,7 @@ class Activity {
     String bulkImportId
     Date startDate
     Date endDate
+    List<ExternalId> externalIds
 
     /** The type of activity performed.  This field must match the name of an ActivityForm */
     String type
@@ -127,6 +131,16 @@ class Activity {
         formVersion nullable: true
         verificationStatus nullable: true, inList: ['not applicable', 'not approved', 'not verified', 'under review' , 'approved']
         bulkImportId nullable: true
+        externalIds nullable: true
+    }
+
+    static Activity findByExternalId(String externalId) {
+        where {
+            externalIds {
+                externalId == externalId
+            }
+            status != Status.DELETED
+        }.find()
     }
 
 }
diff --git a/grails-app/domain/au/org/ala/ecodata/ExternalId.groovy b/grails-app/domain/au/org/ala/ecodata/ExternalId.groovy
@@ -12,7 +12,8 @@ class ExternalId implements Comparable {
 
     enum IdType {
         INTERNAL_ORDER_NUMBER, TECH_ONE_CODE, WORK_ORDER, GRANT_AWARD, GRANT_OPPORTUNITY, RELATED_PROJECT,
-        MONITOR_PROTOCOL_INTERNAL_ID, MONITOR_PROTOCOL_GUID, TECH_ONE_CONTRACT_NUMBER, MONITOR_PLOT_GUID, UNSPECIFIED }
+        MONITOR_PROTOCOL_INTERNAL_ID, MONITOR_PROTOCOL_GUID, TECH_ONE_CONTRACT_NUMBER, MONITOR_PLOT_GUID,
+        MONITOR_MINTED_COLLECTION_ID, UNSPECIFIED }
 
     static constraints = {
     }

diff --git a/grails-app/services/au/org/ala/ecodata/ParatooService.groovy b/grails-app/services/au/org/ala/ecodata/ParatooService.groovy
@@ -200,7 +200,7 @@ class ParatooService {
 
 
 
-    private static Map mapActivity(Map surveyData, Map activity, ParatooProtocolConfig config) {
+    private static Map mapActivity(String mintedCollectionId, Map surveyData, Map activity, ParatooProtocolConfig config) {
         activity.startDate = config.getStartDate(surveyData)
         activity.endDate = config.getEndDate(surveyData)
         activity.type = ''// map activity type from protocol
@@ -210,7 +210,7 @@ class ParatooService {
                 data: surveyData
         ]
         activity.outputs = [output]
-        activity
+        activity.externalIds = [new ExternalId(idType:ExternalId.IdType.MONITOR_MINTED_COLLECTION_ID, externalId: mintedCollectionId)]
     }
 
     private ParatooProtocolConfig getProtocolConfig(String protocolId) {
@@ -371,6 +371,7 @@ class ParatooService {
         form.publicationStatus = PublicationStatus.PUBLISHED
         form.description = protocol.attributes.description
         form.tags = tags
+        form.externalIds
     }
 
     private ParatooProject mapProject(Project project, AccessLevel accessLevel, List<Site> sites) {