Merge remote-tracking branch 'origin/dev' into dev

gbif · Aug 14, 2024 · 62c3963 · 62c3963
2 parents a957a24 + f70be5c
commit 62c3963
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...n/java/org/gbif/registry/service/collections/suggestions/BaseChangeSuggestionService.java b/...n/java/org/gbif/registry/service/collections/suggestions/BaseChangeSuggestionService.java
@@ -844,4 +844,8 @@ private boolean isEmptyAddress(Address address) {
   protected abstract ChangeSuggestionDto createConvertToCollectionSuggestionDto(R changeSuggestion);
 
   protected abstract UUID applyConversionToCollection(ChangeSuggestionDto dto);
+
+  protected static String decodeIRN(String irn) {
+    return irn.replace("gbif:ih:irn:", "");
+  }
 }
diff --git a/.../org/gbif/registry/service/collections/suggestions/CollectionChangeSuggestionService.java b/.../org/gbif/registry/service/collections/suggestions/CollectionChangeSuggestionService.java
@@ -16,12 +16,14 @@
 import org.gbif.api.model.collections.Collection;
 import org.gbif.api.model.collections.CollectionEntityType;
 import org.gbif.api.model.collections.Institution;
+import org.gbif.api.model.collections.MasterSourceMetadata;
 import org.gbif.api.model.collections.suggestions.CollectionChangeSuggestion;
 import org.gbif.api.model.collections.suggestions.Type;
 import org.gbif.api.model.registry.Identifier;
 import org.gbif.api.service.collections.CollectionService;
 import org.gbif.api.service.collections.InstitutionService;
 import org.gbif.api.vocabulary.IdentifierType;
+import org.gbif.api.vocabulary.collections.Source;
 import org.gbif.registry.events.EventManager;
 import org.gbif.registry.mail.EmailSender;
 import org.gbif.registry.mail.collections.CollectionsEmailManager;
@@ -92,7 +94,7 @@ public int createChangeSuggestion(CollectionChangeSuggestion changeSuggestion) {
   }
 
   @Override
-  public  UUID applyChangeSuggestion(int suggestionKey){
+  public UUID applyChangeSuggestion(int suggestionKey){
     ChangeSuggestionDto dto = changeSuggestionMapper.get(suggestionKey);
     if (dto.getType() == Type.CREATE) {
       if (Boolean.TRUE.equals(dto.getCreateInstitution())) {
@@ -110,6 +112,8 @@ public  UUID applyChangeSuggestion(int suggestionKey){
     if (dto.getIhIdentifier() != null){
       collectionService.addIdentifier(createdEntity,new Identifier(IdentifierType.IH_IRN,
         dto.getIhIdentifier()));
+      collectionService.addMasterSourceMetadata(createdEntity, new MasterSourceMetadata(
+        Source.IH_IRN, decodeIRN(dto.getIhIdentifier())));
     }
 
     return createdEntity;
@@ -152,8 +156,10 @@ public UUID createInstitutionForCollectionSuggestion(ChangeSuggestionDto dto){
         Institution institution = collectionChangeSuggestionToInstitution(dto);
 
         createdEntity = institutionService.create(institution);
-        institutionService.addIdentifier(createdEntity,new Identifier(IdentifierType.IH_IRN,
+        institutionService.addIdentifier(createdEntity, new Identifier(IdentifierType.IH_IRN,
           dto.getIhIdentifier()));
+        institutionService.addMasterSourceMetadata(createdEntity, new MasterSourceMetadata(
+          Source.IH_IRN, decodeIRN(dto.getIhIdentifier())));
         createContacts(changeSuggestion,createdEntity);
       }
     }