Handle null ownerGroup for tests

geonetwork · Nov 25, 2024 · d0fbcc9 · d0fbcc9
1 parent b4722bc
commit d0fbcc9
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/services/src/main/java/org/fao/geonet/api/records/MetadataSharingApi.java b/services/src/main/java/org/fao/geonet/api/records/MetadataSharingApi.java
@@ -1503,12 +1503,14 @@ private void checkUserProfileToUnpublishMetadata(UserSession userSession) {
      * @param group              The {@link Group} to change the privileges for.
      * @return True if the user can change the privileges for the group, false otherwise.
      */
-    private boolean canUserChangePrivilegesForGroup(final ServiceContext context, int metadataGroupOwner, Group group) {
+    private boolean canUserChangePrivilegesForGroup(final ServiceContext context, Integer metadataGroupOwner, Group group) {
         Profile minimumProfileForPrivileges = group.getMinimumProfileForPrivileges();
         if (minimumProfileForPrivileges == null) {
             return true;
         } else {
-            return (metadataGroupOwner == group.getId()) || (accessManager.isProfileOrMoreOnGroup(context, minimumProfileForPrivileges, group.getId()));
+            boolean isGroupOwner = metadataGroupOwner != null && metadataGroupOwner == group.getId();
+            boolean userIsMinimumProfile = accessManager.isProfileOrMoreOnGroup(context, minimumProfileForPrivileges, group.getId());
+            return isGroupOwner || userIsMinimumProfile;
         }
     }