Merge remote-tracking branch 'origin/master' into upgrade-sf5

src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php

@@ -0,0 +1,145 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Repository;
+
+use Chill\MainBundle\Entity\NewsItem;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ObjectRepository;
+use Symfony\Component\Clock\ClockInterface;
+
+class NewsItemRepository implements ObjectRepository
+{
+    private readonly EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager, private readonly ClockInterface $clock)
+    {
+        $this->repository = $entityManager->getRepository(NewsItem::class);
+    }
+
+    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    {
+        return $this->repository->createQueryBuilder($alias, $indexBy);
+    }
+
+    public function find($id)
+    {
+        return $this->repository->find($id);
+    }
+
+    public function findAll()
+    {
+        return $this->repository->findAll();
+    }
+
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria)
+    {
+        return $this->repository->findOneBy($criteria);
+    }
+
+    public function getClassName()
+    {
+        return NewsItem::class;
+    }
+
+    private function buildBaseQuery(
+        ?string $pattern = null
+    ): QueryBuilder {
+        $qb = $this->createQueryBuilder('n');
+
+        $qb->where('n.startDate <= :now');
+        $qb->setParameter('now', $this->clock->now());
+
+        if (null !== $pattern && '' !== $pattern) {
+            $qb->andWhere($qb->expr()->like('LOWER(UNACCENT(n.title))', 'LOWER(UNACCENT(:pattern))'))
+                ->orWhere($qb->expr()->like('LOWER(UNACCENT(n.content))', 'LOWER(UNACCENT(:pattern))'))
+                ->setParameter('pattern', '%'.$pattern.'%');
+        }
+
+        return $qb;
+    }
+
+    public function findAllFilteredBySearchTerm(?string $pattern = null)
+    {
+        $qb = $this->buildBaseQuery($pattern);
+        $qb
+            ->addOrderBy('n.startDate', 'DESC')
+            ->addOrderBy('n.id', 'DESC');
+
+        return $qb->getQuery()->getResult();
+    }
+
+    /**
+     * @return list<NewsItem>
+     */
+    public function findCurrentNews(?int $limit = null, ?int $offset = null): array
+    {
+        $qb = $this->buildQueryCurrentNews();
+        $qb->addOrderBy('n.startDate', 'DESC');
+
+        if (null !== $limit) {
+            $qb->setMaxResults($limit);
+        }
+
+        if (null !== $offset) {
+            $qb->setFirstResult($offset);
+        }
+
+        return $qb
+            ->getQuery()
+            ->getResult();
+    }
+
+    public function countAllFilteredBySearchTerm(?string $pattern = null)
+    {
+        $qb = $this->buildBaseQuery($pattern);
+
+        return $qb
+            ->select('COUNT(n)')
+            ->getQuery()
+            ->getSingleScalarResult();
+    }
+
+    public function countCurrentNews()
+    {
+        return $this->buildQueryCurrentNews()
+            ->select('COUNT(n)')
+            ->getQuery()
+            ->getSingleScalarResult();
+    }
+
+    private function buildQueryCurrentNews(): QueryBuilder
+    {
+        $now = $this->clock->now();
+
+        $qb = $this->createQueryBuilder('n');
+        $qb
+            ->where(
+                $qb->expr()->andX(
+                    $qb->expr()->lte('n.startDate', ':now'),
+                    $qb->expr()->orX(
+                        $qb->expr()->gt('n.endDate', ':now'),
+                        $qb->expr()->isNull('n.endDate')
+                    )
+                )
+            )
+            ->setParameter('now', $now);
+
+        return $qb;
+    }
+}

src/Bundle/ChillMainBundle/Repository/ScopeRepository.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
@@ -20,7 +21,7 @@ final class ScopeRepository implements ScopeRepositoryInterface
 {
     private readonly EntityRepository $repository;
 
-    public function __construct(EntityManagerInterface $entityManager)
+    public function __construct(EntityManagerInterface $entityManager, private readonly TranslatableStringHelperInterface $translatableStringHelper)
     {
         $this->repository = $entityManager->getRepository(Scope::class);
     }
@@ -45,11 +46,11 @@ final class ScopeRepository implements ScopeRepositoryInterface
 
     public function findAllActive(): array
     {
-        $qb = $this->repository->createQueryBuilder('s');
+        $scopes = $this->repository->findBy(['active' => true]);
 
-        $qb->where('s.active = \'TRUE\'');
+        usort($scopes, fn (Scope $a, Scope $b) => $this->translatableStringHelper->localize($a->getName()) <=> $this->translatableStringHelper->localize($b->getName()));
 
-        return $qb->getQuery()->getResult();
+        return $scopes;
     }
 
     /**

src/Bundle/ChillMainBundle/Repository/UserJobRepository.php

@@ -40,7 +40,11 @@ readonly class UserJobRepository implements UserJobRepositoryInterface
 
     public function findAllActive(): array
     {
-        return $this->repository->findBy(['active' => true]);
+        $jobs = $this->repository->findBy(['active' => true]);
+
+        usort($jobs, fn (UserJob $a, UserJob $b) => $this->translatableStringHelper->localize($a->getLabel()) <=> $this->translatableStringHelper->localize($b->getLabel()));
+
+        return $jobs;
     }
 
     public function findAllOrderedByName(): array

src/Bundle/ChillMainBundle/Repository/UserRepository.php

@@ -106,8 +106,8 @@ final readonly class UserRepository implements UserRepositoryInterface
             FROM users u
             LEFT JOIN chill_main_civility civility ON u.civility_id = civility.id
             LEFT JOIN centers mainCenter ON u.maincenter_id = mainCenter.id
-            LEFT JOIN chill_main_user_job_history userJobHistory ON u.id = userJobHistory.user_id
-            LEFT JOIN chill_main_user_job userJob ON userJobHistory.job_id = userJob.id AND tstzrange(userJobHistory.startdate, userJobHistory.enddate) @> NOW()
+            LEFT JOIN chill_main_user_job_history userJobHistory ON u.id = userJobHistory.user_id AND tstzrange(userJobHistory.startdate, userJobHistory.enddate) @> NOW()
+            LEFT JOIN chill_main_user_job userJob ON userJobHistory.job_id = userJob.id
             LEFT JOIN chill_main_user_scope_history userScopeHistory ON u.id = userScopeHistory.user_id AND tstzrange(userScopeHistory.startdate, userScopeHistory.enddate) @> NOW()
             LEFT JOIN scopes mainScope ON userScopeHistory.scope_id = mainScope.id
             LEFT JOIN chill_main_location currentLocation ON u.currentlocation_id = currentLocation.id