create identifier when creating a collection and institution from a s…

…uggestion (#579)
gbif · Aug 12, 2024 · 06bbaf5 · 06bbaf5
1 parent 2b91367
commit 06bbaf5
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 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
@@ -29,12 +29,15 @@
 import org.gbif.api.model.common.paging.PagingResponse;
 import org.gbif.api.model.registry.Commentable;
 import org.gbif.api.model.registry.Identifiable;
+import org.gbif.api.model.registry.Identifier;
 import org.gbif.api.model.registry.MachineTaggable;
 import org.gbif.api.model.registry.Taggable;
 import org.gbif.api.service.collections.ChangeSuggestionService;
+import org.gbif.api.service.collections.CollectionService;
 import org.gbif.api.service.collections.ContactService;
 import org.gbif.api.service.collections.CrudService;
 import org.gbif.api.vocabulary.Country;
+import org.gbif.api.vocabulary.IdentifierType;
 import org.gbif.api.vocabulary.UserRole;
 import org.gbif.registry.events.EventManager;
 import org.gbif.registry.events.collections.EventType;

diff --git a/.../org/gbif/registry/service/collections/suggestions/CollectionChangeSuggestionService.java b/.../org/gbif/registry/service/collections/suggestions/CollectionChangeSuggestionService.java
@@ -18,8 +18,10 @@
 import org.gbif.api.model.collections.Institution;
 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.registry.events.EventManager;
 import org.gbif.registry.mail.EmailSender;
 import org.gbif.registry.mail.collections.CollectionsEmailManager;
@@ -48,6 +50,7 @@ public class CollectionChangeSuggestionService
 
   private final ChangeSuggestionMapper changeSuggestionMapper;
   private final InstitutionService institutionService;
+  private final CollectionService collectionService;
 
   @Autowired
   public CollectionChangeSuggestionService(
@@ -77,6 +80,7 @@ public CollectionChangeSuggestionService(
         collectionsMailConfigurationProperties);
     this.changeSuggestionMapper = changeSuggestionMapper;
     this.institutionService = institutionService;
+    this.collectionService = collectionService;
   }
 
   @Override
@@ -96,10 +100,19 @@ public  UUID applyChangeSuggestion(int suggestionKey){
         Collection suggestedCollection = readJson(dto.getSuggestedEntity(), Collection.class);
         suggestedCollection.setInstitutionKey(createdInstitution);
         dto.setSuggestedEntity(toJson(suggestedCollection));
+
         changeSuggestionMapper.update(dto);
       }
     }
-    return super.applyChangeSuggestion(suggestionKey);
+
+    UUID createdEntity = super.applyChangeSuggestion(suggestionKey);
+
+    if (dto.getIhIdentifier() != null){
+      collectionService.addIdentifier(createdEntity,new Identifier(IdentifierType.IH_IRN,
+        dto.getIhIdentifier()));
+    }
+
+    return createdEntity;
   }
 
   @Override
@@ -135,10 +148,12 @@ public UUID createInstitutionForCollectionSuggestion(ChangeSuggestionDto dto){
     CollectionChangeSuggestion changeSuggestion = dtoToChangeSuggestion(dto);
     UUID createdEntity = null;
     if (dto.getType() == Type.CREATE) {
-
-      if (dto.getCreateInstitution()) {
+      if (Boolean.TRUE.equals(dto.getCreateInstitution())) {
         Institution institution = collectionChangeSuggestionToInstitution(dto);
+
         createdEntity = institutionService.create(institution);
+        institutionService.addIdentifier(createdEntity,new Identifier(IdentifierType.IH_IRN,
+          dto.getIhIdentifier()));
         createContacts(changeSuggestion,createdEntity);
       }
     }
@@ -150,10 +165,14 @@ private Institution collectionChangeSuggestionToInstitution(ChangeSuggestionDto
 
     if (dto.getSuggestedEntity() != null) {
       Collection collection = readJson(dto.getSuggestedEntity(), Collection.class);
-      institution.setName(collection.getName());
+
+      String name = collection.getName();
+      if(name.startsWith("Herbarium - ")) {
+        name = name.substring("Herbarium - ".length());
+      }
+      institution.setName(name);
       institution.setCode(collection.getCode());
       institution.setActive(collection.isActive());
-
       institution.setAddress(collection.getAddress());
       institution.setEmail(collection.getEmail());
       institution.setPhone(collection.getPhone());

diff --git a/...org/gbif/registry/service/collections/suggestions/InstitutionChangeSuggestionService.java b/...org/gbif/registry/service/collections/suggestions/InstitutionChangeSuggestionService.java
@@ -16,6 +16,7 @@
 import org.gbif.api.model.collections.CollectionEntityType;
 import org.gbif.api.model.collections.Institution;
 import org.gbif.api.model.collections.suggestions.InstitutionChangeSuggestion;
+import org.gbif.api.service.collections.CollectionService;
 import org.gbif.api.service.collections.InstitutionService;
 import org.gbif.registry.events.EventManager;
 import org.gbif.registry.mail.EmailSender;