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

Optimize multiple dis-enrollment

Browse Source
This commit is contained in:
Pramila Niroshan 2023-11-10 18:06:58 +05:30
parent 2d6e512fdf
commit 46090437f0
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/api/DeviceManagementService.java
View File

@ -1287,7 +1287,8 @@ public interface DeviceManagementService {
produces = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON,
httpMethod = "PUT", httpMethod = "PUT",
value = "Remove Multiple Devices Specified by Device IDs and Device Type", value = "Remove Multiple Devices Specified by Device IDs and Device Type",
notes = "Deletes multiple devices of the specified device type specified by their device IDs and returns the status of the deletion operation.", notes = "Deletes multiple devices of the specified device type specified by their device IDs" +
" and returns the status of the dis-enrollment operation.",
tags = "Device Management", tags = "Device Management",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ -1319,7 +1320,7 @@ public interface DeviceManagementService {
}) })
Response disenrollMultipleDevices(@ApiParam( Response disenrollMultipleDevices(@ApiParam(
name = "deviceTypeWithDeviceIds", name = "deviceTypeWithDeviceIds",
value = "The properties to advanced search devices.", value = "Device type and corresponding device IDs for disenrollment",
required = true) required = true)
DisenrollRequest deviceTypeWithDeviceIds); DisenrollRequest deviceTypeWithDeviceIds);
@GET @GET

19
components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/DeviceManagementServiceImpl.java
View File

@ -491,17 +491,22 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
List<DeviceIdentifier> failedToDisenrollDevices = new ArrayList<>(); List<DeviceIdentifier> failedToDisenrollDevices = new ArrayList<>();
Map<String, List<String>> list = deviceTypeWithDeviceIds.getDeviceTypeWithDeviceIds(); Map<String, List<String>> list = deviceTypeWithDeviceIds.getDeviceTypeWithDeviceIds();
String deviceType;
List<String> deviceIds;
DeviceIdentifier deviceIdentifier;
Device persistedDevice;
boolean response;
for (Map.Entry<String, List<String>> entry : list.entrySet()) { for (Map.Entry<String, List<String>> entry : list.entrySet()) {
String deviceType = entry.getKey(); deviceType = entry.getKey();
List<String> deviceIds = entry.getValue(); deviceIds = entry.getValue();
for (String deviceId : deviceIds) { for (String deviceId : deviceIds) {
DeviceIdentifier deviceIdentifier = new DeviceIdentifier(deviceId, deviceType); deviceIdentifier = new DeviceIdentifier(deviceId, deviceType);
try { try {
Device persistedDevice = deviceManagementProviderService.getDevice(deviceIdentifier, true); persistedDevice = deviceManagementProviderService.getDevice(deviceIdentifier, true);
if (persistedDevice != null) { if (persistedDevice != null) {
boolean response = deviceManagementProviderService.disenrollDevice(deviceIdentifier); response = deviceManagementProviderService.disenrollDevice(deviceIdentifier);
if (response) { if (response) {
successfullyDisenrolledDevices.add(deviceIdentifier); successfullyDisenrolledDevices.add(deviceIdentifier);
} else { } else {
@ -509,6 +514,10 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
} }
} else { } else {
failedToDisenrollDevices.add(deviceIdentifier); failedToDisenrollDevices.add(deviceIdentifier);
if(log.isDebugEnabled()){
String msg = "Error encountered while dis-enrolling device of type: " + deviceType + " with " + deviceId;
log.error(msg);
}
} }
} catch (DeviceManagementException e) { } catch (DeviceManagementException e) {
String msg = "Error encountered while dis-enrolling device of type: " + deviceType + " with " + deviceId; String msg = "Error encountered while dis-enrolling device of type: " + deviceType + " with " + deviceId;