waruni
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issues in get devices method

Browse Source
master
prathabanKavin 5 months ago
parent aa9f3da380
commit 2021a0b37a
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File

53
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
Unescape View File

@ -1484,34 +1484,35 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
stmt.setInt(3, limit); stmt.setInt(3, limit);
stmt.setInt(4, offset); stmt.setInt(4, offset);
try (ResultSet rs = stmt.executeQuery()) { try (ResultSet rs = stmt.executeQuery()) {
while (rs.next()) { while (rs.next()) {
if (groupDetails.getGroupId() == 0) { if (groupDetails.getGroupId() == 0) {
groupDetails.setGroupId(rs.getInt("GROUP_ID")); groupDetails.setGroupId(rs.getInt("GROUP_ID"));
groupDetails.setGroupName(rs.getString("GROUP_NAME")); groupDetails.setGroupName(rs.getString("GROUP_NAME"));
groupDetails.setGroupOwner(rs.getString("GROUP_OWNER")); groupDetails.setGroupOwner(rs.getString("GROUP_OWNER"));
}
int deviceId = rs.getInt("DEVICE_ID");
deviceIds.add(deviceId);
deviceOwners.put(deviceId, rs.getString("DEVICE_OWNER"));
deviceStatuses.put(deviceId, rs.getString("DEVICE_STATUS"));
deviceNames.put(deviceId, rs.getString("DEVICE_NAME"));
deviceTypes.put(deviceId, rs.getString("DEVICE_TYPE"));
deviceIdentifiers.put(deviceId, rs.getString("DEVICE_IDENTIFICATION"));
} }
int deviceId = rs.getInt("DEVICE_ID");
deviceIds.add(deviceId);
deviceOwners.put(deviceId, rs.getString("DEVICE_OWNER"));
deviceStatuses.put(deviceId, rs.getString("DEVICE_STATUS"));
deviceNames.put(deviceId, rs.getString("DEVICE_NAME"));
deviceTypes.put(deviceId, rs.getString("DEVICE_TYPE"));
deviceIdentifiers.put(deviceId, rs.getString("DEVICE_IDENTIFICATION"));
} }
} groupDetails.setDeviceIds(deviceIds);
} catch (SQLException e) { groupDetails.setDeviceCount(deviceIds.size());
String msg = "Error occurred while retrieving group details and device IDs for group: " + groupName; groupDetails.setDeviceOwners(deviceOwners);
log.error(msg, e); groupDetails.setDeviceStatuses(deviceStatuses);
throw new GroupManagementDAOException(msg, e); groupDetails.setDeviceNames(deviceNames);
groupDetails.setDeviceTypes(deviceTypes);
groupDetails.setDeviceIdentifiers(deviceIdentifiers);
return groupDetails;
} }
groupDetails.setDeviceIds(deviceIds); } catch (SQLException e) {
groupDetails.setDeviceCount(deviceIds.size()); String msg = "Error occurred while retrieving group details and device IDs for group: " + groupName;
groupDetails.setDeviceOwners(deviceOwners); log.error(msg, e);
groupDetails.setDeviceStatuses(deviceStatuses); throw new GroupManagementDAOException(msg, e);
groupDetails.setDeviceNames(deviceNames); }
groupDetails.setDeviceTypes(deviceTypes);
groupDetails.setDeviceIdentifiers(deviceIdentifiers);
return groupDetails;
} }
} }

Write Preview
Loading…
Cancel
Save