fix(pagination): change query to get children organization list

crf-devs · May 10, 2020 · c209d21 · c209d21
1 parent 051404e
commit c209d21
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/Controller/Organization/CommissionableAsset/AssetsListController.php b/src/Controller/Organization/CommissionableAsset/AssetsListController.php
@@ -37,7 +37,7 @@ public function __invoke(Request $request, Organization $organization): Response
         /** @var Organization $currentOrganization */
         $currentOrganization = $this->getUser();
         $assets = $this->paginator->paginate(
-            $this->assetRepository->findByOrganization($organization),
+            $this->assetRepository->findByOrganizationAndChildrenQb($organization),
             $request->query->getInt('page', $this->getParameter('app.pagination_default_start')),
             $this->getParameter('app.pagination_default_limit')
         );

diff --git a/src/Controller/Organization/OrganizationListController.php b/src/Controller/Organization/OrganizationListController.php
@@ -35,7 +35,7 @@ public function __invoke(Request $request): Response
         }
 
         $organizations = $this->paginator->paginate(
-            $this->organizationRepository->findByParentQueryBuilder($organization),
+            $this->organizationRepository->findChildrenQueryBuilder($organization),
             $request->query->getInt('page', $this->getParameter('app.pagination_default_start')),
             $this->getParameter('app.pagination_default_limit')
         );

diff --git a/src/Repository/OrganizationRepository.php b/src/Repository/OrganizationRepository.php
@@ -106,6 +106,18 @@ public function findByParentQueryBuilder(Organization $organization): QueryBuild
         return $qb;
     }
 
+    public function findChildrenQueryBuilder(Organization $organization): QueryBuilder
+    {
+        $qb = $this->createQueryBuilder('o');
+
+        $qb
+            ->where('o.parent = :orga')
+            ->setParameter('orga', $organization)
+            ->addOrderBy('o.name', 'ASC');
+
+        return $qb;
+    }
+
     public function findByIdOrParentIdQueryBuilder(int $organizationId, QueryBuilder $qb = null): QueryBuilder
     {
         $alias = 'o';