Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/PolicyManagementServiceImpl.java

@@ -221,14 +221,22 @@ public class PolicyManagementServiceImpl implements PolicyManagementService {
         RequestValidationUtil.validatePolicyIds(policyIds);
         PolicyManagerService policyManagementService = DeviceMgtAPIUtils.getPolicyManagementService();
         boolean policyDeleted = true;
+        String invalidPolicyIds = "";
         try {
             PolicyAdministratorPoint pap = policyManagementService.getPAP();
             for (int i : policyIds) {
                 Policy policy = pap.getPolicy(i);
-                if (policy == null || !pap.deletePolicy(policy)) {
+                if (policy == null) {
+                    invalidPolicyIds += i + ",";
                     policyDeleted = false;
                 }
             }
+            if(policyDeleted) {
+                for(int i : policyIds) {
+                    Policy policy = pap.getPolicy(i);
+                    pap.deletePolicy(policy);
+                }
+            }
         } catch (PolicyManagementException e) {
             String msg = "ErrorResponse occurred while removing policies";
             log.error(msg, e);
@@ -239,8 +247,10 @@ public class PolicyManagementServiceImpl implements PolicyManagementService {
             return Response.status(Response.Status.OK).entity("Policies have been successfully deleted").build();
         } else {
             //TODO:Check of this logic is correct
-            return Response.status(Response.Status.NOT_FOUND).entity(
+            String ModifiedInvalidPolicyIds = invalidPolicyIds.substring(0, invalidPolicyIds.length()-1);
-                    new ErrorResponse.ErrorResponseBuilder().setMessage("Policy doesn't exist").build()).build();
+            return Response.status(Response.Status.BAD_REQUEST).entity(
+                    new ErrorResponse.ErrorResponseBuilder().setMessage("Policies with the policy ID " +
+                                                                        ModifiedInvalidPolicyIds + " doesn't exist").build()).build();
         }
     }
 

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java

@@ -420,7 +420,8 @@ public class GenericOperationDAOImpl implements OperationDAO {
                     "ON feom.OPERATION_ID = o.ID LEFT OUTER JOIN (SELECT ID, ENROLMENT_ID, OPERATION_ID, " +
                     "OPERATION_RESPONSE, MAX(RECEIVED_TIMESTAMP) LATEST_RECEIVED_TIMESTAMP " +
                     "FROM DM_DEVICE_OPERATION_RESPONSE GROUP BY ENROLMENT_ID , OPERATION_ID) orsp " +
-                    "ON o.ID = orsp.OPERATION_ID AND feom.ENROLMENT_ID = orsp.ENROLMENT_ID GROUP BY feom.ENROLMENT_ID";
+                    "ON o.ID = orsp.OPERATION_ID AND feom.ENROLMENT_ID = orsp.ENROLMENT_ID GROUP BY feom.ENROLMENT_ID, " +
+                    "feom.OPERATION_ID";
 
             stmt = conn.prepareStatement(sql);