Merge pull request #402 from wttech/bugfix/add-group

fixed ADD-CHILDREN, ADD-PARENT command
wttech · Aug 2, 2023 · c71e06b · c71e06b
2 parents 0f1539b + cc9ee45
commit c71e06b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/...em/actions.main/src/main/java/com/cognifide/apm/main/actions/addchildren/AddChildren.java b/...em/actions.main/src/main/java/com/cognifide/apm/main/actions/addchildren/AddChildren.java
@@ -79,11 +79,18 @@ private ActionResult process(Context context, boolean execute) {
           ActionUtils.checkCyclicRelations(group, (Group) authorizable);
         }
 
+        boolean flag = true;
         if (execute) {
-          group.addMember(authorizable);
+          flag = group.addMember(authorizable);
+          if (!flag) {
+            flag = group.isMember(authorizable);
+          }
+        }
+        if (flag) {
+          actionResult.logMessage(MessagingUtils.addedToGroup(authorizableId, group.getID()));
+        } else {
+          actionResult.logError(MessagingUtils.failedToAddToGroup(authorizableId, group.getID()));
         }
-
-        actionResult.logMessage(MessagingUtils.addedToGroup(authorizableId, group.getID()));
       } catch (RepositoryException | ActionExecutionException e) {
         actionResult.logError(MessagingUtils.createMessage(e));
       } catch (AuthorizableNotFoundException e) {

diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addparents/AddParents.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addparents/AddParents.java
@@ -78,10 +78,18 @@ private ActionResult process(Context context, boolean execute) {
         LOGGER.info(String.format("Adding Authorizable with id = %s to group with id = %s",
             authorizable.getID(), group.getID()));
 
+        boolean flag = true;
         if (execute) {
-          group.addMember(authorizable);
+          flag = group.addMember(authorizable);
+          if (!flag) {
+            flag = group.isMember(authorizable);
+          }
+        }
+        if (flag) {
+          actionResult.logMessage(MessagingUtils.addedToGroup(authorizable.getID(), id));
+        } else {
+          actionResult.logError(MessagingUtils.failedToAddToGroup(authorizable.getID(), id));
         }
-        actionResult.logMessage(MessagingUtils.addedToGroup(authorizable.getID(), id));
       } catch (RepositoryException | ActionExecutionException e) {
         actionResult.logError(MessagingUtils.createMessage(e));
       } catch (AuthorizableNotFoundException e) {

diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/utils/MessagingUtils.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/utils/MessagingUtils.java
@@ -42,6 +42,10 @@ public static String addedToGroup(String authorizableId, String groupId) {
     return "Authorizable " + authorizableId + " added to group " + groupId;
   }
 
+  public static String failedToAddToGroup(String authorizableId, String groupId) {
+    return String.format("Failed to add authorizable %s to group %s (some specific constraint)", authorizableId, groupId);
+  }
+
   public static String newPasswordSet(String userId) {
     return "New password for user " + userId + " was set";
   }