From 491570a21caca71df44dfbe7a1a2b1448aa895d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 5 Oct 2022 14:46:03 +0200
Subject: [PATCH] [export] Fixed: the scope aggregator (accompanying course)
 group by period's scope (and the label didn't show this)

+ extract ScopeRepository and create ScopeRepositoryInterface
---
 .../Repository/ScopeRepository.php            |  7 +++--
 .../Repository/ScopeRepositoryInterface.php   | 28 +++++++++++++++++++
 .../ScopeAggregator.php                       |  2 +-
 .../translations/messages.fr.yml              |  3 +-
 4 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Repository/ScopeRepositoryInterface.php

diff --git a/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php b/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
index 5b3efe658..6336addbd 100644
--- a/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
@@ -14,9 +14,10 @@ namespace Chill\MainBundle\Repository;
 use Chill\MainBundle\Entity\Scope;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
-final class ScopeRepository implements ObjectRepository
+final class ScopeRepository implements ScopeRepositoryInterface
 {
     private EntityRepository $repository;
 
@@ -25,7 +26,7 @@ final class ScopeRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(Scope::class);
     }
 
-    public function createQueryBuilder($alias, $indexBy = null)
+    public function createQueryBuilder($alias, $indexBy = null): QueryBuilder
     {
         return $this->repository->createQueryBuilder($alias, $indexBy);
     }
@@ -59,7 +60,7 @@ final class ScopeRepository implements ObjectRepository
         return $this->repository->findOneBy($criteria, $orderBy);
     }
 
-    public function getClassName()
+    public function getClassName(): string
     {
         return Scope::class;
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/ScopeRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/ScopeRepositoryInterface.php
new file mode 100644
index 000000000..1764db8d3
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Repository/ScopeRepositoryInterface.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Chill\MainBundle\Repository;
+
+use Chill\MainBundle\Entity\Scope;
+use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ObjectRepository;
+
+interface ScopeRepositoryInterface extends ObjectRepository
+{
+    public function createQueryBuilder($alias, $indexBy = null): QueryBuilder;
+
+    public function find($id, $lockMode = null, $lockVersion = null): ?Scope;
+
+    /**
+     * @return Scope[]
+     */
+    public function findAll(): array;
+
+    /**
+     * @return Scope[]
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array;
+
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?Scope;
+
+    public function getClassName(): string;
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php
index 0ff6aa747..77eb06835 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php
@@ -83,6 +83,6 @@ final class ScopeAggregator implements AggregatorInterface
 
     public function getTitle(): string
     {
-        return 'Group by user scope';
+        return 'Group course by scope';
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 12a193ac2..d8c60fca4 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -437,7 +437,8 @@ Filtered by person having an activity between %date_from% and %date_to% with rea
 ## accompanying course filters/aggr
 Filter by user scope: Filtrer les parcours par service du référent
 "Filtered by user main scope: only %scope%": "Filtré par service du référent: uniquement %scope%"
-Group by user scope: Grouper les parcours par service du référent
+
+Group course by scope: Grouper les parcours par service
 
 Filter by user job: Filtrer les parcours par métier du référent
 "Filtered by user job: only %job%": "Filtré par métier du référent: uniquement %job%"