Improved searching for users using spaces

SURFnet · Apr 29, 2016 · e5ce327 · e5ce327
1 parent 9be1faa
commit e5ce327
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/src/AppBundle/Manager/MembershipManager.php b/src/AppBundle/Manager/MembershipManager.php
@@ -71,15 +71,19 @@ public function findMemberships(
  $qb = $this->doctrine->getRepository('AppBundle:UserInGroup')->createQueryBuilder('ug');
 
  if (!empty($query)) {
- $qb->andWhere(
- $qb->expr()->orX(
- $qb->expr()->like('u.firstName', ':query'),
- $qb->expr()->like('u.lastName', ':query'),
- $qb->expr()->like('u.loginName', ':query')
- )
- );
-
- $qb->setParameter('query', '%' . $query . '%');
+ $terms = explode(' ', $query);
+
+ foreach ($terms as $i => $term) {
+ $qb->andWhere(
+ $qb->expr()->orX(
+ $qb->expr()->like('u.firstName', ':term' . $i),
+ $qb->expr()->like('u.lastName', ':term' . $i),
+ $qb->expr()->like('u.loginName', ':term' . $i)
+ )
+ );
+
+ $qb->setParameter('term' . $i, '%' . $term . '%');
+ }
  }
 
  if (!empty($users)) {

diff --git a/src/AppBundle/Manager/UserManager.php b/src/AppBundle/Manager/UserManager.php
@@ -70,7 +70,7 @@ public function findUsers($query = null, $sort = 'reference', $offset = 0, $limi
  }
 
  if (!empty($query)) {
- $terms = explode(' ', '%' . $query . '%');
+ $terms = explode(' ', $query);
 
  foreach ($terms as $i => $term) {
  $qb->andWhere(
@@ -81,7 +81,7 @@ public function findUsers($query = null, $sort = 'reference', $offset = 0, $limi
  )
  );
 
- $qb->setParameter('term' . $i, $term);
+ $qb->setParameter('term' . $i, '%' . $term . '%');
  }
  }