Merge branch 'permanent-delete' into 'master'

Fix Permanent delete for multiple enrollments

## Purpose
To enable permanent deletion of a sinlge device with multiple enroolmemts

## Goals
> (Goals achieved by feature)

## Approach

## Documentation

## Automation tests

## Security checks
 - Followed secure coding standards? (yes/no)
 - Ran FindSecurityBugs plugin and verified report? (yes/no)
 - Confirmed that this PR doesn't commit any keys, passwords, tokens, usernames, or other secrets? (yes/no)

## Related MRs


## Test environment

## Learning

See merge request entgra/carbon-device-mgt!296
3.x.x
Saad Sahibjan 5 years ago
commit ebf46f46e1

@ -533,10 +533,10 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
try { try {
DeviceManagementDAOFactory.beginTransaction(); DeviceManagementDAOFactory.beginTransaction();
existingDevices = deviceDAO.getDevicesByIdentifiers(deviceIdentifiers, tenantId); existingDevices = deviceDAO.getDevicesByIdentifiers(deviceIdentifiers, tenantId);
if (existingDevices.size() != deviceIdentifiers.size()) {
for (Device device : existingDevices) { for (Device device : existingDevices) {
deviceIdentifiers.remove(device.getDeviceIdentifier()); deviceIdentifiers.remove(device.getDeviceIdentifier());
} }
if (!deviceIdentifiers.isEmpty()) {
String msg = String msg =
"Couldn't find device ids for all the requested device identifiers. " + "Couldn't find device ids for all the requested device identifiers. " +
"Therefore payload should contain device identifiers which are not in the system. " + "Therefore payload should contain device identifiers which are not in the system. " +

Loading…
Cancel
Save