Add new recordProfileUserAdmin notification level (geonetwork#8779)

* Add new recordProfileUserAdmin notification level

* Add null profile checks in case of a misconfigured notification level

* Filter out records with no group from notification when a recordProfile notification level is set

Author: tylerjmchugh

core/src/main/java/org/fao/geonet/kernel/metadata/DefaultStatusActions.java

@@ -412,8 +412,14 @@ public static List<User> getUserToNotify(StatusValueNotificationLevel notificati
                 if (owner.isPresent()) {
                     users.add(owner.get());
                 }
-            } else if (notificationLevel == StatusValueNotificationLevel.recordProfileReviewer) {
-                List<Pair<Integer, User>> results = userRepository.findAllByGroupOwnerNameAndProfile(recordIds, Profile.Reviewer);
+            } else if (notificationLevel.name().startsWith("recordProfile")) {
+                String profileId = notificationLevel.name().replace("recordProfile", "");
+                Profile profile = Profile.findProfileIgnoreCase(profileId);
+                if (profile == null) {
+                    Log.error(Geonet.DATA_MANAGER, "Invalid notification level is configured '" + notificationLevel + "' The associated profile '" + profileId + "' does not exist.");
+                    return users;
+                }
+                List<Pair<Integer, User>> results = userRepository.findAllByGroupOwnerNameAndProfile(recordIds, profile);
                 Collections.sort(results, Comparator.comparing(s -> s.two().getName()));
                 for (Pair<Integer, User> p : results) {
                     users.add(p.two());
@@ -441,6 +447,10 @@ public static List<User> getUserToNotify(StatusValueNotificationLevel notificati
             } else if (notificationLevel.name().startsWith("catalogueProfile")) {
                 String profileId = notificationLevel.name().replace("catalogueProfile", "");
                 Profile profile = Profile.findProfileIgnoreCase(profileId);
+                if (profile == null) {
+                    Log.error(Geonet.DATA_MANAGER, "Invalid notification level is configured '" + notificationLevel + "' The associated profile '" + profileId + "' does not exist.");
+                    return users;
+                }
                 users = userRepository.findAllByProfile(profile);
             } else if (notificationLevel == StatusValueNotificationLevel.catalogueAdministrator) {
                 SettingManager settingManager = ApplicationContextHolder.get().getBean(SettingManager.class);

domain/src/main/java/org/fao/geonet/domain/StatusValueNotificationLevel.java

@@ -63,6 +63,10 @@ public enum StatusValueNotificationLevel {
      * When assigned should notify the reviewers part of the record group owner.
      */
     recordProfileReviewer,
+    /**
+     * When assigned should notify the user administrators part of the record group owner.
+     */
+    recordProfileUserAdmin,
     /**
      * When assigned should notify the record author.
      */

services/src/main/java/org/fao/geonet/util/MetadataPublicationMailNotifier.java

@@ -75,9 +75,10 @@ public void notifyPublication(Locale[] feedbackLocales,
                 StatusValueNotificationLevel.valueOf(notificationSetting);
             if (notificationLevel != null) {
 
-                if (notificationLevel == StatusValueNotificationLevel.recordProfileReviewer) {
+                if (notificationLevel.name().startsWith("recordProfile")) {
                     Map<Integer, List<MetadataPublicationNotificationInfo>> metadataListToNotifyPublicationPerGroup =
                         metadataListToNotifyPublication.stream()
+                            .filter(metadata -> metadata.getGroupId() != null)
                             .collect(Collectors.groupingBy(MetadataPublicationNotificationInfo::getGroupId));
 
                     // Process the metadata published by group owner

web-ui/src/main/resources/catalog/locales/en-admin.json

@@ -1503,6 +1503,7 @@
     "notificationLevel-catalogueProfileRegisteredUser": "Notify the catalogue registered user",
     "notificationLevel-catalogueProfileGuest": "Notify the catalogue guest",
     "notificationLevel-recordProfileReviewer": "Notify the reviewers part of the record group owner",
+    "notificationLevel-recordProfileUserAdmin": "Notify the user administrators part of the record group owner",
     "notificationLevel-recordUserAuthor": "Notify the record author",
     "notificationLevel-recordGroupEmail": "Notify the group(s) emails",
     "confirmMapserverDelete": "Are you sure you want to delete this Map server?",