From 5f7e79b758e613e7b09fdc95b50a22ae21b5cf92 Mon Sep 17 00:00:00 2001
From: Marcos Lopez Gonzalez <marcoslg@gmail.com>
Date: Mon, 7 Aug 2023 16:40:33 +0200
Subject: [PATCH] #511 fixed email for merge suggestions

---
 .../suggestions/BaseChangeSuggestionService.java         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/registry-service/src/main/java/org/gbif/registry/service/collections/suggestions/BaseChangeSuggestionService.java b/registry-service/src/main/java/org/gbif/registry/service/collections/suggestions/BaseChangeSuggestionService.java
index 4300ba751..2a67632cf 100644
--- a/registry-service/src/main/java/org/gbif/registry/service/collections/suggestions/BaseChangeSuggestionService.java
+++ b/registry-service/src/main/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(),