Merge branch 'subs-operation-status-fix' into 'master'

Fix operation status issue in app subscription

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

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/OperationStatusBean.java

@@ -44,6 +44,12 @@ public class OperationStatusBean {
     )
     private String status;
 
+    @ApiModelProperty(
+            name = "operationCode",
+            value = "Operation Code."
+    )
+    private String operationCode;
+
     public int getOperationId() {
         return operationId;
     }
@@ -59,4 +65,12 @@ public class OperationStatusBean {
     public void setStatus(String status) {
         this.status = status;
     }
+
+    public String getOperationCode() {
+        return operationCode;
+    }
+
+    public void setOperationCode(String operationCode) {
+        this.operationCode = operationCode;
+    }
 }

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

@@ -1417,6 +1417,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
             }
             Operation operation = DeviceMgtAPIUtils.validateOperationStatusBean(operationStatusBean);
             operation.setId(operationStatusBean.getOperationId());
+            operation.setCode(operationStatusBean.getOperationCode());
             DeviceMgtAPIUtils.getDeviceManagementService().updateOperation(device, operation);
 
             if (MDMAppConstants.AndroidConstants.OPCODE_INSTALL_APPLICATION.equals(operation.getCode()) ||