Fix to display statistics in webapps

Fixed to display the subscription statistics in web apps also.

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/subscription/mgt/impl/RoleBasedSubscriptionManagementHelperServiceImpl.java

@@ -44,6 +44,8 @@ import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
 import io.entgra.device.mgt.core.device.mgt.common.PaginationRequest;
 import io.entgra.device.mgt.core.device.mgt.common.PaginationResult;
 import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceManagementDAOException;
+import io.entgra.device.mgt.core.device.mgt.core.dto.DeviceDetailsDTO;
 import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -190,7 +192,7 @@ public class RoleBasedSubscriptionManagementHelperServiceImpl implements Subscri
             List<Integer> deviceIdsOwnByRole = getDeviceIdsOwnByRole(subscriptionInfo.getIdentifier(), tenantId);
             SubscriptionStatisticDTO subscriptionStatisticDTO = subscriptionDAO.
                     getSubscriptionStatistic(deviceIdsOwnByRole, isUnsubscribe, tenantId, applicationReleaseDTO.getId());
-            int allDeviceCount = deviceIdsOwnByRole.size();
+            int allDeviceCount = getDeviceIdsOwnByRoleWithType(subscriptionInfo.getIdentifier(), tenantId, applicationReleaseDTO);
             return SubscriptionManagementHelperUtil.getSubscriptionStatistics(subscriptionStatisticDTO, allDeviceCount);
         } catch (DeviceManagementException | ApplicationManagementDAOException | UserStoreException e) {
             String msg = "Error encountered while getting subscription statistics for role: " + subscriptionInfo.getIdentifier();
@@ -212,7 +214,7 @@ public class RoleBasedSubscriptionManagementHelperServiceImpl implements Subscri
             PaginationRequest paginationRequest = new PaginationRequest(-1, -1);
             paginationRequest.setOwner(user);
             paginationRequest.setStatusList(Arrays.asList(EnrolmentInfo.Status.ACTIVE.name(),
-                    EnrolmentInfo.Status.INACTIVE.name(),EnrolmentInfo.Status.UNREACHABLE.name()));
+                    EnrolmentInfo.Status.INACTIVE.name(), EnrolmentInfo.Status.UNREACHABLE.name()));
             PaginationResult ownDeviceIds = HelperUtil.getDeviceManagementProviderService().
                     getAllDevicesIdList(paginationRequest);
             if (ownDeviceIds.getData() != null) {
@@ -222,6 +224,38 @@ public class RoleBasedSubscriptionManagementHelperServiceImpl implements Subscri
         return deviceListOwnByRole.stream().map(Device::getId).collect(Collectors.toList());
     }
 
+    private int getDeviceIdsOwnByRoleWithType(String roleName, int tenantId, ApplicationReleaseDTO applicationReleaseDTO)
+            throws UserStoreException, DeviceManagementException {
+        UserStoreManager userStoreManager = DataHolder.getInstance().getRealmService()
+                .getTenantUserRealm(tenantId).getUserStoreManager();
+        String[] usersWithRole = userStoreManager.getUserListOfRole(roleName);
+        int idCountOwnByRole = 0;
+        int deviceTypeId;
+        try {
+            deviceTypeId = applicationDAO.getApplication(applicationReleaseDTO.getUuid(), tenantId).getDeviceTypeId();
+        } catch (ApplicationManagementDAOException e) {
+            String msg = "Error encountered while accessing application management data.";
+            log.error(msg, e);
+            throw new DeviceManagementException(msg, e);
+        }
+        for (String user : usersWithRole) {
+            try {
+                List<DeviceDetailsDTO> idsOwnByRole = HelperUtil.getDeviceManagementProviderService()
+                        .getDevicesByTenantId(tenantId, deviceTypeId, user, null);
+                if (idsOwnByRole != null) {
+                    idCountOwnByRole += idsOwnByRole.size();
+                }
+            } catch (DeviceManagementDAOException e) {
+                String msg = String.format("Error encountered while accessing device management data for user: %s", user);
+                log.error(msg, e);
+            } catch (Exception e) {
+                String msg = String.format("Unexpected error occurred for user: %s", user);
+                log.error(msg, e);
+            }
+        }
+        return idCountOwnByRole;
+    }
+
     private static class RoleBasedSubscriptionManagementHelperServiceImplHolder {
         private static final RoleBasedSubscriptionManagementHelperServiceImpl INSTANCE
                 = new RoleBasedSubscriptionManagementHelperServiceImpl();

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/subscription/mgt/impl/UserBasedSubscriptionManagementHelperServiceImpl.java

@@ -43,6 +43,8 @@ import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
 import io.entgra.device.mgt.core.device.mgt.common.PaginationRequest;
 import io.entgra.device.mgt.core.device.mgt.common.PaginationResult;
 import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceManagementDAOException;
+import io.entgra.device.mgt.core.device.mgt.core.dto.DeviceDetailsDTO;
 import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -181,12 +183,16 @@ public class UserBasedSubscriptionManagementHelperServiceImpl implements Subscri
             List<Integer> deviceIdsOwnByUser = getDeviceIdsOwnByUser(subscriptionInfo.getIdentifier());
             SubscriptionStatisticDTO subscriptionStatisticDTO = subscriptionDAO.
                     getSubscriptionStatistic(deviceIdsOwnByUser, isUnsubscribe, tenantId, applicationReleaseDTO.getId());
-            int allDeviceCount = deviceIdsOwnByUser.size();
+            List <DeviceDetailsDTO> devices = HelperUtil.getDeviceManagementProviderService().getDevicesByTenantId(tenantId,
+                    applicationDAO.getApplication(applicationReleaseDTO.getUuid(), tenantId).getDeviceTypeId(), subscriptionInfo.getIdentifier(), null);
+            int allDeviceCount = devices.size();
             return SubscriptionManagementHelperUtil.getSubscriptionStatistics(subscriptionStatisticDTO, allDeviceCount);
         } catch (DeviceManagementException | ApplicationManagementDAOException e) {
             String msg = "Error encountered while getting subscription statistics for user: " + subscriptionInfo.getIdentifier();
             log.error(msg, e);
             throw new ApplicationManagementException(msg, e);
+        } catch (DeviceManagementDAOException e) {
+            throw new RuntimeException(e);
         } finally {
             ConnectionManagerUtil.closeDBConnection();
         }

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java

@@ -1590,20 +1590,23 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
         int deviceCount = 0;
         try {
             Connection connection = GroupManagementDAOFactory.getConnection();
-            String sql = "SELECT COUNT(e.ID) AS COUNT " +
+            StringBuilder sql = new StringBuilder("SELECT COUNT(e.ID) AS COUNT " +
                     "FROM DM_GROUP d " +
                     "INNER JOIN DM_DEVICE_GROUP_MAP m ON d.ID = m.GROUP_ID " +
                     "INNER JOIN DM_ENROLMENT e ON m.DEVICE_ID = e.DEVICE_ID " +
                     "INNER JOIN DM_DEVICE r ON e.DEVICE_ID = r.ID " +
                     "WHERE d.TENANT_ID = ? " +
                     "AND d.GROUP_NAME = ? " +
-                    "AND r.DEVICE_TYPE_ID = ? " +
-                    "AND e.STATUS NOT IN ('REMOVED', 'DELETED')";
-
-            try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
+                    "AND e.STATUS NOT IN ('REMOVED', 'DELETED')");
+            if (deviceTypeId != 0) {
+                sql.append(" AND r.DEVICE_TYPE_ID = ?");
+            }
+            try (PreparedStatement preparedStatement = connection.prepareStatement(sql.toString())) {
                 preparedStatement.setInt(1, tenantId);
                 preparedStatement.setString(2, groupName);
-                preparedStatement.setInt(3, deviceTypeId);
+                if (deviceTypeId != 0) {
+                    preparedStatement.setInt(3, deviceTypeId);
+                }
                 try (ResultSet resultSet = preparedStatement.executeQuery()) {
                     if (resultSet.next()) {
                         deviceCount = resultSet.getInt("COUNT");
@@ -1618,3 +1621,5 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
         }
     }
 }
+
+