From 4c3211b079f8ba5bd56f0cb3957bcb480f278c88 Mon Sep 17 00:00:00 2001
From: prabathabey <prabathabey@git.com>
Date: Wed, 10 Aug 2016 19:40:51 +0530
Subject: [PATCH] Fixing issues in acitivity retrieval

---
 .../mgt/dao/impl/GenericOperationDAOImpl.java | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java
index 9fb72f9bc9..f523b22f64 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java
@@ -367,30 +367,30 @@ public class GenericOperationDAOImpl implements OperationDAO {
 //                sql = sql + " OFFSET ?";
 //            }
 
-            String sql = "SELECT eom.ENROLMENT_ID, eom.OPERATION_ID, eom.STATUS, eom.UPDATED_TIMESTAMP, " +
-                    "foor.OPERATION_ID, foor.DEVICE_TYPE, foor.OPERATION_CODE, foor.OPERATION_TYPE, foor.OP_RES_ID, " +
-                    "foor.OPERATION_RESPONSE, foor.RECEIVED_TIMESTAMP, foor.DEVICE_IDENTIFICATION, " +
-                    "foor.ENROLMENT_ID FROM (SELECT ENROLMENT_ID, OPERATION_ID, STATUS, UPDATED_TIMESTAMP FROM " +
-                    "DM_ENROLMENT_OP_MAPPING WHERE UPDATED_TIMESTAMP > ? LIMIT ? OFFSET ?) eom LEFT OUTER JOIN (SELECT oor.OPERATION_ID, " +
-                    "det.DEVICE_TYPE, oor.OPERATION_CODE, oor.OPERATION_RESPONSE, oor.RECEIVED_TIMESTAMP, " +
-                    "oor.OP_RES_ID, oor.OPERATION_TYPE, det.DEVICE_IDENTIFICATION, det.ENROLMENT_ID FROM " +
-                    "(SELECT d.DEVICE_IDENTIFICATION, t.NAME AS DEVICE_TYPE, e.ID AS ENROLMENT_ID FROM DM_DEVICE d " +
-                    "INNER JOIN DM_DEVICE_TYPE t ON d.DEVICE_TYPE_ID = t.ID INNER JOIN DM_ENROLMENT e ON " +
-                    "d.ID = e.DEVICE_ID WHERE e.TENANT_ID = ?) det INNER JOIN (SELECT o.ID AS OPERATION_ID, " +
-                    "o.TYPE AS OPERATION_TYPE, o.OPERATION_CODE, r.OPERATION_RESPONSE, r.ID AS OP_RES_ID, " +
-                    "r.LATEST_RECEIVED_TIMESTAMP AS RECEIVED_TIMESTAMP, r.ENROLMENT_ID FROM DM_OPERATION o " +
-                    "INNER JOIN (SELECT ID, ENROLMENT_ID, OPERATION_ID, OPERATION_RESPONSE, " +
-                    "MAX(RECEIVED_TIMESTAMP) LATEST_RECEIVED_TIMESTAMP FROM DM_DEVICE_OPERATION_RESPONSE GROUP BY " +
-                    "ENROLMENT_ID, OPERATION_ID) r ON o.ID = r.OPERATION_ID) oor ON " +
-                    "det.ENROLMENT_ID = oor.ENROLMENT_ID) foor ON eom.ENROLMENT_ID=foor.ENROLMENT_ID AND " +
-                    "eom.OPERATION_ID = foor.OPERATION_ID ORDER BY eom.OPERATION_ID ASC;";
+            String sql = "SELECT feom.ENROLMENT_ID, feom.OPERATION_ID, feom.CREATED_TIMESTAMP, o.TYPE AS OPERATION_TYPE, " +
+                    "o.OPERATION_CODE, orsp.OPERATION_RESPONSE, orsp. LATEST_RECEIVED_TIMESTAMP AS RECEIVED_TIMESTAMP, " +
+                    "orsp.ID AS OP_RES_ID, feom.STATUS, feom.UPDATED_TIMESTAMP, feom.DEVICE_IDENTIFICATION, " +
+                    "feom.DEVICE_TYPE FROM (SELECT eom.ENROLMENT_ID, eom.OPERATION_ID, eom.STATUS, " +
+                    "eom.CREATED_TIMESTAMP, eom.UPDATED_TIMESTAMP, fe.DEVICE_IDENTIFICATION, fe.DEVICE_TYPE FROM " +
+                    "(SELECT ENROLMENT_ID, OPERATION_ID, STATUS, CREATED_TIMESTAMP, UPDATED_TIMESTAMP FROM " +
+                    "DM_ENROLMENT_OP_MAPPING WHERE UPDATED_TIMESTAMP > ? LIMIT ? OFFSET ?) eom LEFT OUTER JOIN (SELECT e.ID AS ENROLMENT_ID, " +
+                    "d.ID AS DEVICE_ID, d.DEVICE_IDENTIFICATION, t.NAME AS DEVICE_TYPE FROM DM_ENROLMENT e " +
+                    "LEFT OUTER JOIN DM_DEVICE d ON e.DEVICE_ID=d.ID LEFT OUTER JOIN DM_DEVICE_TYPE t ON " +
+                    "d.DEVICE_TYPE_ID = t.ID WHERE d.TENANT_ID = ? AND e.TENANT_ID = ?) fe ON " +
+                    "fe.ENROLMENT_ID=eom.ENROLMENT_ID) feom LEFT OUTER JOIN DM_OPERATION o ON feom.OPERATION_ID = o.ID " +
+                    "LEFT OUTER JOIN (SELECT ID, ENROLMENT_ID, OPERATION_ID, OPERATION_RESPONSE, " +
+                    "MAX(RECEIVED_TIMESTAMP) LATEST_RECEIVED_TIMESTAMP FROM DM_DEVICE_OPERATION_RESPONSE " +
+                    "GROUP BY ENROLMENT_ID, OPERATION_ID) orsp ON o.ID = orsp.OPERATION_ID AND " +
+                    "feom.ENROLMENT_ID = orsp.ENROLMENT_ID";
 
             stmt = conn.prepareStatement(sql);
 
             stmt.setLong(1, timestamp);
             stmt.setInt(2, limit);
             stmt.setInt(3, offset);
-            stmt.setInt(4, PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId());
+            int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
+            stmt.setInt(4, tenantId);
+            stmt.setInt(5, tenantId);
 
             rs = stmt.executeQuery();