Merge pull request #1 from SURFnet/name-sort

Name sort
SURFnet · Aug 26, 2016 · 847852d · 847852d
2 parents b315564 + 684945b
commit 847852d
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/src/AppBundle/Controller/GroupController.php b/src/AppBundle/Controller/GroupController.php
@@ -9,7 +9,6 @@
 use AppBundle\Form\UserGroupType;
 use AppBundle\Form\UserInGroupType;
 use AppBundle\Form\UserInGroupUpdateType;
-use FOS\RestBundle\Controller\Annotations;
 use FOS\RestBundle\Controller\FOSRestController;
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/src/AppBundle/Controller/UserController.php b/src/AppBundle/Controller/UserController.php
@@ -4,7 +4,6 @@
 
 use AppBundle\Entity\User;
 use AppBundle\Form\UserType;
-use FOS\RestBundle\Controller\Annotations;
 use FOS\RestBundle\Controller\FOSRestController;
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/src/AppBundle/Controller/UserGroupController.php b/src/AppBundle/Controller/UserGroupController.php
@@ -3,7 +3,6 @@
 namespace AppBundle\Controller;
 
 use AppBundle\Entity\UserInGroup;
-use FOS\RestBundle\Controller\Annotations;
 use FOS\RestBundle\Controller\FOSRestController;
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/src/AppBundle/Entity/User.php b/src/AppBundle/Entity/User.php
@@ -62,7 +62,7 @@ class User
     protected $loginName;
 
     /**
-     * @var string
+     * @var \DateTime
      *
      * @ORM\Column(type="datetime", name="UserTimestamp", nullable=true)
      * @Expose()

diff --git a/src/AppBundle/Manager/MembershipManager.php b/src/AppBundle/Manager/MembershipManager.php
@@ -5,6 +5,7 @@
 use AppBundle\Entity\UserInGroup;
 use AppBundle\Event\GroupEvent;
 use Doctrine\Bundle\DoctrineBundle\Registry;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\ORM\Tools\Pagination\Paginator;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -98,11 +99,18 @@ public function findMemberships(
             $qb->andWhere('ug.role = :role')->setParameter('role', $role);
         }
 
+        if ($sort === 'name') {
+            $sort = new Expr\OrderBy('u.lastName');
+            $sort->add('u.firstName');
+        } else {
+            $sort = new Expr\OrderBy('u.' . $sort);
+        }
+
         $qb
             ->andWhere('ug.group = :id')
             ->setParameter('id', $groupId)
             ->join('ug.user', 'u')
-            ->orderBy('u.' . $sort, 'ASC')
+            ->orderBy($sort)
             ->setFirstResult($offset)
             ->setMaxResults($limit);
 

diff --git a/src/AppBundle/Manager/UserManager.php b/src/AppBundle/Manager/UserManager.php
@@ -5,6 +5,7 @@
 use AppBundle\Entity\User;
 use AppBundle\Event\UserEvent;
 use Doctrine\Bundle\DoctrineBundle\Registry;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\ORM\Tools\Pagination\Paginator;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -65,7 +66,14 @@ public function findUsers(
         /** @var QueryBuilder $qb */
         $qb = $this->doctrine->getRepository('AppBundle:User')->createQueryBuilder('u');
 
-        $qb->where('u.type = \'ldap\'')->orderBy('u.' . $sort, 'ASC')->setFirstResult($offset)->setMaxResults($limit);
+        if ($sort === 'name') {
+            $sort = new Expr\OrderBy('u.lastName');
+            $sort->add('u.firstName');
+        } else {
+            $sort = new Expr\OrderBy('u.' . $sort);
+        }
+
+        $qb->where('u.type = \'ldap\'')->orderBy($sort)->setFirstResult($offset)->setMaxResults($limit);
 
         if ($reference !== null) {
             $qb->andWhere('u.reference = :reference')->setParameter('reference', $reference);