Change time filtering DB column

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

@@ -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" +
+                    new ErrorResponse.ErrorResponseBuilder().setCode(400l)
-                            " should not be higher values than endTimestamp").build());
+                            .setMessage("Request parameter startTimestamp should not be " +
+                                    "a higher value than endTimestamp").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

@@ -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);