Split Job and Scope Aggregators

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobAggregator.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\UserJobRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr\From;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final class JobAggregator implements AggregatorInterface
+{
+
+    private UserJobRepository $jobRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        UserJobRepository $jobRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->jobRepository = $jobRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getLabels($key, array $values, $data)
+    {
+        return function($value): string {
+            if ($value === '_header') {
+                return 'Job';
+            }
+
+            $j = $this->jobRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $j->getLabel()
+            );
+        };
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getQueryKeys($data): array
+    {
+        return ['job_aggregator'];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getTitle(): string
+    {
+        return 'Group by user job';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function addRole()
+    {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('acp.job', 'j');
+
+        $qb->addSelect('IDENTITY(acp.job) AS job_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('job_aggregator');
+        } else {
+            $qb->groupBy('job_aggregator');
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+}

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Chill\PersonBundle\Export\Aggregator;
+namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\ScopeRepository;
@@ -80,21 +80,9 @@ final class ScopeAggregator implements AggregatorInterface
      */
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        switch ($qb->getRootAlias()) {
-
-            case 'acp':
         $qb->join('acp.scopes', 's');
+
         $qb->addSelect('s.id as scope_aggregator');
-                break;
-
-            case 'acpw':
-                $qb->join('acpw.referrers', 'r');
-                $qb->addSelect('IDENTITY(r.mainScope) as scope_aggregator');
-                break;
-
-            default:
-                throw new \Exception("Does not apply on that base entity");
-        }
 
         $groupBy = $qb->getDQLPart('groupBy');
 
@@ -110,6 +98,6 @@ final class ScopeAggregator implements AggregatorInterface
      */
     public function applyOn(): string
     {
-        return Declarations::ACP_SHARED;
+        return Declarations::ACP_TYPE;
     }
 }

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Chill\PersonBundle\Export\Aggregator;
+namespace Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserJobRepository;
@@ -80,21 +80,9 @@ final class JobAggregator implements AggregatorInterface
      */
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        switch ($qb->getRootAlias()) {
+        $qb->join('acpw.referrers', 'u');
 
-            case 'acp':
-                $qb->join('acp.job', 'j');
-                $qb->addSelect('IDENTITY(acp.job) AS job_aggregator');
-                break;
-
-            case 'acpw':
-                $qb->join('acpw.referrers', 'r');
-                $qb->addSelect('IDENTITY(r.userJob) as job_aggregator');
-                break;
-
-            default:
-                throw new \Exception("Does not apply on that base entity");
-        }
+        $qb->addSelect('IDENTITY(u.userJob) as job_aggregator');
 
         $groupBy = $qb->getDQLPart('groupBy');
 
@@ -110,6 +98,6 @@ final class JobAggregator implements AggregatorInterface
      */
     public function applyOn(): string
     {
-        return Declarations::ACP_SHARED;
+        return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 }

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators;
+
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\ScopeRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr\From;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final class ScopeAggregator implements AggregatorInterface
+{
+
+    private ScopeRepository $scopeRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        ScopeRepository $scopeRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->scopeRepository = $scopeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ($value === '_header') {
+                return 'Scope';
+            }
+
+            $s = $this->scopeRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $s->getName()
+            );
+        };
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getQueryKeys($data): array
+    {
+        return ['scope_aggregator'];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getTitle(): string
+    {
+        return 'Group by user scope';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function addRole()
+    {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('acpw.referrers', 'u');
+
+        $qb->addSelect('IDENTITY(u.mainScope) as scope_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('scope_aggregator');
+        } else {
+            $qb->groupBy('scope_aggregator');
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function applyOn(): string
+    {
+        return Declarations::SOCIAL_WORK_ACTION_TYPE;
+    }
+}

src/Bundle/ChillPersonBundle/config/services/exports_accompanying_course.yaml

@@ -150,19 +150,19 @@ services:
             - { name: chill.export_filter, alias: accompanyingcourse_openbetweendates_filter }
 
     ## Aggregators
-    chill.person.export.aggregator_scope:
-        class: Chill\PersonBundle\Export\Aggregator\ScopeAggregator
+    chill.person.export.aggregator_referrer_scope:
+        class: Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ScopeAggregator
         autowire: true
         autoconfigure: true
         tags:
-            - { name: chill.export_aggregator, alias: accompanyingcourse_scope_aggregator }
+            - { name: chill.export_aggregator, alias: accompanyingcourse_referrer_scope_aggregator }
 
-    chill.person.export.aggregator_job:
-        class: Chill\PersonBundle\Export\Aggregator\JobAggregator
+    chill.person.export.aggregator_referrer_job:
+        class: Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\JobAggregator
         autowire: true
         autoconfigure: true
         tags:
-            - { name: chill.export_aggregator, alias: accompanyingcourse_job_aggregator }
+            - { name: chill.export_aggregator, alias: accompanyingcourse_referrer_job_aggregator }
 
     chill.person.export.aggregator_socialissue:
         class: Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\SocialIssueAggregator

src/Bundle/ChillPersonBundle/config/services/exports_social_actions.yaml

@@ -30,12 +30,12 @@ services:
     tags:
         - { name: chill.export_filter, alias: social_work_actions_job_filter }
 
-  chill.person.export.filter_treating_agent:
+  chill.person.export.filter_treatingagent:
     class: Chill\PersonBundle\Export\Filter\SocialWorkFilters\ReferrerFilter
     autowire: true
     autoconfigure: true
     tags:
-        - { name: chill.export_filter, alias: social_work_actions_treating_agent_filter }
+        - { name: chill.export_filter, alias: social_work_actions_treatingagent_filter }
   
   ## AGGREGATORS
   chill.person.export.aggregator_action_type:
@@ -45,12 +45,26 @@ services:
     tags:
         - { name: chill.export_aggregator, alias: social_work_actions_action_type_aggregator }
 
-  chill.person.export.aggregator_treating_agent:
+  chill.person.export.aggregator_treatingagent_scope:
+      class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ScopeAggregator
+      autowire: true
+      autoconfigure: true
+      tags:
+          - { name: chill.export_aggregator, alias: social_work_actions_treatingagent_scope_aggregator }
+
+  chill.person.export.aggregator_treatingagent_job:
+      class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\JobAggregator
+      autowire: true
+      autoconfigure: true
+      tags:
+          - { name: chill.export_aggregator, alias: social_work_actions_treatingagent_job_aggregator }
+
+  chill.person.export.aggregator_treatingagent:
     class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ReferrerAggregator
     autowire: true
     autoconfigure: true
     tags:
-        - { name: chill.export_aggregator, alias: social_work_actions_treating_agent_aggregator }
+        - { name: chill.export_aggregator, alias: social_work_actions_treatingagent_aggregator }
   
   chill.person.export.aggregator_goal:
     class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\GoalAggregator