Add initial fix for group subscription table

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/CategorizedSubscriptionResult.java

@@ -23,10 +23,15 @@ import java.util.List;
 
 public class CategorizedSubscriptionResult {
     private List<DeviceSubscriptionData> installedDevices;
+    private int installedDevicesCount;
     private List<DeviceSubscriptionData> pendingDevices;
+    private int pendingDevicesCount;
     private List<DeviceSubscriptionData> errorDevices;
+    private int errorDevicesCount;
     private List<DeviceSubscriptionData> newDevices;
+    private int newDevicesCount;
     private List<DeviceSubscriptionData> subscribedDevices;
+    private int subscribedDevicesCount;
 
     public CategorizedSubscriptionResult(List<DeviceSubscriptionData> installedDevices,
                                          List<DeviceSubscriptionData> pendingDevices,
@@ -61,6 +66,48 @@ public class CategorizedSubscriptionResult {
         this.subscribedDevices = subscribedDevices;
     }
 
+    public CategorizedSubscriptionResult(List<DeviceSubscriptionData> installedDevices,
+                                         List<DeviceSubscriptionData> pendingDevices,
+                                         List<DeviceSubscriptionData> errorDevices,
+                                         List<DeviceSubscriptionData> newDevices,
+                                         int installedDevicesCount,
+                                         int pendingDevicesCount,
+                                         int errorDevicesCount,
+                                         int newDevicesCount
+                                         ) {
+        this.installedDevices = installedDevices;
+        this.pendingDevices = pendingDevices;
+        this.errorDevices = errorDevices;
+        this.newDevices = newDevices;
+        this.subscribedDevices = null;
+        this.installedDevicesCount = installedDevicesCount;
+        this.pendingDevicesCount = pendingDevicesCount;
+        this.errorDevicesCount = errorDevicesCount;
+        this.newDevicesCount = newDevicesCount;
+        this.subscribedDevicesCount = 0;
+    }
+
+    public CategorizedSubscriptionResult(List<DeviceSubscriptionData> installedDevices,
+                                         List<DeviceSubscriptionData> pendingDevices,
+                                         List<DeviceSubscriptionData> errorDevices,
+                                         List<DeviceSubscriptionData> newDevices,
+                                         List<DeviceSubscriptionData> subscribedDevices, int installedDevicesCount,
+                                         int pendingDevicesCount,
+                                         int errorDevicesCount,
+                                         int newDevicesCount,
+                                         int subscribedDevicesCount) {
+        this.installedDevices = installedDevices;
+        this.pendingDevices = pendingDevices;
+        this.errorDevices = errorDevices;
+        this.newDevices = newDevices;
+        this.subscribedDevices = subscribedDevices;
+        this.installedDevicesCount = installedDevicesCount;
+        this.pendingDevicesCount = pendingDevicesCount;
+        this.errorDevicesCount = errorDevicesCount;
+        this.newDevicesCount = newDevicesCount;
+        this.subscribedDevicesCount = subscribedDevicesCount;
+    }
+
     public CategorizedSubscriptionResult(List<DeviceSubscriptionData> devices, String tabActionStatus) {
         switch (tabActionStatus) {
             case "COMPLETED":
@@ -127,4 +174,44 @@ public class CategorizedSubscriptionResult {
     public void setSubscribedDevices(List<DeviceSubscriptionData> subscribedDevices) {
         this.subscribedDevices = subscribedDevices;
     }
+
+    public int getInstalledDevicesCount() {
+        return installedDevicesCount;
+    }
+
+    public void setInstalledDevicesCount(int installedDevicesCount) {
+        this.installedDevicesCount = installedDevicesCount;
+    }
+
+    public int getPendingDevicesCount() {
+        return pendingDevicesCount;
+    }
+
+    public void setPendingDevicesCount(int pendingDevicesCount) {
+        this.pendingDevicesCount = pendingDevicesCount;
+    }
+
+    public int getErrorDevicesCount() {
+        return errorDevicesCount;
+    }
+
+    public void setErrorDevicesCount(int errorDevicesCount) {
+        this.errorDevicesCount = errorDevicesCount;
+    }
+
+    public int getNewDevicesCount() {
+        return newDevicesCount;
+    }
+
+    public void setNewDevicesCount(int newDevicesCount) {
+        this.newDevicesCount = newDevicesCount;
+    }
+
+    public int getSubscribedDevicesCount() {
+        return subscribedDevicesCount;
+    }
+
+    public void setSubscribedDevicesCount(int subscribedDevicesCount) {
+        this.subscribedDevicesCount = subscribedDevicesCount;
+    }
 }

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/SubscriptionDAO.java

@@ -517,4 +517,16 @@ public interface SubscriptionDAO {
      * @throws ApplicationManagementDAOException if connection establishment or SQL execution fails.
      */
     int getUserUnsubscriptionCount(int appReleaseId, int tenantId) throws ApplicationManagementDAOException;
+
+    /**
+     * This method is used to get the counts of devices related to a UUID.
+     *
+     * @param appReleaseId the UUID of the application release.
+     * @param tenantId id of the current tenant.
+     * @param actionStatus categorized status.
+     * @param actionTriggeredFrom type of the action.
+     * @return {@link int} which contains the count of the subscription type
+     * @throws ApplicationManagementDAOException if connection establishment or SQL execution fails.
+     */
+    int countSubscriptionsByStatus(int appReleaseId, int tenantId, String actionStatus, String actionTriggeredFrom) throws ApplicationManagementDAOException;
 }

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/subscription/GenericSubscriptionDAOImpl.java

@@ -2487,4 +2487,33 @@ public class GenericSubscriptionDAOImpl extends AbstractDAOImpl implements Subsc
             throw new ApplicationManagementDAOException(msg, e);
         }
     }
+
+    public int countSubscriptionsByStatus(int appReleaseId, int tenantId, String actionStatus, String actionTriggeredFrom) throws ApplicationManagementDAOException {
+        if (log.isDebugEnabled()) {
+            log.debug("Request received in DAO Layer to count device subscriptions by status and actionTriggeredFrom for the given AppReleaseID.");
+        }
+        try {
+            Connection conn = this.getDBConnection();
+            String sql = "SELECT COUNT(*) FROM AP_DEVICE_SUBSCRIPTION WHERE AP_APP_RELEASE_ID = ? AND TENANT_ID = ? AND STATUS = ?";
+            try (PreparedStatement ps = conn.prepareStatement(sql)) {
+                ps.setInt(1, appReleaseId);
+                ps.setInt(2, tenantId);
+                ps.setString(3, actionStatus);
+                try (ResultSet rs = ps.executeQuery()) {
+                    if (rs.next()) {
+                        return rs.getInt(1);
+                    }
+                }
+            }
+        } catch (DBConnectionException e) {
+            String msg = "Error occurred while obtaining the DB connection to count device subscriptions by status and action trigger.";
+            log.error(msg, e);
+            throw new ApplicationManagementDAOException(msg, e);
+        } catch (SQLException e) {
+            String msg = "SQL Error occurred while counting device subscriptions by status and action trigger.";
+            log.error(msg, e);
+            throw new ApplicationManagementDAOException(msg, e);
+        }
+        return 0;
+    }
 }

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/SubscriptionManagerImpl.java

@@ -1878,33 +1878,59 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
                 }
 
                 List<DeviceSubscriptionData> requestedDevices = new ArrayList<>();
+                String actionTriggeredFrom = "group";
+                int installedCount;
+                int pendingCount;
+                int errorCount;
+                int newCount;
+                int subscribedCount;
+                int totalDeviceCount =
+                        groupManagementProviderService.getDeviceCount(groupDetailWithDevices.getGroupId());
+
                 if (StringUtils.isNotBlank(request.getTabActionStatus())) {
                     switch (request.getTabActionStatus()) {
                         case "COMPLETED":
                             requestedDevices = installedDevices;
+                            installedCount = subscriptionDAO.countSubscriptionsByStatus(appReleaseId, tenantId, request.getTabActionStatus(), actionTriggeredFrom);
                             break;
                         case "PENDING":
                             requestedDevices = pendingDevices;
+                            pendingCount = subscriptionDAO.countSubscriptionsByStatus(appReleaseId, tenantId, request.getTabActionStatus(), actionTriggeredFrom);
                             break;
                         case "ERROR":
                             requestedDevices = errorDevices;
+                            errorCount = subscriptionDAO.countSubscriptionsByStatus(appReleaseId, tenantId, request.getTabActionStatus(), actionTriggeredFrom);
                             break;
                         case "NEW":
                             requestedDevices = newDevices;
+//                            newCount = subscriptionDAO.countSubscriptionsByStatus(appReleaseId, tenantId, request.getTabActionStatus(), actionTriggeredFrom);
                             break;
                         case "SUBSCRIBED":
                             requestedDevices = subscribedDevices;
+                            subscribedCount = subscriptionDAO.countSubscriptionsByStatus(appReleaseId, tenantId, request.getTabActionStatus(), actionTriggeredFrom);
                             break;
                     }
                     groupDetailDTO.setDevices(new CategorizedSubscriptionResult(requestedDevices, request.getTabActionStatus()));
                 } else {
                     CategorizedSubscriptionResult categorizedSubscriptionResult;
+
+                    installedCount = subscriptionDAO.countSubscriptionsByStatus(appReleaseId, tenantId, "COMPLETED", actionTriggeredFrom);
+                    pendingCount = subscriptionDAO.countSubscriptionsByStatus(appReleaseId, tenantId, "PENDING", actionTriggeredFrom);
+                    errorCount = subscriptionDAO.countSubscriptionsByStatus(appReleaseId, tenantId, "ERROR", actionTriggeredFrom);
+//                    newCount = subscriptionDAO.countSubscriptionsByStatus(appReleaseId, tenantId, "NEW", actionTriggeredFrom);
+                    subscribedCount = subscriptionDAO.countSubscriptionsByStatus(appReleaseId, tenantId, "SUBSCRIBED", actionTriggeredFrom);
+                    newCount = totalDeviceCount - (installedCount + pendingCount + errorCount + subscribedCount);
+
                     if (subscribedDevices.isEmpty()) {
                         categorizedSubscriptionResult =
-                                new CategorizedSubscriptionResult(installedDevices, pendingDevices, errorDevices, newDevices);
+                                new CategorizedSubscriptionResult(installedDevices, pendingDevices, errorDevices, newDevices, installedCount, pendingCount, errorCount, newCount);
+//                        categorizedSubscriptionResult =
+//                                new CategorizedSubscriptionResult(installedDevices, pendingDevices, errorDevices, newDevices);
                     } else {
                         categorizedSubscriptionResult =
-                                new CategorizedSubscriptionResult(installedDevices, pendingDevices, errorDevices, newDevices, subscribedDevices);
+                                new CategorizedSubscriptionResult(installedDevices, pendingDevices, errorDevices, newDevices, subscribedDevices, installedCount, pendingCount, errorCount, newCount, subscribedCount);
+//                        categorizedSubscriptionResult =
+//                                new CategorizedSubscriptionResult(installedDevices, pendingDevices, errorDevices, newDevices, subscribedDevices);
                     }
                     groupDetailDTO.setDevices(categorizedSubscriptionResult);
                 }