update operation status

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/OperationManager.java

@@ -59,7 +59,8 @@ public interface OperationManager {
 
     public Operation getNextPendingOperation(DeviceIdentifier deviceId) throws OperationManagementException;
 
-    public void updateOperation(int operationId, Operation.Status operationStatus) throws OperationManagementException;
+    public void updateOperation(int deviceId, int operationId, Operation.Status operationStatus) throws
+            OperationManagementException;
 
     public void deleteOperation(int operationId) throws OperationManagementException;
 

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

@@ -465,9 +465,10 @@ public class DeviceManagementServiceProviderImpl implements DeviceManagementServ
     }
 
     @Override
-    public void updateOperation(int operationId, Operation.Status operationStatus)
+    public void updateOperation(int deviceId, int operationId, Operation.Status operationStatus)
             throws OperationManagementException {
-        DeviceManagementDataHolder.getInstance().getOperationManager().updateOperation(operationId, operationStatus);
+        DeviceManagementDataHolder.getInstance().getOperationManager().updateOperation(deviceId,operationId,
+                operationStatus);
     }
 
     @Override

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java

@@ -263,7 +263,7 @@ public class OperationManagerImpl implements OperationManager {
     }
 
     @Override
-    public void updateOperation(int operationId, Operation.Status operationStatus)
+    public void updateOperation(int deviceId, int operationId, Operation.Status operationStatus)
             throws OperationManagementException {
 
         if (log.isDebugEnabled()) {
@@ -280,7 +280,9 @@ public class OperationManagerImpl implements OperationManager {
             dtoOperation.setStatus(org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Status.valueOf
                     (operationStatus.toString()));
             OperationManagementDAOFactory.beginTransaction();
-            lookupOperationDAO(dtoOperation).updateOperation(dtoOperation);
+            operationDAO.updateOperation(dtoOperation);
+            operationDAO.updateOperationStatus(deviceId,operationId,
+                    org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Status.valueOf(operationStatus.toString()));
             OperationManagementDAOFactory.commitTransaction();
         } catch (OperationManagementDAOException ex) {
             try {

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

@@ -42,4 +42,7 @@ public interface OperationDAO {
 
     Operation getNextOperation(int deviceId) throws OperationManagementDAOException;
 
+    void updateOperationStatus(int deviceId, int operationId,Operation.Status status) throws
+            OperationManagementDAOException;
+
 }

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

@@ -76,10 +76,34 @@ public class OperationDAOImpl implements OperationDAO {
             stmt.executeUpdate();
 
         } catch (SQLException e) {
-            throw new OperationManagementDAOException("Error occurred while adding operation metadata", e);
+            throw new OperationManagementDAOException("Error occurred while update operation metadata", e);
+        } finally {
+            OperationManagementDAOUtil.cleanupResources(stmt);
+        }
+    }
+
+    public void updateOperationStatus(int deviceId, int operationId,Operation.Status status)
+            throws OperationManagementDAOException{
+
+        PreparedStatement stmt = null;
+        try {
+            Connection connection = OperationManagementDAOFactory.getConnection();
+            stmt = connection.prepareStatement("UPDATE DM_DEVICE_OPERATION_MAPPING O SET O.STATUS=? " +
+                    "WHERE O.DEVICE_ID=? and O.OPERATION_ID=?");
+
+            stmt.setString(1, status.toString());
+            stmt.setInt(2, deviceId);
+            stmt.setInt(3, operationId);
+            stmt.executeUpdate();
+
+        } catch (SQLException e) {
+            throw new OperationManagementDAOException("Error occurred while update device mapping operation status " +
+                    "metadata",
+                    e);
         } finally {
             OperationManagementDAOUtil.cleanupResources(stmt);
         }
+
     }
 
     @Override

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

@@ -149,8 +149,9 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
     }
 
     @Override
-    public void updateOperation(int operationId, Operation.Status operationStatus) throws OperationManagementException {
-        DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().updateOperation(operationId,
+    public void updateOperation(int deviceId, int operationId, Operation.Status operationStatus) throws
+            OperationManagementException {
+        DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().updateOperation(deviceId, operationId,
                 operationStatus);
     }