Telecominfraproject/wlan-cloud-services
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-services.git synced 2026-01-27 10:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIFI 1739 client session forcustomer max items (#90)

Browse Source 
* [WIFI-1739] Changing client forCustomer cassandra filtering to get 1 session per returned row

* [WIFI-1739] Fix spacing
This commit is contained in:
ralphlee3
2021-03-11 13:53:14 -05:00
committed by GitHub
parent 818cfeb4f0
commit 659fc5bc9e
3 changed files with 135 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
client-datastore-cassandra/src/main/java/com/telecominfraproject/wlan/client/datastore/cassandra/ClientSessionDAO.java
View File

@@ -410,7 +410,7 @@ public class ClientSessionDAO {
queryArgs.addAll(equipmentIds);
query += "and equipmentId in " + CassandraUtils.getBindPlaceholders(equipmentIds);
query_head = "select macAddress from client_session_by_equipment where customerId = ? ";
query_head = "select macAddress, equipmentId from client_session_by_equipment where customerId = ? ";
filterOptions = FilterOptions.customer_and_equipment;
}
@@ -425,7 +425,7 @@ public class ClientSessionDAO {
}
query = " locationId in " + CassandraUtils.getBindPlaceholders(locationIds) + query;
query_head = "select macAddress from client_session_by_location where ";
query_head = "select macAddress, equipmentId from client_session_by_location where ";
filterOptions = FilterOptions.customer_and_location;
}
@@ -435,7 +435,7 @@ public class ClientSessionDAO {
queryArgs.clear();
queryArgs.add(customerId);
queryArgs.add("%" + macSubstring.toLowerCase() + "%");
query_head = "select macAddress from client_session_by_mac where customerId = ? ";
query_head = "select macAddress, equipmentId from client_session_by_mac where customerId = ? ";
if (locationIds != null && !locationIds.isEmpty()) {
queryArgs.addAll(locationIds);
@@ -443,7 +443,7 @@ public class ClientSessionDAO {
}
if (equipmentIds != null && !equipmentIds.isEmpty()) {
queryArgs.addAll(equipmentIds);
query_head = "select macAddress from client_session_by_mac_and_equipment where customerId = ? ";
query_head = "select macAddress, equipmentId from client_session_by_mac_and_equipment where customerId = ? ";
}
query = " and macAddressString like ? " + query + " allow filtering";
@@ -494,27 +494,24 @@ public class ClientSessionDAO {
case customer_and_equipment:
case customer_and_location:
case customer_and_macAddress:
//the query was against client_session_by_equipment or client_session_by_location table
//find all the macAddresses for the page, then retrieve records for them from client_session table
Set<MacAddress> macAddrSet = new HashSet<>();
//the query was against client_session_by_equipment, client_session_by_location, or client_session_by_mac(_and_equipment) table
//find all the macAddresses and equipmentId for the page, then retrieve records for them from client_session table
while (rs.getAvailableWithoutFetching() > 0) {
macAddrSet.add(new MacAddress(rs.one().getLong("macAddress")));
}
//get all the sessions for the involved mac addresses
List<ClientSession> pageSessions = getSessions(customerId, macAddrSet);
//apply local filtering because retrieved sessions may be from different equipments and locations
pageSessions.forEach(cs -> {
//apply locationId and equipmentId filtering in here
if ((locationIds == null || locationIds.isEmpty() || locationIds.contains(cs.getLocationId()))
&& (equipmentIds == null || equipmentIds.isEmpty() || equipmentIds.contains(cs.getEquipmentId()))
&& (macSubstring == null || macSubstring.isEmpty() || cs.getMacAddress().getAddressAsString().toLowerCase().contains(macSubstring.toLowerCase()))
)
Row row = rs.one();
MacAddress macAddr = new MacAddress(row.getLong("macAddress"));
long eqId = row.getLong("equipmentId");
// get a single client session per customerId, returned equipmentId, and returned macAddress from filter tables
ClientSession retSession = getSessionOrNull(customerId, eqId, macAddr);
if (retSession != null
&& (locationIds == null || locationIds.isEmpty() || locationIds.contains(retSession.getLocationId()))
&& (equipmentIds == null || equipmentIds.isEmpty() || equipmentIds.contains(retSession.getEquipmentId()))
&& (macSubstring == null || macSubstring.isEmpty() || retSession.getMacAddress().getAddressAsString().toLowerCase().contains(macSubstring.toLowerCase()))
)
{
pageItems.add(cs);
}
});
pageItems.add(retSession);
}
}
break;
default:

57
client-datastore-common-test/src/main/java/com/telecominfraproject/wlan/client/datastore/BaseClientDatastoreTest.java
View File

@@ -973,6 +973,63 @@ public abstract class BaseClientDatastoreTest {
return new ArrayList<>(Arrays.asList(new String[]{"qr_49", "qr_48", "qr_47", "qr_46", "qr_45", "qr_44", "qr_43", "qr_42", "qr_41", "qr_40" }));
}
@Test
public void testClientSessionPaginationMaxItems()
{
//create 100 Client sessions
ClientSession mdl;
int customerId = (int) testSequence.incrementAndGet();
long locationId = testSequence.incrementAndGet();
int apNameIdx = 0;
List<ClientSession> sessionsToCreate = new ArrayList<>();
for(int i = 0; i< 10; i++){
mdl = new ClientSession();
mdl.setCustomerId(customerId);
mdl.setLocationId(locationId);
mdl.setEquipmentId(testSequence.incrementAndGet());
mdl.setMacAddress(new MacAddress("A1:FF:FF:FF:FF:FF"));
ClientSessionDetails details = new ClientSessionDetails();
details.setApFingerprint("qr_"+apNameIdx);
mdl.setDetails(details );
apNameIdx++;
sessionsToCreate.add(mdl);
}
List<ClientSession> createdList = testInterface.updateSessions(sessionsToCreate);
List<ClientSessionDetails> createdDetailsList = new ArrayList<>();
List<ClientSessionDetails> detailsToCreateList = new ArrayList<>();
sessionsToCreate.forEach(s -> detailsToCreateList.add(s.getDetails()));
createdList.forEach(s -> createdDetailsList.add(s.getDetails()));
assertEquals(detailsToCreateList, createdDetailsList);
PaginationContext<ClientSession> context = new PaginationContext<>(5);
PaginationResponse<ClientSession> page1 = testInterface.getSessionsForCustomer(customerId, null, new HashSet<Long>(Arrays.asList(locationId)), null, Collections.emptyList(), context);
assertEquals(5, page1.getItems().size());
page1 = testInterface.getSessionsForCustomer(customerId, null, null, "A1", Collections.emptyList(), context);
assertEquals(5, page1.getItems().size());
context = new PaginationContext<>(10);
page1 = testInterface.getSessionsForCustomer(customerId, null, new HashSet<Long>(Arrays.asList(locationId)), null, Collections.emptyList(), context);
assertEquals(10, page1.getItems().size());
context = new PaginationContext<>(20);
page1 = testInterface.getSessionsForCustomer(customerId, null, new HashSet<Long>(Arrays.asList(locationId)), null, Collections.emptyList(), context);
assertEquals(10, page1.getItems().size());
createdList.forEach(c -> testInterface.deleteSession(c.getCustomerId(), c.getEquipmentId(), c.getMacAddress()));
}
protected ClientSession createClientSessionObject() {
ClientSession result = new ClientSession();

58
client-service-remote/src/test/java/com/telecominfraproject/wlan/client/ClientServiceRemoteTest.java
View File

@@ -865,6 +865,64 @@ public class ClientServiceRemoteTest extends BaseRemoteTest {
}
@Test
public void testClientSessionPaginationMaxItems()
{
//create 100 Client sessions
ClientSession mdl;
int customerId = getNextCustomerId();
long locationId = getNextLocationId();
int apNameIdx = 0;
List<ClientSession> sessionsToCreate = new ArrayList<>();
for(int i = 0; i< 10; i++){
mdl = new ClientSession();
mdl.setCustomerId(customerId);
mdl.setLocationId(locationId);
mdl.setEquipmentId(getNextEquipmentId());
mdl.setMacAddress(new MacAddress("A1:FF:FF:FF:FF:FF"));
ClientSessionDetails details = new ClientSessionDetails();
details.setApFingerprint("qr_"+apNameIdx);
mdl.setDetails(details );
apNameIdx++;
sessionsToCreate.add(mdl);
}
List<ClientSession> createdList = remoteInterface.updateSessions(sessionsToCreate);
List<ClientSessionDetails> createdDetailsList = new ArrayList<>();
List<ClientSessionDetails> detailsToCreateList = new ArrayList<>();
sessionsToCreate.forEach(s -> detailsToCreateList.add(s.getDetails()));
createdList.forEach(s -> createdDetailsList.add(s.getDetails()));
assertEquals(detailsToCreateList, createdDetailsList);
PaginationContext<ClientSession> context = new PaginationContext<>(5);
PaginationResponse<ClientSession> page1 = remoteInterface.getSessionsForCustomer(customerId, null, new HashSet<Long>(Arrays.asList(locationId)), null, Collections.emptyList(), context);
assertEquals(5, page1.getItems().size());
page1 = remoteInterface.getSessionsForCustomer(customerId, null, null, "A1", Collections.emptyList(), context);
assertEquals(5, page1.getItems().size());
context = new PaginationContext<>(10);
page1 = remoteInterface.getSessionsForCustomer(customerId, null, new HashSet<Long>(Arrays.asList(locationId)), null, Collections.emptyList(), context);
assertEquals(10, page1.getItems().size());
context = new PaginationContext<>(20);
page1 = remoteInterface.getSessionsForCustomer(customerId, null, new HashSet<Long>(Arrays.asList(locationId)), null, Collections.emptyList(), context);
assertEquals(10, page1.getItems().size());
createdList.forEach(c -> remoteInterface.deleteSession(c.getCustomerId(), c.getEquipmentId(), c.getMacAddress()));
}
private ClientSession createClientSessionObject() {
ClientSession result = new ClientSession();
long nextId = getNextCustomerId();