Adding temporary development code bits for dashboard analytics feature

components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/GadgetDataService.java

@@ -69,4 +69,11 @@ public interface GadgetDataService {
     Map<String, Integer> getFeatureNonCompliantDeviceCountsByOwnershipTypes(String nonCompliantFeatureCode,
                                                                             Map<String, Object> filters);
 
+    @SuppressWarnings("unused")
+    PaginationResult getDevicesWithDetails(Map<String, Object> filters, PaginationRequest paginationRequest);
+
+    @SuppressWarnings("unused")
+    PaginationResult getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode,
+                    Map<String, Object> filters, PaginationRequest paginationRequest);
+
 }

components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAO.java

@@ -21,7 +21,6 @@ package org.wso2.carbon.device.mgt.analytics.dashboard.dao;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
 
-import java.util.List;
 import java.util.Map;
 
 public interface GadgetDataServiceDAO {
@@ -81,10 +80,11 @@ public interface GadgetDataServiceDAO {
                                                     Map<String, Object> filters) throws GadgetDataServiceDAOException;
 
     @SuppressWarnings("unused")
-    List<Map<String, Object>> getDevicesWithDetails(Map<String, Object> filters) throws GadgetDataServiceDAOException;
+    PaginationResult getDevicesWithDetails(Map<String, Object> filters,
+                                           PaginationRequest paginationRequest) throws GadgetDataServiceDAOException;
 
     @SuppressWarnings("unused")
-    List<Map<String, Object>> getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode,
+    PaginationResult getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode,
-                                                    Map<String, Object> filters) throws GadgetDataServiceDAOException;
+            Map<String, Object> filters, PaginationRequest paginationRequest) throws GadgetDataServiceDAOException;
 
 }

components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAOImpl.java

@@ -357,7 +357,8 @@ class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
         return filteredDeviceCountsByOwnershipTypes;
     }
 
-    public Map<String, Integer> getFeatureNonCompliantDeviceCountsByOwnershipTypes(String nonCompliantFeatureCode, Map<String, Object> filters) throws GadgetDataServiceDAOException {
+    public Map<String, Integer> getFeatureNonCompliantDeviceCountsByOwnershipTypes(String nonCompliantFeatureCode,
+                                Map<String, Object> filters) throws GadgetDataServiceDAOException {
         Connection con;
         PreparedStatement stmt = null;
         ResultSet rs = null;
@@ -404,24 +405,27 @@ class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
         return filteredDeviceCountsByOwnershipTypes;
     }
 
-    public List<Map<String, Object>> getDevicesWithDetails(Map<String, Object> filters) throws GadgetDataServiceDAOException {
+    public PaginationResult getDevicesWithDetails(Map<String, Object> filters,
+                                        PaginationRequest paginationRequest) throws GadgetDataServiceDAOException {
         Connection con;
         PreparedStatement stmt = null;
         ResultSet rs = null;
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
         Map<String, Object> filteredDeviceWithDetails = new HashMap<>();
         List<Map<String, Object>> filteredDevicesWithDetails = new ArrayList<>();
+        int totalRecordsCount = 0;
         try {
             con = this.getConnection();
-            String sql;
+            String sql, advancedSqlFiltering = "";
-            sql = "SELECT DEVICE_ID, PLATFORM, OWNERSHIP, CONNECTIVITY_STATUS FROM DEVICES_VIEW_1 WHERE TENANT_ID = ?";
+            // appending filters if exist, to support advanced filtering options
-            // appending filters to support advanced filtering options
             // [1] appending filter columns, if exist
             if (filters != null && filters.size() > 0) {
                 for (String column : filters.keySet()) {
-                    sql = sql + " AND " + column + " = ?";
+                    advancedSqlFiltering = advancedSqlFiltering + "AND " + column + " = ? ";
                 }
             }
+            sql = "SELECT DEVICE_ID, PLATFORM, OWNERSHIP, CONNECTIVITY_STATUS FROM DEVICES_VIEW_1 " +
+                  "WHERE TENANT_ID = ? " + advancedSqlFiltering + "ORDER BY DEVICE_ID ASC LIMIT ?, ?";
             stmt = con.prepareStatement(sql);
             // [2] appending filter column values, if exist
             stmt.setInt(1, tenantId);
@@ -435,6 +439,11 @@ class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
                     }
                     i++;
                 }
+                stmt.setInt(i, paginationRequest.getStartIndex());
+                stmt.setInt(++i, paginationRequest.getRowCount());
+            } else {
+                stmt.setInt(2, paginationRequest.getStartIndex());
+                stmt.setInt(3, paginationRequest.getRowCount());
             }
             // executing query
             rs = stmt.executeQuery();
@@ -446,33 +455,50 @@ class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
                 filteredDeviceWithDetails.put("connectivity-details", rs.getString("CONNECTIVITY_STATUS"));
                 filteredDevicesWithDetails.add(filteredDeviceWithDetails);
             }
+            // fetching total records count
+            sql = "SELECT COUNT(DEVICE_ID) AS DEVICE_COUNT FROM DEVICES_VIEW_1 WHERE TENANT_ID = ?";
+
+            stmt = con.prepareStatement(sql);
+            stmt.setInt(1, tenantId);
+
+            // executing query
+            rs = stmt.executeQuery();
+            // fetching query results
+            while (rs.next()) {
+                totalRecordsCount = rs.getInt("DEVICE_COUNT");
+            }
         } catch (SQLException e) {
             throw new GadgetDataServiceDAOException("Error occurred while executing a selection query to the database", e);
         } finally {
             DeviceManagementDAOUtil.cleanupResources(stmt, rs);
         }
-        return filteredDevicesWithDetails;
+        PaginationResult paginationResult = new PaginationResult();
+        paginationResult.setData(filteredDevicesWithDetails);
+        paginationResult.setRecordsTotal(totalRecordsCount);
+        return paginationResult;
     }
 
-    public List<Map<String, Object>> getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode, Map<String, Object> filters) throws GadgetDataServiceDAOException {
+    public PaginationResult getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode,
+        Map<String, Object> filters, PaginationRequest paginationRequest) throws GadgetDataServiceDAOException {
         Connection con;
         PreparedStatement stmt = null;
         ResultSet rs = null;
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
         Map<String, Object> filteredDeviceWithDetails = new HashMap<>();
         List<Map<String, Object>> filteredDevicesWithDetails = new ArrayList<>();
+        int totalRecordsCount = 0;
         try {
             con = this.getConnection();
-            String sql;
+            String sql, advancedSqlFiltering = "";
-            sql = "SELECT DEVICE_ID, PLATFORM, OWNERSHIP, CONNECTIVITY_STATUS FROM DEVICES_VIEW_2 " +
+            // appending filters if exist, to support advanced filtering options
-                "WHERE TENANT_ID = ? AND FEATURE_CODE = ?";
-            // appending filters to support advanced filtering options
             // [1] appending filter columns, if exist
             if (filters != null && filters.size() > 0) {
                 for (String column : filters.keySet()) {
-                    sql = sql + " AND " + column + " = ?";
+                    advancedSqlFiltering = advancedSqlFiltering + "AND " + column + " = ? ";
                 }
             }
+            sql = "SELECT DEVICE_ID, PLATFORM, OWNERSHIP, CONNECTIVITY_STATUS FROM DEVICES_VIEW_2 " +
+                    "WHERE TENANT_ID = ? AND FEATURE_CODE = ? " + advancedSqlFiltering + "ORDER BY DEVICE_ID ASC LIMIT ?, ?";
             stmt = con.prepareStatement(sql);
             // [2] appending filter column values, if exist
             stmt.setInt(1, tenantId);
@@ -487,6 +513,11 @@ class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
                     }
                     i++;
                 }
+                stmt.setInt(i, paginationRequest.getStartIndex());
+                stmt.setInt(++i, paginationRequest.getRowCount());
+            } else {
+                stmt.setInt(3, paginationRequest.getStartIndex());
+                stmt.setInt(4, paginationRequest.getRowCount());
             }
             // executing query
             rs = stmt.executeQuery();
@@ -498,12 +529,29 @@ class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
                 filteredDeviceWithDetails.put("connectivity-details", rs.getString("CONNECTIVITY_STATUS"));
                 filteredDevicesWithDetails.add(filteredDeviceWithDetails);
             }
+            // fetching total records count
+            sql = "SELECT COUNT(DEVICE_ID) AS DEVICE_COUNT FROM DEVICES_VIEW_2 " +
+                  "WHERE TENANT_ID = ? AND FEATURE_CODE = ?";
+
+            stmt = con.prepareStatement(sql);
+            stmt.setInt(1, tenantId);
+            stmt.setString(2, nonCompliantFeatureCode);
+
+            // executing query
+            rs = stmt.executeQuery();
+            // fetching query results
+            while (rs.next()) {
+                totalRecordsCount = rs.getInt("DEVICE_COUNT");
+            }
         } catch (SQLException e) {
             throw new GadgetDataServiceDAOException("Error occurred while executing a selection query to the database", e);
         } finally {
             DeviceManagementDAOUtil.cleanupResources(stmt, rs);
         }
-        return filteredDevicesWithDetails;
+        PaginationResult paginationResult = new PaginationResult();
+        paginationResult.setData(filteredDevicesWithDetails);
+        paginationResult.setRecordsTotal(totalRecordsCount);
+        return paginationResult;
     }
 
     private Connection getConnection() throws SQLException {

components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/internal/GadgetDataServiceImpl.java

@@ -236,4 +236,15 @@ class GadgetDataServiceImpl implements GadgetDataService {
         return featureNonCompliantDeviceCountsByOwnershipTypes;
     }
 
+    @Override
+    public PaginationResult getDevicesWithDetails(Map<String, Object> filters, PaginationRequest paginationRequest) {
+        return null;
+    }
+
+    @Override
+    public PaginationResult getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode,
+                            Map<String, Object> filters, PaginationRequest paginationRequest) {
+        return null;
+    }
+
 }