#511 fixed email for merge suggestions

gbif · Aug 7, 2023 · 5f7e79b · 5f7e79b
1 parent 4433aa2
commit 5f7e79b
Showing 1 changed file with 7 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
@@ -192,13 +192,18 @@ public int createChangeSuggestion(R changeSuggestion) {
     // send email
     if (Boolean.TRUE.equals(collectionsMailConfigurationProperties.getEnabled())) {
       try {
-        T suggestedEntity = readJson(dto.getSuggestedEntity(), clazz);
+        String entityName = null;
+        if (dto.getSuggestedEntity() != null) {
+          entityName = readJson(dto.getSuggestedEntity(), clazz).getName();
+        } else if (dto.getEntityKey() != null) {
+          entityName = crudService.get(dto.getEntityKey()).getName();
+        }
 
         BaseEmailModel emailModel =
             emailManager.generateNewChangeSuggestionEmailModel(
                 dto.getKey(),
                 dto.getEntityType(),
-                suggestedEntity.getName(),
+                entityName,
                 dto.getCountryScope(),
                 dto.getEntityKey(),
                 dto.getType(),