community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

deviceOrg: get children of root best practices apply

Browse Source
This commit is contained in:
isuri 2024-03-05 14:29:35 +05:30
parent d2593114b7
commit 0de808229f
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization.api/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/organization/api/DeviceOrganizationMgtService.java
View File

@ -433,7 +433,7 @@ public interface DeviceOrganizationMgtService {
* @return A response containing a list of root device organizations. * @return A response containing a list of root device organizations.
*/ */
@GET @GET
@Path("roots-children") @Path("roots/children")
@ApiOperation( @ApiOperation(
produces = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON,
httpMethod = "GET", httpMethod = "GET",

2
components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization.api/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/organization/api/DeviceOrganizationMgtServiceImpl.java
View File

@ -158,7 +158,7 @@ public class DeviceOrganizationMgtServiceImpl implements DeviceOrganizationMgtSe
} }
@GET @GET
@Path("roots-children") @Path("roots/children")
@Override @Override
public Response getDeviceOrganizationChildrenForRoots( public Response getDeviceOrganizationChildrenForRoots(
@DefaultValue("0") @QueryParam("offset") int offset, @DefaultValue("0") @QueryParam("offset") int offset,

9
components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/organization/impl/DeviceOrganizationServiceImpl.java
View File

@ -177,22 +177,15 @@ public class DeviceOrganizationServiceImpl implements DeviceOrganizationService
PaginationRequest paginationRequest = new PaginationRequest(request.getOffSet(), request.getLimit()); PaginationRequest paginationRequest = new PaginationRequest(request.getOffSet(), request.getLimit());
List<DeviceOrganization> roots = getDeviceOrganizationRoots(paginationRequest); List<DeviceOrganization> roots = getDeviceOrganizationRoots(paginationRequest);
if (roots == null || roots.isEmpty()) {
log.warn("No root device organizations found.");
return allDeviceOrganizations; // Return an empty list
}
// Iterate over each root and fetch its children // Iterate over each root and fetch its children
for (DeviceOrganization root : roots) { for (DeviceOrganization root : roots) {
DeviceNodeResult childrenResult = getChildrenOfDeviceNode(root.getDeviceId(), request.getMaxDepth(), request.isIncludeDevice()); DeviceNodeResult childrenResult = getChildrenOfDeviceNode(root.getDeviceId(), request.getMaxDepth(), request.isIncludeDevice());
if (childrenResult != null) { if (childrenResult != null) {
allDeviceOrganizations.add(childrenResult); allDeviceOrganizations.add(childrenResult);
} else {
log.warn("no children found for roots.");
} }
} }
return allDeviceOrganizations; return allDeviceOrganizations;
} catch (NullPointerException | DeviceOrganizationMgtPluginException e) { } catch (DeviceOrganizationMgtPluginException e) {
String msg = "Error occurred while retrieving all device organizations for roots."; String msg = "Error occurred while retrieving all device organizations for roots.";
log.error(msg, e); log.error(msg, e);
throw new DeviceOrganizationMgtPluginException(msg, e); throw new DeviceOrganizationMgtPluginException(msg, e);