community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change time filtering DB column

Browse Source
This commit is contained in:
Pahansith Gunathilake 2021-12-01 17:10:45 +05:30
parent 007b309c71
commit cf4f45c89d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -773,8 +773,9 @@ public class RequestValidationUtil {
public static void validateTimeDuration(long startTimestamp, long endTimestamp) {
if (startTimestamp > endTimestamp) {
throw new InputValidationException(
new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage("Request parameter startTimestamp" +
" should not be higher values than endTimestamp").build());
new ErrorResponse.ErrorResponseBuilder().setCode(400l)
.setMessage("Request parameter startTimestamp should not be " +
"a higher value than endTimestamp").build());
}
}
}

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

@ -1769,7 +1769,7 @@ public class GenericOperationDAOImpl implements OperationDAO {
}
if (activityPaginationRequest.getStartTimestamp() > 0 && activityPaginationRequest.getEndTimestamp() > 0) {
isTimeDurationFilteringProvided = true;
sql += "AND UPDATED_TIMESTAMP BETWEEN ? AND ? ";
sql += "AND CREATED_TIMESTAMP BETWEEN ? AND ? ";
}
if (activityPaginationRequest.getType() != null) {
sql += "AND TYPE = ? ";
@ -1797,7 +1797,7 @@ public class GenericOperationDAOImpl implements OperationDAO {
sql += "AND eom.UPDATED_TIMESTAMP > ? ";
}
if (isTimeDurationFilteringProvided) {
sql += "AND eom.UPDATED_TIMESTAMP BETWEEN ? AND ? ";
sql += "AND eom.CREATED_TIMESTAMP BETWEEN ? AND ? ";
}
if (activityPaginationRequest.getType() != null) {
sql += "AND eom.TYPE = ? ";
@ -1917,8 +1917,9 @@ public class GenericOperationDAOImpl implements OperationDAO {
}
if (activityPaginationRequest.getStartTimestamp() > 0 && activityPaginationRequest.getEndTimestamp() > 0) {
isTimeDurationFilteringProvided = true;
sql += "AND UPDATED_TIMESTAMP BETWEEN ? AND ? ";
sql += "AND CREATED_TIMESTAMP BETWEEN ? AND ? ";
}
int index = 1;
try (PreparedStatement stmt = conn.prepareStatement(sql)) {
stmt.setInt(index++, tenantId);