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

Merge pull request 'Fix geofence search by partial name' (#282) from prathabanKavin/device-mgt-core:searchgeofencefix into master

Browse Source 
Reviewed-on: community/device-mgt-core#282
scope_role_map
Pahansith Gunathilake 1 year ago
parent cdf3e2717a ce62632702
commit c50c8d5907
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

4
components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/AbstractGeofenceDAOImpl.java
Unescape View File

@ -153,7 +153,7 @@ public abstract class AbstractGeofenceDAOImpl implements GeofenceDAO {
try (PreparedStatement stmt = conn.prepareStatement(sql)) { try (PreparedStatement stmt = conn.prepareStatement(sql)) {
stmt.setInt(index++, tenantId); stmt.setInt(index++, tenantId);
if (isNameProvided) { if (isNameProvided) {
stmt.setString(index++, request.getProperty(DeviceManagementConstants.GeoServices.FENCE_NAME).toString() + "%"); stmt.setString(index++, "%" + request.getProperty(DeviceManagementConstants.GeoServices.FENCE_NAME).toString() + "%");
} }
stmt.setInt(index++, request.getRowCount()); stmt.setInt(index++, request.getRowCount());
stmt.setInt(index, request.getStartIndex()); stmt.setInt(index, request.getStartIndex());
@ -190,7 +190,7 @@ public abstract class AbstractGeofenceDAOImpl implements GeofenceDAO {
"WHERE FENCE_NAME LIKE ?" + "WHERE FENCE_NAME LIKE ?" +
"AND TENANT_ID = ? "; "AND TENANT_ID = ? ";
try (PreparedStatement stmt = conn.prepareStatement(sql)) { try (PreparedStatement stmt = conn.prepareStatement(sql)) {
stmt.setString(1, fenceName + "%"); stmt.setString(1, "%" + fenceName + "%");
stmt.setInt(2, tenantId); stmt.setInt(2, tenantId);
try (ResultSet rst = stmt.executeQuery()) { try (ResultSet rst = stmt.executeQuery()) {
geofenceData = extractGeofenceData(rst); geofenceData = extractGeofenceData(rst);

4
components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/geofence/GenericGeofenceDAOImpl.java
Unescape View File

@ -143,7 +143,7 @@ public class GenericGeofenceDAOImpl extends AbstractGeofenceDAOImpl {
try (PreparedStatement stmt = conn.prepareStatement(sql)) { try (PreparedStatement stmt = conn.prepareStatement(sql)) {
stmt.setInt(index++, tenantId); stmt.setInt(index++, tenantId);
if (isNameProvided) { if (isNameProvided) {
stmt.setString(index++, request.getProperty(DeviceManagementConstants.GeoServices.FENCE_NAME).toString() + "%"); stmt.setString(index++, request.getProperty("%" + DeviceManagementConstants.GeoServices.FENCE_NAME).toString() + "%");
} }
stmt.setInt(index++, request.getRowCount()); stmt.setInt(index++, request.getRowCount());
stmt.setInt(index, request.getStartIndex()); stmt.setInt(index, request.getStartIndex());
@ -180,7 +180,7 @@ public class GenericGeofenceDAOImpl extends AbstractGeofenceDAOImpl {
"WHERE FENCE_NAME LIKE ?" + "WHERE FENCE_NAME LIKE ?" +
"AND TENANT_ID = ? "; "AND TENANT_ID = ? ";
try (PreparedStatement stmt = conn.prepareStatement(sql)) { try (PreparedStatement stmt = conn.prepareStatement(sql)) {
stmt.setString(1, fenceName + "%"); stmt.setString(1,"%" + fenceName + "%");
stmt.setInt(2, tenantId); stmt.setInt(2, tenantId);
try (ResultSet rst = stmt.executeQuery()) { try (ResultSet rst = stmt.executeQuery()) {
geofenceData = extractGeofenceData(rst); geofenceData = extractGeofenceData(rst);

2
components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/geofence/SQLServerGeofenceDAOImpl.java
Unescape View File

@ -71,7 +71,7 @@ public class SQLServerGeofenceDAOImpl extends AbstractGeofenceDAOImpl {
try (PreparedStatement stmt = conn.prepareStatement(sql)) { try (PreparedStatement stmt = conn.prepareStatement(sql)) {
stmt.setInt(index++, tenantId); stmt.setInt(index++, tenantId);
if (isNameProvided) { if (isNameProvided) {
stmt.setString(index++, request.getProperty(DeviceManagementConstants.GeoServices.FENCE_NAME).toString() + "%"); stmt.setString(index++, "%" + request.getProperty(DeviceManagementConstants.GeoServices.FENCE_NAME).toString() + "%");
} }
stmt.setInt(index++, request.getStartIndex()); stmt.setInt(index++, request.getStartIndex());
stmt.setInt(index, request.getRowCount()); stmt.setInt(index, request.getRowCount());

Write Preview
Loading…
Cancel
Save