From 05f0df1b2fd5392e3985bffd27fea63cdf757d57 Mon Sep 17 00:00:00 2001
From: MichalKinas <michal.kinas@hyland.com>
Date: Wed, 5 Jul 2023 19:34:46 +0200
Subject: [PATCH] ACS-5506 Proper Group serialization

---
 .../java/org/alfresco/rest/groups/GroupsTests.java |  3 +--
 .../alfresco/rest/api/tests/client/data/Group.java | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/groups/GroupsTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/groups/GroupsTests.java
index caf9bc471b..7ab715465f 100644
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/groups/GroupsTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/groups/GroupsTests.java
@@ -120,8 +120,7 @@ public class GroupsTests extends RestTest
 
         //ListPersonMembership
         restClient.authenticateUser(userModel).withCoreAPI().usingUser(userModel).listGroupMemberships()
-                                              .assertThat().entriesListContains("id", "GROUP_"+groupName)
-                                              .and().entriesListContains("id", "GROUP_"+subGroupName);
+                                              .assertThat().entriesListContains("id", "GROUP_"+groupName);
         restClient.assertStatusCodeIs(HttpStatus.OK);
 
         //CheckListDetails
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Group.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Group.java
index d8623c397f..acbbf4d8c7 100644
--- a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Group.java
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Group.java
@@ -58,7 +58,9 @@ public class Group extends org.alfresco.rest.api.model.Group implements Serializ
 
         AssertUtil.assertEquals("id", getId(), other.getId());
         AssertUtil.assertEquals("displayName", getDisplayName(), other.getDisplayName());
+        AssertUtil.assertEquals("description", getDescription(), other.getDescription());
         AssertUtil.assertEquals("isRoot", getIsRoot(), other.getIsRoot());
+        AssertUtil.assertEquals("hasSubgroups", getHasSubgroups(), other.getHasSubgroups());
         AssertUtil.assertEquals("parentIds", getParentIds(), other.getParentIds());
         AssertUtil.assertEquals("zones", getZones(), other.getZones());
     }
@@ -73,11 +75,21 @@ public class Group extends org.alfresco.rest.api.model.Group implements Serializ
 
         groupJson.put("displayName", getDisplayName());
 
+        if (getDescription() != null)
+        {
+            groupJson.put("description", getDescription());
+        }
+
         if (getIsRoot() != null)
         {
             groupJson.put("isRoot", getIsRoot());
         }
 
+        if (getHasSubgroups() != null)
+        {
+            groupJson.put("hasSubgroups", getHasSubgroups());
+        }
+
         if (getParentIds() != null)
         {
             groupJson.put("parentIds", new ArrayList(getParentIds()));
@@ -97,6 +109,7 @@ public class Group extends org.alfresco.rest.api.model.Group implements Serializ
         String displayName = (String) jsonObject.get("displayName");
         String description = (String) jsonObject.get("description");
         Boolean isRoot = (Boolean) jsonObject.get("isRoot");
+        Boolean hasSubgroups = (Boolean) jsonObject.get("hasSubgroups");
         List<String> parentIds = (List<String>) jsonObject.get("parentIds");
         List<String> zones = (List<String>) jsonObject.get("zones");
 
@@ -105,6 +118,7 @@ public class Group extends org.alfresco.rest.api.model.Group implements Serializ
         group.setDisplayName(displayName);
         group.setDescription(description);
         group.setIsRoot(isRoot);
+        group.setHasSubgroups(hasSubgroups);
         group.setParentIds(parentIds != null ? new HashSet<>(parentIds) : null);
         group.setZones(zones != null ? new HashSet<>(zones) : null);