community
/
device-mgt-core
12
0
Fork 43
Code Issues Pull Requests 20 Packages Projects Releases Wiki Activity
Labels Milestones

Fix deleted,removed devices appearing in subscription table #447

Merged
pahansith merged 5 commits from prathabanKavin/device-mgt-core:removeddevicefix into master 3 months ago
Conversation 0 Commits 5 Files Changed 9
prathabanKavin commented 3 months ago

Purpose

Description

  • Add device filters similar as installation table to Subscription Details table
## Purpose * Fixes https://roadmap.entgra.net/issues/11444, https://roadmap.entgra.net/issues/11445 ## Description * Add device filters similar as installation table to Subscription Details table
prathabanKavin added 2 commits 3 months ago
prathabanKavin added 1 commit 3 months ago
pahansith requested changes 3 months ago
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 Outdated
ApplicationDTO applicationDTO = this.applicationDAO.getAppWithRelatedRelease(uuid, tenantId);
int appReleaseId = applicationReleaseDTO.getId();
int deviceTypeId = applicationDTO.getDeviceTypeId();
pahansith commented 3 months ago
Owner

Seems we don't require to get this value into a variable

Seems we don't require to get this value into a variable
prathabanKavin marked this conversation as resolved
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 Outdated
ApplicationDTO applicationDTO = this.applicationDAO.getAppWithRelatedRelease(uuid, tenantId);
int appReleaseId = applicationReleaseDTO.getId();
int deviceTypeId = applicationDTO.getDeviceTypeId();
pahansith commented 3 months ago
Owner

Seems we don't require to get this value into a variable

Seems we don't require to get this value into a variable
prathabanKavin 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/EnrollmentDAO.java Outdated
* @throws DeviceManagementDAOException if an error occurs while fetching the data
*/
OwnerWithDeviceDTO getOwnersWithDevices(String owner, int tenantId) throws DeviceManagementDAOException;
OwnerWithDeviceDTO getOwnersWithDevices(String owner, List<String> allowingDeviceStatuses, int tenantId, int deviceTypeId) throws DeviceManagementDAOException;
pahansith commented 3 months ago
Owner

Format code

Format code
prathabanKavin 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
* @throws GroupManagementDAOException if an error occurs while retrieving the group details and devices
*/
GroupDetailsDTO getGroupDetailsWithDevices(String groupName, int tenantId, int offset, int limit)
GroupDetailsDTO getGroupDetailsWithDevices(String groupName, List<String> allowingDeviceStatuses, int deviceTypeId, int tenantId, int offset, int limit)
pahansith commented 3 months ago
Owner

Format code

Format code
prathabanKavin 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/impl/AbstractGroupDAOImpl.java Outdated
@Override
public GroupDetailsDTO getGroupDetailsWithDevices(String groupName, int tenantId, int offset, int limit)
public GroupDetailsDTO getGroupDetailsWithDevices(String groupName, List<String> allowedStatuses, int deviceTypeId, int tenantId, int offset, int limit)
pahansith commented 3 months ago
Owner

Format code

Format code
prathabanKavin 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/service/GroupManagementProviderServiceImpl.java Outdated
try {
GroupManagementDAOFactory.openConnection();
groupDetailsWithDevices = this.groupDAO.getGroupDetailsWithDevices(groupName, tenantId, offset, limit);
groupDetailsWithDevices = this.groupDAO.getGroupDetailsWithDevices(groupName, allowingDeviceStatuses, deviceTypeId, tenantId, offset, limit);
pahansith commented 3 months ago
Owner

Format code

Format code
prathabanKavin marked this conversation as resolved
prathabanKavin added 1 commit 3 months ago
prathabanKavin added 1 commit 3 months ago
pahansith merged commit 090c5d22df into master 3 months ago

Reviewers

pahansith requested changes 3 months ago
The pull request has been merged as 090c5d22df.
Sign in to join this conversation.
Reviewers
Request review
No reviewers
pahansith
Labels
Apply labels
Clear labels
pending upstream
PR depends on pending upstream dependency
No Label pending upstream
Milestone
Set milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Assign users
Clear assignees
No Assignees
2 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: community/device-mgt-core#447
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch 'prathabanKavin/device-mgt-core:removeddevicefix'

Deleting a branch is permanent. It CANNOT be undone. Continue?

No
Yes