Fix for the incorrect device statistics shown in the app store. #508

Merged

tcdlpds merged 6 commits from ruwin/device-mgt-core:statistics into master

ruwin commented

Purpose

Fixed https://roadmap.entgra.net/issues/11657

Description

This pull request addresses a bug fix to the incorrect device statistics shown in the app store.

The following changes have been made:

Filtered and removed device ids getting for the calculation, which are in REMOVED and DELETED statuses.

ruwin added 2 commits

2da8cdd05f Fixed the incorrect device statistics issue happening due to REMOVED and DELETED devices.

6934827920 Fixed the incorrect device statistics issue happening due to REMOVED and DELETED devices.

arshana790 reviewed

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/GroupBasedSubscriptionManagementHelperServiceImpl.java Outdated

rajitha requested changes

ruwin added 1 commit

0609b3a9c2 Used constants instead of hardcoding

ruwin added 1 commit

a161791fc0 Added a method to retrieve the device count based on application type

tcdlpds requested changes

tcdlpds commented

Owner

In this service method are we considering the device type of the application supported?

rajitha commented

Collaborator

Yes, your point is valid, but in the latter part SubscriptionStatisticDTO subscriptionStatisticDTO = subscriptionDAO.getSubscriptionStatistic (deviceIdsOwnByGroup, isUnsubscribe, tenantId, applicationReleaseDTO.getId()); when getting the stats, we're considering the release id. So the device type constraint will be implicitly satisfied.

ruwin commented

Poster

Yes, otherwise if a scenario like triggering an android application installation to group which have both the windows and android devices assigned to it then those app irrelevant devices (in this case windows) are also being counted for the device count but they are not relevant to that app installation. Here we are getting only the completed, pending and error device count and substract it from the total device count and assign that remainder to the new device count and pass it for the calculation of percentages so, when the device type of the application supported is not considered it will count all the devices relevant to that group so the new device percentage might be wrong.

tcdlpds marked this conversation as resolved

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/GroupDAO.java Outdated

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/service/GroupManagementProviderService.java Outdated

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/service/GroupManagementProviderServiceImpl.java

ruwin added 18 commits

bbc1643795 Add release version report supportablility

401c4db5a2 Add tooltip component to features

d8448f55ea Fix data type inconsistency in tag db scripts

8cd8a5b728 Update release rating data type

fe2a489c1f Fix search by middle part of the username is not working in uninstall table in app store.

57295de20f Implement the search API for Subscription details view

4ddea7afc1 Update operations status when serve startup

b304e7dc54 Save OperationStartupHandler in data holder

f8aa4eab90 Throw msg and the exception in relevent places

1a0616fd1d Use try with resources for dao layer

12505b473f Get server startup handlers to a single point in device-mgt core

030966baf4 Add special warning message for Factory Reset, Enterprise Wipe, disneroll operations.

0cbd3007a4 Add missing cope

87d040f7cb Improve device status management service

ea64d3e3cc Fix compile failure

a02bf98487 Add improvements for the TenantMgtServiceComponent.

8212e51fed Added a method to get the device count based on app os type with group

16ee68d8a3 Completed the requested changes

ruwin force-pushed statistics from 16ee68d8a3 to 230192f2d9

tcdlpds merged commit df129651fd into master 5 days ago

Reviewers

rajitha requested changes

tcdlpds requested changes

The pull request has been merged as df129651fd.

No Label

No Milestone

No project

No Assignees

4 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: community/device-mgt-core#508

             List<Integer> removedIds = devices.stream()
                     .filter(device -> {
                         String status = String.valueOf(device.getEnrolmentInfo().getStatus());
                         return "REMOVED".equalsIgnoreCase(status) || "DELETED".equalsIgnoreCase(status);

             List<Device> devices = HelperUtil.getGroupManagementProviderService().
                     getAllDevicesOfGroup(subscriptionInfo.getIdentifier(), false);
             List<Integer> deviceIdsOwnByGroup = devices.stream().map(Device::getId).collect(Collectors.toList());
             List<Integer> removedIds = devices.stream()

                     getAllDevicesOfGroup(subscriptionInfo.getIdentifier(), false);
             List<String> deviceStatuses = Arrays.asList(EnrolmentInfo.Status.ACTIVE.name(),
                     EnrolmentInfo.Status.INACTIVE.name(), EnrolmentInfo.Status.UNREACHABLE.name());
             List<Device> devices = HelperUtil.getGroupManagementProviderService().getAllDevicesOfGroup(subscriptionInfo.getIdentifier(), deviceStatuses, false);

         try {
             GroupManagementDAOFactory.openConnection();
             return groupDAO.getDeviceCountWithGroup(groupName,deviceTypeId, tenantId);
         } catch (SQLException | GroupManagementDAOException e) {


				`int getDeviceCount(String groupName, int tenantId) throws GroupManagementDAOException;`

				`int getDeviceCountWithGroup(String groupName, int deviceTypeId, int tenantId) throws GroupManagementDAOException;`

				`int getDeviceCount(String groupName) throws GroupManagementException;`


				`int getDeviceCountWithGroup(String groupName, int deviceTypeId) throws GroupManagementException;`