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

Add validation for having pending operations while app installation (#550)

Browse Source 
## Purpose
Fixes https://roadmap.entgra.net/issues/11578

Co-authored-by: prathabanKavin <kavinprathaban025@gmail.com>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/550
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>
This commit is contained in:
Kavin Prathaban 2024-12-03 09:08:22 +00:00 committed by Navod Zoysa
parent 91909aeda6
commit cacd5ec742
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/SubscriptionManagerImpl.java
View File

@ -707,6 +707,25 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
}
}
/**
* Validates if all devices in the subscription have pending operations for the application.
*
* @param devices List of {@link Device}
* @param subscribingDeviceIdHolder Subscribing device id holder.
* @throws BadRequestException if incompatible data is found with validate pending app operations request
*/
private <T> void validatePendingAppSubscription(List<Device> devices, SubscribingDeviceIdHolder subscribingDeviceIdHolder) throws BadRequestException{
Set<DeviceIdentifier> deviceIdentifiers = devices.stream()
.map(device -> new DeviceIdentifier(device.getDeviceIdentifier(), device.getType()))
.collect(Collectors.toSet());
Set<DeviceIdentifier> skippedDevices = subscribingDeviceIdHolder.getSkippedDevices().keySet();
if (skippedDevices.containsAll(deviceIdentifiers) && deviceIdentifiers.containsAll(skippedDevices)) {
String msg = "All devices in the subscription have pending operations for this application.";
log.error(msg);
throw new BadRequestException(msg);
}
}
/**
* This method perform given action (i.e APP INSTALL or APP UNINSTALL) on given set of devices.
*
@ -741,6 +760,7 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
Map<String, List<DeviceIdentifier>> deviceIdentifierMap = new HashMap<>();
if (SubAction.INSTALL.toString().equalsIgnoreCase(action)) {
validatePendingAppSubscription(devices, subscribingDeviceIdHolder);
deviceIdentifiers.addAll(new ArrayList<>(subscribingDeviceIdHolder.getAppInstallableDevices().keySet()));
deviceIdentifiers.addAll(new ArrayList<>(subscribingDeviceIdHolder.getAppReInstallableDevices().keySet()));
if (!isOperationReExecutingDisabled) {