Add group info with federationLink

scality · Jun 5, 2024 · bf62361 · bf62361
1 parent 3e945d7
commit bf62361
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/main/java/com/scality/keycloak/groupFederationLink/GroupWithLinkAdminResource.java b/src/main/java/com/scality/keycloak/groupFederationLink/GroupWithLinkAdminResource.java
@@ -178,9 +178,6 @@ public Map<String, Long> countGroupsWithLink(@QueryParam("search") String search
     @Operation(summary = "Find group")
     public GroupWithLinkRepresentation findGroupWithLink(@PathParam("group-id") String id) {
         GroupResource group = groupsResource.getGroupById(id);
-        if (group == null) {
-            throw new NotFoundException("Could not find group by id");
-        }
 
         GroupWithLinkRepresentation groupWithLink = new GroupWithLinkRepresentation();
 
@@ -189,6 +186,16 @@ public GroupWithLinkRepresentation findGroupWithLink(@PathParam("group-id") Stri
                     .createNamedQuery("findByGroupId", GroupFederationLinkEntity.class)
                     .setParameter("groupId", id)
                     .getSingleResult();
+
+            groupWithLink.setId(group.getGroup().getId());
+            groupWithLink.setName(group.getGroup().getName());
+            groupWithLink.setPath(group.getGroup().getPath());
+            groupWithLink.setParentId(group.getGroup().getParentId());
+            groupWithLink.setSubGroupCount(group.getGroup().getSubGroupCount());
+            groupWithLink.setSubGroups(group.getGroup().getSubGroups());
+            groupWithLink.setAttributes(group.getGroup().getAttributes());
+            groupWithLink.setRealmRoles(group.getGroup().getRealmRoles());
+            groupWithLink.setClientRoles(group.getGroup().getClientRoles());
             groupWithLink.setFederationLink(groupFederationLinkEntity.getFederationLink());
         } catch (NoResultException e) {
             logger.trace("No federation link found for group " + id, e);