scottk/wlan-cloud-services
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-services.git synced 2025-11-03 12:07:56 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

[WIFI-3180] Adding case insensitivity to Portal User API Search

Browse Source
This commit is contained in:
ralphlee
2021-07-20 10:38:04 -04:00
parent abb9b59659
commit 7c387f1940
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
portal-user-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/portaluser/datastore/inmemory/PortalUserDatastoreInMemory.java
View File

@@ -148,7 +148,7 @@ public class PortalUserDatastoreInMemory extends BaseInMemoryDatastore implement
PortalUser ret = null; PortalUser ret = null;
for (PortalUser mdl : idToPortalUserMap.values()) { for (PortalUser mdl : idToPortalUserMap.values()) {
if(mdl.getCustomerId() == customerId && mdl.getUsername().equals(username)) { if(mdl.getCustomerId() == customerId && mdl.getUsername().toLowerCase().equals(username.toLowerCase())) {
ret = mdl.clone(); ret = mdl.clone();
} }
} }
@@ -161,7 +161,7 @@ public class PortalUserDatastoreInMemory extends BaseInMemoryDatastore implement
List<PortalUser> listOfPortalUsers = new ArrayList<>(); List<PortalUser> listOfPortalUsers = new ArrayList<>();
for (PortalUser portalUser : idToPortalUserMap.values()) { for (PortalUser portalUser : idToPortalUserMap.values()) {
if (portalUser.getUsername().equals(username)) { if (portalUser.getUsername().toLowerCase().equals(username.toLowerCase())) {
listOfPortalUsers.add(portalUser); listOfPortalUsers.add(portalUser);
} }
} }

9
portal-user-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/portaluser/datastore/rdbms/PortalUserDAO.java
View File

@@ -75,7 +75,6 @@ public class PortalUserDAO extends BaseJdbcDao {
public static final Set<String> ALL_COLUMNS_LOWERCASE = new HashSet<>(); public static final Set<String> ALL_COLUMNS_LOWERCASE = new HashSet<>();
@SuppressWarnings("unused")
//use this for queries where multiple tables are involved //use this for queries where multiple tables are involved
public static final String ALL_COLUMNS_WITH_PREFIX; public static final String ALL_COLUMNS_WITH_PREFIX;
@@ -135,10 +134,10 @@ public class PortalUserDAO extends BaseJdbcDao {
private static final String SQL_GET_BY_USERNAME = private static final String SQL_GET_BY_USERNAME =
"select " + ALL_COLUMNS + "select " + ALL_COLUMNS +
" from " + TABLE_NAME + " " + " from " + TABLE_NAME + " " +
" where username = ? "; " where lower(username) = ? ";
private static final String SQL_GET_BY_CUSTOMERID_AND_USERNAME = SQL_GET_BY_CUSTOMER_ID + private static final String SQL_GET_BY_CUSTOMERID_AND_USERNAME = SQL_GET_BY_CUSTOMER_ID +
" and username = ?"; " and lower(username) = ?";
private static final String SQL_GET_LASTMOD_BY_ID = private static final String SQL_GET_LASTMOD_BY_ID =
"select lastModifiedTimestamp " + "select lastModifiedTimestamp " +
@@ -463,7 +462,7 @@ public class PortalUserDAO extends BaseJdbcDao {
try{ try{
PortalUser portalUser = this.jdbcTemplate.queryForObject( PortalUser portalUser = this.jdbcTemplate.queryForObject(
SQL_GET_BY_CUSTOMERID_AND_USERNAME, SQL_GET_BY_CUSTOMERID_AND_USERNAME,
portalUserRowMapper, customerId, username); portalUserRowMapper, customerId, username.toLowerCase());
LOG.debug("Found PortalUser {}", portalUser); LOG.debug("Found PortalUser {}", portalUser);
@@ -478,7 +477,7 @@ public class PortalUserDAO extends BaseJdbcDao {
LOG.debug("Looking up PortalUsers for username {} {}", username); LOG.debug("Looking up PortalUsers for username {} {}", username);
List<PortalUser> ret = this.jdbcTemplate.query(SQL_GET_BY_USERNAME, List<PortalUser> ret = this.jdbcTemplate.query(SQL_GET_BY_USERNAME,
portalUserRowMapper, username); portalUserRowMapper, username.toLowerCase());
LOG.debug("Found List of Portal Users {}", ret); LOG.debug("Found List of Portal Users {}", ret);