waruni
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/operations' into 'master'

Browse Source 
Added new operation status

See merge request entgra/carbon-device-mgt!834
feature/traccar-sync
Charitha Goonetilleke 3 years ago
parent 78824205c1 e54765e992
commit 9af1e72b73
6 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File

6
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/util/RequestValidationUtil.java
Unescape View File

@ -610,10 +610,12 @@ public class RequestValidationUtil {
|| Constants.OperationStatus.NOTNOW.toUpperCase().equals(status.get(i)) || Constants.OperationStatus.NOTNOW.toUpperCase().equals(status.get(i))
|| Constants.OperationStatus.REPEATED.toUpperCase().equals(status.get(i)) || Constants.OperationStatus.REPEATED.toUpperCase().equals(status.get(i))
|| Constants.OperationStatus.PENDING.toUpperCase().equals(status.get(i)) || Constants.OperationStatus.PENDING.toUpperCase().equals(status.get(i))
|| Constants.OperationStatus.IN_PROGRESS.toUpperCase().equals(status.get(i))) { || Constants.OperationStatus.IN_PROGRESS.toUpperCase().equals(status.get(i))
|| Constants.OperationStatus.REQUIRED_CONFIRMATION.toUpperCase().equals(status.get(i))
|| Constants.OperationStatus.CONFIRMED.toUpperCase().equals(status.get(i))) {
} else { } else {
String msg = "Invalid status type: " + status + ". \nValid status types are COMPLETED | ERROR | " + String msg = "Invalid status type: " + status + ". \nValid status types are COMPLETED | ERROR | " +
"IN_PROGRESS | NOTNOW | PENDING | REPEATED"; "IN_PROGRESS | NOTNOW | PENDING | REPEATED | REQUIRED_CONFIRMATION | CONFIRMED";
log.error(msg); log.error(msg);
throw new InputValidationException(new ErrorResponse.ErrorResponseBuilder() throw new InputValidationException(new ErrorResponse.ErrorResponseBuilder()
.setCode(HttpStatus.SC_BAD_REQUEST) .setCode(HttpStatus.SC_BAD_REQUEST)

2
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/Constants.java
Unescape View File

@ -68,6 +68,8 @@ public class Constants {
public static final String PENDING = "pending"; public static final String PENDING = "pending";
public static final String NOTNOW = "notnow"; public static final String NOTNOW = "notnow";
public static final String REPEATED = "repeated"; public static final String REPEATED = "repeated";
public static final String REQUIRED_CONFIRMATION = "required_confirmation";
public static final String CONFIRMED = "confirmed";
} }
public static final String DEVICES = "devices"; public static final String DEVICES = "devices";
public static final String ATTRIBUTE_DISPLAY_NAME = "DisplayName"; public static final String ATTRIBUTE_DISPLAY_NAME = "DisplayName";

8
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/DeviceMgtAPIUtils.java
Unescape View File

@ -959,9 +959,15 @@ public class DeviceMgtAPIUtils {
case Constants.OperationStatus.REPEATED: case Constants.OperationStatus.REPEATED:
operation.setStatus(Operation.Status.REPEATED); operation.setStatus(Operation.Status.REPEATED);
break; break;
case Constants.OperationStatus.REQUIRED_CONFIRMATION:
operation.setStatus(Operation.Status.REQUIRED_CONFIRMATION);
break;
case Constants.OperationStatus.CONFIRMED:
operation.setStatus(Operation.Status.CONFIRMED);
break;
default: default:
String msg = "Invalid operation status. Valid operations: " + String msg = "Invalid operation status. Valid operations: " +
"[IN_PROGRESS, PENDING, COMPLETED, ERROR, REPEATED, NOTNOW]"; "[IN_PROGRESS, PENDING, COMPLETED, ERROR, REPEATED, NOTNOW, REQUIRED_CONFIRMATION, CONFIRMED]";
log.error(msg); log.error(msg);
throw new BadRequestException(msg); throw new BadRequestException(msg);
} }

2
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/ActivityStatus.java
Unescape View File

@ -30,7 +30,7 @@ import java.util.List;
public class ActivityStatus { public class ActivityStatus {
public enum Status { public enum Status {
IN_PROGRESS, PENDING, COMPLETED, ERROR, REPEATED, INVALID, UNAUTHORIZED, NOTNOW IN_PROGRESS, PENDING, COMPLETED, ERROR, REPEATED, INVALID, UNAUTHORIZED, NOTNOW, REQUIRED_CONFIRMATION, CONFIRMED
} }
@ApiModelProperty( @ApiModelProperty(

2
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/Operation.java
Unescape View File

@ -37,7 +37,7 @@ public class Operation implements Serializable {
} }
public enum Status { public enum Status {
IN_PROGRESS, PENDING, COMPLETED, ERROR, REPEATED, NOTNOW IN_PROGRESS, PENDING, COMPLETED, ERROR, REPEATED, NOTNOW, REQUIRED_CONFIRMATION, CONFIRMED
} }
public enum Control { public enum Control {

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/Operation.java
Unescape View File

@ -30,7 +30,7 @@ public class Operation implements Serializable {
} }
public enum Status { public enum Status {
IN_PROGRESS, PENDING, COMPLETED, ERROR, REPEATED, NOTNOW IN_PROGRESS, PENDING, COMPLETED, ERROR, REPEATED, NOTNOW, REQUIRED_CONFIRMATION, CONFIRMED
} }
public enum Control { public enum Control {

Write Preview
Loading…
Cancel
Save