Merge branch 'master' into 'master'

Minor fixes and improvement for permanent delete devices

See merge request entgra/carbon-device-mgt!309

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java

@@ -533,5 +533,6 @@ public interface DeviceDAO {
      * @param enrollmentIds list of enrollment ids.
      * @throws DeviceManagementDAOException when no enrolments are found for the given device.
      */
-    void deleteDevices(List<String> deviceIdentifiers, List<Integer> deviceIds, List<Integer> enrollmentIds) throws DeviceManagementDAOException;
+    void deleteDevices(List<String> deviceIdentifiers, List<Integer> deviceIds, List<Integer> enrollmentIds)
+            throws DeviceManagementDAOException;
 }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java

@@ -522,43 +522,39 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
     }
 
     @Override
-    public boolean deleteDevices(List<String> deviceIdentifiers) throws DeviceManagementException, InvalidDeviceException {
+    public boolean deleteDevices(List<String> deviceIdentifiers) throws DeviceManagementException,
+                                                                        InvalidDeviceException {
+        if (deviceIdentifiers == null || deviceIdentifiers.isEmpty()) {
+            String msg = "Required values of device identifiers are not set to permanently delete device/s.";
+            log.error(msg);
+            throw new InvalidDeviceException(msg);
+        }
         HashSet<Integer> deviceIds = new HashSet<>();
         List<Integer> enrollmentIds = new ArrayList<>();
+        List<String> validDeviceIdentifiers = new ArrayList<>();
         Map<String, List<String>> deviceIdentifierMap = new HashMap<>();
         Map<String, DeviceManager> deviceManagerMap = new HashMap<>();
         List<DeviceCacheKey> deviceCacheKeyList = new ArrayList<>();
         int tenantId = this.getTenantId();
-        List<Device> existingDevices;
         try {
             DeviceManagementDAOFactory.beginTransaction();
-            existingDevices = deviceDAO.getDevicesByIdentifiers(deviceIdentifiers, tenantId);
+            List<Device> existingDevices = deviceDAO.getDevicesByIdentifiers(deviceIdentifiers, tenantId);
+            DeviceCacheKey deviceCacheKey;
             for (Device device : existingDevices) {
-                deviceIdentifiers.remove(device.getDeviceIdentifier());
+                if (!EnrolmentInfo.Status.REMOVED.equals(device.getEnrolmentInfo().getStatus())) {
-            }
-            if (!deviceIdentifiers.isEmpty()) {
-                String msg =
-                        "Couldn't find device ids for all the requested device identifiers. " +
-                                "Therefore payload should contain device identifiers which are not in the system. " +
-                                "Invalid device identifiers are " + deviceIdentifiers.toString();
-                log.error(msg);
                     DeviceManagementDAOFactory.rollbackTransaction();
-                throw new InvalidDeviceException(msg);
-            }
-            for (Device device : existingDevices) {
-                if (!device.getEnrolmentInfo().getStatus().equals(EnrolmentInfo.Status.REMOVED)) {
                     String msg = "Device " + device.getDeviceIdentifier() + " of type " + device.getType()
                                  + " is not dis-enrolled to permanently delete the device";
                     log.error(msg);
-                    DeviceManagementDAOFactory.rollbackTransaction();
                     throw new InvalidDeviceException(msg);
                 }
-                DeviceCacheKey deviceCacheKey = new DeviceCacheKey();
+                deviceCacheKey = new DeviceCacheKey();
                 deviceCacheKey.setDeviceId(device.getDeviceIdentifier());
                 deviceCacheKey.setDeviceType(device.getType());
                 deviceCacheKey.setTenantId(tenantId);
                 deviceCacheKeyList.add(deviceCacheKey);
                 deviceIds.add(device.getId());
+                validDeviceIdentifiers.add(device.getDeviceIdentifier());
                 enrollmentIds.add(device.getEnrolmentInfo().getId());
                 if (deviceIdentifierMap.containsKey(device.getType())) {
                     deviceIdentifierMap.get(device.getType()).add(device.getDeviceIdentifier());
@@ -567,17 +563,23 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
                             new ArrayList<>(Arrays.asList(device.getDeviceIdentifier())));
                     DeviceManager deviceManager = this.getDeviceManager(device.getType());
                     if (deviceManager == null) {
-                        if (log.isDebugEnabled()) {
+                        log.error("Device Manager associated with the device type '" +device.getType() +
-                            log.debug("Device Manager associated with the device type '"
+                                  "' is null. Therefore, not attempting method 'deleteDevice'");
-                                    + device.getType() + "' is null. Therefore, not attempting method 'deleteDevice'");
-                        }
                         return false;
                     }
                     deviceManagerMap.put(device.getType(), deviceManager);
                 }
             }
+            if (deviceIds.isEmpty()) {
+                String msg = "No device IDs found for the device identifiers '" + deviceIdentifiers + "'";
+                log.error(msg);
+                throw new InvalidDeviceException(msg);
+            }
+            if (log.isDebugEnabled()) {
+                log.debug("Permanently deleting the details of devices : " + validDeviceIdentifiers);
+            }
             //deleting device from the core
-            deviceDAO.deleteDevices(deviceIdentifiers, new ArrayList<>(deviceIds), enrollmentIds);
+            deviceDAO.deleteDevices(validDeviceIdentifiers, new ArrayList<>(deviceIds), enrollmentIds);
             for (Map.Entry<String, DeviceManager> entry : deviceManagerMap.entrySet()) {
                 try {
                     // deleting device from the plugin level
@@ -594,6 +596,9 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
             }
             DeviceManagementDAOFactory.commitTransaction();
             this.removeDevicesFromCache(deviceCacheKeyList);
+            if (log.isDebugEnabled()) {
+                log.debug("Successfully permanently deleted the details of devices : " + validDeviceIdentifiers);
+            }
             return true;
         } catch (TransactionManagementException e) {
             String msg = "Error occurred while initiating transaction";

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js

@@ -900,6 +900,8 @@ function attachDeviceEvents() {
         var deviceId = $(this).data("deviceid");
         if (deviceId) {
             deviceIdentifiers = [deviceId];
+            $(modalPopupContent).html($('#delete-device-modal-content').html());
+            showPopup();
         } else {
             var selectedDevices = getSelectedDevices();
             if (selectedDevices.length == 0) {
@@ -932,8 +934,6 @@ function attachDeviceEvents() {
             }
         }
 
-        $(modalPopupContent).html($('#delete-device-modal-content').html());
-        showPopup();
 
         $("a#delete-device-yes-link").click(function () {
             deleteDevices(deviceIdentifiers);