community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Fix ownership issue in device deletion' (#234) from osh.silva/device-mgt-core:billing-delete-fix-9713 into master

Browse Source 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/234
This commit is contained in:
Inosh Perara 2023-09-26 14:58:19 +00:00
commit bf5ce17bdc
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java
View File

@ -2811,18 +2811,16 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
* @throws DeviceManagementDAOException if refactoring fails * @throws DeviceManagementDAOException if refactoring fails
*/ */
public void refactorEnrolment(Connection conn, List<Integer> deviceIds) throws DeviceManagementDAOException { public void refactorEnrolment(Connection conn, List<Integer> deviceIds) throws DeviceManagementDAOException {
String updateQuery = "UPDATE DM_ENROLMENT SET OWNER = ?, OWNERSHIP = ?, STATUS = ? WHERE DEVICE_ID = ?"; String updateQuery = "UPDATE DM_ENROLMENT SET OWNER = ?, STATUS = ? WHERE DEVICE_ID = ?";
try (PreparedStatement preparedStatement = conn.prepareStatement(updateQuery)) { try (PreparedStatement preparedStatement = conn.prepareStatement(updateQuery)) {
for (int deviceId : deviceIds) { for (int deviceId : deviceIds) {
String randomOwner = generateRandomString(4); String randomOwner = generateRandomString(4);
String randomOwnership = generateRandomString(6);
preparedStatement.setString(1, randomOwner); preparedStatement.setString(1, randomOwner);
preparedStatement.setString(2, randomOwnership); preparedStatement.setString(2, String.valueOf(Status.DELETED));
preparedStatement.setString(3, String.valueOf(Status.DELETED)); preparedStatement.setInt(3, deviceId);
preparedStatement.setInt(4, deviceId);
preparedStatement.executeUpdate(); preparedStatement.executeUpdate();
} }