From 83ba8131600db24cbcf4b6d50db04a4b27b7d26e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 19 Oct 2022 17:56:10 +0200
Subject: [PATCH] Feature: [docgen] order document template by name in list and
 in admin

---
 .../AdminDocGeneratorTemplateController.php        | 14 ++++++++++++++
 .../Repository/DocGeneratorTemplateRepository.php  | 11 +++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
index bb65fb5b2..c365b5e06 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
@@ -14,6 +14,8 @@ namespace Chill\DocGeneratorBundle\Controller;
 use Chill\DocGeneratorBundle\Context\ContextManager;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
@@ -84,4 +86,16 @@ class AdminDocGeneratorTemplateController extends CRUDController
 
         return $entity;
     }
+
+    /**
+     * @param QueryBuilder $query
+     *
+     * @return QueryBuilder|mixed
+     */
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        return $query->addSelect('JSON_EXTRACT(e.name, :lang) AS HIDDEN name_lang')
+            ->setParameter('lang', $request->getLocale())
+            ->addOrderBy('name_lang', 'ASC');
+    }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php
index 4f800fd6a..6a80c34dc 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php
@@ -15,14 +15,18 @@ use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectRepository;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 final class DocGeneratorTemplateRepository implements ObjectRepository
 {
     private EntityRepository $repository;
 
-    public function __construct(EntityManagerInterface $entityManager)
+    private RequestStack $requestStack;
+
+    public function __construct(EntityManagerInterface $entityManager, RequestStack $requestStack)
     {
         $this->repository = $entityManager->getRepository(DocGeneratorTemplate::class);
+        $this->requestStack = $requestStack;
     }
 
     public function countByEntity(string $entity): int
@@ -71,7 +75,10 @@ final class DocGeneratorTemplateRepository implements ObjectRepository
         $builder
             ->where('t.entity LIKE :entity')
             ->andWhere($builder->expr()->eq('t.active', "'TRUE'"))
-            ->setParameter('entity', addslashes($entity));
+            ->setParameter('entity', addslashes($entity))
+            ->addSelect('JSON_EXTRACT(t.name, :lang) AS HIDDEN name_lang')
+            ->setParameter('lang', $this->requestStack->getCurrentRequest()->getLocale())
+            ->addOrderBy('name_lang', 'ASC');
 
         return $builder
             ->getQuery()