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

Fixing activity retrieval with intiatedBy

Browse Source
This commit is contained in:
Ace 2020-10-23 16:59:35 +05:30
parent 22eba43aa9
commit 61c05143c4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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

@ -1090,7 +1090,7 @@ public class GenericOperationDAOImpl implements OperationDAO {
ResultSet rs = null; ResultSet rs = null;
try { try {
Connection conn = OperationManagementDAOFactory.getConnection(); Connection conn = OperationManagementDAOFactory.getConnection();
String sql = "SELECT COUNT(*) AS COUNT " + String sql = "SELECT COUNT(DISTINCT(OPERATION_ID)) AS COUNT " +
"FROM DM_ENROLMENT_OP_MAPPING AS m " + "FROM DM_ENROLMENT_OP_MAPPING AS m " +
" INNER JOIN " + " INNER JOIN " +
" DM_OPERATION dp ON dp.ID = m.OPERATION_ID " + " DM_OPERATION dp ON dp.ID = m.OPERATION_ID " +

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

@ -285,20 +285,20 @@ public class MySQLOperationDAOImpl extends GenericOperationDAOImpl {
"LEFT JOIN " + "LEFT JOIN " +
" DM_DEVICE_OPERATION_RESPONSE opr ON opr.EN_OP_MAP_ID = eom.ID " + " DM_DEVICE_OPERATION_RESPONSE opr ON opr.EN_OP_MAP_ID = eom.ID " +
"INNER JOIN " + "INNER JOIN " +
" (SELECT DISTINCT OPERATION_ID FROM DM_ENROLMENT_OP_MAPPING ORDER BY OPERATION_ID ASC limit ? , ? ) eom_ordered " + " (SELECT DISTINCT OPERATION_ID FROM DM_ENROLMENT_OP_MAPPING WHERE INITIATED_BY = ? " +
" ORDER BY OPERATION_ID ASC limit ? , ? ) eom_ordered " +
" ON eom_ordered.OPERATION_ID = eom.OPERATION_ID " + " ON eom_ordered.OPERATION_ID = eom.OPERATION_ID " +
"WHERE " + "WHERE " +
" eom.UPDATED_TIMESTAMP > ? " + " eom.UPDATED_TIMESTAMP > ? " +
" AND eom.TENANT_ID = ? " + " AND eom.TENANT_ID = ? " +
" AND eom.INITIATED_BY = ? " +
"ORDER BY eom.OPERATION_ID, eom.UPDATED_TIMESTAMP"; "ORDER BY eom.OPERATION_ID, eom.UPDATED_TIMESTAMP";
try (PreparedStatement stmt = conn.prepareStatement(sql)) { try (PreparedStatement stmt = conn.prepareStatement(sql)) {
stmt.setInt(1, offset); stmt.setString(1, user);
stmt.setInt(2, limit); stmt.setInt(2, offset);
stmt.setLong(3, timestamp); stmt.setInt(3, limit);
stmt.setInt(4, tenantId); stmt.setLong(4, timestamp);
stmt.setString(5, user); stmt.setInt(5, tenantId);
try (ResultSet rs = stmt.executeQuery()) { try (ResultSet rs = stmt.executeQuery()) {
ActivityHolder activityHolder = OperationDAOUtil.getActivityHolder(rs); ActivityHolder activityHolder = OperationDAOUtil.getActivityHolder(rs);