diff --git a/.changes/unreleased/Feature-20230920-175207.yaml b/.changes/unreleased/Feature-20230920-175207.yaml new file mode 100644 index 000000000..ec8b51f77 --- /dev/null +++ b/.changes/unreleased/Feature-20230920-175207.yaml @@ -0,0 +1,6 @@ +kind: Feature +body: | + Add history to scopes and to jobs in administrator section. When user job or main scope of user is changed, automaticaly add a new row in history. +time: 2023-09-20T17:52:07.160601133+02:00 +custom: + Issue: "147" diff --git a/.changes/unreleased/Feature-20231011-155115.yaml b/.changes/unreleased/Feature-20231011-155115.yaml new file mode 100644 index 000000000..77aac142b --- /dev/null +++ b/.changes/unreleased/Feature-20231011-155115.yaml @@ -0,0 +1,5 @@ +kind: Feature +body: '[export] add an aggregator for activities: group by job scope aggregator' +time: 2023-10-11T15:51:15.022779832+02:00 +custom: + Issue: "" diff --git a/exports_alias_conventions.csv b/exports_alias_conventions.csv deleted file mode 100644 index ab32cda8e..000000000 --- a/exports_alias_conventions.csv +++ /dev/null @@ -1,63 +0,0 @@ -Entity,Join,Attribute,Alias -AccompanyingPeriod::class,,,acp -,AccompanyingPeriodWork::class,acp.works,acpw -,AccompanyingPeriodParticipation::class,acp.participations,acppart -,Location::class,acp.administrativeLocation,acploc -,ClosingMotive::class,acp.closingMotive,acpmotive -,UserJob::class,acp.job,acpjob -,Origin::class,acp.origin,acporigin -,Scope::class,acp.scopes,acpscope -,SocialIssue::class,acp.socialIssues,acpsocialissue -,User::class,acp.user,acpuser -AccompanyingPeriodWork::class,,,acpw -,AccompanyingPeriodWorkEvaluation::class,acpw.accompanyingPeriodWorkEvaluations,workeval -,User::class,acpw.referrers,acpwuser -,SocialAction::class,acpw.socialAction,acpwsocialaction -,Goal::class,acpw.goals,goal -,Result::class,acpw.results,result -AccompanyingPeriodParticipation::class,,,acppart -,Person::class,acppart.person,partperson -AccompanyingPeriodWorkEvaluation::class,,,workeval -,Evaluation::class,workeval.evaluation,eval -Goal::class,,,goal -,Result::class,goal.results,goalresult -Person::class,,,person -,Center::class,person.center,center -,HouseholdMember::class,partperson.householdParticipations,householdmember -,MaritalStatus::class,person.maritalStatus,personmarital -,VendeePerson::class,,vp -,VendeePersonMineur::class,,vpm -ResidentialAddress::class,,,resaddr -,ThirdParty::class,resaddr.hostThirdParty,tparty -ThirdParty::class,,,tparty -,ThirdPartyCategory::class,tparty.categories,tpartycat -HouseholdMember::class,,,householdmember -,Household::class,householdmember.household,household -,Person::class,householdmember.person,memberperson -,,memberperson.center,membercenter -Household::class,,,household -,HouseholdComposition::class,household.compositions,composition -Activity::class,,,activity -,Person::class,activity.person,actperson -,AccompanyingPeriod::class,activity.accompanyingPeriod,acp -,Person::class,activity_person_having_activity.person,person_person_having_activity -,ActivityReason::class,activity_person_having_activity.reasons,reasons_person_having_activity -,ActivityType::class,activity.activityType,acttype -,Location::class,activity.location,actloc -,SocialAction::class,activity.socialActions,actsocialaction -,SocialIssue::class,activity.socialIssues,actsocialssue -,ThirdParty::class,activity.thirdParties,acttparty -,User::class,activity.user,actuser -,User::class,activity.users,actusers -,ActivityReason::class,activity.reasons,actreasons -,Center::class,actperson.center,actcenter -ActivityReason::class,,,actreasons -,ActivityReasonCategory::class,actreason.category,actreasoncat -Calendar::class,,,cal -,CancelReason::class,cal.cancelReason,calcancel -,Location::class,cal.location,calloc -,User::class,cal.user,caluser -VendeePerson::class,,,vp -,SituationProfessionelle::class,vp.situationProfessionelle,vpprof -,StatutLogement::class,vp.statutLogement,vplog -,TempsDeTravail::class,vp.tempsDeTravail,vptt diff --git a/exports_alias_conventions.md b/exports_alias_conventions.md index 64df91030..eb0545702 100644 --- a/exports_alias_conventions.md +++ b/exports_alias_conventions.md @@ -21,7 +21,6 @@ These are alias conventions : | | AccompanyingPeriodInfo::class | not existing (using custom WITH clause) | acpinfo | | AccompanyingPeriodWork::class | | | acpw | | | AccompanyingPeriodWorkEvaluation::class | acpw.accompanyingPeriodWorkEvaluations | workeval | -| | User::class | acpw.referrers | acpwuser | | | SocialAction::class | acpw.socialAction | acpwsocialaction | | | Goal::class | acpw.goals | goal | | | Result::class | acpw.results | result | diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php index 6f05d88f6..af4ed7352 100644 --- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php +++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php @@ -12,15 +12,22 @@ declare(strict_types=1); namespace Chill\ActivityBundle\Export\Aggregator; use Chill\ActivityBundle\Export\Declarations; +use Chill\MainBundle\Entity\User\UserJobHistory; +use Chill\MainBundle\Export\AggregatorInterface; use Chill\MainBundle\Repository\UserJobRepositoryInterface; use Chill\MainBundle\Templating\TranslatableStringHelperInterface; +use Doctrine\ORM\Query\Expr; use Doctrine\ORM\QueryBuilder; use Symfony\Component\Form\FormBuilderInterface; -use function in_array; -class ActivityUsersJobAggregator implements \Chill\MainBundle\Export\AggregatorInterface +class ActivityUsersJobAggregator implements AggregatorInterface { - public function __construct(private readonly UserJobRepositoryInterface $userJobRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper) {} + private const PREFIX = 'act_agg_user_job'; + + public function __construct( + private readonly UserJobRepositoryInterface $userJobRepository, + private readonly TranslatableStringHelperInterface $translatableStringHelper + ) {} public function addRole(): ?string { @@ -29,24 +36,37 @@ class ActivityUsersJobAggregator implements \Chill\MainBundle\Export\AggregatorI public function alterQuery(QueryBuilder $qb, $data) { - if (!in_array('actusers', $qb->getAllAliases(), true)) { - $qb->leftJoin('activity.users', 'actusers'); - } + $p = self::PREFIX; $qb - ->addSelect('IDENTITY(actusers.userJob) AS activity_users_job_aggregator') - ->addGroupBy('activity_users_job_aggregator'); + ->leftJoin("activity.users", "{$p}_user") + ->leftJoin( + UserJobHistory::class, + "{$p}_history", + Expr\Join::WITH, + $qb->expr()->eq("{$p}_history.user", "{$p}_user") + ) + // job_at based on activity.date + ->andWhere( + $qb->expr()->andX( + $qb->expr()->lte("{$p}_history.startDate", "activity.date"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_history.endDate"), + $qb->expr()->gt("{$p}_history.endDate", "activity.date") + ) + ) + ) + ->addSelect("IDENTITY({$p}_history.job) AS {$p}_select") + ->addGroupBy("{$p}_select"); } - public function applyOn() + public function applyOn(): string { return Declarations::ACTIVITY; } - public function buildForm(FormBuilderInterface $builder) - { - // nothing to add in the form - } + public function buildForm(FormBuilderInterface $builder) {} + public function getFormDefaultData(): array { return []; @@ -73,11 +93,11 @@ class ActivityUsersJobAggregator implements \Chill\MainBundle\Export\AggregatorI public function getQueryKeys($data): array { - return ['activity_users_job_aggregator']; + return [self::PREFIX . '_select']; } - public function getTitle() + public function getTitle(): string { - return 'Aggregate by users job'; + return 'export.aggregator.activity.by_user_job.Aggregate by users job'; } } diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php index a29458dc7..aeb021cf1 100644 --- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php +++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php @@ -12,15 +12,22 @@ declare(strict_types=1); namespace Chill\ActivityBundle\Export\Aggregator; use Chill\ActivityBundle\Export\Declarations; +use Chill\MainBundle\Entity\User\UserScopeHistory; +use Chill\MainBundle\Export\AggregatorInterface; use Chill\MainBundle\Repository\ScopeRepositoryInterface; use Chill\MainBundle\Templating\TranslatableStringHelperInterface; +use Doctrine\ORM\Query\Expr; use Doctrine\ORM\QueryBuilder; use Symfony\Component\Form\FormBuilderInterface; -use function in_array; -class ActivityUsersScopeAggregator implements \Chill\MainBundle\Export\AggregatorInterface +class ActivityUsersScopeAggregator implements AggregatorInterface { - public function __construct(private readonly ScopeRepositoryInterface $scopeRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper) {} + private const PREFIX = 'act_agg_user_scope'; + + public function __construct( + private readonly ScopeRepositoryInterface $scopeRepository, + private readonly TranslatableStringHelperInterface $translatableStringHelper + ) {} public function addRole(): ?string { @@ -29,24 +36,37 @@ class ActivityUsersScopeAggregator implements \Chill\MainBundle\Export\Aggregato public function alterQuery(QueryBuilder $qb, $data) { - if (!in_array('actusers', $qb->getAllAliases(), true)) { - $qb->leftJoin('activity.users', 'actusers'); - } + $p = self::PREFIX; $qb - ->addSelect('IDENTITY(actusers.mainScope) AS activity_users_main_scope_aggregator') - ->addGroupBy('activity_users_main_scope_aggregator'); + ->leftJoin("activity.users", "{$p}_user") + ->leftJoin( + UserScopeHistory::class, + "{$p}_history", + Expr\Join::WITH, + $qb->expr()->eq("{$p}_history.user", "{$p}_user") + ) + // scope_at based on activity.date + ->andWhere( + $qb->expr()->andX( + $qb->expr()->lte("{$p}_history.startDate", "activity.date"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_history.endDate"), + $qb->expr()->gt("{$p}_history.endDate", "activity.date") + ) + ) + ) + ->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select") + ->addGroupBy("{$p}_select"); } - public function applyOn() + public function applyOn(): string { return Declarations::ACTIVITY; } - public function buildForm(FormBuilderInterface $builder) - { - // nothing to add in the form - } + public function buildForm(FormBuilderInterface $builder) {} + public function getFormDefaultData(): array { return []; @@ -73,11 +93,11 @@ class ActivityUsersScopeAggregator implements \Chill\MainBundle\Export\Aggregato public function getQueryKeys($data): array { - return ['activity_users_main_scope_aggregator']; + return [self::PREFIX . '_select']; } - public function getTitle() + public function getTitle(): string { - return 'Aggregate by users scope'; + return 'export.aggregator.activity.by_user_scope.Aggregate by users scope'; } } diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorScopeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorScopeAggregator.php index 581614832..e2357bd7d 100644 --- a/src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorScopeAggregator.php +++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorScopeAggregator.php @@ -12,16 +12,22 @@ declare(strict_types=1); namespace Chill\ActivityBundle\Export\Aggregator; use Chill\ActivityBundle\Export\Declarations; +use Chill\MainBundle\Entity\User\UserScopeHistory; use Chill\MainBundle\Export\AggregatorInterface; use Chill\MainBundle\Repository\ScopeRepository; use Chill\MainBundle\Templating\TranslatableStringHelper; +use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\QueryBuilder; use Symfony\Component\Form\FormBuilderInterface; -use function in_array; class CreatorScopeAggregator implements AggregatorInterface { - public function __construct(private readonly ScopeRepository $scopeRepository, private readonly TranslatableStringHelper $translatableStringHelper) {} + private const PREFIX = 'acp_agg_creator_scope'; + + public function __construct( + private readonly ScopeRepository $scopeRepository, + private readonly TranslatableStringHelper $translatableStringHelper + ) {} public function addRole(): ?string { @@ -30,12 +36,28 @@ class CreatorScopeAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { - if (!in_array('actcreator', $qb->getAllAliases(), true)) { - $qb->leftJoin('activity.createdBy', 'actcreator'); - } + $p = self::PREFIX; - $qb->addSelect('IDENTITY(actcreator.mainScope) AS creatorscope_aggregator'); - $qb->addGroupBy('creatorscope_aggregator'); + $qb + ->leftJoin("activity.createdBy", "{$p}_user") + ->leftJoin( + UserScopeHistory::class, + "{$p}_history", + Join::WITH, + $qb->expr()->eq("{$p}_history.user", "{$p}_user") + ) + // scope_at based on activity.date + ->andWhere( + $qb->expr()->andX( + $qb->expr()->lte("{$p}_history.startDate", "activity.date"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_history.endDate"), + $qb->expr()->gt("{$p}_history.endDate", "activity.date") + ) + ) + ) + ->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select") + ->addGroupBy("{$p}_select"); } public function applyOn(): string @@ -43,10 +65,8 @@ class CreatorScopeAggregator implements AggregatorInterface return Declarations::ACTIVITY; } - public function buildForm(FormBuilderInterface $builder) - { - // no form - } + public function buildForm(FormBuilderInterface $builder) {} + public function getFormDefaultData(): array { return []; @@ -73,11 +93,11 @@ class CreatorScopeAggregator implements AggregatorInterface public function getQueryKeys($data): array { - return ['creatorscope_aggregator']; + return [self::PREFIX . '_select']; } public function getTitle(): string { - return 'Group activity by creator scope'; + return 'export.aggregator.activity.by_creator_scope.Group activity by creator scope'; } } diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/JobScopeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/JobScopeAggregator.php new file mode 100644 index 000000000..251f67b36 --- /dev/null +++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/JobScopeAggregator.php @@ -0,0 +1,104 @@ +leftJoin("activity.createdBy", "{$p}_user") + ->leftJoin( + UserJobHistory::class, + "{$p}_history", + Join::WITH, + $qb->expr()->eq("{$p}_history.user", "{$p}_user") + ) + // job_at based on activity.date + ->andWhere( + $qb->expr()->andX( + $qb->expr()->lte("{$p}_history.startDate", "activity.date"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_history.endDate"), + $qb->expr()->gt("{$p}_history.endDate", "activity.date") + ) + ) + ) + ->addSelect("IDENTITY({$p}_history.job) AS {$p}_select") + ->addGroupBy("{$p}_select"); + } + + public function applyOn(): string + { + return Declarations::ACTIVITY; + } + + public function buildForm(FormBuilderInterface $builder) {} + + public function getFormDefaultData(): array + { + return []; + } + + public function getLabels($key, array $values, $data) + { + return function ($value): string { + if ('_header' === $value) { + return 'Scope'; + } + + if (null === $value || '' === $value) { + return ''; + } + + $s = $this->scopeRepository->find($value); + + return $this->translatableStringHelper->localize( + $s->getName() + ); + }; + } + + public function getQueryKeys($data): array + { + return [self::PREFIX . '_select']; + } + + public function getTitle(): string + { + return 'export.aggregator.activity.by_creator_job.Group activity by creator job'; + } +} diff --git a/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php b/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php index 84d94c000..ea43d387d 100644 --- a/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php +++ b/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php @@ -57,7 +57,7 @@ class ListActivityHelper ->addSelect('AGGREGATE(actPerson.id) AS personsNames') ->leftJoin('activity.users', 'users_u') ->addSelect('AGGREGATE(users_u.id) AS usersIds') - ->addSelect('AGGREGATE(users_u.id) AS usersNames') + ->addSelect('AGGREGATE(JSON_BUILD_OBJECT(\'uid\', users_u.id, \'d\', activity.date)) AS usersNames') ->leftJoin('activity.thirdParties', 'thirdparty') ->addSelect('AGGREGATE(thirdparty.id) AS thirdPartiesIds') ->addSelect('AGGREGATE(thirdparty.id) AS thirdPartiesNames') @@ -68,9 +68,9 @@ class ListActivityHelper ->leftJoin('activity.location', 'location') ->addSelect('location.name AS locationName') ->addSelect('activity.sentReceived') - ->addSelect('IDENTITY(activity.createdBy) AS createdBy') + ->addSelect('JSON_BUILD_OBJECT(\'uid\', IDENTITY(activity.createdBy), \'d\', activity.createdAt) AS createdBy') ->addSelect('activity.createdAt') - ->addSelect('IDENTITY(activity.updatedBy) AS updatedBy') + ->addSelect('JSON_BUILD_OBJECT(\'uid\', IDENTITY(activity.updatedBy), \'d\', activity.updatedAt) AS updatedBy') ->addSelect('activity.updatedAt') ->addGroupBy('activity.id') ->addGroupBy('location.id'); diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/UserScopeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/UserScopeFilter.php index a887eb201..d33ae1a10 100644 --- a/src/Bundle/ChillActivityBundle/Export/Filter/UserScopeFilter.php +++ b/src/Bundle/ChillActivityBundle/Export/Filter/UserScopeFilter.php @@ -13,17 +13,21 @@ namespace Chill\ActivityBundle\Export\Filter; use Chill\ActivityBundle\Export\Declarations; use Chill\MainBundle\Entity\Scope; +use Chill\MainBundle\Entity\User\UserScopeHistory; use Chill\MainBundle\Export\FilterInterface; use Chill\MainBundle\Templating\TranslatableStringHelper; -use Doctrine\ORM\Query\Expr\Andx; +use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\QueryBuilder; use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Component\Form\FormBuilderInterface; -use function in_array; class UserScopeFilter implements FilterInterface { - public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {} + private const PREFIX = 'acp_act_filter_user_scope'; // creator ? cfr translation + + public function __construct( + private readonly TranslatableStringHelper $translatableStringHelper + ) {} public function addRole(): ?string { @@ -32,22 +36,33 @@ class UserScopeFilter implements FilterInterface public function alterQuery(QueryBuilder $qb, $data) { - if (!in_array('actuser', $qb->getAllAliases(), true)) { - $qb->join('activity.user', 'actuser'); - } + $p = self::PREFIX; - $where = $qb->getDQLPart('where'); - - $clause = $qb->expr()->in('actuser.mainScope', ':userscope'); - - if ($where instanceof Andx) { - $where->add($clause); - } else { - $where = $qb->expr()->andX($clause); - } - - $qb->add('where', $where); - $qb->setParameter('userscope', $data['accepted_userscope']); + $qb + ->leftJoin("activity.user", "{$p}_user") // createdBy ? cfr translation + ->leftJoin( + UserScopeHistory::class, + "{$p}_history", + Join::WITH, + $qb->expr()->eq("{$p}_history.user", "{$p}_user") + ) + // scope_at based on activity.date + ->andWhere( + $qb->expr()->andX( + $qb->expr()->lte("{$p}_history.startDate", "activity.date"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_history.endDate"), + $qb->expr()->gt("{$p}_history.endDate", "activity.date") + ) + ) + ) + ->andWhere( + $qb->expr()->in("{$p}_history.scope", ":{$p}_scopes") + ) + ->setParameter( + "{$p}_scopes", + $data["scopes"], + ); } public function applyOn(): string @@ -57,37 +72,41 @@ class UserScopeFilter implements FilterInterface public function buildForm(FormBuilderInterface $builder) { - $builder->add('accepted_userscope', EntityType::class, [ - 'class' => Scope::class, - 'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize( - $s->getName() - ), - 'multiple' => true, - 'expanded' => true, - ]); - } - public function getFormDefaultData(): array - { - return []; + $builder + ->add('scopes', EntityType::class, [ + 'class' => Scope::class, + 'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize( + $s->getName() + ), + 'multiple' => true, + 'expanded' => true, + ]); } public function describeAction($data, $format = 'string'): array { $scopes = []; - foreach ($data['accepted_userscope'] as $s) { + foreach ($data['scopes'] as $s) { $scopes[] = $this->translatableStringHelper->localize( $s->getName() ); } - return ['Filtered activity by userscope: only %scopes%', [ + return ['export.filter.activity.by_creator_scope.Filtered activity by user scope: only %scopes%', [ '%scopes%' => implode(', ', $scopes), ]]; } + public function getFormDefaultData(): array + { + return [ + 'scopes' => [], + ]; + } + public function getTitle(): string { - return 'Filter activity by userscope'; + return 'export.filter.activity.by_creator_scope.Filter activity by user scope'; } } diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php index 69f743987..d787f30ea 100644 --- a/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php +++ b/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php @@ -13,6 +13,7 @@ namespace Chill\ActivityBundle\Export\Filter; use Chill\ActivityBundle\Entity\Activity; use Chill\ActivityBundle\Export\Declarations; +use Chill\MainBundle\Entity\User\UserJobHistory; use Chill\MainBundle\Entity\UserJob; use Chill\MainBundle\Export\FilterInterface; use Chill\MainBundle\Templating\TranslatableStringHelperInterface; @@ -22,7 +23,11 @@ use Symfony\Component\Form\FormBuilderInterface; class UsersJobFilter implements FilterInterface { - public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper) {} + private const PREFIX = 'act_filter_user_job'; + + public function __construct( + private readonly TranslatableStringHelperInterface $translatableStringHelper + ) {} public function addRole(): ?string { @@ -31,14 +36,25 @@ class UsersJobFilter implements FilterInterface public function alterQuery(QueryBuilder $qb, $data) { + $p = self::PREFIX; + $qb ->andWhere( $qb->expr()->exists( - 'SELECT 1 FROM ' . Activity::class . ' activity_users_job_filter_act - JOIN activity_users_job_filter_act.users users WHERE users.userJob IN (:activity_users_job_filter_jobs) AND activity_users_job_filter_act = activity ' + "SELECT 1 FROM " . Activity::class . " {$p}_act " + . "JOIN {$p}_act.users {$p}_user " + . "JOIN " . UserJobHistory::class . " {$p}_history WITH {$p}_history.user = {$p}_user " + . "WHERE {$p}_act = activity " + // job_at based on activity.date + . "AND {$p}_history.startDate <= activity.date " + . "AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > activity.date) " + . "AND {$p}_history.job IN ( :{$p}_jobs )" ) ) - ->setParameter('activity_users_job_filter_jobs', $data['jobs']); + ->setParameter( + "{$p}_jobs", + $data["jobs"] + ); } public function applyOn() @@ -48,21 +64,18 @@ class UsersJobFilter implements FilterInterface public function buildForm(FormBuilderInterface $builder) { - $builder->add('jobs', EntityType::class, [ - 'class' => UserJob::class, - 'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize($j->getLabel()), - 'multiple' => true, - 'expanded' => true, - ]); - } - public function getFormDefaultData(): array - { - return []; + $builder + ->add('jobs', EntityType::class, [ + 'class' => UserJob::class, + 'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize($j->getLabel()), + 'multiple' => true, + 'expanded' => true, + ]); } public function describeAction($data, $format = 'string') { - return ['export.filter.activity.by_usersjob.Filtered activity by users job: only %jobs%', [ + return ['export.filter.activity.by_users_job.Filtered activity by users job: only %jobs%', [ '%jobs%' => implode( ', ', array_map( @@ -73,8 +86,15 @@ class UsersJobFilter implements FilterInterface ]]; } + public function getFormDefaultData(): array + { + return [ + 'jobs' => [], + ]; + } + public function getTitle() { - return 'export.filter.activity.by_usersjob.Filter by users job'; + return 'export.filter.activity.by_users_job.Filter by users job'; } } diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php index 02c3229a7..a1bcb958b 100644 --- a/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php +++ b/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php @@ -14,6 +14,7 @@ namespace Chill\ActivityBundle\Export\Filter; use Chill\ActivityBundle\Entity\Activity; use Chill\ActivityBundle\Export\Declarations; use Chill\MainBundle\Entity\Scope; +use Chill\MainBundle\Entity\User\UserScopeHistory; use Chill\MainBundle\Export\FilterInterface; use Chill\MainBundle\Repository\ScopeRepositoryInterface; use Chill\MainBundle\Templating\TranslatableStringHelperInterface; @@ -23,7 +24,12 @@ use Symfony\Component\Form\FormBuilderInterface; class UsersScopeFilter implements FilterInterface { - public function __construct(private readonly ScopeRepositoryInterface $scopeRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper) {} + private const PREFIX = 'act_filter_user_scope'; + + public function __construct( + private readonly ScopeRepositoryInterface $scopeRepository, + private readonly TranslatableStringHelperInterface $translatableStringHelper + ) {} public function addRole(): ?string { @@ -32,39 +38,47 @@ class UsersScopeFilter implements FilterInterface public function alterQuery(QueryBuilder $qb, $data) { + $p = self::PREFIX; + $qb ->andWhere( $qb->expr()->exists( - 'SELECT 1 FROM ' . Activity::class . ' activity_users_scope_filter_act - JOIN activity_users_scope_filter_act.users users WHERE users.mainScope IN (:activity_users_scope_filter_scopes) AND activity_users_scope_filter_act = activity ' + "SELECT 1 FROM " . Activity::class . " {$p}_act " + . "JOIN {$p}_act.users {$p}_user " + . "JOIN " . UserScopeHistory::class . " {$p}_history WITH {$p}_history.user = {$p}_user " + . "WHERE {$p}_act = activity " + // scope_at based on activity.date + . "AND {$p}_history.startDate <= activity.date " + . "AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > activity.date) " + . "AND {$p}_history.scope IN ( :{$p}_scopes )" ) ) - ->setParameter('activity_users_scope_filter_scopes', $data['scopes']); + ->setParameter( + "{$p}_scopes", + $data["scopes"] + ); } - public function applyOn() + public function applyOn(): string { return Declarations::ACTIVITY; } public function buildForm(FormBuilderInterface $builder) { - $builder->add('scopes', EntityType::class, [ - 'class' => Scope::class, - 'choices' => $this->scopeRepository->findAllActive(), - 'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()), - 'multiple' => true, - 'expanded' => true, - ]); - } - public function getFormDefaultData(): array - { - return []; + $builder + ->add('scopes', EntityType::class, [ + 'class' => Scope::class, + 'choices' => $this->scopeRepository->findAllActive(), + 'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()), + 'multiple' => true, + 'expanded' => true, + ]); } - public function describeAction($data, $format = 'string') + public function describeAction($data, $format = 'string'): array { - return ['export.filter.activity.by_usersscope.Filtered activity by users scope: only %scopes%', [ + return ['export.filter.activity.by_users_scope.Filtered activity by users scope: only %scopes%', [ '%scopes%' => implode( ', ', array_map( @@ -75,8 +89,15 @@ class UsersScopeFilter implements FilterInterface ]]; } - public function getTitle() + public function getFormDefaultData(): array { - return 'export.filter.activity.by_usersscope.Filter by users scope'; + return [ + 'scopes' => [], + ]; + } + + public function getTitle(): string + { + return 'export.filter.activity.by_users_scope.Filter by users scope'; } } diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php index f9db5c158..d61e0999e 100644 --- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php +++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php @@ -122,9 +122,30 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos ->leftJoin('a.user', 'activity_u') ->andWhere( $qb->expr()->orX( - 'creator.userJob IN (:jobs)', - 'activity_u.userJob IN (:jobs)', - 'EXISTS (SELECT 1 FROM ' . User::class . ' activity_user WHERE activity_user MEMBER OF a.users AND activity_user.userJob IN (:jobs))' + $qb->expr()->exists( + sprintf( + "SELECT 1 FROM %s ujh_creator WHERE ujh_creator.user = a.createdBy " + . "AND ujh_creator.job IN (:jobs) AND a.createdAt > ujh_creator.startDate " + . "AND (ujh_creator.endDate IS NULL or ujh_creator.endDate > a.date)", + User\UserJobHistory::class + ) + ), + $qb->expr()->exists( + sprintf( + "SELECT 1 FROM %s ujh_u WHERE ujh_u.user = a.user " + . "AND ujh_u.job IN (:jobs) AND a.createdAt > ujh_u.startDate " + . "AND (ujh_u.endDate IS NULL or ujh_u.endDate > a.date)", + User\UserJobHistory::class + ) + ), + $qb->expr()->exists( + sprintf( + "SELECT 1 FROM %s ujh_users WHERE ujh_users.user MEMBER OF a.users " + . "AND ujh_users.job IN (:jobs) AND a.createdAt > ujh_users.startDate " + . "AND (ujh_users.endDate IS NULL or ujh_users.endDate > a.date)", + User\UserJobHistory::class + ) + ), ) ) ->setParameter('jobs', $jobs); @@ -172,16 +193,17 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos return $qb->getQuery()->getResult(); } - public function findUserJobByAssociated(Person|AccompanyingPeriod $associated): array + public function findUserJobByAssociated(AccompanyingPeriod|Person $associated): array { $in = $this->em->createQueryBuilder(); - $in->select('IDENTITY(u.userJob)') - ->from(User::class, 'u') + $in->select('IDENTITY(u.job)') + ->distinct() + ->from(User\UserJobHistory::class, 'u') ->join( Activity::class, 'a', Join::WITH, - 'a.createdBy = u OR a.user = u OR u MEMBER OF a.users' + 'a.createdBy = u.user OR a.user = u.user OR u.user MEMBER OF a.users AND a.date >= u.startDate ANd (u.endDate IS NULL or u.endDate > a.date)' ); if ($associated instanceof Person) { diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php index e7d3f50ab..657c9441e 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php @@ -12,7 +12,7 @@ declare(strict_types=1); namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators; use Chill\ActivityBundle\Entity\Activity; -use Chill\ActivityBundle\Export\Aggregator\BySocialActionAggregator; +use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\BySocialActionAggregator; use Chill\MainBundle\Test\Export\AbstractAggregatorTest; use Doctrine\ORM\EntityManagerInterface; diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php index 471c6ad21..86c999cf3 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php @@ -12,7 +12,7 @@ declare(strict_types=1); namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators; use Chill\ActivityBundle\Entity\Activity; -use Chill\ActivityBundle\Export\Aggregator\BySocialIssueAggregator; +use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\BySocialIssueAggregator; use Chill\MainBundle\Test\Export\AbstractAggregatorTest; use Doctrine\ORM\EntityManagerInterface; diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/JobScopeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/JobScopeAggregatorTest.php new file mode 100644 index 000000000..3771e6e32 --- /dev/null +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/JobScopeAggregatorTest.php @@ -0,0 +1,60 @@ +aggregator = self::$container->get(JobScopeAggregator::class); + } + + public function getAggregator() + { + return $this->aggregator; + } + + public function getFormData(): array + { + return [ + [], + ]; + } + + public function getQueryBuilders(): array + { + self::bootKernel(); + + $em = self::$container->get(EntityManagerInterface::class); + + return [ + $em->createQueryBuilder() + ->select('count(activity.id)') + ->from(Activity::class, 'activity') + ->leftJoin('activity.accompanyingPeriod', 'acp') + ->leftJoin('activity.user', 'actuser'), + ]; + } +} diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserScopeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserScopeFilterTest.php index cc165c6ac..0e38e92a6 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserScopeFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserScopeFilterTest.php @@ -53,7 +53,7 @@ final class UserScopeFilterTest extends AbstractFilterTest foreach ($array as $a) { $data[] = [ - 'accepted_userscope' => $a, + 'scopes' => $a, ]; } diff --git a/src/Bundle/ChillActivityBundle/config/services/export.yaml b/src/Bundle/ChillActivityBundle/config/services/export.yaml index 563ea7bf5..09a5227eb 100644 --- a/src/Bundle/ChillActivityBundle/config/services/export.yaml +++ b/src/Bundle/ChillActivityBundle/config/services/export.yaml @@ -177,6 +177,10 @@ services: tags: - { name: chill.export_aggregator, alias: activity_creator_scope_aggregator } + Chill\ActivityBundle\Export\Aggregator\JobScopeAggregator: + tags: + - { name: chill.export_aggregator, alias: activity_creator_job_aggregator } + Chill\ActivityBundle\Export\Aggregator\ActivityUsersAggregator: tags: - { name: chill.export_aggregator, alias: activity_users_aggregator } diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml index ef2494f57..8deebbb8c 100644 --- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml @@ -287,8 +287,6 @@ Filter activity by creator: Filtrer les échanges par créateur de l'échange 'Filtered activity by users: only %users%': "Filtré par utilisateurs participants: uniquement %users%" 'Filtered activity by creator: only %users%': "Filtré par créateur: uniquement %users%" Creators: Créateurs -Filter activity by userscope: Filtrer les échanges par service du créateur -'Filtered activity by userscope: only %scopes%': "Filtré par service du créateur: uniquement %scopes%" Accepted userscope: Services Filter acp which has no activity: Filtrer les parcours qui n’ont pas d’échange @@ -306,10 +304,6 @@ Aggregate by activity user: Grouper les échanges par référent Aggregate by activity users: Grouper les échanges par utilisateurs participants Aggregate by activity type: Grouper les échanges par type Aggregate by activity reason: Grouper les échanges par sujet -Aggregate by users scope: Grouper les échanges par service principal de l'utilisateur -Users 's scope: Service principal des utilisateurs participants à l'échange -Aggregate by users job: Grouper les échanges par métier des utilisateurs participants -Users 's job: Métier des utilisateurs participants à l'échange Group activity by locationtype: Grouper les échanges par type de localisation Group activity by date: Grouper les échanges par date @@ -320,7 +314,6 @@ for week: Semaine by year: Par année in year: En Group activity by creator: Grouper les échanges par créateur de l'échange -Group activity by creator scope: Grouper les échanges par service du créateur de l'échange Group activity by linked thirdparties: Grouper les échanges par tiers impliqué Accepted thirdparty: Tiers impliqué Group activity by linked socialaction: Grouper les échanges par action liée @@ -367,10 +360,10 @@ export: filter: activity: - by_usersjob: + by_users_job: Filter by users job: Filtrer les échanges par métier d'au moins un utilisateur participant 'Filtered activity by users job: only %jobs%': 'Filtré par métier d''au moins un utilisateur participant: seulement %jobs%' - by_usersscope: + by_users_scope: Filter by users scope: Filtrer les échanges par services d'au moins un utilisateur participant 'Filtered activity by users scope: only %scopes%': 'Filtré par service d''au moins un utilisateur participant: seulement %scopes%' course_having_activity_between_date: @@ -379,7 +372,9 @@ export: Receiving an activity before: Ayant reçu un échange avant le acp_by_activity_type: 'acp_containing_at_least_one_%activitytypes%': 'Parcours filtrés: uniquement ceux qui contiennent au moins un échange d''un des types suivants: %activitytypes%' - + by_creator_scope: + Filter activity by user scope: Filtrer les échanges par service du créateur de l'échange + 'Filtered activity by user scope: only %scopes%': "Filtré par service du créateur: uniquement %scopes%" aggregator: activity: @@ -391,6 +386,18 @@ export: by_location: Activity Location: Localisation de l'échange Title: Grouper les échanges par localisation de l'échange + by_user_job: + Users 's job: Métier des utilisateurs participants à l'échange + Aggregate by users job: Grouper les échanges par métier des utilisateurs participants + by_user_scope: + Users 's scope: Service principal des utilisateurs participants à l'échange + Aggregate by users scope: Grouper les échanges par service principal de l'utilisateur + by_creator_scope: + Group activity by creator scope: Grouper les échanges par service du créateur de l'échange + Calc date: Date de calcul du service du créateur de l'échange + by_creator_job: + Group activity by creator job: Grouper les échanges par service du créateur de l'échange + Calc date: Date de calcul du service du créateur de l'échange generic_doc: filter: diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserJobAggregator.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserJobAggregator.php index 474f0a49f..ae4fb8477 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserJobAggregator.php +++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserJobAggregator.php @@ -12,17 +12,22 @@ declare(strict_types=1); namespace Chill\AsideActivityBundle\Export\Aggregator; use Chill\AsideActivityBundle\Export\Declarations; +use Chill\MainBundle\Entity\User\UserJobHistory; use Chill\MainBundle\Export\AggregatorInterface; use Chill\MainBundle\Repository\UserJobRepositoryInterface; use Chill\MainBundle\Templating\TranslatableStringHelperInterface; +use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\QueryBuilder; use Symfony\Component\Form\FormBuilderInterface; -use function in_array; - class ByUserJobAggregator implements AggregatorInterface { - public function __construct(private readonly UserJobRepositoryInterface $userJobRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper) {} + private const PREFIX = 'aside_act_agg_user_job'; + + public function __construct( + private readonly UserJobRepositoryInterface $userJobRepository, + private readonly TranslatableStringHelperInterface $translatableStringHelper + ) {} public function addRole(): ?string { @@ -31,24 +36,37 @@ class ByUserJobAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { - if (!in_array('aside_user', $qb->getAllAliases(), true)) { - $qb->leftJoin('aside.agent', 'aside_user'); - } + $p = self::PREFIX; $qb - ->addSelect('IDENTITY(aside_user.userJob) AS aside_activity_user_job_aggregator') - ->addGroupBy('aside_activity_user_job_aggregator'); + ->leftJoin("aside.agent", "{$p}_user") + ->leftJoin( + UserJobHistory::class, + "{$p}_history", + Join::WITH, + $qb->expr()->eq("{$p}_history.user", "{$p}_user") + ) + // job_at based on aside.date + ->andWhere( + $qb->expr()->andX( + $qb->expr()->lte("{$p}_history.startDate", "aside.date"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_history.endDate"), + $qb->expr()->gt("{$p}_history.endDate", "aside.date") + ) + ) + ) + ->addSelect("IDENTITY({$p}_history.job) AS {$p}_select") + ->addGroupBy("{$p}_select"); } - public function applyOn() + public function applyOn(): string { return Declarations::ASIDE_ACTIVITY_TYPE; } - public function buildForm(FormBuilderInterface $builder) - { - // nothing to add in the form - } + public function buildForm(FormBuilderInterface $builder) {} + public function getFormDefaultData(): array { return []; @@ -75,11 +93,11 @@ class ByUserJobAggregator implements AggregatorInterface public function getQueryKeys($data): array { - return ['aside_activity_user_job_aggregator']; + return [self::PREFIX . '_select']; } - public function getTitle() + public function getTitle(): string { - return 'export.aggregator.Aggregate by user job'; + return 'export.aggregator.by_user_job.Aggregate by user job'; } } diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserScopeAggregator.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserScopeAggregator.php index 03646fab4..6c9690791 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserScopeAggregator.php +++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserScopeAggregator.php @@ -12,17 +12,22 @@ declare(strict_types=1); namespace Chill\AsideActivityBundle\Export\Aggregator; use Chill\AsideActivityBundle\Export\Declarations; +use Chill\MainBundle\Entity\User\UserScopeHistory; use Chill\MainBundle\Export\AggregatorInterface; use Chill\MainBundle\Repository\ScopeRepositoryInterface; use Chill\MainBundle\Templating\TranslatableStringHelperInterface; +use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\QueryBuilder; use Symfony\Component\Form\FormBuilderInterface; -use function in_array; - class ByUserScopeAggregator implements AggregatorInterface { - public function __construct(private readonly ScopeRepositoryInterface $scopeRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper) {} + private const PREFIX = 'aside_act_agg_user_scope'; + + public function __construct( + private readonly ScopeRepositoryInterface $scopeRepository, + private readonly TranslatableStringHelperInterface $translatableStringHelper + ) {} public function addRole(): ?string { @@ -31,24 +36,36 @@ class ByUserScopeAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { - if (!in_array('aside_user', $qb->getAllAliases(), true)) { - $qb->leftJoin('aside.agent', 'aside_user'); - } + $p = self::PREFIX; $qb - ->addSelect('IDENTITY(aside_user.mainScope) AS aside_activity_user_scope_aggregator') - ->addGroupBy('aside_activity_user_scope_aggregator'); + ->leftJoin("aside.agent", "{$p}_user") + ->leftJoin( + UserScopeHistory::class, + "{$p}_history", + Join::WITH, + $qb->expr()->eq("{$p}_history.user", "{$p}_user") + ) + ->andWhere( + $qb->expr()->andX( + $qb->expr()->lte("{$p}_history.startDate", "aside.date"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_history.endDate"), + $qb->expr()->gt("{$p}_history.endDate", "aside.date") + ) + ) + ) + ->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select") + ->addGroupBy("{$p}_select"); } - public function applyOn() + public function applyOn(): string { return Declarations::ASIDE_ACTIVITY_TYPE; } - public function buildForm(FormBuilderInterface $builder) - { - // nothing to add in the form - } + public function buildForm(FormBuilderInterface $builder) {} + public function getFormDefaultData(): array { return []; @@ -75,11 +92,11 @@ class ByUserScopeAggregator implements AggregatorInterface public function getQueryKeys($data): array { - return ['aside_activity_user_scope_aggregator']; + return [self::PREFIX . '_select']; } - public function getTitle() + public function getTitle(): string { - return 'export.aggregator.Aggregate by user scope'; + return 'export.aggregator.by_user_scope.Aggregate by user scope'; } } diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php index 53e66c6c3..0981c6bf8 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php +++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php @@ -182,7 +182,10 @@ final readonly class ListAsideActivity implements ListInterface, GroupedExportIn { $qb = $this->em->createQueryBuilder() ->from(AsideActivity::class, 'aside') - ->leftJoin('aside.agent', 'agent'); + ->leftJoin('aside.agent', 'agent') + ->leftJoin('agent.scopeHistories', 'scopeHistories') + ->andWhere('scopeHistories.startDate <= aside.date AND (scopeHistories.endDate IS NULL or scopeHistories.endDate > aside.date)') + ; $qb ->addSelect('aside.id AS id') @@ -190,7 +193,7 @@ final readonly class ListAsideActivity implements ListInterface, GroupedExportIn ->addSelect('aside.updatedAt AS updatedAt') ->addSelect('IDENTITY(aside.agent) AS agent_id') ->addSelect('IDENTITY(aside.createdBy) AS creator_id') - ->addSelect('IDENTITY(agent.mainScope) AS main_scope') + ->addSelect('IDENTITY(scopeHistories.scope) AS main_scope') ->addSelect('IDENTITY(agent.mainCenter) AS main_center') ->addSelect('IDENTITY(aside.type) AS aside_activity_type') ->addSelect('aside.date') diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php index 5cff1b0e3..69aaa376f 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php +++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php @@ -13,6 +13,7 @@ namespace Chill\AsideActivityBundle\Export\Filter; use Chill\AsideActivityBundle\Entity\AsideActivity; use Chill\AsideActivityBundle\Export\Declarations; +use Chill\MainBundle\Entity\User\UserJobHistory; use Chill\MainBundle\Entity\UserJob; use Chill\MainBundle\Export\FilterInterface; use Chill\MainBundle\Templating\TranslatableStringHelperInterface; @@ -22,7 +23,11 @@ use Symfony\Component\Form\FormBuilderInterface; class ByUserJobFilter implements FilterInterface { - public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper) {} + private const PREFIX = 'aside_act_filter_user_job'; + + public function __construct( + private readonly TranslatableStringHelperInterface $translatableStringHelper + ) {} public function addRole(): ?string { @@ -31,38 +36,46 @@ class ByUserJobFilter implements FilterInterface public function alterQuery(QueryBuilder $qb, $data) { + $p = self::PREFIX; + $qb ->andWhere( $qb->expr()->exists( - 'SELECT 1 FROM ' . AsideActivity::class . ' aside_activity_user_job_filter_act - JOIN aside_activity_user_job_filter_act.agent aside_activity_user_job_filter_user WHERE aside_activity_user_job_filter_user.userJob IN (:aside_activity_user_job_filter_jobs) AND aside_activity_user_job_filter_act = aside' + "SELECT 1 FROM " . AsideActivity::class . " {$p}_act " + . "JOIN {$p}_act.agent {$p}_user " + . "JOIN " . UserJobHistory::class . " {$p}_history WITH {$p}_history.user = {$p}_user " + . "WHERE {$p}_act = aside " + // job_at based on aside.date + . "AND {$p}_history.startDate <= aside.date " + . "AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > aside.date) " + . "AND {$p}_history.job IN ( :{$p}_jobs )" ) ) - ->setParameter('aside_activity_user_job_filter_jobs', $data['jobs']); + ->setParameter( + "{$p}_jobs", + $data["jobs"], + ); } - public function applyOn() + public function applyOn(): string { return Declarations::ASIDE_ACTIVITY_TYPE; } public function buildForm(FormBuilderInterface $builder) { - $builder->add('jobs', EntityType::class, [ - 'class' => UserJob::class, - 'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize($j->getLabel()), - 'multiple' => true, - 'expanded' => true, - ]); - } - public function getFormDefaultData(): array - { - return []; + $builder + ->add('jobs', EntityType::class, [ + 'class' => UserJob::class, + 'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize($j->getLabel()), + 'multiple' => true, + 'expanded' => true, + ]); } - public function describeAction($data, $format = 'string') + public function describeAction($data, $format = 'string'): array { - return ['export.filter.Filtered aside activities by user jobs: only %jobs%', [ + return ['export.filter.by_user_job.Filtered aside activities by user jobs: only %jobs%', [ '%jobs%' => implode( ', ', array_map( @@ -73,8 +86,15 @@ class ByUserJobFilter implements FilterInterface ]]; } - public function getTitle() + public function getFormDefaultData(): array { - return 'export.filter.Filter by user jobs'; + return [ + 'jobs' => [], + ]; + } + + public function getTitle(): string + { + return 'export.filter.by_user_job.Filter by user jobs'; } } diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php index 22930183e..bcaabdcea 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php +++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php @@ -14,6 +14,7 @@ namespace Chill\AsideActivityBundle\Export\Filter; use Chill\AsideActivityBundle\Entity\AsideActivity; use Chill\AsideActivityBundle\Export\Declarations; use Chill\MainBundle\Entity\Scope; +use Chill\MainBundle\Entity\User\UserScopeHistory; use Chill\MainBundle\Export\FilterInterface; use Chill\MainBundle\Repository\ScopeRepositoryInterface; use Chill\MainBundle\Templating\TranslatableStringHelperInterface; @@ -23,7 +24,12 @@ use Symfony\Component\Form\FormBuilderInterface; class ByUserScopeFilter implements FilterInterface { - public function __construct(private readonly ScopeRepositoryInterface $scopeRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper) {} + private const PREFIX = 'aside_act_filter_user_scope'; + + public function __construct( + private readonly ScopeRepositoryInterface $scopeRepository, + private readonly TranslatableStringHelperInterface $translatableStringHelper + ) {} public function addRole(): ?string { @@ -32,39 +38,47 @@ class ByUserScopeFilter implements FilterInterface public function alterQuery(QueryBuilder $qb, $data) { + $p = self::PREFIX; + $qb ->andWhere( $qb->expr()->exists( - 'SELECT 1 FROM ' . AsideActivity::class . ' aside_activity_user_scope_filter_act - JOIN aside_activity_user_scope_filter_act.agent aside_activity_user_scope_filter_user WHERE aside_activity_user_scope_filter_user.mainScope IN (:aside_activity_user_scope_filter_scopes) AND aside_activity_user_scope_filter_act = aside ' + "SELECT 1 FROM " . AsideActivity::class . " {$p}_act " + . "JOIN {$p}_act.agent {$p}_user " + . "JOIN " . UserScopeHistory::class . " {$p}_history WITH {$p}_history.user = {$p}_user " + . "WHERE {$p}_act = aside " + // scope_at based on aside.date + . "AND {$p}_history.startDate <= aside.date " + . "AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > aside.date) " + . "AND {$p}_history.scope IN ( :{$p}_scopes )" ) ) - ->setParameter('aside_activity_user_scope_filter_scopes', $data['scopes']); + ->setParameter( + "{$p}_scopes", + $data["scopes"], + ); } - public function applyOn() + public function applyOn(): string { return Declarations::ASIDE_ACTIVITY_TYPE; } public function buildForm(FormBuilderInterface $builder) { - $builder->add('scopes', EntityType::class, [ - 'class' => Scope::class, - 'choices' => $this->scopeRepository->findAllActive(), - 'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()), - 'multiple' => true, - 'expanded' => true, - ]); - } - public function getFormDefaultData(): array - { - return []; + $builder + ->add('scopes', EntityType::class, [ + 'class' => Scope::class, + 'choices' => $this->scopeRepository->findAllActive(), + 'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()), + 'multiple' => true, + 'expanded' => true, + ]); } public function describeAction($data, $format = 'string') { - return ['export.filter.Filtered aside activities by user scope: only %scopes%', [ + return ['export.filter.by_user_scope.Filtered aside activities by user scope: only %scopes%', [ '%scopes%' => implode( ', ', array_map( @@ -75,8 +89,15 @@ class ByUserScopeFilter implements FilterInterface ]]; } - public function getTitle() + public function getFormDefaultData(): array { - return 'export.filter.Filter by user scope'; + return [ + 'scopes' => [], + ]; + } + + public function getTitle(): string + { + return 'export.filter.by_user_scope.Filter by user scope'; } } diff --git a/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/ListAsideActivityTest.php b/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/ListAsideActivityTest.php new file mode 100644 index 000000000..6bd29ef1d --- /dev/null +++ b/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/ListAsideActivityTest.php @@ -0,0 +1,43 @@ +listAsideActivity = self::$container->get(ListAsideActivity::class); + } + + public function testExecuteQuery(): void + { + $qb = $this->listAsideActivity->initiateQuery([], [], []) + ->setMaxResults(1); + + $results = $qb->getQuery()->getResult(AbstractQuery::HYDRATE_ARRAY); + + self::assertIsArray($results, "smoke test: test that the result is an array"); + } +} diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml index 6028193db..0a324d2cd 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml +++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml @@ -200,17 +200,21 @@ export: Aside activities before this date: Actvitités annexes avant cette date 'Filtered aside activity by user: only %users%': "Filtré par utilisateur: uniquement %users%" Filter aside activity by user: Filtrer par utilisateur - 'Filtered aside activities by user jobs: only %jobs%': "Filtré par métier des utilisateurs: uniquement %jobs%" - Filter by user jobs: Filtrer les activités annexes par métier des utilisateurs - 'Filtered aside activities by user scope: only %scopes%': "Filtré par service des utilisateur: uniquement %scopes%" - Filter by user scope: Filtrer les activités annexes par service d'utilisateur + by_user_job: + 'Filtered aside activities by user jobs: only %jobs%': "Filtré par métier des utilisateurs: uniquement %jobs%" + Filter by user jobs: Filtrer les activités annexes par métier des utilisateurs + by_user_scope: + 'Filtered aside activities by user scope: only %scopes%': "Filtré par service des utilisateurs: uniquement %scopes%" + Filter by user scope: Filtrer les activités annexes par service d'utilisateur Filter by aside activity location: Filtrer les activités annexes par localisation 'Filtered by aside activity location: only %location%': "Filtré par localisation: uniquement %location%" aggregator: Group by aside activity type: Grouper les activités annexes par type d'activité Aside activity type: Type d'activité annexe - Aggregate by user job: Grouper les activités annexes par métier des utilisateurs - Aggregate by user scope: Grouper les activités annexes par service des utilisateurs + by_user_job: + Aggregate by user job: Grouper les activités annexes par métier des utilisateurs + by_user_scope: + Aggregate by user scope: Grouper les activités annexes par service des utilisateurs Aside activity location: Localisation des activités annexe Group by aside activity location: Grouper les activités annexes par localisation Aside activity localisation: Localisation diff --git a/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php index 9b89010dc..475657f68 100644 --- a/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php +++ b/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php @@ -34,7 +34,7 @@ class ChargeRepository extends ServiceEntityRepository /** * @return Charge[] */ - public function findAllByEntity(Person|Household $entity): array + public function findAllByEntity(Household|Person $entity): array { $qb = $this->createQueryBuilder('c'); diff --git a/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php index 836f13e4b..6ecf13d28 100644 --- a/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php +++ b/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php @@ -35,7 +35,7 @@ class ResourceRepository extends ServiceEntityRepository /** * @return Resource[] */ - public function findAllByEntity(Person|Household $entity): array + public function findAllByEntity(Household|Person $entity): array { $qb = $this->createQueryBuilder('r'); @@ -47,7 +47,7 @@ class ResourceRepository extends ServiceEntityRepository return $qb->getQuery()->getResult(); } - public function findByEntityAndDate(Person|Household $entity, DateTime $date, $sort = null) + public function findByEntityAndDate(Household|Person $entity, DateTime $date, $sort = null) { $qb = $this->createQueryBuilder('c'); diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php index 139de7b17..189d70130 100644 --- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php +++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php @@ -12,17 +12,23 @@ declare(strict_types=1); namespace Chill\CalendarBundle\Export\Aggregator; use Chill\CalendarBundle\Export\Declarations; +use Chill\MainBundle\Entity\User\UserJobHistory; use Chill\MainBundle\Export\AggregatorInterface; use Chill\MainBundle\Repository\UserJobRepository; use Chill\MainBundle\Templating\TranslatableStringHelper; use Closure; +use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\QueryBuilder; use Symfony\Component\Form\FormBuilderInterface; -use function in_array; final readonly class JobAggregator implements AggregatorInterface { - public function __construct(private UserJobRepository $jobRepository, private TranslatableStringHelper $translatableStringHelper) {} + private const PREFIX = 'cal_agg_job'; + + public function __construct( + private UserJobRepository $jobRepository, + private TranslatableStringHelper $translatableStringHelper + ) {} public function addRole(): ?string { @@ -31,12 +37,28 @@ final readonly class JobAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { - if (!in_array('caluser', $qb->getAllAliases(), true)) { - $qb->join('cal.mainUser', 'caluser'); - } + $p = self::PREFIX; - $qb->addSelect('IDENTITY(caluser.userJob) as job_aggregator'); - $qb->addGroupBy('job_aggregator'); + $qb + ->leftJoin('cal.mainUser', "{$p}_user") + ->leftJoin( + UserJobHistory::class, + "{$p}_history", + Join::WITH, + $qb->expr()->eq("{$p}_history.user", "{$p}_user") + ) + // job_at based on cal.startDate + ->andWhere( + $qb->expr()->andX( + $qb->expr()->lte("{$p}_history.startDate", "cal.startDate"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_history.endDate"), + $qb->expr()->gt("{$p}_history.endDate", "cal.startDate") + ) + ) + ) + ->addSelect("IDENTITY({$p}_history.job) AS {$p}_select") + ->addGroupBy("{$p}_select"); } public function applyOn(): string @@ -44,10 +66,8 @@ final readonly class JobAggregator implements AggregatorInterface return Declarations::CALENDAR_TYPE; } - public function buildForm(FormBuilderInterface $builder) - { - // no form - } + public function buildForm(FormBuilderInterface $builder) {} + public function getFormDefaultData(): array { return []; @@ -64,7 +84,9 @@ final readonly class JobAggregator implements AggregatorInterface return ''; } - $j = $this->jobRepository->find($value); + if (null === $j = $this->jobRepository->find($value)) { + return ''; + } return $this->translatableStringHelper->localize( $j->getLabel() @@ -74,11 +96,11 @@ final readonly class JobAggregator implements AggregatorInterface public function getQueryKeys($data): array { - return ['job_aggregator']; + return [self::PREFIX . '_select']; } public function getTitle(): string { - return 'Group calendars by agent job'; + return 'export.aggregator.calendar.agent_job.Group calendars by agent job'; } } diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php index f1daa643c..5412a15d1 100644 --- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php +++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php @@ -12,16 +12,19 @@ declare(strict_types=1); namespace Chill\CalendarBundle\Export\Aggregator; use Chill\CalendarBundle\Export\Declarations; +use Chill\MainBundle\Entity\User\UserScopeHistory; use Chill\MainBundle\Export\AggregatorInterface; use Chill\MainBundle\Repository\ScopeRepository; use Chill\MainBundle\Templating\TranslatableStringHelper; use Closure; +use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\QueryBuilder; use Symfony\Component\Form\FormBuilderInterface; -use function in_array; final readonly class ScopeAggregator implements AggregatorInterface { + private const PREFIX = "cal_agg_scope"; + public function __construct( private ScopeRepository $scopeRepository, private TranslatableStringHelper $translatableStringHelper @@ -34,12 +37,28 @@ final readonly class ScopeAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { - if (!in_array('caluser', $qb->getAllAliases(), true)) { - $qb->join('cal.mainUser', 'caluser'); - } + $p = self::PREFIX; - $qb->addSelect('IDENTITY(caluser.mainScope) as scope_aggregator'); - $qb->addGroupBy('scope_aggregator'); + $qb + ->leftJoin("cal.mainUser", "{$p}_user") + ->leftJoin( + UserScopeHistory::class, + "{$p}_history", + Join::WITH, + $qb->expr()->eq("{$p}_history.user", "{$p}_user") + ) + // scope_at based on cal.startDate + ->andWhere( + $qb->expr()->andX( + $qb->expr()->lte("{$p}_history.startDate", "cal.startDate"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_history.endDate"), + $qb->expr()->gt("{$p}_history.endDate", "cal.startDate") + ) + ) + ) + ->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select") + ->addGroupBy("{$p}_select"); } public function applyOn(): string @@ -47,10 +66,8 @@ final readonly class ScopeAggregator implements AggregatorInterface return Declarations::CALENDAR_TYPE; } - public function buildForm(FormBuilderInterface $builder) - { - // no form - } + public function buildForm(FormBuilderInterface $builder) {} + public function getFormDefaultData(): array { return []; @@ -67,7 +84,9 @@ final readonly class ScopeAggregator implements AggregatorInterface return ''; } - $s = $this->scopeRepository->find($value); + if (null === $s = $this->scopeRepository->find($value)) { + return ''; + } return $this->translatableStringHelper->localize( $s->getName() @@ -77,11 +96,11 @@ final readonly class ScopeAggregator implements AggregatorInterface public function getQueryKeys($data): array { - return ['scope_aggregator']; + return [self::PREFIX . '_select']; } public function getTitle(): string { - return 'Group calendars by agent scope'; + return 'export.aggregator.calendar.agent_scope.Group calendars by agent scope'; } } diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php index 1391c4968..93def5631 100644 --- a/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php +++ b/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php @@ -12,19 +12,23 @@ declare(strict_types=1); namespace Chill\CalendarBundle\Export\Filter; use Chill\CalendarBundle\Export\Declarations; +use Chill\MainBundle\Entity\User\UserJobHistory; use Chill\MainBundle\Entity\UserJob; use Chill\MainBundle\Export\FilterInterface; use Chill\MainBundle\Templating\TranslatableStringHelper; -use Doctrine\ORM\Query\Expr\Andx; +use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\QueryBuilder; use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Contracts\Translation\TranslatorInterface; -use function in_array; -class JobFilter implements FilterInterface +final readonly class JobFilter implements FilterInterface { - public function __construct(protected TranslatorInterface $translator, private readonly TranslatableStringHelper $translatableStringHelper) {} + private const PREFIX = 'cal_filter_job'; + + public function __construct( + private TranslatableStringHelper $translatableStringHelper + ) {} public function addRole(): ?string { @@ -33,21 +37,32 @@ class JobFilter implements FilterInterface public function alterQuery(QueryBuilder $qb, $data) { - if (!in_array('caluser', $qb->getAllAliases(), true)) { - $qb->join('cal.mainUser', 'caluser'); - } + $p = self::PREFIX; - $where = $qb->getDQLPart('where'); - $clause = $qb->expr()->in('caluser.userJob', ':job'); + $qb + ->leftJoin("cal.mainUser", "{$p}_user") + ->leftJoin( + UserJobHistory::class, + "{$p}_history", + Join::WITH, + $qb->expr()->eq("{$p}_history.user", "{$p}_user") + ) + // job_at based on cal.startDate + ->andWhere( + $qb->expr()->andX( + $qb->expr()->lte("{$p}_history.startDate", "cal.startDate"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_history.endDate"), + $qb->expr()->gt("{$p}_history.endDate", "cal.startDate") + ) + ) + ) + ->andWhere($qb->expr()->in("{$p}_history.job", ":{$p}_job")) + ->setParameter( + "{$p}_job", + $data["job"] + ); - if ($where instanceof Andx) { - $where->add($clause); - } else { - $where = $qb->expr()->andX($clause); - } - - $qb->add('where', $where); - $qb->setParameter('job', $data['job']); } public function applyOn(): string @@ -57,18 +72,15 @@ class JobFilter implements FilterInterface public function buildForm(FormBuilderInterface $builder) { - $builder->add('job', EntityType::class, [ - 'class' => UserJob::class, - 'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize( - $j->getLabel() - ), - 'multiple' => true, - 'expanded' => true, - ]); - } - public function getFormDefaultData(): array - { - return []; + $builder + ->add('job', EntityType::class, [ + 'class' => UserJob::class, + 'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize( + $j->getLabel() + ), + 'multiple' => true, + 'expanded' => true, + ]); } public function describeAction($data, $format = 'string'): array @@ -81,13 +93,20 @@ class JobFilter implements FilterInterface ); } - return ['Filtered by agent job: only %jobs%', [ + return ['export.filter.calendar.agent_job.Filtered by agent job: only %jobs%', [ '%jobs%' => implode(', ', $userJobs), ]]; } + public function getFormDefaultData(): array + { + return [ + 'job' => [], + ]; + } + public function getTitle(): string { - return 'Filter calendars by agent job'; + return 'export.filter.calendar.agent_job.Filter calendars by agent job'; } } diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php index a30638d0d..e04bd922b 100644 --- a/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php +++ b/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php @@ -13,18 +13,23 @@ namespace Chill\CalendarBundle\Export\Filter; use Chill\CalendarBundle\Export\Declarations; use Chill\MainBundle\Entity\Scope; +use Chill\MainBundle\Entity\User\UserScopeHistory; use Chill\MainBundle\Export\FilterInterface; use Chill\MainBundle\Templating\TranslatableStringHelper; -use Doctrine\ORM\Query\Expr\Andx; +use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\QueryBuilder; use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Contracts\Translation\TranslatorInterface; -use function in_array; class ScopeFilter implements FilterInterface { - public function __construct(protected TranslatorInterface $translator, private readonly TranslatableStringHelper $translatableStringHelper) {} + private const PREFIX = 'cal_filter_scope'; + + public function __construct( + protected TranslatorInterface $translator, + private readonly TranslatableStringHelper $translatableStringHelper + ) {} public function addRole(): ?string { @@ -33,45 +38,52 @@ class ScopeFilter implements FilterInterface public function alterQuery(QueryBuilder $qb, $data) { - if (!in_array('caluser', $qb->getAllAliases(), true)) { - $qb->join('cal.mainUser', 'caluser'); - } + $p = self::PREFIX; - $where = $qb->getDQLPart('where'); - $clause = $qb->expr()->in('caluser.mainScope', ':scope'); - - if ($where instanceof Andx) { - $where->add($clause); - } else { - $where = $qb->expr()->andX($clause); - } - - $qb->add('where', $where); - $qb->setParameter('scope', $data['scope']); + $qb + ->leftJoin("cal.mainUser", "{$p}_user") + ->leftJoin( + UserScopeHistory::class, + "{$p}_history", + Join::WITH, + $qb->expr()->eq("{$p}_history.user", "{$p}_user") + ) + // scope_at based on cal.startDate + ->andWhere( + $qb->expr()->andX( + $qb->expr()->lte("{$p}_history.startDate", "cal.startDate"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_history.endDate"), + $qb->expr()->gt("{$p}_history.endDate", "cal.startDate") + ) + ) + ) + ->andWhere($qb->expr()->in("{$p}_history.scope", ":{$p}_scope")) + ->setParameter( + "{$p}_scope", + $data["scope"] + ); } - public function applyOn() + public function applyOn(): string { return Declarations::CALENDAR_TYPE; } public function buildForm(FormBuilderInterface $builder) { - $builder->add('scope', EntityType::class, [ - 'class' => Scope::class, - 'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize( - $s->getName() - ), - 'multiple' => true, - 'expanded' => true, - ]); - } - public function getFormDefaultData(): array - { - return []; + $builder + ->add('scope', EntityType::class, [ + 'class' => Scope::class, + 'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize( + $s->getName() + ), + 'multiple' => true, + 'expanded' => true, + ]); } - public function describeAction($data, $format = 'string') + public function describeAction($data, $format = 'string'): array { $scopes = []; @@ -81,13 +93,20 @@ class ScopeFilter implements FilterInterface ); } - return ['Filtered by agent scope: only %scopes%', [ + return ['export.filter.calendar.agent_scope.Filtered by agent scope: only %scopes%', [ '%scopes%' => implode(', ', $scopes), ]]; } - public function getTitle() + public function getFormDefaultData(): array { - return 'Filter calendars by agent scope'; + return [ + 'scope' => [], + ]; + } + + public function getTitle(): string + { + return 'export.filter.calendar.agent_scope.Filter calendars by agent scope'; } } diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReader.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReader.php index a81ef34c3..740666cd6 100644 --- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReader.php +++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReader.php @@ -33,7 +33,7 @@ final readonly class MSUserAbsenceReader implements MSUserAbsenceReaderInterface /** * @throw UserAbsenceSyncException when the data cannot be reached or is not valid from microsoft */ - public function isUserAbsent(User $user): bool|null + public function isUserAbsent(User $user): null|bool { $id = $this->mapCalendarToUser->getUserId($user); diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReaderInterface.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReaderInterface.php index a918bb7ea..f67562e27 100644 --- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReaderInterface.php +++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReaderInterface.php @@ -18,5 +18,5 @@ interface MSUserAbsenceReaderInterface /** * @throw UserAbsenceSyncException when the data cannot be reached or is not valid from microsoft */ - public function isUserAbsent(User $user): bool|null; + public function isUserAbsent(User $user): null|bool; } diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/JobAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/JobAggregatorTest.php index 8dda425f7..094567fa7 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/JobAggregatorTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/JobAggregatorTest.php @@ -46,7 +46,7 @@ final class JobAggregatorTest extends AbstractAggregatorTest public function getFormData(): array { return [ - [], + [] ]; } diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/JobFilterTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/JobFilterTest.php index 42629896c..d571508c8 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/JobFilterTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/JobFilterTest.php @@ -22,6 +22,7 @@ use Chill\CalendarBundle\Entity\Calendar; use Chill\CalendarBundle\Export\Filter\JobFilter; use Chill\MainBundle\Entity\UserJob; use Chill\MainBundle\Test\Export\AbstractFilterTest; +use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\EntityManagerInterface; /** @@ -62,7 +63,11 @@ final class JobFilterTest extends AbstractFilterTest ->setMaxResults(1) ->getResult(); - yield ['job' => $array]; + return [ + [ + 'job' => new ArrayCollection($array) + ] + ]; } public function getQueryBuilders(): array diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/ScopeFilterTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/ScopeFilterTest.php index eef7d1362..06d36846b 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/ScopeFilterTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/ScopeFilterTest.php @@ -22,6 +22,7 @@ use Chill\CalendarBundle\Entity\Calendar; use Chill\CalendarBundle\Export\Filter\ScopeFilter; use Chill\MainBundle\Entity\Scope; use Chill\MainBundle\Test\Export\AbstractFilterTest; +use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\EntityManagerInterface; /** @@ -62,15 +63,11 @@ final class ScopeFilterTest extends AbstractFilterTest ->setMaxResults(1) ->getResult(); - $data = []; - - foreach ($array as $a) { - $data[] = [ - 'scope' => $a, - ]; - } - - return $data; + return [ + [ + 'scope' => new ArrayCollection($array) + ] + ]; } public function getQueryBuilders(): array diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml index c56d7835f..d157683e0 100644 --- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml @@ -99,24 +99,32 @@ Get the sum of appointment durations according to various filters: Calcule la so 'Filtered by agent: only %agents%': "Filtré par agents: uniquement %agents%" Filter calendars by agent: Filtrer les rendez-vous par agents -Filter calendars by agent job: Filtrer les rendez-vous par métiers des agents -'Filtered by agent job: only %jobs%': 'Filtré par métiers des agents: uniquement les %jobs%' -Filter calendars by agent scope: Filtrer les rendez-vous par services des agents -'Filtered by agent scope: only %scopes%': 'Filtré par services des agents: uniquement les services %scopes%' Filter calendars between certain dates: Filtrer les rendez-vous par date du rendez-vous 'Filtered by calendars between %dateFrom% and %dateTo%': 'Filtré par rendez-vous entre %dateFrom% et %dateTo%' 'Filtered by calendar range: only %calendarRange%': 'Filtré par rendez-vous par plage de disponibilité: uniquement les %calendarRange%' Filter by calendar range: Filtrer par rendez-vous dans une plage de disponibilité ou non Group calendars by agent: Grouper les rendez-vous par agent -Group calendars by agent job: Grouper les rendez-vous par métier de l'agent -Group calendars by agent scope: Grouper les rendez-vous par service de l'agent Group calendars by location type: Grouper les rendez-vous par type de localisation Group calendars by location: Grouper les rendez-vous par lieu de rendez-vous Group calendars by cancel reason: Grouper les rendez-vous par motif d'annulation Group calendars by month and year: Grouper les rendez-vous par mois et année Group calendars by urgency: Grouper les rendez-vous par urgent ou non +export: + aggregator.calendar: + agent_job: + Group calendars by agent job: Grouper les rendez-vous par métier de l'agent + agent_scope: + Group calendars by agent scope: Grouper les rendez-vous par service de l'agent + filter.calendar: + agent_job: + Filter calendars by agent job: Filtrer les rendez-vous par métiers des agents (utilisateurs principaux) + 'Filtered by agent job: only %jobs%': 'Filtré par métiers des agents (utilisateurs principaux): uniquement les %jobs%' + agent_scope: + Filter calendars by agent scope: Filtrer les rendez-vous par services des agents (utilisateurs principaux) + 'Filtered by agent scope: only %scopes%': 'Filtré par services des agents (utilisateurs principaux): uniquement les services %scopes%' + Scope: Service Job: Métier Location type: Type de localisation diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php index 27a4f930f..2ee0a9c48 100644 --- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php +++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php @@ -366,7 +366,7 @@ class CustomFieldChoice extends AbstractCustomField * If the value had an 'allow_other' = true option, the returned value * **is not** the content of the _other field, but the `_other` string. */ - private function guessValue(array|string|null $value) + private function guessValue(null|array|string $value) { if (null === $value) { return null; diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php index 7ede1a08a..41fc535fe 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php +++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php @@ -138,7 +138,7 @@ class CustomFieldsGroup /** * Get name. */ - public function getName(?string $language = null): string|array + public function getName(?string $language = null): array|string { //TODO set this in a service, PLUS twig function if (null !== $language) { diff --git a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php index 126178a9e..54dc763ef 100644 --- a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php +++ b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php @@ -44,7 +44,7 @@ class ParticipationController extends AbstractController * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/participation/create", name="chill_event_participation_create") */ - public function createAction(Request $request): \Symfony\Component\HttpFoundation\Response|\Symfony\Component\HttpFoundation\RedirectResponse + public function createAction(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response { // test the request is correct try { @@ -162,7 +162,7 @@ class ParticipationController extends AbstractController /** * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse */ - public function createMultiple(Request $request): \Symfony\Component\HttpFoundation\Response|\Symfony\Component\HttpFoundation\RedirectResponse + public function createMultiple(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response { $participations = $this->handleRequest($request, new Participation(), true); @@ -205,7 +205,7 @@ class ParticipationController extends AbstractController /** * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse */ - public function createSingle(Request $request): \Symfony\Component\HttpFoundation\Response|\Symfony\Component\HttpFoundation\RedirectResponse + public function createSingle(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response { $participation = $this->handleRequest($request, new Participation(), false); @@ -249,7 +249,7 @@ class ParticipationController extends AbstractController * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/participation/{participation_id}/delete", name="chill_event_participation_delete", requirements={"participation_id"="\d+"}, methods={"GET", "DELETE"}) */ - public function deleteAction($participation_id, Request $request): \Symfony\Component\HttpFoundation\Response|\Symfony\Component\HttpFoundation\RedirectResponse + public function deleteAction($participation_id, Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response { $em = $this->getDoctrine()->getManager(); $participation = $em->getRepository(\Chill\EventBundle\Entity\Participation::class)->findOneBy([ @@ -330,7 +330,7 @@ class ParticipationController extends AbstractController * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/participation/{event_id}/edit_multiple", name="chill_event_participation_edit_multiple") */ - public function editMultipleAction($event_id): \Symfony\Component\HttpFoundation\Response|\Symfony\Component\HttpFoundation\RedirectResponse + public function editMultipleAction($event_id): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response { $event = $this->getDoctrine()->getRepository(\Chill\EventBundle\Entity\Event::class) ->find($event_id); @@ -388,7 +388,7 @@ class ParticipationController extends AbstractController * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/participation/new", name="chill_event_participation_new") */ - public function newAction(Request $request): \Symfony\Component\HttpFoundation\Response|\Symfony\Component\HttpFoundation\RedirectResponse + public function newAction(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response { // test the request is correct try { @@ -560,7 +560,7 @@ class ParticipationController extends AbstractController Request $request, Participation $participation, bool $multiple = false - ): \Chill\EventBundle\Entity\Participation|array { + ): array|\Chill\EventBundle\Entity\Participation { $em = $this->getDoctrine()->getManager(); if ($em->contains($participation)) { @@ -637,7 +637,7 @@ class ParticipationController extends AbstractController * * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse */ - protected function newMultiple(Request $request): \Symfony\Component\HttpFoundation\Response|\Symfony\Component\HttpFoundation\RedirectResponse + protected function newMultiple(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response { $participations = $this->handleRequest($request, new Participation(), true); $ignoredParticipations = $newParticipations = []; diff --git a/src/Bundle/ChillEventBundle/Entity/Event.php b/src/Bundle/ChillEventBundle/Entity/Event.php index 17f7899fc..b2e00c24e 100644 --- a/src/Bundle/ChillEventBundle/Entity/Event.php +++ b/src/Bundle/ChillEventBundle/Entity/Event.php @@ -135,7 +135,7 @@ class Event implements HasCenterInterface, HasScopeInterface return $this->id; } - public function getModerator(): User|null + public function getModerator(): null|User { return $this->moderator; } diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php index 6b6bfa8e0..c68cf6762 100644 --- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php +++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php @@ -96,7 +96,7 @@ class LoadPostalCodesCommand extends Command try { $this->addPostalCode($row, $output); ++$num; - } catch (ExistingPostalCodeException|CountryCodeNotFoundException|PostalCodeNotValidException $ex) { + } catch (CountryCodeNotFoundException|ExistingPostalCodeException|PostalCodeNotValidException $ex) { $output->writeln(' on line ' . $line . ' : ' . $ex->getMessage() . ''); } ++$line; diff --git a/src/Bundle/ChillMainBundle/Controller/PasswordController.php b/src/Bundle/ChillMainBundle/Controller/PasswordController.php index 1c1d11f84..dc0856cc0 100644 --- a/src/Bundle/ChillMainBundle/Controller/PasswordController.php +++ b/src/Bundle/ChillMainBundle/Controller/PasswordController.php @@ -99,7 +99,7 @@ class PasswordController extends AbstractController * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse * @\Symfony\Component\Routing\Annotation\Route(path="/public/{_locale}/password/recover", name="password_recover") */ - public function recoverAction(Request $request): \Symfony\Component\HttpFoundation\Response|\Symfony\Component\HttpFoundation\RedirectResponse + public function recoverAction(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response { if (false === $this->isGranted(PasswordRecoverVoter::ASK_TOKEN)) { return new Response($this->translator->trans('You are not allowed ' @@ -168,7 +168,7 @@ class PasswordController extends AbstractController * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse * @\Symfony\Component\Routing\Annotation\Route(path="/public/{_locale}/password/request-recover", name="password_request_recover") */ - public function requestRecoverAction(Request $request): \Symfony\Component\HttpFoundation\Response|\Symfony\Component\HttpFoundation\RedirectResponse + public function requestRecoverAction(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response { if (false === $this->isGranted(PasswordRecoverVoter::ASK_TOKEN)) { return new Response($this->translator->trans('You are not allowed ' diff --git a/src/Bundle/ChillMainBundle/Controller/UserExportController.php b/src/Bundle/ChillMainBundle/Controller/UserExportController.php index 450be8dd7..fe318c4ae 100644 --- a/src/Bundle/ChillMainBundle/Controller/UserExportController.php +++ b/src/Bundle/ChillMainBundle/Controller/UserExportController.php @@ -50,7 +50,7 @@ final readonly class UserExportController fn (string $e) => $this->translator->trans('admin.users.export.' . $e), [ 'id', - 'username', + // 'username', 'email', 'enabled', 'civility_id', diff --git a/src/Bundle/ChillMainBundle/Controller/UserJobScopeHistoriesController.php b/src/Bundle/ChillMainBundle/Controller/UserJobScopeHistoriesController.php new file mode 100644 index 000000000..55d7aceb7 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Controller/UserJobScopeHistoriesController.php @@ -0,0 +1,45 @@ +getUserJobHistoriesOrdered(); + $scopeHistories = $user->getMainScopeHistoriesOrdered(); + + return new Response( + $this->engine->render( + '@ChillMain/User/history.html.twig', + [ + 'user' => $user, + 'jobHistories' => $jobHistories, + 'scopeHistories' => $scopeHistories, + ] + ) + ); + } +} diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php index 6760a798f..72848303f 100644 --- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php +++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php @@ -23,6 +23,8 @@ use Chill\MainBundle\Controller\RegroupmentController; use Chill\MainBundle\Controller\UserController; use Chill\MainBundle\Controller\UserJobApiController; use Chill\MainBundle\Controller\UserJobController; +use Chill\MainBundle\Controller\UserJobHistoryController; +use Chill\MainBundle\Controller\UserScopeHistoryController; use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface; use Chill\MainBundle\Doctrine\DQL\Age; use Chill\MainBundle\Doctrine\DQL\Extract; @@ -31,6 +33,7 @@ use Chill\MainBundle\Doctrine\DQL\Greatest; use Chill\MainBundle\Doctrine\DQL\JsonAggregate; use Chill\MainBundle\Doctrine\DQL\JsonbArrayLength; use Chill\MainBundle\Doctrine\DQL\JsonbExistsInArray; +use Chill\MainBundle\Doctrine\DQL\JsonBuildObject; use Chill\MainBundle\Doctrine\DQL\JsonExtract; use Chill\MainBundle\Doctrine\DQL\Least; use Chill\MainBundle\Doctrine\DQL\OverlapsI; @@ -56,6 +59,8 @@ use Chill\MainBundle\Entity\Regroupment; use Chill\MainBundle\Entity\User; use Chill\MainBundle\Entity\UserJob; use Chill\MainBundle\Form\CenterType; +use Chill\MainBundle\Entity\User\UserJobHistory; +use Chill\MainBundle\Entity\User\UserScopeHistory; use Chill\MainBundle\Form\CivilityType; use Chill\MainBundle\Form\CountryType; use Chill\MainBundle\Form\LanguageType; @@ -251,6 +256,7 @@ class ChillMainExtension extends Extension implements 'AGGREGATE' => JsonAggregate::class, 'REPLACE' => Replace::class, 'JSON_EXTRACT' => JsonExtract::class, + 'JSON_BUILD_OBJECT' => JsonBuildObject::class, ], 'numeric_functions' => [ 'JSONB_EXISTS_IN_ARRAY' => JsonbExistsInArray::class, diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php index a63f04164..6fc763c6d 100644 --- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php +++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php @@ -29,7 +29,7 @@ class Extract extends FunctionNode { private string $field; - private \Doctrine\ORM\Query\AST\Node|string|null $value = null; + private null|\Doctrine\ORM\Query\AST\Node|string $value = null; //private PathExpression $value; //private FunctionNode $value; //private DateDiffFunction $value; diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonBuildObject.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonBuildObject.php new file mode 100644 index 000000000..4a8c3485a --- /dev/null +++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonBuildObject.php @@ -0,0 +1,53 @@ + $expr->dispatch($sqlWalker), $this->exprs)) . ')'; + } + + public function parse(Parser $parser) + { + $lexer = $parser->getLexer(); + $parser->match(Lexer::T_IDENTIFIER); + $parser->match(Lexer::T_OPEN_PARENTHESIS); + + $this->exprs[] = $parser->ArithmeticPrimary(); + + while (Lexer::T_COMMA === $lexer->lookahead['type']) { + $parser->match(Lexer::T_COMMA); + $this->exprs[] = $parser->ArithmeticPrimary(); + } + + $parser->match(Lexer::T_CLOSE_PARENTHESIS); + } +} diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonExtract.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonExtract.php index 95d851790..7d93071b7 100644 --- a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonExtract.php +++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonExtract.php @@ -18,7 +18,7 @@ use Doctrine\ORM\Query\SqlWalker; class JsonExtract extends FunctionNode { - private \Doctrine\ORM\Query\AST\Node|string|null $element = null; + private null|\Doctrine\ORM\Query\AST\Node|string $element = null; private ?\Doctrine\ORM\Query\AST\ArithmeticExpression $keyToExtract = null; diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/ToChar.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/ToChar.php index ef150867e..a5e73209d 100644 --- a/src/Bundle/ChillMainBundle/Doctrine/DQL/ToChar.php +++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/ToChar.php @@ -23,7 +23,7 @@ class ToChar extends FunctionNode { private ?\Doctrine\ORM\Query\AST\ArithmeticExpression $datetime = null; - private \Doctrine\ORM\Query\AST\Node|string|null $fmt = null; + private null|\Doctrine\ORM\Query\AST\Node|string $fmt = null; public function getSql(SqlWalker $sqlWalker) { diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php index 8cb45cd57..5df70134b 100644 --- a/src/Bundle/ChillMainBundle/Entity/User.php +++ b/src/Bundle/ChillMainBundle/Entity/User.php @@ -11,10 +11,15 @@ declare(strict_types=1); namespace Chill\MainBundle\Entity; +use Chill\MainBundle\Entity\User\UserJobHistory; +use Chill\MainBundle\Entity\User\UserScopeHistory; use DateTimeImmutable; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; +use Doctrine\Common\Collections\Criteria; +use Doctrine\Common\Collections\Selectable; use Doctrine\ORM\Mapping as ORM; +use Iterator; use RuntimeException; use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Serializer\Annotation as Serializer; @@ -113,9 +118,11 @@ class User implements UserInterface, \Stringable private ?Location $mainLocation = null; /** - * @ORM\ManyToOne(targetEntity=Scope::class) + * @var Collection&Selectable + * @ORM\OneToMany(targetEntity=UserScopeHistory::class, + * mappedBy="user", cascade={"persist", "remove"}, orphanRemoval=true) */ - private ?Scope $mainScope = null; + private Collection&Selectable $scopeHistories; /** * @ORM\Column(type="string", length=255) @@ -130,9 +137,11 @@ class User implements UserInterface, \Stringable private ?string $salt = null; /** - * @ORM\ManyToOne(targetEntity=UserJob::class) + * @var Collection&Selectable + * @ORM\OneToMany(targetEntity=UserJobHistory::class, + * mappedBy="user", cascade={"persist", "remove"}, orphanRemoval=true) */ - private ?UserJob $userJob = null; + private Collection&Selectable $jobHistories; /** * @ORM\Column(type="string", length=80) @@ -154,6 +163,8 @@ class User implements UserInterface, \Stringable public function __construct() { $this->groupCenters = new ArrayCollection(); + $this->scopeHistories = new ArrayCollection(); + $this->jobHistories = new ArrayCollection(); } /** @@ -252,9 +263,38 @@ class User implements UserInterface, \Stringable return $this->mainLocation; } - public function getMainScope(): ?Scope + public function getMainScope(?DateTimeImmutable $at = null): ?Scope { - return $this->mainScope; + $at ??= new DateTimeImmutable('now'); + + foreach ($this->scopeHistories as $scopeHistory) { + if ($at >= $scopeHistory->getStartDate() && ( + null === $scopeHistory->getEndDate() || $at < $scopeHistory->getEndDate() + )) { + return $scopeHistory->getScope(); + } + } + + return null; + } + + public function getMainScopeHistories(): Collection + { + return $this->scopeHistories; + } + + /** + * @return ArrayCollection|UserScopeHistory[] + */ + public function getMainScopeHistoriesOrdered(): ArrayCollection + { + $scopeHistories = $this->getMainScopeHistories(); + + $sortedScopeHistories = $scopeHistories->toArray(); + + usort($sortedScopeHistories, fn ($a, $b) => $a->getStartDate() < $b->getStartDate() ? 1 : -1); + + return new ArrayCollection($sortedScopeHistories); } /** @@ -275,9 +315,38 @@ class User implements UserInterface, \Stringable return $this->salt; } - public function getUserJob(): ?UserJob + public function getUserJob(?DateTimeImmutable $at = null): ?UserJob { - return $this->userJob; + $at ??= new DateTimeImmutable('now'); + + foreach ($this->jobHistories as $jobHistory) { + if ($at >= $jobHistory->getStartDate() && ( + null === $jobHistory->getEndDate() || $at < $jobHistory->getEndDate() + )) { + return $jobHistory->getJob(); + } + } + + return null; + } + + public function getUserJobHistories(): Collection + { + return $this->jobHistories; + } + + /** + * @return ArrayCollection|UserJobHistory[] + */ + public function getUserJobHistoriesOrdered(): ArrayCollection + { + $jobHistories = $this->getUserJobHistories(); + + $sortedJobHistories = $jobHistories->toArray(); + + usort($sortedJobHistories, fn ($a, $b) => $a->getStartDate() < $b->getStartDate() ? 1 : -1); + + return new ArrayCollection($sortedJobHistories); } /** @@ -455,7 +524,36 @@ class User implements UserInterface, \Stringable public function setMainScope(?Scope $mainScope): User { - $this->mainScope = $mainScope; + if ($mainScope === $this->getMainScope()) { + return $this; + } + + $newScope = new UserScopeHistory(); + + $newScope + ->setStartDate(new DateTimeImmutable('now')) + ->setScope($mainScope) + ->setUser($this); + + $this->scopeHistories[] = $newScope; + + $criteria = new Criteria(); + $criteria->orderBy(['startDate' => Criteria::ASC, 'id' => Criteria::ASC]); + + /** @var Iterator $scopes */ + $scopes = $this->scopeHistories->matching($criteria)->getIterator(); + $scopes->rewind(); + + do { + /** @var UserScopeHistory $current */ + $current = $scopes->current(); + $scopes->next(); + + if ($scopes->valid()) { + $next = $scopes->current(); + $current->setEndDate($next->getStartDate()); + } + } while ($scopes->valid()); return $this; } @@ -486,7 +584,36 @@ class User implements UserInterface, \Stringable public function setUserJob(?UserJob $userJob): User { - $this->userJob = $userJob; + if ($userJob === $this->getUserJob()) { + return $this; + } + + $newJob = new UserJobHistory(); + + $newJob + ->setStartDate(new DateTimeImmutable('now')) + ->setJob($userJob) + ->setUser($this); + + $this->jobHistories[] = $newJob; + + $criteria = new Criteria(); + $criteria->orderBy(['startDate' => Criteria::ASC, 'id' => Criteria::ASC]); + + /** @var Iterator $jobs */ + $jobs = $this->jobHistories->matching($criteria)->getIterator(); + $jobs->rewind(); + + do { + /** @var UserJobHistory $current */ + $current = $jobs->current(); + $jobs->next(); + + if ($jobs->valid()) { + $next = $jobs->current(); + $current->setEndDate($next->getStartDate()); + } + } while ($jobs->valid()); return $this; } diff --git a/src/Bundle/ChillMainBundle/Entity/User/UserJobHistory.php b/src/Bundle/ChillMainBundle/Entity/User/UserJobHistory.php new file mode 100644 index 000000000..233a48e2a --- /dev/null +++ b/src/Bundle/ChillMainBundle/Entity/User/UserJobHistory.php @@ -0,0 +1,107 @@ +endDate; + } + + public function getId(): ?int + { + return $this->id; + } + + public function getJob(): ?UserJob + { + return $this->job; + } + + public function getStartDate(): ?DateTimeImmutable + { + return $this->startDate; + } + + public function getUser(): User + { + return $this->user; + } + + public function setEndDate(?DateTimeImmutable $endDate): self + { + $this->endDate = $endDate; + + return $this; + } + + public function setJob(?UserJob $job): UserJobHistory + { + $this->job = $job; + + return $this; + } + + public function setStartDate(DateTimeImmutable $startDate): self + { + $this->startDate = $startDate; + + return $this; + } + + public function setUser(User $user): UserJobHistory + { + $this->user = $user; + + return $this; + } + +} diff --git a/src/Bundle/ChillMainBundle/Entity/User/UserScopeHistory.php b/src/Bundle/ChillMainBundle/Entity/User/UserScopeHistory.php new file mode 100644 index 000000000..3c4d28d4f --- /dev/null +++ b/src/Bundle/ChillMainBundle/Entity/User/UserScopeHistory.php @@ -0,0 +1,107 @@ +endDate; + } + + public function getId(): ?int + { + return $this->id; + } + + public function getScope(): ?Scope + { + return $this->scope; + } + + public function getStartDate(): ?DateTimeImmutable + { + return $this->startDate; + } + + public function getUser(): User + { + return $this->user; + } + + public function setEndDate(?DateTimeImmutable $endDate): self + { + $this->endDate = $endDate; + + return $this; + } + + public function setScope(?Scope $scope): UserScopeHistory + { + $this->scope = $scope; + + return $this; + } + + public function setStartDate(DateTimeImmutable $startDate): self + { + $this->startDate = $startDate; + + return $this; + } + + public function setUser(User $user): UserScopeHistory + { + $this->user = $user; + + return $this; + } + +} diff --git a/src/Bundle/ChillMainBundle/Export/ExportFormHelper.php b/src/Bundle/ChillMainBundle/Export/ExportFormHelper.php index e21ea7f4d..8d9320424 100644 --- a/src/Bundle/ChillMainBundle/Export/ExportFormHelper.php +++ b/src/Bundle/ChillMainBundle/Export/ExportFormHelper.php @@ -28,7 +28,7 @@ final readonly class ExportFormHelper private FormFactoryInterface $formFactory, ) {} - public function getDefaultData(string $step, ExportInterface|DirectExportInterface $export, array $options = []): array + public function getDefaultData(string $step, DirectExportInterface|ExportInterface $export, array $options = []): array { return match ($step) { 'centers', 'generate_centers' => ['centers' => $this->authorizationHelper->getReachableCenters($export->requiredRole())], @@ -45,7 +45,7 @@ final readonly class ExportFormHelper return $formatter->getFormDefaultData($options['aggregator_aliases']); } - private function getDefaultDataStepExport(ExportInterface|DirectExportInterface $export, array $options): array + private function getDefaultDataStepExport(DirectExportInterface|ExportInterface $export, array $options): array { $data = [ ExportType::EXPORT_KEY => $export->getFormDefaultData(), diff --git a/src/Bundle/ChillMainBundle/Export/ExportManager.php b/src/Bundle/ChillMainBundle/Export/ExportManager.php index 612ff4140..dae3f7de3 100644 --- a/src/Bundle/ChillMainBundle/Export/ExportManager.php +++ b/src/Bundle/ChillMainBundle/Export/ExportManager.php @@ -101,7 +101,7 @@ class ExportManager * * @return FilterInterface[] a \Generator that contains filters. The key is the filter's alias */ - public function &getFiltersApplyingOn(ExportInterface|DirectExportInterface $export, ?array $centers = null): iterable + public function &getFiltersApplyingOn(DirectExportInterface|ExportInterface $export, ?array $centers = null): iterable { if ($export instanceof DirectExportInterface) { return; @@ -124,7 +124,7 @@ class ExportManager * * @return null|iterable a \Generator that contains aggretagors. The key is the filter's alias */ - public function &getAggregatorsApplyingOn(ExportInterface|DirectExportInterface $export, ?array $centers = null): ?iterable + public function &getAggregatorsApplyingOn(DirectExportInterface|ExportInterface $export, ?array $centers = null): ?iterable { if ($export instanceof ListInterface || $export instanceof DirectExportInterface) { return; @@ -307,7 +307,7 @@ class ExportManager * * @throws RuntimeException */ - public function getExport($alias): ExportInterface|DirectExportInterface + public function getExport($alias): DirectExportInterface|ExportInterface { if (!array_key_exists($alias, $this->exports)) { throw new RuntimeException("The export with alias {$alias} is not known."); @@ -453,7 +453,7 @@ class ExportManager * */ public function isGrantedForElement( - ExportInterface|DirectExportInterface|ModifierInterface $element, + DirectExportInterface|ExportInterface|ModifierInterface $element, \Chill\MainBundle\Export\DirectExportInterface|\Chill\MainBundle\Export\ExportInterface $export = null, ?array $centers = null ): bool { diff --git a/src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php b/src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php index 01bd7f2fc..a3e4bae86 100644 --- a/src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php +++ b/src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php @@ -281,9 +281,9 @@ class ExportAddressHelper }; case 'country': - return function ($value) use ($key) { + return function ($value) use ($sanitizedKey, $translationPrefix) { if ('_header' === $value) { - return 'export.list.acp' . $key; + return $translationPrefix . $sanitizedKey; } if (null === $value) { diff --git a/src/Bundle/ChillMainBundle/Export/Helper/UserHelper.php b/src/Bundle/ChillMainBundle/Export/Helper/UserHelper.php index 996f8d925..44c2f260f 100644 --- a/src/Bundle/ChillMainBundle/Export/Helper/UserHelper.php +++ b/src/Bundle/ChillMainBundle/Export/Helper/UserHelper.php @@ -20,21 +20,64 @@ class UserHelper { public function __construct(private readonly UserRender $userRender, private readonly UserRepositoryInterface $userRepository) {} + /** + * Return a callable that will transform a value into a string representing a user + * + * The callable may receive as argument: + * + * - an int or a string, the id of the user; + * - a string containing a json which will be decoded, and will have this structure: array{uid: int, d: string}. The job and scopes will be shown at this date + * + * @param string $key the key of the content + * @param array $values the list of values + * @param string $header the header's content + */ public function getLabel($key, array $values, string $header): callable { - return function ($value) use ($header) { + return function (null|int|string $value) use ($header) { if ('_header' === $value) { return $header; } - if (null === $value || null === $user = $this->userRepository->find($value)) { + if (null === $value) { return ''; } - return $this->userRender->renderString($user, []); + if (is_numeric($value)) { + $uid = $value; + $date = null; + } else { + $decode = json_decode($value, true, 512, JSON_THROW_ON_ERROR); + $uid = $decode['uid']; + + if (null === $uid) { + return ''; + } + + $date = new \DateTimeImmutable($decode['d']); + } + + if (null === $user = $this->userRepository->find($uid)) { + return ''; + } + + return $this->userRender->renderString($user, ['at' => $date]); }; } + /** + * Return a callable that will transform a value into a string representing a user + * + * The callable may receive as argument: + * + * - an int or a string, the id of the user; + * - a string containing a json which will be decoded, and will have this structure: array{uid: int, d: string}. The job and scopes will be shown at this date * @param $key + * + * @param string $key the key of the element + * @param array $values a list of values + * @param string $header the header's content + * @return callable + */ public function getLabelMulti($key, array $values, string $header): callable { return function ($value) use ($header) { @@ -46,31 +89,36 @@ class UserHelper return ''; } - $decoded = json_decode((string) $value, null, 512, JSON_THROW_ON_ERROR); + $decoded = json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR); if (0 === count($decoded)) { return ''; } + $asStrings = []; - return - implode( - '|', - array_map( - function (int $userId) { - $user = $this->userRepository->find($userId); + foreach ($decoded as $userId) { + if (is_array($userId)) { + $uid = $userId['uid']; + $date = new \DateTimeImmutable($userId['d']); + } else { + $uid = $userId; + $date = null; + } - if (null === $user) { - return ''; - } + if (null === $uid) { + continue; + } - return $this->userRender->renderString($user, []); - }, - array_unique( - array_filter($decoded, static fn (?int $userId) => null !== $userId), - SORT_NUMERIC - ) - ) - ); + $user = $this->userRepository->find($uid); + + if (null === $user) { + continue; + } + + $asStrings[$uid] = $this->userRender->renderString($user, ['absence' => false, 'at' => $date]); + } + + return implode('|', $asStrings); }; } } diff --git a/src/Bundle/ChillMainBundle/Repository/User/UserJobHistoryRepository.php b/src/Bundle/ChillMainBundle/Repository/User/UserJobHistoryRepository.php new file mode 100644 index 000000000..443e01213 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Repository/User/UserJobHistoryRepository.php @@ -0,0 +1,29 @@ + + */ +class UserJobHistoryRepository extends ServiceEntityRepository +{ + public function __construct(ManagerRegistry $registry) + { + parent::__construct($registry, UserJobHistory::class); + } +} diff --git a/src/Bundle/ChillMainBundle/Repository/User/UserScopeHistoryRepository.php b/src/Bundle/ChillMainBundle/Repository/User/UserScopeHistoryRepository.php new file mode 100644 index 000000000..040155457 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Repository/User/UserScopeHistoryRepository.php @@ -0,0 +1,29 @@ + + */ +final class UserScopeHistoryRepository extends ServiceEntityRepository +{ + public function __construct(ManagerRegistry $registry) + { + parent::__construct($registry, UserScopeHistory::class); + } +} diff --git a/src/Bundle/ChillMainBundle/Repository/UserRepository.php b/src/Bundle/ChillMainBundle/Repository/UserRepository.php index 230a2b925..17775f475 100644 --- a/src/Bundle/ChillMainBundle/Repository/UserRepository.php +++ b/src/Bundle/ChillMainBundle/Repository/UserRepository.php @@ -13,7 +13,8 @@ namespace Chill\MainBundle\Repository; use Chill\MainBundle\Entity\GroupCenter; use Chill\MainBundle\Entity\User; -use Doctrine\ORM\AbstractQuery; +use Doctrine\DBAL\Connection; +use Doctrine\DBAL\Exception; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityRepository; use Doctrine\ORM\NoResultException; @@ -27,7 +28,11 @@ final readonly class UserRepository implements UserRepositoryInterface { private EntityRepository $repository; - public function __construct(private EntityManagerInterface $entityManager) + private const FIELDS = ['id', 'email', 'enabled', 'civility_id', 'civility_abbreviation', 'civility_name', 'label', 'mainCenter_id', + 'mainCenter_name', 'mainScope_id', 'mainScope_name', 'userJob_id', 'userJob_name', 'currentLocation_id', 'currentLocation_name', + 'mainLocation_id', 'mainLocation_name']; + + public function __construct(private EntityManagerInterface $entityManager, private Connection $connection) { $this->repository = $entityManager->getRepository(User::class); } @@ -75,48 +80,55 @@ final readonly class UserRepository implements UserRepositoryInterface } /** - * @param string $lang + * @throws Exception */ public function findAllAsArray(string $lang): iterable { - $dql = sprintf(<<<'DQL' + $sql = sprintf(<<<'SQL' SELECT - u.id AS id, + u.id, u.username AS username, - u.email, + u.email AS email, u.enabled, - IDENTITY(u.civility) AS civility_id, - JSON_EXTRACT(civility.abbreviation, :lang) AS civility_abbreviation, - JSON_EXTRACT(civility.name, :lang) AS civility_name, + u.civility_id, + civility.abbreviation->>:lang AS civility_abbreviation, + civility.name->>:lang AS civility_name, u.label, mainCenter.id AS mainCenter_id, mainCenter.name AS mainCenter_name, - IDENTITY(u.mainScope) AS mainScope_id, - JSON_EXTRACT(mainScope.name, :lang) AS mainScope_name, - IDENTITY(u.userJob) AS userJob_id, - JSON_EXTRACT(userJob.label, :lang) AS userJob_name, + mainScope.id AS mainScope_id, + mainScope.name->>:lang AS mainScope_name, + userJob.id AS userJob_id, + userJob.label->>:lang AS userJob_name, currentLocation.id AS currentLocation_id, currentLocation.name AS currentLocation_name, mainLocation.id AS mainLocation_id, mainLocation.name AS mainLocation_name, u.absenceStart - FROM Chill\MainBundle\Entity\User u - LEFT JOIN u.civility civility - LEFT JOIN u.currentLocation currentLocation - LEFT JOIN u.mainLocation mainLocation - LEFT JOIN u.mainCenter mainCenter - LEFT JOIN u.mainScope mainScope - LEFT JOIN u.userJob userJob - ORDER BY u.label - DQL); + 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_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 + LEFT JOIN chill_main_location mainLocation ON u.mainlocation_id = mainLocation.id + ORDER BY u.label, u.id + SQL); - $query = $this->entityManager->createQuery($dql) - ->setHydrationMode(AbstractQuery::HYDRATE_ARRAY) - ->setParameter('lang', $lang) - ; + $query = $this->connection->prepare($sql); - foreach ($query->toIterable() as $u) { - yield $u; + foreach ($query->executeQuery(['lang' => $lang])->iterateAssociative() as $u) { + $converted = []; + foreach (self::FIELDS as $f) { + $converted[$f] = $u[strtolower($f)]; + } + + $converted['absenceStart'] = null !== $u['absencestart'] ? new \DateTimeImmutable($u['absencestart']) : null; + + /** @phpstan-ignore-next-line phpstan does not take into account that all required keys will be present */ + yield $converted; } } diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig index ad05a5a2c..c95308610 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig @@ -1,10 +1,10 @@ {{- user.label }} - {%- if opts['user_job'] and user.userJob is not null %} - ({{ user.userJob.label|localize_translatable_string }}) + {%- if opts['user_job'] and user.userJob(opts['at']) is not null %} + ({{ user.userJob(opts['at']).label|localize_translatable_string }}) {%- endif -%} - {%- if opts['main_scope'] and user.mainScope is not null %} - ({{ user.mainScope.name|localize_translatable_string }}) + {%- if opts['main_scope'] and user.mainScope(opts['at']) is not null %} + ({{ user.mainScope(opts['at']).name|localize_translatable_string }}) {%- endif -%} {%- if opts['absence'] and user.isAbsent %} {{ 'absence.A'|trans }} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig index 60beb7ed7..38493201e 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig @@ -4,20 +4,20 @@ {% block admin_content -%} {% embed '@ChillMain/CRUD/_index.html.twig' %} - + {% block index_header %}

{{ 'List circles'|trans }}

{% endblock %} - + {% block filter_order %}{% endblock %} - + {% block table_entities_thead_tr %} id {{ 'Name'|trans }} {{ 'Active'|trans }} {{ 'Actions'|trans }} {% endblock %} - + {% block table_entities_tbody %} {% for entity in entities %} @@ -40,9 +40,9 @@ {% endfor %} {% endblock %} - + {% block pagination %}{% endblock %} - + {% block list_actions %}
  • diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig index 4ac863ee6..4c90915ed 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig @@ -1,7 +1,8 @@ -{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %} +{% extends '@ChillMain/CRUD/Admin/index.html.twig' %} {% block admin_content -%} {% embed '@ChillMain/CRUD/_edit_content.html.twig' %} + {% block crud_content_after_form %} {% if access_permissions_group_list %}

    {{ 'Permissions granted'|trans }}

    @@ -54,5 +55,14 @@ {% endblock %} {% block content_form_actions_save_and_show %}{% endblock %} + + {% block content_form_actions_view %} +
  • + + {{ 'admin.users.job_scope_histories.Show history'|trans }} + +
    • + {% endblock %} + {% endembed %} {% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/history.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/history.html.twig new file mode 100644 index 000000000..eb1e0e461 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/User/history.html.twig @@ -0,0 +1,81 @@ +{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %} + +{% block title %}{{ 'admin.users.job_scope_histories.index.histories'|trans }}{% endblock title %} + +{% block admin_content %} +

    {{ user.usernameCanonical }}

    +

    {{ 'admin.users.job_scope_histories.index.histories'|trans }}

    + +

    {{ 'admin.users.job_scope_histories.index.job_history.title'|trans }}

    + + + + + + + + + + {% for entity in jobHistories %} + + + + + + {% endfor %} + +
    {{ 'admin.users.job_scope_histories.index.job_history.start'|trans }}{{ 'admin.users.job_scope_histories.index.job_history.end'|trans }}{{ 'admin.users.job_scope_histories.index.job_history.job'|trans }}
    {{ entity.startDate|format_datetime('medium') }} + {% if entity.endDate is not null %} + {{ entity.endDate|format_datetime('medium') }} + {% else %} + {{ "admin.users.job_scope_histories.index.job_history.today"|trans }} + {% endif %} + + {% if entity.job %} + {{ entity.job.label|localize_translatable_string }} + {% else %} + {{ 'admin.users.job_scope_histories.index.job_history.undefined'|trans }} + {% endif %} +
    + +

    {{ 'admin.users.job_scope_histories.index.scope_history.title'|trans }}

    + + + + + + + + + + {% for entity in scopeHistories %} + + + + + + {% endfor %} + +
    {{ 'admin.users.job_scope_histories.index.scope_history.start'|trans }}{{ 'admin.users.job_scope_histories.index.scope_history.end'|trans }}{{ 'admin.users.job_scope_histories.index.scope_history.scope'|trans }}
    {{ entity.startDate|format_datetime('medium') }} + {% if entity.endDate is not null %} + {{ entity.endDate|format_datetime('medium') }} + {% else %} + {{ "admin.users.job_scope_histories.index.scope_history.today"|trans }} + {% endif %} + + {% if entity.scope %} + {{ entity.scope.name|localize_translatable_string }} + {% else %} + {{ 'admin.users.job_scope_histories.index.scope_history.undefined'|trans }} + {% endif %} +
    + + + +{% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig index c5cd73d18..5393f09c8 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig @@ -56,7 +56,9 @@
  • métier: - {% if entity.userJob %}{{ entity.userJob.label|localize_translatable_string }}{% endif %} + {% if entity.userJob %} + {{ entity.userJob.label|localize_translatable_string }} + {% endif %}
  • cercle/centre: diff --git a/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig index 3902b33cf..a0c66ccdc 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig @@ -35,7 +35,7 @@ {% block actions_before %}
  • - {{'Back to the admin'|trans}} + {{'Back to the admin'|trans }}
    • {% endblock %} diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php index 574d98b90..413492915 100644 --- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php +++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php @@ -66,7 +66,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface * * @return User[] */ - public function findUsersReaching(string $role, array|\Chill\MainBundle\Entity\Center $center, array|\Chill\MainBundle\Entity\Scope|null $scope = null, bool $onlyEnabled = true): array + public function findUsersReaching(string $role, array|\Chill\MainBundle\Entity\Center $center, null|array|\Chill\MainBundle\Entity\Scope $scope = null, bool $onlyEnabled = true): array { return $this->userACLAwareRepository ->findUsersByReachedACL($role, $center, $scope, $onlyEnabled); @@ -130,7 +130,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface * @param Center|Center[] $center * @return Scope[] */ - public function getReachableCircles(UserInterface $user, string $role, \Chill\MainBundle\Entity\Center|array $center) + public function getReachableCircles(UserInterface $user, string $role, array|\Chill\MainBundle\Entity\Center $center) { $scopes = []; @@ -162,7 +162,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface /** * Return all reachable scope for a given user, center and role. */ - public function getReachableScopes(UserInterface $user, string $role, Center|array $center): array + public function getReachableScopes(UserInterface $user, string $role, array|Center $center): array { return $this->getReachableCircles($user, $role, $center); } @@ -172,7 +172,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface * * @param Center|Center[] $center May be an array of center */ - public function userCanReachCenter(User $user, \Chill\MainBundle\Entity\Center|array $center): bool + public function userCanReachCenter(User $user, array|\Chill\MainBundle\Entity\Center $center): bool { if ($center instanceof Traversable) { foreach ($center as $c) { diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php index 1dc9668ec..2a8c6587c 100644 --- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php +++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php @@ -29,5 +29,5 @@ interface AuthorizationHelperInterface * @param Center|array
    $center * @return list */ - public function getReachableScopes(UserInterface $user, string $role, Center|array $center): array; + public function getReachableScopes(UserInterface $user, string $role, array|Center $center): array; } diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php index 93dec24da..a4a464e45 100644 --- a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php +++ b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php @@ -32,12 +32,7 @@ final readonly class ScopeResolverDispatcher return false; } - /** - * @param mixed $entity - * @param array|null $options - * @return iterable|Scope|null - */ - public function resolveScope(mixed $entity, ?array $options = []): iterable|\Chill\MainBundle\Entity\Scope|null + public function resolveScope(mixed $entity, ?array $options = []): null|\Chill\MainBundle\Entity\Scope|iterable { foreach ($this->resolvers as $resolver) { if ($resolver->supports($entity, $options)) { diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php index 58dc7e839..4149e387b 100644 --- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php +++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php @@ -45,7 +45,7 @@ class DiscriminatedObjectDenormalizer implements ContextAwareDenormalizerInterfa if ($this->denormalizer->supportsDenormalization($data, $localType, $format)) { try { return $this->denormalizer->denormalize($data, $localType, $format, $context); - } catch (RuntimeException|NotNormalizableValueException $e) { + } catch (NotNormalizableValueException|RuntimeException $e) { $lastException = $e; } } diff --git a/src/Bundle/ChillMainBundle/Service/EntityInfo/ViewEntityInfoManager.php b/src/Bundle/ChillMainBundle/Service/EntityInfo/ViewEntityInfoManager.php index 5057d76e5..c5ef96d0b 100644 --- a/src/Bundle/ChillMainBundle/Service/EntityInfo/ViewEntityInfoManager.php +++ b/src/Bundle/ChillMainBundle/Service/EntityInfo/ViewEntityInfoManager.php @@ -12,6 +12,7 @@ declare(strict_types=1); namespace Chill\MainBundle\Service\EntityInfo; use Doctrine\DBAL\Connection; +use Psr\Log\LoggerInterface; class ViewEntityInfoManager { @@ -21,6 +22,7 @@ class ViewEntityInfoManager */ private readonly iterable $vienEntityInfoProviders, private readonly Connection $connection, + private readonly LoggerInterface $logger, ) {} public function synchronizeOnDB(): void @@ -28,6 +30,8 @@ class ViewEntityInfoManager $this->connection->transactional(function (Connection $conn): void { foreach ($this->vienEntityInfoProviders as $viewProvider) { foreach ($this->createOrReplaceViewSQL($viewProvider, $viewProvider->getViewName()) as $sql) { + $this->logger->debug("Will execute create view sql", ['sql' => $sql]); + $this->logger->debug($sql); $conn->executeQuery($sql); } } @@ -41,7 +45,7 @@ class ViewEntityInfoManager { return [ "DROP VIEW IF EXISTS {$viewName}", - sprintf("CREATE VIEW {$viewName} AS %s", $viewProvider->getViewQuery()) + sprintf("CREATE OR REPLACE VIEW {$viewName} AS %s", $viewProvider->getViewQuery()) ]; } } diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php index 0878453b2..c26664bf1 100644 --- a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php +++ b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php @@ -28,10 +28,14 @@ class UserRender implements ChillEntityRenderInterface 'main_scope' => true, 'user_job' => true, 'absence' => true, + 'at' => null, ]; public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, private readonly \Twig\Environment $engine, private readonly TranslatorInterface $translator) {} + /** + * @param mixed $entity + */ public function renderBox($entity, array $options): string { $opts = array_merge(self::DEFAULT_OPTIONS, $options); @@ -42,20 +46,23 @@ class UserRender implements ChillEntityRenderInterface ]); } + /** + * @param mixed $entity + */ public function renderString($entity, array $options): string { $opts = array_merge(self::DEFAULT_OPTIONS, $options); $str = $entity->getLabel(); - if (null !== $entity->getUserJob() && $opts['user_job']) { + if (null !== $entity->getUserJob($opts['at']) && $opts['user_job']) { $str .= ' (' . $this->translatableStringHelper - ->localize($entity->getUserJob()->getLabel()) . ')'; + ->localize($entity->getUserJob($opts['at'])->getLabel()) . ')'; } - if (null !== $entity->getMainScope() && $opts['main_scope']) { + if (null !== $entity->getMainScope($opts['at']) && $opts['main_scope']) { $str .= ' (' . $this->translatableStringHelper - ->localize($entity->getMainScope()->getName()) . ')'; + ->localize($entity->getMainScope($opts['at'])->getName()) . ')'; } if ($entity->isAbsent() && $opts['absence']) { diff --git a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonBuildObjectTest.php b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonBuildObjectTest.php new file mode 100644 index 000000000..d2897546c --- /dev/null +++ b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonBuildObjectTest.php @@ -0,0 +1,61 @@ +entityManager = self::$container->get(EntityManagerInterface::class); + } + + /** + * @dataProvider provideQueries + */ + public function testQuery(string $sql, array $params, array $paramType): void + { + $query = $this->entityManager->createQuery($sql); + + foreach ($params as $k => $v) { + $query->setParameter($k, $v, $paramType[$k]); + } + $query->setMaxResults(1); + + $result = $query->getResult(AbstractQuery::HYDRATE_ARRAY); + + self::assertIsArray($result); + } + + public function provideQueries(): iterable + { + yield ["SELECT JSON_BUILD_OBJECT(1, 2, 3, 4) FROM " . Address::class . " a", [], []]; + yield ["SELECT JSON_BUILD_OBJECT('st', a.street, 'sn', a.streetNumber) FROM " . Address::class . ' a', [], []]; + // next query make the test fails. But we do not need it for now. + //yield ["SELECT JSON_BUILD_OBJECT(a.street, :param), LOWER(:param) FROM " . Address::class . " a", ['param' => 1], ['param' => Types::INTEGER]]; + } + +} diff --git a/src/Bundle/ChillMainBundle/Tests/Entity/UserTest.php b/src/Bundle/ChillMainBundle/Tests/Entity/UserTest.php new file mode 100644 index 000000000..2aeadc574 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Tests/Entity/UserTest.php @@ -0,0 +1,71 @@ +setMainScope($scopeA); + $user->setMainScope($scopeB); + + // 1. check getMainScope get now scopeB, not scopeA + self::assertSame($scopeB, $user->getMainScope()); + + // 2. get scopeA history, check endDate is not null + self::assertNotNull( + $user + ->getMainScopeHistories() + ->filter(fn (User\UserScopeHistory $userScopeHistory) => $userScopeHistory->getScope() === $scopeA) + ->first()->getEndDate() + ); + + } + + public function testUserJobHistory() + { + $user = new User(); + $jobA = new UserJob(); + $jobB = new UserJob(); + + $user->setUserJob($jobA); + $user->setUserJob($jobB); + + // 1. check getUserJob get now jobB, not jobA + self::assertSame($jobB, $user->getUserJob()); + + // 2. get jobA history, check endDate is not null + self::assertNotNull( + $user + ->getUserJobHistories() + ->filter(fn (User\UserJobHistory $userJobHistory) => $userJobHistory->getJob() === $jobA) + ->first()->getEndDate() + ); + } + +} diff --git a/src/Bundle/ChillMainBundle/migrations/Version20230711152947.php b/src/Bundle/ChillMainBundle/migrations/Version20230711152947.php index ed804473e..d11a9f78a 100644 --- a/src/Bundle/ChillMainBundle/migrations/Version20230711152947.php +++ b/src/Bundle/ChillMainBundle/migrations/Version20230711152947.php @@ -18,7 +18,7 @@ final class Version20230711152947 extends AbstractMigration { public function getDescription(): string { - return 'Add data to '; + return 'Add last execution data to cronjon execution table'; } public function up(Schema $schema): void diff --git a/src/Bundle/ChillMainBundle/migrations/Version20230913114115.php b/src/Bundle/ChillMainBundle/migrations/Version20230913114115.php new file mode 100644 index 000000000..3e79412bb --- /dev/null +++ b/src/Bundle/ChillMainBundle/migrations/Version20230913114115.php @@ -0,0 +1,136 @@ +addSql('ALTER TABLE chill_main_user_job_history DROP CONSTRAINT user_job_history_endate_null_or_after_startdate'); + $this->addSql('ALTER TABLE chill_main_user_job_history DROP CONSTRAINT user_job_history_not_overlaps'); + $this->addSql('DROP SEQUENCE chill_main_user_job_history_id_seq CASCADE'); + $this->addSql('ALTER TABLE chill_main_user_job_history DROP CONSTRAINT FK_4E3BF4DDBE04EA9'); + $this->addSql('ALTER TABLE chill_main_user_job_history DROP CONSTRAINT FK_4E3BF4DDA76ED395'); + $this->addSql('DROP TABLE chill_main_user_job_history'); + + $this->addSql('ALTER TABLE users ADD userjob_id INT DEFAULT NULL'); + $this->addSql('ALTER TABLE users ADD CONSTRAINT fk_1483a5e964b65c5b FOREIGN KEY (userjob_id) REFERENCES chill_main_user_job (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('CREATE INDEX idx_1483a5e964b65c5b ON users (userjob_id)'); + + // drop scope_history + $this->addSql('ALTER TABLE chill_main_user_scope_history DROP CONSTRAINT user_scope_history_endate_null_or_after_startdate'); + $this->addSql('ALTER TABLE chill_main_user_scope_history DROP CONSTRAINT user_scope_history_not_overlaps'); + $this->addSql('DROP SEQUENCE chill_main_user_scope_history_id_seq CASCADE'); + $this->addSql('ALTER TABLE chill_main_user_scope_history DROP CONSTRAINT FK_48B969D7682B5931'); + $this->addSql('ALTER TABLE chill_main_user_scope_history DROP CONSTRAINT FK_48B969D7A76ED395'); + $this->addSql('DROP TABLE chill_main_user_scope_history'); + + $this->addSql('ALTER TABLE users ADD mainscope_id INT DEFAULT NULL'); + $this->addSql('ALTER TABLE users ADD CONSTRAINT fk_1483a5e9115e73f3 FOREIGN KEY (mainscope_id) REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('CREATE INDEX idx_1483a5e9115e73f3 ON users (mainscope_id)'); + + } + + public function getDescription(): string + { + return 'Add new entities UserScopeHistory and UserJobHistory'; + } + + public function up(Schema $schema): void + { + // create scope_history + $this->addSql('CREATE SEQUENCE chill_main_user_scope_history_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE TABLE chill_main_user_scope_history (' + . 'id INT NOT NULL,' + . 'scope_id INT DEFAULT NULL,' + . 'user_id INT DEFAULT NULL,' + . 'endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL,' + . 'startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL,' + . 'PRIMARY KEY(id))'); + + $this->addSql('CREATE INDEX IDX_48B969D7682B5931 ON chill_main_user_scope_history (scope_id)'); + $this->addSql('CREATE INDEX IDX_48B969D7A76ED395 ON chill_main_user_scope_history (user_id)'); + + $this->addSql('COMMENT ON COLUMN chill_main_user_scope_history.endDate IS \'(DC2Type:datetime_immutable)\''); + $this->addSql('COMMENT ON COLUMN chill_main_user_scope_history.startDate IS \'(DC2Type:datetime_immutable)\''); + + $this->addSql('ALTER TABLE chill_main_user_scope_history ADD CONSTRAINT FK_48B969D7682B5931 ' + . 'FOREIGN KEY (scope_id) REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + + $this->addSql('ALTER TABLE chill_main_user_scope_history ADD CONSTRAINT FK_48B969D7A76ED395 ' + . 'FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + + $this->addSql('ALTER TABLE chill_main_user_scope_history ' + . 'ADD CONSTRAINT user_scope_history_not_overlaps ' + . 'EXCLUDE USING GIST (user_id with =, tsrange(startDate, endDate) with &&) ' + . 'DEFERRABLE INITIALLY DEFERRED'); + + $this->addSql('ALTER TABLE chill_main_user_scope_history ' + . 'ADD CONSTRAINT user_scope_history_endate_null_or_after_startdate ' + . 'CHECK (startDate <= endDate OR endDate IS NULL)'); + + // insert user scope_history datas + $this->addSql('INSERT INTO chill_main_user_scope_history (id, startDate, endDate, user_id, scope_id) ' + . 'SELECT nextval(\'chill_main_user_scope_history_id_seq\'), \'1970-01-01\'::date, NULL, users.id, mainscope_id ' + . 'FROM users'); + + // remove mainscope + $this->addSql('ALTER TABLE users DROP CONSTRAINT fk_1483a5e9115e73f3'); + $this->addSql('ALTER TABLE users DROP mainscope_id'); + + + // create job_history + $this->addSql('CREATE SEQUENCE chill_main_user_job_history_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE TABLE chill_main_user_job_history (' + . 'id INT NOT NULL,' + . 'job_id INT DEFAULT NULL,' + . 'user_id INT DEFAULT NULL,' + . 'endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL,' + . 'startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL,' + . 'PRIMARY KEY(id))'); + + $this->addSql('CREATE INDEX IDX_4E3BF4DDBE04EA9 ON chill_main_user_job_history (job_id)'); + $this->addSql('CREATE INDEX IDX_4E3BF4DDA76ED395 ON chill_main_user_job_history (user_id)'); + + $this->addSql('COMMENT ON COLUMN chill_main_user_job_history.endDate IS \'(DC2Type:datetime_immutable)\''); + $this->addSql('COMMENT ON COLUMN chill_main_user_job_history.startDate IS \'(DC2Type:datetime_immutable)\''); + + $this->addSql('ALTER TABLE chill_main_user_job_history ADD CONSTRAINT FK_4E3BF4DDBE04EA9 ' + . 'FOREIGN KEY (job_id) REFERENCES chill_main_user_job (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + + $this->addSql('ALTER TABLE chill_main_user_job_history ADD CONSTRAINT FK_4E3BF4DDA76ED395 ' + . 'FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + + $this->addSql('ALTER TABLE chill_main_user_job_history ' + . 'ADD CONSTRAINT user_job_history_not_overlaps ' + . 'EXCLUDE USING GIST (user_id with =, tsrange(startDate, endDate) with &&) ' + . 'DEFERRABLE INITIALLY DEFERRED'); + + $this->addSql('ALTER TABLE chill_main_user_job_history ' + . 'ADD CONSTRAINT user_job_history_endate_null_or_after_startdate ' + . 'CHECK (startDate <= endDate OR endDate IS NULL)'); + + // insert user job_history datas + $this->addSql('INSERT INTO chill_main_user_job_history (id, startDate, endDate, user_id, job_id) ' + . 'SELECT nextval(\'chill_main_user_job_history_id_seq\'), \'1970-01-01\'::date, NULL, users.id, userjob_id ' + . 'FROM users'); + + // remove userjob + $this->addSql('ALTER TABLE users DROP CONSTRAINT fk_1483a5e964b65c5b'); + $this->addSql('ALTER TABLE users DROP userjob_id'); + + } +} diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml index 6cbb1fef4..28615bc75 100644 --- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml @@ -651,3 +651,24 @@ admin: center_name: Centre permissionsGroup_id: Identifiant du groupe de permissions permissionsGroup_name: Groupe de permissions + job_scope_histories: + Show history: Voir l'historique + index: + histories: Historique des services et des métiers + Back to user job: Revenir à l'utilisateur + job_history: + title: Historique des métiers + start: Du + end: Jusque + today: en cours + undefined: non défini + user: Utilisateur + job: Métier + scope_history: + title: Historique des services + start: Du + end: Jusque + today: en cours + undefined: non défini + user: Utilisateur + scope: Service diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php index 1b85daea8..3e0ab7add 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php @@ -36,7 +36,17 @@ use Symfony\Contracts\Translation\TranslatorInterface; class HouseholdCompositionController extends AbstractController { - public function __construct(private readonly Security $security, private readonly HouseholdCompositionRepository $householdCompositionRepository, private readonly HouseholdRepository $householdRepository, private readonly PaginatorFactory $paginatorFactory, private readonly FormFactoryInterface $formFactory, private readonly EntityManagerInterface $entityManager, private readonly TranslatorInterface $translator, private readonly \Twig\Environment $engine, private readonly UrlGeneratorInterface $urlGenerator) {} + public function __construct( + private readonly Security $security, + private readonly HouseholdCompositionRepository $householdCompositionRepository, + private readonly HouseholdRepository $householdRepository, + private readonly PaginatorFactory $paginatorFactory, + private readonly FormFactoryInterface $formFactory, + private readonly EntityManagerInterface $entityManager, + private readonly TranslatorInterface $translator, + private readonly \Twig\Environment $engine, + private readonly UrlGeneratorInterface $urlGenerator + ) {} /** * @Route("/{_locale}/person/household/{household_id}/composition/{composition_id}/delete", name="chill_person_household_composition_delete") diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php index 229a69f2c..38d13ea43 100644 --- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php +++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php @@ -40,7 +40,7 @@ abstract class AddressPart extends FunctionNode 'country_id', ]; - private \Doctrine\ORM\Query\AST\Node|string|null $date = null; + private null|\Doctrine\ORM\Query\AST\Node|string $date = null; /** * @var \Doctrine\ORM\Query\AST\Node diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php index 2224f307b..e074f53ef 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php @@ -977,7 +977,7 @@ class AccompanyingPeriod implements /** * @Groups({"read"}) */ - public function getRequestor(): Person|ThirdParty|null + public function getRequestor(): null|Person|ThirdParty { return $this->requestorPerson ?? $this->requestorThirdParty; } diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php index afbb91963..0c17276ae 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php @@ -26,6 +26,7 @@ use DateTimeImmutable; use DateTimeInterface; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; +use Doctrine\Common\Collections\ReadableCollection; use Doctrine\ORM\Mapping as ORM; use LogicException; use Symfony\Component\Serializer\Annotation as Serializer; @@ -154,14 +155,10 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues private PrivateCommentEmbeddable $privateComment; /** - * @var Collection - * @ORM\ManyToMany(targetEntity=User::class) - * @ORM\JoinTable(name="chill_person_accompanying_period_work_referrer") - * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light"}) - * @Serializer\Groups({"accompanying_period_work:edit"}) - * @Serializer\Groups({"accompanying_period_work:create"}) + * @var Collection + * @ORM\OneToMany(targetEntity=AccompanyingPeriodWorkReferrerHistory::class, cascade={"persist", "remove"}, mappedBy="accompanyingPeriodWork", orphanRemoval=true) */ - private Collection $referrers; + private Collection $referrersHistory; /** * @var Collection @@ -220,7 +217,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues $this->thirdParties = new ArrayCollection(); $this->persons = new ArrayCollection(); $this->accompanyingPeriodWorkEvaluations = new ArrayCollection(); - $this->referrers = new ArrayCollection(); + $this->referrersHistory = new ArrayCollection(); } public function addAccompanyingPeriodWorkEvaluation(AccompanyingPeriodWorkEvaluation $evaluation): self @@ -254,8 +251,9 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues public function addReferrer(User $referrer): self { - if (!$this->referrers->contains($referrer)) { - $this->referrers[] = $referrer; + if (!$this->getReferrers()->contains($referrer)) { + $this->referrersHistory[] = + new AccompanyingPeriodWorkReferrerHistory($this, $referrer, new DateTimeImmutable('today')); } return $this; @@ -351,15 +349,26 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues } /** - * @return Collection|User[] + * @return ReadableCollection + * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light"}) + * @Serializer\Groups({"accompanying_period_work:edit"}) + * @Serializer\Groups({"accompanying_period_work:create"}) */ - public function getReferrers(): Collection + public function getReferrers(): ReadableCollection { - return $this->referrers; + return $this->referrersHistory + ->filter(fn (AccompanyingPeriodWorkReferrerHistory $h) => null === $h->getEndDate()) + ->map(fn (AccompanyingPeriodWorkReferrerHistory $h) => $h->getUser()); } + public function getReferrersHistory(): Collection + { + return $this->referrersHistory; + } + + /** - * @return Collection|Result[] + * @return Collection */ public function getResults(): Collection { @@ -434,7 +443,16 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues public function removeReferrer(User $referrer): self { - $this->referrers->removeElement($referrer); + foreach ($this->referrersHistory as $history) { + if ($history->isOpen() && $referrer === $history->getUser()) { + $history->setEndDate(new DateTimeImmutable('today')); + + if ($history->isDateRangeEmpty()) { + $history->removeAccompanyingPeriodWork(); + $this->referrersHistory->removeElement($history); + } + } + } return $this; } diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkReferrerHistory.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkReferrerHistory.php new file mode 100644 index 000000000..057b5a409 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkReferrerHistory.php @@ -0,0 +1,120 @@ +id; + } + + public function getEndDate(): ?\DateTimeImmutable + { + return $this->endDate; + } + + public function setEndDate(?\DateTimeImmutable $endDate): AccompanyingPeriodWorkReferrerHistory + { + $this->endDate = $endDate; + return $this; + } + + public function getAccompanyingPeriodWork(): AccompanyingPeriodWork + { + return $this->accompanyingPeriodWork; + } + + public function getUser(): User + { + return $this->user; + } + + public function getStartDate(): \DateTimeImmutable + { + return $this->startDate; + } + + /** + * to be used when the history is removed (when startDate = endDate) + * + * @return self + */ + public function removeAccompanyingPeriodWork(): self + { + $this->accompanyingPeriodWork = null; + + return $this; + } + + /** + * @return bool true if the endDate is null + */ + public function isOpen(): bool + { + return null === $this->getEndDate(); + } + + /** + * return true if the date range is empty (start date and end date are equal). + * + * @return bool true if the start date and end date are equal. + */ + public function isDateRangeEmpty(): bool + { + return $this->getStartDate()->format('Y-m-d') === $this->getEndDate()?->format('Y-m-d'); + } +} diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php index c9f1e9279..abe171df1 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php @@ -96,7 +96,7 @@ class Resource /** * @Groups({"read"}) */ - public function getResource(): \Chill\PersonBundle\Entity\Person|\Chill\ThirdPartyBundle\Entity\ThirdParty|null + public function getResource(): null|\Chill\PersonBundle\Entity\Person|\Chill\ThirdPartyBundle\Entity\ThirdParty { return $this->person ?? $this->thirdParty; } diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php index 832afb987..3265f09e1 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Person.php +++ b/src/Bundle/ChillPersonBundle/Entity/Person.php @@ -619,7 +619,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI * @return true | array True if the accompanying periods are not collapsing, * an array with data for displaying the error */ - public function checkAccompanyingPeriodsAreNotCollapsing(): bool|array + public function checkAccompanyingPeriodsAreNotCollapsing(): array|bool { $periods = $this->getAccompanyingPeriodsOrdered(); $periodsNbr = count($periods); diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php index a5475263e..f98964fcb 100644 --- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php @@ -156,7 +156,7 @@ class SocialAction * * @return Collection|SocialAction[] a list with the elements of the given list which are parent of other elements in the given list */ - public static function findAncestorSocialActions(\Doctrine\Common\Collections\Collection|array $socialActions): Collection + public static function findAncestorSocialActions(array|\Doctrine\Common\Collections\Collection $socialActions): Collection { $ancestors = new ArrayCollection(); @@ -236,7 +236,7 @@ class SocialAction /** * @param Collection|SocialAction[] $socialActions */ - public static function getDescendantsWithThisForActions(\Doctrine\Common\Collections\Collection|array $socialActions): Collection + public static function getDescendantsWithThisForActions(array|\Doctrine\Common\Collections\Collection $socialActions): Collection { $unique = []; @@ -420,7 +420,7 @@ class SocialAction return $this; } - public static function filterRemoveDeactivatedActions(ReadableCollection|array $actions, \DateTime $comparisonDate): ReadableCollection|array + public static function filterRemoveDeactivatedActions(array|ReadableCollection $actions, \DateTime $comparisonDate): array|ReadableCollection { $filterFn = fn (SocialAction $socialAction) => !$socialAction->isDesactivated($comparisonDate); diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php index 5c9f1a9c4..000d83397 100644 --- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php @@ -110,7 +110,7 @@ class SocialIssue * * @return Collection|SocialIssue[] */ - public static function findAncestorSocialIssues(\Doctrine\Common\Collections\Collection|array $socialIssues): Collection + public static function findAncestorSocialIssues(array|\Doctrine\Common\Collections\Collection $socialIssues): Collection { $ancestors = new ArrayCollection(); diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/CreatorJobAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/CreatorJobAggregator.php index b07da6871..8dee2e5f0 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/CreatorJobAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/CreatorJobAggregator.php @@ -11,17 +11,24 @@ declare(strict_types=1); namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators; +use Chill\MainBundle\Entity\User\UserJobHistory; 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; +use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\QueryBuilder; use Symfony\Component\Form\FormBuilderInterface; -use function in_array; class CreatorJobAggregator implements AggregatorInterface { - public function __construct(private readonly UserJobRepository $jobRepository, private readonly TranslatableStringHelper $translatableStringHelper) {} + private const PREFIX = 'acp_agg_creator_job'; + + public function __construct( + private readonly UserJobRepository $jobRepository, + private readonly TranslatableStringHelper $translatableStringHelper + ) {} public function addRole(): ?string { @@ -30,12 +37,41 @@ class CreatorJobAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { - if (!in_array('acp_creator', $qb->getAllAliases(), true)) { - $qb->leftJoin('acp.createdBy', 'acp_creator'); - } + $p = self::PREFIX; - $qb->addSelect('IDENTITY(acp_creator.userJob) AS acp_creator_job_aggregator') - ->addGroupBy('acp_creator_job_aggregator'); + $qb + ->leftJoin( + "acp.userHistories", + "{$p}_userHistory", + Join::WITH, + $qb->expr()->andX( + $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", "acp.id"), + $qb->expr()->andX( + $qb->expr()->gte("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.startDate"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_userHistory.endDate"), + $qb->expr()->lt("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.endDate") + ) + ) + ) + ) + ->leftJoin( + UserJobHistory::class, + "{$p}_jobHistory", + Expr\Join::WITH, + $qb->expr()->andX( + $qb->expr()->eq("{$p}_jobHistory.user", "{$p}_userHistory.createdBy"), // et si il est null ? + $qb->expr()->andX( + $qb->expr()->lte("{$p}_jobHistory.startDate", "{$p}_userHistory.startDate"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_jobHistory.endDate"), + $qb->expr()->gt("{$p}_jobHistory.endDate", "{$p}_userHistory.startDate") + ) + ) + ) + ) + ->addSelect("IDENTITY({$p}_jobHistory.job) AS {$p}_select") + ->addGroupBy("{$p}_select"); } public function applyOn(): string @@ -43,10 +79,8 @@ class CreatorJobAggregator implements AggregatorInterface return Declarations::ACP_TYPE; } - public function buildForm(FormBuilderInterface $builder) - { - // No form needed - } + public function buildForm(FormBuilderInterface $builder) {} + public function getFormDefaultData(): array { return []; @@ -71,11 +105,11 @@ class CreatorJobAggregator implements AggregatorInterface public function getQueryKeys($data): array { - return ['acp_creator_job_aggregator']; + return [self::PREFIX . '_select']; } public function getTitle(): string { - return 'Group by creator job'; + return 'export.aggregator.course.by_creator_job.Group by creator job'; } } diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobWorkingOnCourseAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobWorkingOnCourseAggregator.php index 46489069d..b42bb0cd5 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobWorkingOnCourseAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobWorkingOnCourseAggregator.php @@ -11,6 +11,7 @@ declare(strict_types=1); namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators; +use Chill\MainBundle\Entity\User\UserJobHistory; use Chill\MainBundle\Export\AggregatorInterface; use Chill\MainBundle\Repository\UserJobRepositoryInterface; use Chill\MainBundle\Templating\TranslatableStringHelperInterface; @@ -22,18 +23,57 @@ use Symfony\Component\Form\FormBuilderInterface; final readonly class JobWorkingOnCourseAggregator implements AggregatorInterface { - private const COLUMN_NAME = 'user_working_on_course_job_id'; + private const PREFIX = 'acp_agg_user_job_working_on_course'; public function __construct( private UserJobRepositoryInterface $userJobRepository, private TranslatableStringHelperInterface $translatableStringHelper, ) {} - public function buildForm(FormBuilderInterface $builder) + public function addRole(): ?string { - // nothing to add here + return null; } + public function alterQuery(QueryBuilder $qb, $data) + { + $p = self::PREFIX; + + $qb + ->leftJoin( + AccompanyingPeriodInfo::class, + "acpinfo", + Join::WITH, + $qb->expr()->eq("IDENTITY(acpinfo.accompanyingPeriod)", "acp.id") + ) + ->leftJoin("acpinfo.user", "{$p}_user") + ->leftJoin( + UserJobHistory::class, + "{$p}_history", + Join::WITH, + $qb->expr()->eq("{$p}_history.user", "{$p}_user") + ) + // job_at based on _info.infoDate + ->andWhere( + $qb->expr()->andX( + $qb->expr()->lte("{$p}_history.startDate", "acpinfo.infoDate"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_history.endDate"), + $qb->expr()->gt("{$p}_history.endDate", "acpinfo.infoDate") + ) + ) + ) + ->addSelect("IDENTITY({$p}_history.job) AS {$p}_select") + ->addGroupBy("{$p}_select"); + } + + public function applyOn(): string + { + return Declarations::ACP_TYPE; + } + + public function buildForm(FormBuilderInterface $builder) {} + public function getFormDefaultData(): array { return []; @@ -41,7 +81,7 @@ final readonly class JobWorkingOnCourseAggregator implements AggregatorInterface public function getLabels($key, array $values, $data): \Closure { - return function (int|string|null $jobId) { + return function (null|int|string $jobId) { if (null === $jobId || '' === $jobId) { return ''; } @@ -58,42 +98,13 @@ final readonly class JobWorkingOnCourseAggregator implements AggregatorInterface }; } - public function getQueryKeys($data) + public function getQueryKeys($data): array { - return [self::COLUMN_NAME]; + return [self::PREFIX . '_select']; } - public function getTitle() + public function getTitle(): string { return 'export.aggregator.course.by_job_working.title'; } - - public function addRole(): ?string - { - return null; - } - - public function alterQuery(QueryBuilder $qb, $data) - { - if (!in_array('acpinfo', $qb->getAllAliases(), true)) { - $qb->leftJoin( - AccompanyingPeriodInfo::class, - 'acpinfo', - Join::WITH, - 'acp.id = IDENTITY(acpinfo.accompanyingPeriod)' - ); - } - - if (!in_array('acpinfo_user', $qb->getAllAliases(), true)) { - $qb->leftJoin('acpinfo.user', 'acpinfo_user'); - } - - $qb->addSelect('IDENTITY(acpinfo_user.userJob) AS ' . self::COLUMN_NAME); - $qb->addGroupBy(self::COLUMN_NAME); - } - - public function applyOn() - { - return Declarations::ACP_TYPE; - } } diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php index 7810df3f8..664d3f77e 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php @@ -11,22 +11,24 @@ declare(strict_types=1); namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators; +use Chill\MainBundle\Entity\User\UserScopeHistory; use Chill\MainBundle\Export\AggregatorInterface; -use Chill\MainBundle\Form\Type\PickRollingDateType; use Chill\MainBundle\Repository\ScopeRepositoryInterface; -use Chill\MainBundle\Service\RollingDate\RollingDate; -use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface; use Chill\MainBundle\Templating\TranslatableStringHelperInterface; use Chill\PersonBundle\Export\Declarations; +use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\QueryBuilder; use LogicException; use Symfony\Component\Form\FormBuilderInterface; -class ReferrerScopeAggregator implements AggregatorInterface +readonly class ReferrerScopeAggregator implements AggregatorInterface { - private const SCOPE_KEY = 'acp_agg_refscope_user_history_ref_scope_name'; + private const PREFIX = 'acp_agg_referrer_scope'; - public function __construct(private readonly ScopeRepositoryInterface $scopeRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly RollingDateConverterInterface $rollingDateConverter) {} + public function __construct( + private ScopeRepositoryInterface $scopeRepository, + private TranslatableStringHelperInterface $translatableStringHelper, + ) {} public function addRole(): ?string { @@ -35,52 +37,53 @@ class ReferrerScopeAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { - $userHistory = 'acp_agg_refscope_user_history'; - $ref = 'acp_agg_refscope_user_history_ref'; - $scopeName = self::SCOPE_KEY; - $dateCalc = 'acp_agg_refscope_user_history_date_calc'; + $p = self::PREFIX; $qb - ->leftJoin('acp.userHistories', $userHistory) - ->leftJoin($userHistory . '.user', $ref) - ->andWhere( - $qb->expr()->orX( - $qb->expr()->isNull($userHistory), + ->leftJoin( + "acp.userHistories", + "{$p}_userHistory", + Join::WITH, + $qb->expr()->andX( + $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", "acp.id"), $qb->expr()->andX( - $qb->expr()->lte($userHistory . '.startDate', ':' . $dateCalc), + $qb->expr()->gte("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.startDate"), $qb->expr()->orX( - $qb->expr()->isNull($userHistory . '.endDate'), - $qb->expr()->gt($userHistory . '.endDate', ':' . $dateCalc) + $qb->expr()->isNull("{$p}_userHistory.endDate"), + $qb->expr()->lt("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.endDate") ) ) ) ) - ->setParameter( - $dateCalc, - $this->rollingDateConverter->convert($data['date_calc']) - ); - - // add groups - $qb - ->addSelect('IDENTITY(' . $ref . '.mainScope) AS ' . $scopeName) - ->addGroupBy($scopeName); + ->leftJoin( + UserScopeHistory::class, + "{$p}_scopeHistory", + Join::WITH, + $qb->expr()->andX( + $qb->expr()->eq("{$p}_scopeHistory.user", "{$p}_userHistory.user"), + $qb->expr()->andX( + $qb->expr()->lte("{$p}_scopeHistory.startDate", "{$p}_userHistory.startDate"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_scopeHistory.endDate"), + $qb->expr()->gt("{$p}_scopeHistory.endDate", "{$p}_userHistory.startDate") + ) + ) + ) + ) + ->addSelect("IDENTITY({$p}_scopeHistory.scope) AS {$p}_select") + ->addGroupBy("{$p}_select"); } - public function applyOn() + public function applyOn(): string { return Declarations::ACP_TYPE; } - public function buildForm(FormBuilderInterface $builder) - { - $builder->add('date_calc', PickRollingDateType::class, [ - 'label' => 'export.aggregator.course.by_user_scope.Computation date for referrer', - 'required' => true, - ]); - } + public function buildForm(FormBuilderInterface $builder) {} + public function getFormDefaultData(): array { - return ['date_calc' => new RollingDate(RollingDate::T_TODAY)]; + return []; } public function getLabels($key, array $values, $data) @@ -104,12 +107,12 @@ class ReferrerScopeAggregator implements AggregatorInterface }; } - public function getQueryKeys($data) + public function getQueryKeys($data): array { - return [self::SCOPE_KEY]; + return [self::PREFIX . '_select']; } - public function getTitle() + public function getTitle(): string { return 'export.aggregator.course.by_user_scope.Group course by referrer\'s scope'; } diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php index 1f164a45e..c8f73f635 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php @@ -80,6 +80,6 @@ final readonly class ScopeAggregator implements AggregatorInterface public function getTitle(): string { - return 'Group course by scope'; + return 'export.aggregator.course.by_scope.Group course by scope'; } } diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeWorkingOnCourseAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeWorkingOnCourseAggregator.php index a5b2f10f0..f0dcff515 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeWorkingOnCourseAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeWorkingOnCourseAggregator.php @@ -11,9 +11,9 @@ declare(strict_types=1); namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators; +use Chill\MainBundle\Entity\User\UserScopeHistory; use Chill\MainBundle\Export\AggregatorInterface; use Chill\MainBundle\Repository\ScopeRepositoryInterface; -use Chill\MainBundle\Repository\UserJobRepositoryInterface; use Chill\MainBundle\Templating\TranslatableStringHelperInterface; use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodInfo; use Chill\PersonBundle\Export\Declarations; @@ -23,18 +23,57 @@ use Symfony\Component\Form\FormBuilderInterface; final readonly class ScopeWorkingOnCourseAggregator implements AggregatorInterface { - private const COLUMN_NAME = 'user_working_on_course_scope_id'; + private const PREFIX = 'acp_agg_user_scope_working_on_course'; public function __construct( private ScopeRepositoryInterface $scopeRepository, private TranslatableStringHelperInterface $translatableStringHelper, ) {} - public function buildForm(FormBuilderInterface $builder) + public function addRole(): ?string { - // nothing to add here + return null; } + public function alterQuery(QueryBuilder $qb, $data) + { + $p = self::PREFIX; + + $qb + ->leftJoin( + AccompanyingPeriodInfo::class, + "acpinfo", + Join::WITH, + $qb->expr()->eq("IDENTITY(acpinfo.accompanyingPeriod)", "acp.id") + ) + ->leftJoin("acpinfo.user", "{$p}_user") + ->leftJoin( + UserScopeHistory::class, + "{$p}_history", + Join::WITH, + $qb->expr()->eq("{$p}_history.user", "{$p}_user") + ) + // scope_at based on _info.infoDate + ->andWhere( + $qb->expr()->andX( + $qb->expr()->lte("{$p}_history.startDate", "acpinfo.infoDate"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_history.endDate"), + $qb->expr()->gt("{$p}_history.endDate", "acpinfo.infoDate") + ) + ) + ) + ->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select") + ->addGroupBy("{$p}_select"); + } + + public function applyOn(): string + { + return Declarations::ACP_TYPE; + } + + public function buildForm(FormBuilderInterface $builder) {} + public function getFormDefaultData(): array { return []; @@ -42,7 +81,7 @@ final readonly class ScopeWorkingOnCourseAggregator implements AggregatorInterfa public function getLabels($key, array $values, $data): \Closure { - return function (int|string|null $scopeId) { + return function (null|int|string $scopeId) { if (null === $scopeId || '' === $scopeId) { return ''; } @@ -59,42 +98,13 @@ final readonly class ScopeWorkingOnCourseAggregator implements AggregatorInterfa }; } - public function getQueryKeys($data) + public function getQueryKeys($data): array { - return [self::COLUMN_NAME]; + return [self::PREFIX. '_select']; } - public function getTitle() + public function getTitle(): string { return 'export.aggregator.course.by_scope_working.title'; } - - public function addRole(): ?string - { - return null; - } - - public function alterQuery(QueryBuilder $qb, $data) - { - if (!in_array('acpinfo', $qb->getAllAliases(), true)) { - $qb->leftJoin( - AccompanyingPeriodInfo::class, - 'acpinfo', - Join::WITH, - 'acp.id = IDENTITY(acpinfo.accompanyingPeriod)' - ); - } - - if (!in_array('acpinfo_user', $qb->getAllAliases(), true)) { - $qb->leftJoin('acpinfo.user', 'acpinfo_user'); - } - - $qb->addSelect('IDENTITY(acpinfo_user.mainScope) AS ' . self::COLUMN_NAME); - $qb->addGroupBy(self::COLUMN_NAME); - } - - public function applyOn() - { - return Declarations::ACP_TYPE; - } } diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php index 883635a1e..ff3c0a3b2 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php @@ -11,17 +11,23 @@ declare(strict_types=1); namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators; +use Chill\MainBundle\Entity\User\UserJobHistory; 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\Join; use Doctrine\ORM\QueryBuilder; use Symfony\Component\Form\FormBuilderInterface; -use function in_array; final readonly class UserJobAggregator implements AggregatorInterface { - public function __construct(private UserJobRepository $jobRepository, private TranslatableStringHelper $translatableStringHelper) {} + private const PREFIX = 'acp_agg_user_job'; + + public function __construct( + private UserJobRepository $jobRepository, + private TranslatableStringHelper $translatableStringHelper + ) {} public function addRole(): ?string { @@ -30,12 +36,41 @@ final readonly class UserJobAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { - if (!in_array('acpuser', $qb->getAllAliases(), true)) { - $qb->leftJoin('acp.user', 'acpuser'); - } + $p = self::PREFIX; - $qb->addSelect('IDENTITY(acpuser.userJob) AS job_aggregator'); - $qb->addGroupBy('job_aggregator'); + $qb + ->leftJoin( + "acp.userHistories", + "{$p}_userHistory", + Join::WITH, + $qb->expr()->andX( + $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", "acp.id"), + $qb->expr()->andX( + $qb->expr()->gte("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.startDate"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_userHistory.endDate"), + $qb->expr()->lt("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.endDate") + ) + ) + ) + ) + ->leftJoin( + UserJobHistory::class, + "{$p}_jobHistory", + Join::WITH, + $qb->expr()->andX( + $qb->expr()->eq("{$p}_jobHistory.user", "{$p}_userHistory.user"), + $qb->expr()->andX( + $qb->expr()->lte("{$p}_jobHistory.startDate", "{$p}_userHistory.startDate"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_jobHistory.endDate"), + $qb->expr()->gt("{$p}_jobHistory.endDate", "{$p}_userHistory.startDate") + ) + ) + ) + ) + ->addSelect("IDENTITY({$p}_jobHistory.job) AS {$p}_select") + ->addGroupBy("{$p}_select"); } public function applyOn(): string @@ -43,10 +78,8 @@ final readonly class UserJobAggregator implements AggregatorInterface return Declarations::ACP_TYPE; } - public function buildForm(FormBuilderInterface $builder) - { - // no form - } + public function buildForm(FormBuilderInterface $builder) {} + public function getFormDefaultData(): array { return []; @@ -63,7 +96,9 @@ final readonly class UserJobAggregator implements AggregatorInterface return ''; } - $j = $this->jobRepository->find($value); + if (null === $j = $this->jobRepository->find($value)) { + return ''; + } return $this->translatableStringHelper->localize( $j->getLabel() @@ -73,11 +108,11 @@ final readonly class UserJobAggregator implements AggregatorInterface public function getQueryKeys($data): array { - return ['job_aggregator']; + return [self::PREFIX . '_select']; } public function getTitle(): string { - return 'Group by user job'; + return 'export.aggregator.course.by_user_job.Group by user job'; } } diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserWorkingOnCourseAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserWorkingOnCourseAggregator.php index 862a2de79..b36795cdd 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserWorkingOnCourseAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserWorkingOnCourseAggregator.php @@ -41,7 +41,7 @@ final readonly class UserWorkingOnCourseAggregator implements AggregatorInterfac public function getLabels($key, array $values, $data): \Closure { - return function (int|string|null $userId) { + return function (null|int|string $userId) { if (null === $userId || '' === $userId) { return ''; } diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CenterAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CenterAggregator.php index 99187264a..c6d8cfae0 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CenterAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CenterAggregator.php @@ -46,7 +46,7 @@ final readonly class CenterAggregator implements AggregatorInterface public function getLabels($key, array $values, $data): Closure { - return function (int|string|null $value) { + return function (null|int|string $value) { if (null === $value || '' === $value) { return ''; } diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php index ab1048144..c95d4ef37 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php @@ -11,17 +11,30 @@ declare(strict_types=1); namespace Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators; +use Chill\MainBundle\Entity\Scope; +use Chill\MainBundle\Entity\User\UserJobHistory; +use Chill\MainBundle\Entity\UserJob; use Chill\MainBundle\Export\AggregatorInterface; +use Chill\MainBundle\Form\Type\PickRollingDateType; use Chill\MainBundle\Repository\UserJobRepository; +use Chill\MainBundle\Service\RollingDate\RollingDate; +use Chill\MainBundle\Service\RollingDate\RollingDateConverter; use Chill\MainBundle\Templating\TranslatableStringHelper; +use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkReferrerHistory; use Chill\PersonBundle\Export\Declarations; +use Doctrine\ORM\Query\Expr; use Doctrine\ORM\QueryBuilder; use Symfony\Component\Form\FormBuilderInterface; use function in_array; final readonly class JobAggregator implements AggregatorInterface { - public function __construct(private UserJobRepository $jobRepository, private TranslatableStringHelper $translatableStringHelper) {} + private const PREFIX = 'acp_work_action_agg_user_job'; + + public function __construct( + private UserJobRepository $jobRepository, + private TranslatableStringHelper $translatableStringHelper + ) {} public function addRole(): ?string { @@ -30,12 +43,20 @@ final readonly class JobAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { - if (!in_array('acpwuser', $qb->getAllAliases(), true)) { - $qb->leftJoin('acpw.referrers', 'acpwuser'); - } + $p = self::PREFIX; - $qb->addSelect('IDENTITY(acpwuser.userJob) as job_aggregator') - ->addGroupBy('job_aggregator'); + $qb + ->leftJoin( + UserJob::class, + "{$p}_job", + Expr\Join::WITH, + 'EXISTS (SELECT 1 FROM ' . AccompanyingPeriodWorkReferrerHistory::class . " {$p}_ref_history + JOIN {$p}_ref_history.user {$p}_ref_history_user JOIN {$p}_ref_history_user.jobHistories {$p}_job_history + WHERE {$p}_ref_history.accompanyingPeriodWork = acpw AND IDENTITY({$p}_job_history.job) = {$p}_job.id AND {$p}_job_history.startDate <= {$p}_ref_history.startDate + AND ({$p}_job_history.endDate IS NULL or {$p}_job_history.endDate >= {$p}_ref_history.startDate))" + ) + ->addSelect("{$p}_job.id as {$p}_select") + ->addGroupBy("{$p}_select"); } public function applyOn(): string @@ -43,10 +64,8 @@ final readonly class JobAggregator implements AggregatorInterface return Declarations::SOCIAL_WORK_ACTION_TYPE; } - public function buildForm(FormBuilderInterface $builder) - { - // no form - } + public function buildForm(FormBuilderInterface $builder) {} + public function getFormDefaultData(): array { return []; @@ -63,7 +82,9 @@ final readonly class JobAggregator implements AggregatorInterface return ''; } - $j = $this->jobRepository->find($value); + if (null === $j = $this->jobRepository->find($value)) { + return ''; + } return $this->translatableStringHelper->localize( $j->getLabel() @@ -73,11 +94,11 @@ final readonly class JobAggregator implements AggregatorInterface public function getQueryKeys($data): array { - return ['job_aggregator']; + return [self::PREFIX . '_select']; } public function getTitle(): string { - return 'Group by treating agent job'; + return 'export.aggregator.course_work.by_agent_job.Group by treating agent job'; } } diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php index 6af106715..99f766ebc 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php @@ -12,7 +12,10 @@ declare(strict_types=1); namespace Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators; use Chill\MainBundle\Export\AggregatorInterface; +use Chill\MainBundle\Form\Type\PickRollingDateType; use Chill\MainBundle\Repository\UserRepository; +use Chill\MainBundle\Service\RollingDate\RollingDate; +use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface; use Chill\MainBundle\Templating\Entity\UserRender; use Chill\PersonBundle\Export\Declarations; use Doctrine\ORM\QueryBuilder; @@ -21,7 +24,13 @@ use function in_array; final readonly class ReferrerAggregator implements AggregatorInterface { - public function __construct(private UserRepository $userRepository, private UserRender $userRender) {} + private const PREFIX = 'acpw_referrer_aggregator'; + + public function __construct( + private UserRepository $userRepository, + private UserRender $userRender, + private RollingDateConverterInterface $rollingDateConverter + ) {} public function addRole(): ?string { @@ -30,11 +39,16 @@ final readonly class ReferrerAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { - if (!in_array('acpwuser', $qb->getAllAliases(), true)) { - $qb->leftJoin('acpw.referrers', 'acpwuser'); - } + $p = self::PREFIX; - $qb->addSelect('acpwuser.id AS referrer_aggregator'); + $qb + ->leftJoin('acpw.referrersHistory', $p . "_acpwusers_history") + ->andWhere("{$p}_acpwusers_history.startDate <= :{$p}_calc_date AND ({$p}_acpwusers_history.endDate IS NULL or {$p}_acpwusers_history.endDate > :{$p}_calc_date)"); + + $qb->setParameter("{$p}_calc_date", $this->rollingDateConverter->convert( + $data['referrer_at'] ?? new RollingDate(RollingDate::T_TODAY) + )); + $qb->addSelect("IDENTITY({$p}_acpwusers_history.user) AS referrer_aggregator"); $qb->addGroupBy('referrer_aggregator'); } @@ -45,11 +59,16 @@ final readonly class ReferrerAggregator implements AggregatorInterface public function buildForm(FormBuilderInterface $builder) { - // no form + $builder->add('referrer_at', PickRollingDateType::class, [ + 'label' => 'export.aggregator.course_work.by_treating_agent.Calc date' + ]); } + public function getFormDefaultData(): array { - return []; + return [ + 'referrer_at' => new RollingDate(RollingDate::T_TODAY), + ]; } public function getLabels($key, array $values, $data) @@ -65,7 +84,7 @@ final readonly class ReferrerAggregator implements AggregatorInterface $r = $this->userRepository->find($value); - return $this->userRender->renderString($r, []); + return $this->userRender->renderString($r, ['absence' => false, 'user_job' => false, 'main_scope' => false]); }; } @@ -76,6 +95,6 @@ final readonly class ReferrerAggregator implements AggregatorInterface public function getTitle(): string { - return 'Group by treating agent'; + return 'export.aggregator.course_work.by_treating_agent.Group by treating agent'; } } diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php index bdfd3326f..6fc158dad 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php @@ -11,17 +11,30 @@ declare(strict_types=1); namespace Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators; +use Chill\MainBundle\Entity\Scope; +use Chill\MainBundle\Entity\User\UserScopeHistory; +use Chill\MainBundle\Entity\UserJob; use Chill\MainBundle\Export\AggregatorInterface; +use Chill\MainBundle\Form\Type\PickRollingDateType; use Chill\MainBundle\Repository\ScopeRepository; +use Chill\MainBundle\Service\RollingDate\RollingDate; +use Chill\MainBundle\Service\RollingDate\RollingDateConverter; use Chill\MainBundle\Templating\TranslatableStringHelper; +use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkReferrerHistory; use Chill\PersonBundle\Export\Declarations; +use Doctrine\ORM\Query\Expr; use Doctrine\ORM\QueryBuilder; use Symfony\Component\Form\FormBuilderInterface; use function in_array; final readonly class ScopeAggregator implements AggregatorInterface { - public function __construct(private ScopeRepository $scopeRepository, private TranslatableStringHelper $translatableStringHelper) {} + private const PREFIX = 'acp_work_action_agg_user_scope'; + + public function __construct( + private ScopeRepository $scopeRepository, + private TranslatableStringHelper $translatableStringHelper + ) {} public function addRole(): ?string { @@ -30,12 +43,20 @@ final readonly class ScopeAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { - if (!in_array('acpwuser', $qb->getAllAliases(), true)) { - $qb->leftJoin('acpw.referrers', 'acpwuser'); - } + $p = self::PREFIX; - $qb->addSelect('IDENTITY(acpwuser.mainScope) as scope_aggregator'); - $qb->addGroupBy('scope_aggregator'); + $qb + ->leftJoin( + Scope::class, + "{$p}_scope", + Expr\Join::WITH, + 'EXISTS (SELECT 1 FROM ' . AccompanyingPeriodWorkReferrerHistory::class . " {$p}_ref_history + JOIN {$p}_ref_history.user {$p}_ref_history_user JOIN {$p}_ref_history_user.scopeHistories {$p}_scope_history + WHERE {$p}_ref_history.accompanyingPeriodWork = acpw AND IDENTITY({$p}_scope_history.scope) = {$p}_scope.id AND {$p}_scope_history.startDate <= {$p}_ref_history.startDate + AND ({$p}_scope_history.endDate IS NULL or {$p}_scope_history.endDate >= {$p}_ref_history.startDate))" + ) + ->addSelect("{$p}_scope.id as {$p}_select") + ->addGroupBy("{$p}_select"); } public function applyOn(): string @@ -43,10 +64,8 @@ final readonly class ScopeAggregator implements AggregatorInterface return Declarations::SOCIAL_WORK_ACTION_TYPE; } - public function buildForm(FormBuilderInterface $builder) - { - // no form - } + public function buildForm(FormBuilderInterface $builder) {} + public function getFormDefaultData(): array { return []; @@ -63,7 +82,9 @@ final readonly class ScopeAggregator implements AggregatorInterface return ''; } - $s = $this->scopeRepository->find($value); + if (null === $s = $this->scopeRepository->find($value)) { + return ''; + } return $this->translatableStringHelper->localize( $s->getName() @@ -73,11 +94,11 @@ final readonly class ScopeAggregator implements AggregatorInterface public function getQueryKeys($data): array { - return ['scope_aggregator']; + return [self::PREFIX . '_select']; } public function getTitle(): string { - return 'Group by treating agent scope'; + return 'export.aggregator.course_work.by_agent_scope.Group by treating agent scope'; } } diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWork.php index 0b34899b9..3923936b8 100644 --- a/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWork.php +++ b/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWork.php @@ -24,6 +24,7 @@ use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface; use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork; use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation; use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal; +use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkReferrerHistory; use Chill\PersonBundle\Entity\AccompanyingPeriod\UserHistory; use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Entity\Person\PersonCenterHistory; @@ -69,6 +70,7 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac 'personsName', 'thirdParties', 'handlingThierParty', + //'acpwReferrers', 'referrers', 'createdAt', 'createdBy', @@ -76,7 +78,20 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac 'updatedBy', ]; - public function __construct(private readonly EntityManagerInterface $entityManager, private readonly DateTimeHelper $dateTimeHelper, private readonly UserHelper $userHelper, private readonly LabelPersonHelper $personHelper, private readonly LabelThirdPartyHelper $thirdPartyHelper, private readonly TranslatableStringExportLabelHelper $translatableStringExportLabelHelper, private readonly SocialIssueRender $socialIssueRender, private readonly SocialIssueRepository $socialIssueRepository, private readonly SocialActionRender $socialActionRender, private readonly RollingDateConverterInterface $rollingDateConverter, private readonly AggregateStringHelper $aggregateStringHelper, private readonly SocialActionRepository $socialActionRepository) {} + public function __construct( + private readonly EntityManagerInterface $entityManager, + private readonly DateTimeHelper $dateTimeHelper, + private readonly UserHelper $userHelper, + private readonly LabelPersonHelper $personHelper, + private readonly LabelThirdPartyHelper $thirdPartyHelper, + private readonly TranslatableStringExportLabelHelper $translatableStringExportLabelHelper, + private readonly SocialIssueRender $socialIssueRender, + private readonly SocialIssueRepository $socialIssueRepository, + private readonly SocialActionRender $socialActionRender, + private readonly RollingDateConverterInterface $rollingDateConverter, + private readonly AggregateStringHelper $aggregateStringHelper, + private readonly SocialActionRepository $socialActionRepository + ) {} public function buildForm(FormBuilderInterface $builder) { @@ -141,6 +156,7 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac }, 'createdBy', 'updatedBy', 'acp_user' => $this->userHelper->getLabel($key, $values, 'export.list.acpw.' . $key), 'referrers' => $this->userHelper->getLabel($key, $values, 'export.list.acpw.' . $key), + //'acpwReferrers' => $this->userHelper->getLabelMulti($key, $values, 'export.list.acpw.' . $key), 'personsName' => $this->personHelper->getLabelMulti($key, $values, 'export.list.acpw.' . $key), 'handlingThierParty' => $this->thirdPartyHelper->getLabel($key, $values, 'export.list.acpw.' . $key), 'thirdParties' => $this->thirdPartyHelper->getLabelMulti($key, $values, 'export.list.acpw.' . $key), @@ -167,7 +183,7 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac public function getResult($query, $data) { - return $query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR); + return dump($query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR)); } public function getTitle(): string @@ -269,9 +285,20 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac // referrers => at date XXXX $qb - ->addSelect('(SELECT IDENTITY(history.user) FROM ' . UserHistory::class . ' history ' . + ->addSelect('(SELECT JSON_BUILD_OBJECT(\'uid\', IDENTITY(history.user), \'d\', history.startDate) FROM ' . UserHistory::class . ' history ' . 'WHERE history.accompanyingPeriod = acp AND history.startDate <= :calcDate AND (history.endDate IS NULL OR history.endDate > :calcDate)) AS referrers'); + /* + // acpwReferrers at date XXX + $qb + ->addSelect('( + SELECT IDENTITY(acpw_ref_history.accompanyingPeriodWork) AS acpw_ref_history_id, + JSON_BUILD_OBJECT(\'uid\', IDENTITY(acpw_ref_history.user), \'d\', acpw_ref_history.startDate) + FROM ' . AccompanyingPeriodWorkReferrerHistory::class . ' acpw_ref_history ' . + 'WHERE acpw_ref_history.accompanyingPeriodWork = acpw AND acpw_ref_history.startDate <= :calcDate AND (acpw_ref_history.endDate IS NULL or acpw_ref_history.endDate > :calcDate) GROUP BY acpw_ref_history_id) AS acpwReferrers' + ); + */ + // thirdparties $qb ->addSelect('(SELECT AGGREGATE(tp.id) FROM ' . ThirdParty::class . ' tp ' diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php b/src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php index 34646dbd0..253b4f34c 100644 --- a/src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php +++ b/src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php @@ -132,7 +132,7 @@ class ListEvaluation implements ListInterface, GroupedExportInterface ); }, 'createdBy', 'updatedBy', 'acpw_acp_user' => $this->userHelper->getLabel($key, $values, 'export.list.eval.' . $key), - 'acpw_referrers' => $this->userHelper->getLabel($key, $values, 'export.list.eval.' . $key), + 'acpw_referrers' => $this->userHelper->getLabelMulti($key, $values, 'export.list.eval.' . $key), 'acpw_persons_id' => $this->aggregateStringHelper->getLabelMulti($key, $values, 'export.list.eval.' . $key), 'acpw_persons' => $this->personHelper->getLabelMulti($key, $values, 'export.list.eval.' . $key), 'eval_title' => $this->translatableStringExportLabelHelper @@ -252,8 +252,8 @@ class ListEvaluation implements ListInterface, GroupedExportInterface // referrers => at date XXXX $qb - ->addSelect('(SELECT IDENTITY(history.user) FROM ' . UserHistory::class . ' history ' . - 'WHERE history.accompanyingPeriod = acp AND history.startDate <= :calc_date AND (history.endDate IS NULL OR history.endDate > :calc_date)) AS acpw_referrers'); + ->addSelect('(SELECT JSON_BUILD_OBJECT(\'uid\', IDENTITY(history.user), \'d\', history.startDate) FROM ' . UserHistory::class . ' history ' . + 'WHERE history.accompanyingPeriod = acp AND history.startDate <= :calc_date AND (history.endDate IS NULL OR history.endDate > :calc_date)) AS referrers'); // persons $qb diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php index eca8a299a..10467f911 100644 --- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php +++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php @@ -11,19 +11,25 @@ declare(strict_types=1); namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters; +use Chill\MainBundle\Entity\User\UserJobHistory; use Chill\MainBundle\Entity\UserJob; use Chill\MainBundle\Export\FilterInterface; use Chill\MainBundle\Repository\UserJobRepositoryInterface; use Chill\MainBundle\Templating\TranslatableStringHelper; use Chill\PersonBundle\Export\Declarations; +use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\QueryBuilder; use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Component\Form\FormBuilderInterface; -use function in_array; class CreatorJobFilter implements FilterInterface { - public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, private readonly UserJobRepositoryInterface $userJobRepository) {} + private const PREFIX = 'acp_filter_creator_job'; + + public function __construct( + private readonly TranslatableStringHelper $translatableStringHelper, + private readonly UserJobRepositoryInterface $userJobRepository + ) {} public function addRole(): ?string { @@ -32,13 +38,44 @@ class CreatorJobFilter implements FilterInterface public function alterQuery(QueryBuilder $qb, $data) { - if (!in_array('acp_creator', $qb->getAllAliases(), true)) { - $qb->join('acp.createdBy', 'acp_creator'); - } + $p = self::PREFIX; $qb - ->andWhere($qb->expr()->in('acp_creator.userJob', ':creator_job')) - ->setParameter('creator_job', $data['creator_job']); + ->join( + "acp.userHistories", + "{$p}_userHistory", + Join::WITH, + $qb->expr()->andX( + $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", "acp.id"), + $qb->expr()->andX( + $qb->expr()->gte("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.startDate"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_userHistory.endDate"), + $qb->expr()->lt("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.endDate") + ) + ) + ) + ) + ->leftJoin( + UserJobHistory::class, + "{$p}_history", + Join::WITH, + $qb->expr()->andX( + $qb->expr()->eq("{$p}_history.user", "{$p}_userHistory.createdBy"), + $qb->expr()->andX( + $qb->expr()->lte("{$p}_history.startDate", "{$p}_userHistory.startDate"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_history.endDate"), + $qb->expr()->gt("{$p}_history.endDate", "{$p}_userHistory.startDate") + ) + ) + ) + ) + ->andWhere($qb->expr()->in("{$p}_history.job", ":{$p}_jobs")) + ->setParameter( + "{$p}_jobs", + $data["creator_job"], + ); } public function applyOn(): string @@ -48,20 +85,17 @@ class CreatorJobFilter implements FilterInterface public function buildForm(FormBuilderInterface $builder) { - $builder->add('creator_job', EntityType::class, [ - 'class' => UserJob::class, - 'choices' => $this->userJobRepository->findAllActive(), - 'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize( - $j->getLabel() - ), - 'multiple' => true, - 'expanded' => true, - 'label' => 'Job', - ]); - } - public function getFormDefaultData(): array - { - return []; + $builder + ->add('creator_job', EntityType::class, [ + 'class' => UserJob::class, + 'choices' => $this->userJobRepository->findAllActive(), + 'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize( + $j->getLabel() + ), + 'multiple' => true, + 'expanded' => true, + 'label' => 'Job', + ]); } public function describeAction($data, $format = 'string'): array @@ -79,8 +113,15 @@ class CreatorJobFilter implements FilterInterface ]]; } + public function getFormDefaultData(): array + { + return [ + 'creator_job' => [], + ]; + } + public function getTitle(): string { - return 'Filter by creator job'; + return 'export.filter.course.creator_job.Filter by creator job'; } } diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/JobWorkingOnCourseFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/JobWorkingOnCourseFilter.php index 142cfd307..7024d837d 100644 --- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/JobWorkingOnCourseFilter.php +++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/JobWorkingOnCourseFilter.php @@ -11,17 +11,15 @@ declare(strict_types=1); namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters; -use Chill\MainBundle\Entity\User; +use Chill\MainBundle\Entity\User\UserJobHistory; use Chill\MainBundle\Entity\UserJob; use Chill\MainBundle\Export\FilterInterface; use Chill\MainBundle\Form\Type\PickRollingDateType; -use Chill\MainBundle\Form\Type\PickUserDynamicType; use Chill\MainBundle\Repository\UserJobRepositoryInterface; use Chill\MainBundle\Service\RollingDate\RollingDate; use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface; -use Chill\MainBundle\Templating\Entity\UserRender; use Chill\MainBundle\Templating\TranslatableStringHelperInterface; -use Chill\PersonBundle\Entity\AccompanyingPeriod; +use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodInfo; use Chill\PersonBundle\Export\Declarations; use Doctrine\ORM\QueryBuilder; use Symfony\Bridge\Doctrine\Form\Type\EntityType; @@ -34,12 +32,54 @@ use Symfony\Component\Form\FormBuilderInterface; */ readonly class JobWorkingOnCourseFilter implements FilterInterface { + private const PREFIX = 'acp_filter_user_job_working_on_course'; + public function __construct( private UserJobRepositoryInterface $userJobRepository, private RollingDateConverterInterface $rollingDateConverter, private TranslatableStringHelperInterface $translatableStringHelper, ) {} + public function addRole(): ?string + { + return null; + } + + public function alterQuery(QueryBuilder $qb, $data): void + { + $p = self::PREFIX; + + $qb + ->andWhere( + $qb->expr()->exists( + "SELECT 1 FROM " . AccompanyingPeriodInfo::class . " {$p}_info " + . "JOIN {$p}_info.user {$p}_user " + . "JOIN " . UserJobHistory::class . " {$p}_history WITH {$p}_history.user = {$p}_user " + . "WHERE IDENTITY({$p}_info.accompanyingPeriod) = acp.id " + . "AND {$p}_history.job IN (:{$p}_jobs) " + // job_at based on _info.infoDate + . "AND {$p}_history.startDate <= {$p}_info.infoDate " + . "AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > {$p}_info.infoDate) " + . "AND {$p}_info.infoDate >= :{$p}_start and {$p}_info.infoDate < :{$p}_end" + ) + ) + ->setParameter("{$p}_jobs", $data['jobs']) + ->setParameter( + "{$p}_start", + $this->rollingDateConverter->convert($data['start_date']), + ) + ->setParameter( + "{$p}_end", + $this->rollingDateConverter->convert($data['end_date']) + ) + ; + } + + public function applyOn(): string + { + return Declarations::ACP_TYPE; + } + public function buildForm(FormBuilderInterface $builder): void { $jobs = $this->userJobRepository->findAllActive(); @@ -59,23 +99,14 @@ readonly class JobWorkingOnCourseFilter implements FilterInterface ->add('end_date', PickRollingDateType::class, [ 'label' => 'export.filter.course.by_job_working.Job working before' ]) + //->add('job_at', PickRollingDateType::class, [ + // 'label' => 'bla', + // 'help' => 'bli', + // 'required' => false, + //]) ; } - public function getFormDefaultData(): array - { - return [ - 'jobs' => [], - 'start_date' => new RollingDate(RollingDate::T_YEAR_CURRENT_START), - 'end_date' => new RollingDate(RollingDate::T_TODAY), - ]; - } - - public function getTitle(): string - { - return 'export.filter.course.by_job_working.title'; - } - public function describeAction($data, $format = 'string'): array { return [ @@ -93,37 +124,18 @@ readonly class JobWorkingOnCourseFilter implements FilterInterface ]; } - public function addRole(): ?string + public function getFormDefaultData(): array { - return null; + return [ + 'jobs' => [], + 'start_date' => new RollingDate(RollingDate::T_YEAR_CURRENT_START), + 'end_date' => new RollingDate(RollingDate::T_TODAY), + //'job_at' => null, + ]; } - public function alterQuery(QueryBuilder $qb, $data): void + public function getTitle(): string { - $ai_alias = 'jobs_working_on_course_filter_acc_info'; - $ai_user_alias = 'jobs_working_on_course_filter_user'; - $ai_jobs = 'jobs_working_on_course_filter_jobs'; - $start = 'acp_jobs_work_on_start'; - $end = 'acp_jobs_work_on_end'; - - $qb - ->andWhere( - $qb->expr()->exists( - "SELECT 1 FROM " . AccompanyingPeriod\AccompanyingPeriodInfo::class . " {$ai_alias} JOIN {$ai_alias}.user {$ai_user_alias} " . - "WHERE IDENTITY({$ai_alias}.accompanyingPeriod) = acp.id - AND {$ai_user_alias}.userJob IN (:{$ai_jobs}) - AND {$ai_alias}.infoDate >= :{$start} and {$ai_alias}.infoDate < :{$end} - " - ) - ) - ->setParameter($ai_jobs, $data['jobs']) - ->setParameter($start, $this->rollingDateConverter->convert($data['start_date'])) - ->setParameter($end, $this->rollingDateConverter->convert($data['end_date'])) - ; - } - - public function applyOn(): string - { - return Declarations::ACP_TYPE; + return 'export.filter.course.by_job_working.title'; } } diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ScopeWorkingOnCourseFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ScopeWorkingOnCourseFilter.php index 6aef4e3da..491122968 100644 --- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ScopeWorkingOnCourseFilter.php +++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ScopeWorkingOnCourseFilter.php @@ -12,18 +12,14 @@ declare(strict_types=1); namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters; use Chill\MainBundle\Entity\Scope; -use Chill\MainBundle\Entity\User; -use Chill\MainBundle\Entity\UserJob; +use Chill\MainBundle\Entity\User\UserScopeHistory; use Chill\MainBundle\Export\FilterInterface; use Chill\MainBundle\Form\Type\PickRollingDateType; -use Chill\MainBundle\Form\Type\PickUserDynamicType; use Chill\MainBundle\Repository\ScopeRepositoryInterface; -use Chill\MainBundle\Repository\UserJobRepositoryInterface; use Chill\MainBundle\Service\RollingDate\RollingDate; use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface; -use Chill\MainBundle\Templating\Entity\UserRender; use Chill\MainBundle\Templating\TranslatableStringHelperInterface; -use Chill\PersonBundle\Entity\AccompanyingPeriod; +use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodInfo; use Chill\PersonBundle\Export\Declarations; use Doctrine\ORM\QueryBuilder; use Symfony\Bridge\Doctrine\Form\Type\EntityType; @@ -36,12 +32,54 @@ use Symfony\Component\Form\FormBuilderInterface; */ readonly class ScopeWorkingOnCourseFilter implements FilterInterface { + private const PREFIX = 'acp_filter_user_scope_working_on_course'; + public function __construct( private ScopeRepositoryInterface $scopeRepository, private RollingDateConverterInterface $rollingDateConverter, private TranslatableStringHelperInterface $translatableStringHelper, ) {} + public function addRole(): ?string + { + return null; + } + + public function alterQuery(QueryBuilder $qb, $data): void + { + $p = self::PREFIX; + + $qb + ->andWhere( + $qb->expr()->exists( + "SELECT 1 FROM " . AccompanyingPeriodInfo::class . " {$p}_info " + . "JOIN {$p}_info.user {$p}_user " + . "JOIN " . UserScopeHistory::class . " {$p}_history WITH {$p}_history.user = {$p}_user " + . "WHERE IDENTITY({$p}_info.accompanyingPeriod) = acp.id " + . "AND {$p}_history.scope IN ( :{$p}_scopes ) " + // scope_at based on _info.infoDate + . "AND {$p}_history.startDate <= {$p}_info.infoDate " + . "AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > {$p}_info.infoDate) " + . "AND {$p}_info.infoDate >= :{$p}_start AND {$p}_info.infoDate < :{$p}_end" + ) + ) + ->setParameter("{$p}_scopes", $data["scopes"]) + ->setParameter( + "{$p}_start", + $this->rollingDateConverter->convert($data["start_date"]), + ) + ->setParameter( + "{$p}_end", + $this->rollingDateConverter->convert($data["end_date"]) + ) + ; + } + + public function applyOn(): string + { + return Declarations::ACP_TYPE; + } + public function buildForm(FormBuilderInterface $builder): void { $scopes = $this->scopeRepository->findAllActive(); @@ -64,20 +102,6 @@ readonly class ScopeWorkingOnCourseFilter implements FilterInterface ; } - public function getFormDefaultData(): array - { - return [ - 'scopes' => [], - 'start_date' => new RollingDate(RollingDate::T_YEAR_CURRENT_START), - 'end_date' => new RollingDate(RollingDate::T_TODAY), - ]; - } - - public function getTitle(): string - { - return 'export.filter.course.by_scope_working.title'; - } - public function describeAction($data, $format = 'string'): array { return [ @@ -95,37 +119,17 @@ readonly class ScopeWorkingOnCourseFilter implements FilterInterface ]; } - public function addRole(): ?string + public function getFormDefaultData(): array { - return null; + return [ + 'scopes' => [], + 'start_date' => new RollingDate(RollingDate::T_YEAR_CURRENT_START), + 'end_date' => new RollingDate(RollingDate::T_TODAY), + ]; } - public function alterQuery(QueryBuilder $qb, $data): void + public function getTitle(): string { - $ai_alias = 'scopes_working_on_course_filter_acc_info'; - $ai_user_alias = 'scopes_working_on_course_filter_user'; - $ai_scopes = 'scopes_working_on_course_filter_scopes'; - $start = 'acp_scopes_work_on_start'; - $end = 'acp_scopes_work_on_end'; - - $qb - ->andWhere( - $qb->expr()->exists( - "SELECT 1 FROM " . AccompanyingPeriod\AccompanyingPeriodInfo::class . " {$ai_alias} JOIN {$ai_alias}.user {$ai_user_alias} " . - "WHERE IDENTITY({$ai_alias}.accompanyingPeriod) = acp.id - AND {$ai_user_alias}.mainScope IN (:{$ai_scopes}) - AND {$ai_alias}.infoDate >= :{$start} and {$ai_alias}.infoDate < :{$end} - " - ) - ) - ->setParameter($ai_scopes, $data['scopes']) - ->setParameter($start, $this->rollingDateConverter->convert($data['start_date'])) - ->setParameter($end, $this->rollingDateConverter->convert($data['end_date'])) - ; - } - - public function applyOn(): string - { - return Declarations::ACP_TYPE; + return 'export.filter.course.by_scope_working.title'; } } diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php index 082231cfc..dc55fd454 100644 --- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php +++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php @@ -11,30 +11,25 @@ declare(strict_types=1); namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters; +use Chill\MainBundle\Entity\User\UserJobHistory; use Chill\MainBundle\Entity\UserJob; use Chill\MainBundle\Export\FilterInterface; -use Chill\MainBundle\Form\Type\PickRollingDateType; use Chill\MainBundle\Repository\UserJobRepositoryInterface; -use Chill\MainBundle\Service\RollingDate\RollingDate; -use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface; use Chill\MainBundle\Templating\TranslatableStringHelper; use Chill\PersonBundle\Export\Declarations; +use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\QueryBuilder; use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\Security\Core\Security; class UserJobFilter implements FilterInterface { - private const A = 'acp_ujob_filter_uhistory'; + private const PREFIX = 'acp_filter_user_job'; - private const AU = 'acp_ujob_filter_uhistory_user'; - - private const P = 'acp_ujob_filter_date'; - - private const PJ = 'acp_ujob_filter_job'; - - public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, private readonly UserJobRepositoryInterface $userJobRepository, private readonly RollingDateConverterInterface $rollingDateConverter) {} + public function __construct( + private readonly TranslatableStringHelper $translatableStringHelper, + private readonly UserJobRepositoryInterface $userJobRepository, + ) {} public function addRole(): ?string { @@ -43,26 +38,45 @@ class UserJobFilter implements FilterInterface public function alterQuery(QueryBuilder $qb, $data) { + $p = self::PREFIX; + $qb - ->join('acp.userHistories', self::A) - ->andWhere( + ->leftJoin( + "acp.userHistories", + "{$p}_userHistory", + Join::WITH, $qb->expr()->andX( - $qb->expr()->lte(self::A . '.startDate', ':' . self::P), - $qb->expr()->orX( - $qb->expr()->isNull(self::A . '.endDate'), - $qb->expr()->gt(self::A . '.endDate', ':' . self::P) + $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", "acp.id"), + $qb->expr()->andX( + $qb->expr()->gte("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.startDate"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_userHistory.endDate"), + $qb->expr()->lt("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.endDate") + ) ) ) ) + ->leftJoin( + UserJobHistory::class, + "{$p}_jobHistory", + Join::WITH, + $qb->expr()->andX( + $qb->expr()->eq("{$p}_jobHistory.user", "{$p}_userHistory.user"), + $qb->expr()->andX( + $qb->expr()->lte("{$p}_jobHistory.startDate", "{$p}_userHistory.startDate"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_jobHistory" . ".endDate"), + $qb->expr()->gt("{$p}_jobHistory.endDate", "{$p}_userHistory.startDate") + ) + ) + ) + ) + ->andWhere($qb->expr()->in("{$p}_jobHistory.job", ":{$p}_job")) ->setParameter( - self::P, - $this->rollingDateConverter->convert($data['date_calc']) + "{$p}_job", + $data["jobs"], ) - ->join(self::A . '.user', self::AU) - ->andWhere( - $qb->expr()->in(self::AU . '.userJob', ':' . self::PJ) - ) - ->setParameter(self::PJ, $data['jobs']); + ; } public function applyOn() @@ -80,21 +94,13 @@ class UserJobFilter implements FilterInterface 'expanded' => true, 'choice_label' => fn (UserJob $job) => $this->translatableStringHelper->localize($job->getLabel()), 'label' => 'Job', - ]) - ->add('date_calc', PickRollingDateType::class, [ - 'label' => 'export.filter.course.by_user_scope.Computation date for referrer', - 'required' => true, ]); } - public function getFormDefaultData(): array - { - return ['date_calc' => new RollingDate(RollingDate::T_TODAY)]; - } public function describeAction($data, $format = 'string') { return [ - 'Filtered by user job: only %job%', [ + 'export.filter.course.by_user_job.Filtered by user job: only %job%', [ '%job%' => implode( ', ', array_map( @@ -106,8 +112,15 @@ class UserJobFilter implements FilterInterface ]; } - public function getTitle() + public function getFormDefaultData(): array { - return 'Filter by user job'; + return [ + 'jobs' => [], + ]; + } + + public function getTitle(): string + { + return 'export.filter.course.by_user_job.Filter by user job'; } } diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php index 5a08eadc1..3e53f49f1 100644 --- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php +++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php @@ -12,30 +12,24 @@ declare(strict_types=1); namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters; use Chill\MainBundle\Entity\Scope; -use Chill\MainBundle\Entity\User; +use Chill\MainBundle\Entity\User\UserScopeHistory; use Chill\MainBundle\Export\FilterInterface; -use Chill\MainBundle\Form\Type\PickRollingDateType; use Chill\MainBundle\Repository\ScopeRepositoryInterface; -use Chill\MainBundle\Service\RollingDate\RollingDate; -use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface; use Chill\MainBundle\Templating\TranslatableStringHelper; use Chill\PersonBundle\Export\Declarations; +use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\QueryBuilder; use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\Security\Core\Security; class UserScopeFilter implements FilterInterface { - private const A = 'acp_uscope_filter_uhistory'; + private const PREFIX = 'acp_filter_main_scope'; - private const AU = 'acp_uscope_filter_uhistory_user'; - - private const P = 'acp_uscope_filter_date'; - - private const PS = 'acp_uscope_filter_scopes'; - - public function __construct(private readonly ScopeRepositoryInterface $scopeRepository, private readonly Security $security, private readonly TranslatableStringHelper $translatableStringHelper, private readonly RollingDateConverterInterface $rollingDateConverter) {} + public function __construct( + private readonly ScopeRepositoryInterface $scopeRepository, + private readonly TranslatableStringHelper $translatableStringHelper, + ) {} public function addRole(): ?string { @@ -44,29 +38,48 @@ class UserScopeFilter implements FilterInterface public function alterQuery(QueryBuilder $qb, $data) { + $p = self::PREFIX; + $qb - ->join('acp.userHistories', self::A) - ->andWhere( + ->join( + "acp.userHistories", + "{$p}_userHistory", + Join::WITH, $qb->expr()->andX( - $qb->expr()->lte(self::A . '.startDate', ':' . self::P), - $qb->expr()->orX( - $qb->expr()->isNull(self::A . '.endDate'), - $qb->expr()->gt(self::A . '.endDate', ':' . self::P) + $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", "acp.id"), + $qb->expr()->andX( + $qb->expr()->gte("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.startDate"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_userHistory.endDate"), + $qb->expr()->lt("COALESCE(acp.closingDate, CURRENT_TIMESTAMP())", "{$p}_userHistory.endDate") + ) ) ) ) + ->join( + UserScopeHistory::class, + "{$p}_scopeHistory", + Join::WITH, + $qb->expr()->andX( + $qb->expr()->eq("{$p}_scopeHistory.user", "{$p}_userHistory.user"), + $qb->expr()->andX( + $qb->expr()->lte("{$p}_scopeHistory.startDate", "{$p}_userHistory.startDate"), + $qb->expr()->orX( + $qb->expr()->isNull("{$p}_scopeHistory.endDate"), + $qb->expr()->gt("{$p}_scopeHistory.endDate", "{$p}_userHistory.startDate") + ) + ) + ) + ) + ->andWhere($qb->expr()->in("{$p}_scopeHistory.scope", ":{$p}_scopes")) ->setParameter( - self::P, - $this->rollingDateConverter->convert($data['date_calc']) + "{$p}_scopes", + $data["scopes"], ) - ->join(self::A . '.user', self::AU) - ->andWhere( - $qb->expr()->in(self::AU . '.mainScope', ':' . self::PS) - ) - ->setParameter(self::PS, $data['scopes']); + ; } - public function applyOn() + public function applyOn(): string { return Declarations::ACP_TYPE; } @@ -80,21 +93,13 @@ class UserScopeFilter implements FilterInterface 'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()), 'multiple' => true, 'expanded' => true, - ]) - ->add('date_calc', PickRollingDateType::class, [ - 'label' => 'export.filter.course.by_user_scope.Computation date for referrer', - 'required' => true, ]); } - public function getFormDefaultData(): array - { - return ['date_calc' => new RollingDate(RollingDate::T_TODAY)]; - } public function describeAction($data, $format = 'string') { return [ - 'Filtered by user main scope: only %scope%', [ + 'export.filter.course.by_user_scope.Filtered by user main scope: only %scope%', [ '%scope%' => implode( ', ', array_map( @@ -106,16 +111,15 @@ class UserScopeFilter implements FilterInterface ]; } - public function getTitle() + public function getFormDefaultData(): array { - return 'Filter by user scope'; + return [ + 'scopes' => [], + ]; } - private function getUserMainScope(): Scope + public function getTitle(): string { - /** @var User $user */ - $user = $this->security->getUser(); - - return $user->getMainScope(); + return 'export.filter.course.by_user_scope.Filter by user scope'; } } diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php index 91c48b22b..c0de87d65 100644 --- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php +++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php @@ -11,10 +11,16 @@ declare(strict_types=1); namespace Chill\PersonBundle\Export\Filter\SocialWorkFilters; +use Chill\MainBundle\Entity\User\UserJobHistory; use Chill\MainBundle\Entity\UserJob; use Chill\MainBundle\Export\FilterInterface; +use Chill\MainBundle\Form\Type\PickRollingDateType; +use Chill\MainBundle\Service\RollingDate\RollingDate; +use Chill\MainBundle\Service\RollingDate\RollingDateConverter; use Chill\MainBundle\Templating\TranslatableStringHelper; +use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkReferrerHistory; use Chill\PersonBundle\Export\Declarations; +use Doctrine\ORM\Query\Expr; use Doctrine\ORM\Query\Expr\Andx; use Doctrine\ORM\QueryBuilder; use Symfony\Bridge\Doctrine\Form\Type\EntityType; @@ -24,7 +30,12 @@ use function in_array; class JobFilter implements FilterInterface { - public function __construct(protected TranslatorInterface $translator, private readonly TranslatableStringHelper $translatableStringHelper) {} + private const PREFIX = 'acp_work_action_filter_user_job'; + + public function __construct( + protected TranslatorInterface $translator, + private readonly TranslatableStringHelper $translatableStringHelper + ) {} public function addRole(): ?string { @@ -33,42 +44,35 @@ class JobFilter implements FilterInterface public function alterQuery(QueryBuilder $qb, $data) { - if (!in_array('acpwuser', $qb->getAllAliases(), true)) { - $qb->join('acpw.referrers', 'acpwuser'); - } + $p = self::PREFIX; - $where = $qb->getDQLPart('where'); - $clause = $qb->expr()->in('acpwuser.userJob', ':job'); + $qb->andWhere( + 'EXISTS (SELECT 1 FROM ' . AccompanyingPeriodWorkReferrerHistory::class . " {$p}_ref_history + JOIN {$p}_ref_history.user {$p}_ref_history_user JOIN {$p}_ref_history_user.jobHistories {$p}_job_history + WHERE {$p}_ref_history.accompanyingPeriodWork = acpw AND {$p}_job_history.job IN (:{$p}_job) AND {$p}_job_history.startDate <= {$p}_ref_history.startDate + AND ({$p}_job_history.endDate IS NULL or {$p}_job_history.endDate >= {$p}_ref_history.startDate))" + ); - if ($where instanceof Andx) { - $where->add($clause); - } else { - $where = $qb->expr()->andX($clause); - } - - $qb->add('where', $where); - $qb->setParameter('job', $data['job']); + $qb->setParameter("{$p}_job", $data["job"]); } - public function applyOn() + public function applyOn(): string { return Declarations::SOCIAL_WORK_ACTION_TYPE; } public function buildForm(FormBuilderInterface $builder) { - $builder->add('job', EntityType::class, [ - 'class' => UserJob::class, - 'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize( - $j->getLabel() - ), - 'multiple' => true, - 'expanded' => true, - ]); - } - public function getFormDefaultData(): array - { - return []; + $builder + ->add('job', EntityType::class, [ + 'class' => UserJob::class, + 'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize( + $j->getLabel() + ), + 'multiple' => true, + 'expanded' => true, + ]) + ; } public function describeAction($data, $format = 'string') @@ -81,13 +85,21 @@ class JobFilter implements FilterInterface ); } - return ['Filtered by treating agent job: only %jobs%', [ + return ['export.filter.work.by_user_job.Filtered by treating agent job: only %jobs%', [ '%jobs%' => implode(', ', $userjobs), ]]; } + public function getFormDefaultData(): array + { + return [ + 'job' => [], + 'job_at' => new RollingDate(RollingDate::T_TODAY) + ]; + } + public function getTitle(): string { - return 'Filter by treating agent job'; + return 'export.filter.work.by_user_job.Filter by treating agent job'; } } diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php index bddcfbf9b..2410a5d08 100644 --- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php +++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php @@ -12,7 +12,10 @@ declare(strict_types=1); namespace Chill\PersonBundle\Export\Filter\SocialWorkFilters; use Chill\MainBundle\Export\FilterInterface; +use Chill\MainBundle\Form\Type\PickRollingDateType; use Chill\MainBundle\Form\Type\PickUserDynamicType; +use Chill\MainBundle\Service\RollingDate\RollingDate; +use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface; use Chill\MainBundle\Templating\Entity\UserRender; use Chill\PersonBundle\Export\Declarations; use Doctrine\ORM\Query\Expr\Andx; @@ -20,8 +23,12 @@ use Doctrine\ORM\QueryBuilder; use Symfony\Component\Form\FormBuilderInterface; use function in_array; -class ReferrerFilter implements FilterInterface +final readonly class ReferrerFilter implements FilterInterface { + private const PREFIX = 'acpw_referrer_filter'; + + public function __construct(private RollingDateConverterInterface $rollingDateConverter) {} + public function addRole(): ?string { return null; @@ -29,21 +36,19 @@ class ReferrerFilter implements FilterInterface public function alterQuery(QueryBuilder $qb, $data) { - if (!in_array('acpwuser', $qb->getAllAliases(), true)) { - $qb->join('acpw.referrers', 'acpwuser'); - } + $p = self::PREFIX; - $where = $qb->getDQLPart('where'); - $clause = $qb->expr()->in('acpwuser', ':agents'); + $qb + ->leftJoin('acpw.referrersHistory', $p . "_acpwusers_history") + ->andWhere("{$p}_acpwusers_history.startDate <= :{$p}_calc_date AND ({$p}_acpwusers_history.endDate IS NULL or {$p}_acpwusers_history.endDate > :{$p}_calc_date)") + ->andWhere("{$p}_acpwusers_history.user IN (:{$p}_agents)"); - if ($where instanceof Andx) { - $where->add($clause); - } else { - $where = $qb->expr()->andX($clause); - } - - $qb->add('where', $where); - $qb->setParameter('agents', $data['accepted_agents']); + $qb + ->setParameter("{$p}_agents", $data['accepted_agents']) + ->setParameter("{$p}_calc_date", $this->rollingDateConverter->convert( + $data['agent_at'] ?? new RollingDate(RollingDate::T_TODAY) + )) + ; } public function applyOn(): string @@ -53,13 +58,23 @@ class ReferrerFilter implements FilterInterface public function buildForm(FormBuilderInterface $builder) { - $builder->add('accepted_agents', PickUserDynamicType::class, [ - 'multiple' => true, - ]); + $builder + ->add('accepted_agents', PickUserDynamicType::class, [ + 'multiple' => true, + 'label' => 'export.filter.work.by_treating_agent.Accepted agents' + ]) + ->add('agent_at', PickRollingDateType::class, [ + 'label' => 'export.filter.work.by_treating_agent.Calc date', + 'help' => 'export.filter.work.by_treating_agent.calc_date_help', + ]) + ; } public function getFormDefaultData(): array { - return []; + return [ + 'accepted_agents' => [], + 'agent_at' => new RollingDate(RollingDate::T_TODAY), + ]; } public function describeAction($data, $format = 'string'): array @@ -71,13 +86,14 @@ class ReferrerFilter implements FilterInterface } return [ - 'Filtered by treating agent: only %agents%', [ - '%agents' => implode(', ', $users), + 'exports.filter.work.by_treating_agent.Filtered by treating agent at date', [ + 'agents' => implode(', ', $users), + 'agent_at' => $this->rollingDateConverter->convert($data['agent_at'] ?? new RollingDate(RollingDate::T_TODAY)), ], ]; } public function getTitle(): string { - return 'Filter by treating agent'; + return 'export.filter.work.by_treating_agent.Filter by treating agent'; } } diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php index f25897a7e..ce9b4e585 100644 --- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php +++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php @@ -12,19 +12,28 @@ declare(strict_types=1); namespace Chill\PersonBundle\Export\Filter\SocialWorkFilters; use Chill\MainBundle\Entity\Scope; +use Chill\MainBundle\Entity\User\UserScopeHistory; use Chill\MainBundle\Export\FilterInterface; +use Chill\MainBundle\Form\Type\PickRollingDateType; +use Chill\MainBundle\Service\RollingDate\RollingDate; +use Chill\MainBundle\Service\RollingDate\RollingDateConverter; use Chill\MainBundle\Templating\TranslatableStringHelper; +use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkReferrerHistory; use Chill\PersonBundle\Export\Declarations; -use Doctrine\ORM\Query\Expr\Andx; +use Doctrine\ORM\Query\Expr; use Doctrine\ORM\QueryBuilder; use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Contracts\Translation\TranslatorInterface; -use function in_array; class ScopeFilter implements FilterInterface { - public function __construct(protected TranslatorInterface $translator, private readonly TranslatableStringHelper $translatableStringHelper) {} + private const PREFIX = 'acp_work_action_filter_user_scope'; + + public function __construct( + protected TranslatorInterface $translator, + private readonly TranslatableStringHelper $translatableStringHelper + ) {} public function addRole(): ?string { @@ -33,21 +42,15 @@ class ScopeFilter implements FilterInterface public function alterQuery(QueryBuilder $qb, $data) { - if (!in_array('acpwuser', $qb->getAllAliases(), true)) { - $qb->join('acpw.referrers', 'acpwuser'); - } + $p = self::PREFIX; - $where = $qb->getDQLPart('where'); - $clause = $qb->expr()->in('acpwuser.mainScope', ':scope'); - - if ($where instanceof Andx) { - $where->add($clause); - } else { - $where = $qb->expr()->andX($clause); - } - - $qb->add('where', $where); - $qb->setParameter('scope', $data['scope']); + $qb->andWhere( + 'EXISTS (SELECT 1 FROM ' . AccompanyingPeriodWorkReferrerHistory::class . " {$p}_ref_history + JOIN {$p}_ref_history.user {$p}_ref_history_user JOIN {$p}_ref_history_user.scopeHistories {$p}_scope_history + WHERE {$p}_ref_history.accompanyingPeriodWork = acpw AND {$p}_scope_history.scope IN (:{$p}_scope) AND {$p}_scope_history.startDate <= {$p}_ref_history.startDate + AND ({$p}_scope_history.endDate IS NULL or {$p}_scope_history.endDate >= {$p}_ref_history.startDate))" + ) + ->setParameter("{$p}_scope", $data["scope"]); } public function applyOn() @@ -57,21 +60,19 @@ class ScopeFilter implements FilterInterface public function buildForm(FormBuilderInterface $builder) { - $builder->add('scope', EntityType::class, [ - 'class' => Scope::class, - 'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize( - $s->getName() - ), - 'multiple' => true, - 'expanded' => true, - ]); - } - public function getFormDefaultData(): array - { - return []; + $builder + ->add('scope', EntityType::class, [ + 'class' => Scope::class, + 'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize( + $s->getName() + ), + 'multiple' => true, + 'expanded' => true, + ]) + ; } - public function describeAction($data, $format = 'string') + public function describeAction($data, $format = 'string'): array { $scopes = []; @@ -81,13 +82,21 @@ class ScopeFilter implements FilterInterface ); } - return ['Filtered by treating agent scope: only %scopes%', [ + return ['export.filter.work.by_user_scope.Filtered by treating agent scope: only %scopes%', [ '%scopes%' => implode(', ', $scopes), ]]; } - public function getTitle() + public function getFormDefaultData(): array { - return 'Filter by treating agent scope'; + return [ + 'scope' => [], + 'scope_at' => new RollingDate(RollingDate::T_TODAY) + ]; + } + + public function getTitle(): string + { + return 'export.filter.work.by_user_scope.Filter by treating agent scope'; } } diff --git a/src/Bundle/ChillPersonBundle/Export/Helper/ListAccompanyingPeriodHelper.php b/src/Bundle/ChillPersonBundle/Export/Helper/ListAccompanyingPeriodHelper.php index 7349c5457..1531b0489 100644 --- a/src/Bundle/ChillPersonBundle/Export/Helper/ListAccompanyingPeriodHelper.php +++ b/src/Bundle/ChillPersonBundle/Export/Helper/ListAccompanyingPeriodHelper.php @@ -15,6 +15,7 @@ use Chill\MainBundle\Entity\Address; use Chill\MainBundle\Entity\Scope; use Chill\MainBundle\Export\Helper\DateTimeHelper; use Chill\MainBundle\Export\Helper\ExportAddressHelper; +use Chill\MainBundle\Export\Helper\UserHelper; use Chill\MainBundle\Templating\TranslatableStringHelperInterface; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress; @@ -59,8 +60,10 @@ final readonly class ListAccompanyingPeriodHelper 'scopes', 'socialIssues', 'acpCreatedAt', + 'acpCreatedBy_id', 'acpCreatedBy', 'acpUpdatedAt', + 'acpUpdatedBy_id', 'acpUpdatedBy', ]; @@ -75,6 +78,7 @@ final readonly class ListAccompanyingPeriodHelper private SocialIssueRender $socialIssueRender, private TranslatableStringHelperInterface $translatableStringHelper, private TranslatorInterface $translator, + private UserHelper $userHelper, ) {} public function getQueryKeys($data) @@ -104,6 +108,7 @@ final readonly class ListAccompanyingPeriodHelper return $this->translatableStringHelper->localize(json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR)); }, + 'acpCreatedBy', 'acpUpdatedBy', 'referrer' => $this->userHelper->getLabel($key, $values, 'export.list.acp.' . $key), 'locationPersonName', 'requestorPerson' => function ($value) use ($key) { if ('_header' === $value) { return 'export.list.acp.' . $key; @@ -204,11 +209,11 @@ final readonly class ListAccompanyingPeriodHelper // add the field which are simple association $qb - ->leftJoin('acp.createdBy', "acp_created_by_t") - ->addSelect('acp_created_by_t.label AS acpCreatedBy'); + ->addSelect('IDENTITY(acp.createdBy) AS acpCreatedBy_id') + ->addSelect('JSON_BUILD_OBJECT(\'uid\', IDENTITY(acp.createdBy), \'d\', acp.createdAt) AS acpCreatedBy'); $qb - ->leftJoin('acp.updatedBy', "acp_updated_by_t") - ->addSelect('acp_updated_by_t.label AS acpUpdatedBy'); + ->addSelect('IDENTITY(acp.updatedBy) AS acpUpdatedBy_id') + ->addSelect('JSON_BUILD_OBJECT(\'uid\', IDENTITY(acp.updatedBy), \'d\', acp.updatedAt) AS acpUpdatedBy'); foreach (['origin' => 'label', 'closingMotive' => 'name', 'job' => 'label', 'administrativeLocation' => 'name'] as $entity => $field) { $qb @@ -230,7 +235,7 @@ final readonly class ListAccompanyingPeriodHelper // referree at date $qb - ->addSelect('referrer_t.label AS referrer') + ->addSelect('JSON_BUILD_OBJECT(\'uid\', IDENTITY(userHistory.user), \'d\', userHistory.startDate) AS referrer') ->addSelect('userHistory.startDate AS referrerSince') ->leftJoin('acp.userHistories', 'userHistory') ->leftJoin('userHistory.user', 'referrer_t') diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php index 28cbca270..fb1bb4ffa 100644 --- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php +++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php @@ -12,6 +12,7 @@ declare(strict_types=1); namespace Chill\PersonBundle\Repository\AccompanyingPeriod; use Chill\MainBundle\Entity\User; +use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork; use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation; use DateTimeImmutable; use Doctrine\ORM\EntityManagerInterface; @@ -91,7 +92,9 @@ class AccompanyingPeriodWorkEvaluationRepository implements ObjectRepository $qb->expr()->gte(':now', $qb->expr()->diff('e.maxDate', 'e.warningInterval')), $qb->expr()->orX( $qb->expr()->eq('period.user', ':user'), - $qb->expr()->isMemberOf(':user', 'work.referrers') + $qb->expr()->exists( + 'SELECT 1 FROM ' . AccompanyingPeriodWork::class . ' subw JOIN subw.referrersHistory subw_ref_history WHERE subw.id = work.id AND subw_ref_history.user = :user' + ) ) ) ) diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php index 04ce8928e..4cbbab9fc 100644 --- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php +++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php @@ -132,10 +132,10 @@ final readonly class AccompanyingPeriodWorkRepository implements ObjectRepositor // set limit and offset $sql .= " ORDER BY - CASE WHEN enddate IS NULL THEN '-infinity'::timestamp ELSE 'infinity'::timestamp END ASC, - startdate DESC, - enddate DESC, - id DESC"; + CASE WHEN w.enddate IS NULL THEN '-infinity'::timestamp ELSE 'infinity'::timestamp END ASC, + w.startdate DESC, + w.enddate DESC, + w.id DESC"; $sql .= " LIMIT :limit OFFSET :offset"; @@ -239,7 +239,9 @@ final readonly class AccompanyingPeriodWorkRepository implements ObjectRepositor $qb->expr()->lte('w.startDate', ':until'), $qb->expr()->orX( $qb->expr()->eq('period.user', ':user'), - $qb->expr()->isMemberOf(':user', 'w.referrers') + $qb->expr()->exists( + 'SELECT 1 FROM ' . AccompanyingPeriodWork::class . ' subw JOIN subw.referrersHistory subw_ref_history WHERE subw.id = w.id AND subw_ref_history.user = :user and subw.ref_history.endDate IS NULL' + ) ) ) ) diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php index f6faeed12..86e94f52e 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php @@ -37,7 +37,7 @@ class AccompanyingPeriodWorkNormalizer implements ContextAwareNormalizerInterfac * * @throws ExceptionInterface */ - public function normalize($object, ?string $format = null, array $context = []): array|\ArrayObject|bool|float|int|string|null + public function normalize($object, ?string $format = null, array $context = []): null|array|\ArrayObject|bool|float|int|string { $initial = $this->normalizer->normalize($object, $format, array_merge( $context, diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEndQueryPartForAccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEndQueryPartForAccompanyingPeriodInfo.php index 8ba9b9640..f0b38b635 100644 --- a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEndQueryPartForAccompanyingPeriodInfo.php +++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEndQueryPartForAccompanyingPeriodInfo.php @@ -54,7 +54,7 @@ class AccompanyingPeriodWorkEndQueryPartForAccompanyingPeriodInfo implements Acc public function getFromStatement(): string { return 'chill_person_accompanying_period_work w - LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr on w.id = cpapwr.accompanyingperiodwork_id'; + LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON w.id = cpapwr.accompanyingperiodwork_id AND daterange(cpapwr.startDate, cpapwr.endDate) @> w.endDate'; } public function getWhereClause(): string diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationWarningDateQueryPartForAccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationCreationQueryPartForAccompanyingPeriodInfo.php similarity index 73% rename from src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationWarningDateQueryPartForAccompanyingPeriodInfo.php rename to src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationCreationQueryPartForAccompanyingPeriodInfo.php index a71fe4d29..53b5e31ad 100644 --- a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationWarningDateQueryPartForAccompanyingPeriodInfo.php +++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationCreationQueryPartForAccompanyingPeriodInfo.php @@ -11,10 +11,11 @@ declare(strict_types=1); namespace Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoQueryPart; +use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork; use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation; use Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface; -class AccompanyingPeriodWorkEvaluationWarningDateQueryPartForAccompanyingPeriodInfo implements AccompanyingPeriodInfoUnionQueryPartInterface +class AccompanyingPeriodWorkEvaluationCreationQueryPartForAccompanyingPeriodInfo implements AccompanyingPeriodInfoUnionQueryPartInterface { public function getAccompanyingPeriodIdColumn(): string { @@ -33,12 +34,12 @@ class AccompanyingPeriodWorkEvaluationWarningDateQueryPartForAccompanyingPeriodI public function getUserIdColumn(): string { - return 'cpapwr.user_id'; + return 'e.createdBy_id'; } public function getDateTimeColumn(): string { - return 'e.maxDate'; + return 'e.createdAt'; } public function getMetadataColumn(): string @@ -48,18 +49,18 @@ class AccompanyingPeriodWorkEvaluationWarningDateQueryPartForAccompanyingPeriodI public function getDiscriminator(): string { - return 'accompanying_period_work_evaluation_max'; + return 'accompanying_period_work_evaluation_creation'; } public function getFromStatement(): string { return 'chill_person_accompanying_period_work_evaluation e JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id - LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id'; + LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id AND daterange(cpapwr.startDate, cpapwr.endDate) @> e.startDate'; } public function getWhereClause(): string { - return 'e.maxDate IS NOT NULL'; + return 'e.createdAt IS NOT NULL'; } } diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationMaxQueryPartForAccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationMaxQueryPartForAccompanyingPeriodInfo.php index b89f77460..843602249 100644 --- a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationMaxQueryPartForAccompanyingPeriodInfo.php +++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationMaxQueryPartForAccompanyingPeriodInfo.php @@ -56,7 +56,7 @@ class AccompanyingPeriodWorkEvaluationMaxQueryPartForAccompanyingPeriodInfo impl { return 'chill_person_accompanying_period_work_evaluation e JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id - LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id'; + LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id AND daterange(cpapwr.startDate, cpapwr.endDate) @> e.maxDate'; } public function getWhereClause(): string diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationStartQueryPartForAccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationStartQueryPartForAccompanyingPeriodInfo.php index 8ea3e579c..cc82fc9ab 100644 --- a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationStartQueryPartForAccompanyingPeriodInfo.php +++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationStartQueryPartForAccompanyingPeriodInfo.php @@ -56,11 +56,11 @@ class AccompanyingPeriodWorkEvaluationStartQueryPartForAccompanyingPeriodInfo im { return 'chill_person_accompanying_period_work_evaluation e JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id - LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id'; + LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id AND daterange(cpapwr.startDate, cpapwr.endDate) @> e.startDate'; } public function getWhereClause(): string { - return ''; + return 'e.startDate IS NOT NULL'; } } diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkNewReferrerQueryPartForAccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkNewReferrerQueryPartForAccompanyingPeriodInfo.php new file mode 100644 index 000000000..2208c2975 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkNewReferrerQueryPartForAccompanyingPeriodInfo.php @@ -0,0 +1,64 @@ + w.startDate'; } public function getWhereClause(): string diff --git a/src/Bundle/ChillPersonBundle/Tests/Action/Remove/PersonMoveTest.php b/src/Bundle/ChillPersonBundle/Tests/Action/Remove/PersonMoveTest.php index ce3d8a3d1..64826930f 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Action/Remove/PersonMoveTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Action/Remove/PersonMoveTest.php @@ -24,6 +24,7 @@ use Chill\PersonBundle\Entity\Household\HouseholdMember; use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Entity\Relationships\Relation; use Chill\PersonBundle\Entity\Relationships\Relationship; +use Chill\PersonBundle\Repository\Person\PersonCenterHistoryInterface; use Chill\PersonBundle\Repository\PersonRepository; use Doctrine\DBAL\Connection; use Doctrine\ORM\EntityManagerInterface; @@ -44,6 +45,8 @@ class PersonMoveTest extends KernelTestCase private CenterRepositoryInterface $centerRepository; + private PersonCenterHistoryInterface $personCenterHistory; + /** * @var list */ @@ -56,6 +59,7 @@ class PersonMoveTest extends KernelTestCase $this->personMoveManager = self::$container->get(PersonMoveManager::class); $this->eventDispatcher = self::$container->get(EventDispatcherInterface::class); $this->centerRepository = self::$container->get(CenterRepositoryInterface::class); + $this->personCenterHistory = self::$container->get(PersonCenterHistoryInterface::class); } public static function tearDownAfterClass(): void @@ -146,18 +150,22 @@ class PersonMoveTest extends KernelTestCase $personB = $this->em->find(Person::class, $personB->getId()); $message = 'Move persons with overlapping center histories'; - $this->em->refresh($personB); - self::assertCount(0, $personsByIdOfA); self::assertNotNull($personB?->getId(), $message); - $centerHistoriesB = $personB->getCenterHistory(); - $oldestDate = new \DateTimeImmutable('2023-01-01'); + $centersHistories = $this->personCenterHistory->findBy(['person' => $personB]); - $this->em->refresh($centerHistoriesB->first()); + // compute the oldest center history + $oldestCenterHistory = null; + foreach ($centersHistories as $centerHistory) { + $this->em->refresh($centerHistory); + if (null === $oldestCenterHistory || ($oldestCenterHistory instanceof Person\PersonCenterHistory && $oldestCenterHistory->getStartDate() >= $centerHistory->getStartDate())) { + $oldestCenterHistory = $centerHistory; + } + } - self::assertCount(2, $centerHistoriesB); - self::assertEquals($oldestDate, $centerHistoriesB->first()->getStartDate()); + self::assertCount(2, $centersHistories); + self::assertEquals('2023-01-01', $oldestCenterHistory?->getStartDate()->format('Y-m-d')); self::$entitiesToDelete[] = [Person::class, $personA]; self::$entitiesToDelete[] = [Person::class, $personB]; @@ -218,11 +226,11 @@ class PersonMoveTest extends KernelTestCase $this->em->persist($memberA); $this->em->persist($memberB); - self::$entitiesToDelete[] = [Person::class, $personA]; - self::$entitiesToDelete[] = [Person::class, $personB]; self::$entitiesToDelete[] = [HouseholdMember::class, $memberA]; self::$entitiesToDelete[] = [HouseholdMember::class, $memberB]; self::$entitiesToDelete[] = [Household::class, $household]; + self::$entitiesToDelete[] = [Person::class, $personA]; + self::$entitiesToDelete[] = [Person::class, $personB]; yield [$personA, $personB, "move 2 people having the same household at the same time"]; diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php index 64b78f49e..4f2d19f54 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php @@ -52,16 +52,6 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase private ?int $personId = null; - private KernelBrowser $client; - - /** - * Setup before each test method (see phpunit doc). - */ - protected function setUp(): void - { - $this->client = $this->getClientAuthenticated(); - } - protected function tearDown(): void { self::ensureKernelShutdown(); @@ -427,8 +417,9 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase */ public function testAccompanyingCourseShow(int $personId, int $periodId) { - $c = $this->client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', $periodId)); - $response = $this->client->getResponse(); + $client = $this->getClientAuthenticated(); + $client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', $periodId)); + $response = $client->getResponse(); $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true)); @@ -548,12 +539,13 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase */ public function testReferralAvailable(int $personId, int $periodId) { - $this->client->request( + $client = $this->getClientAuthenticated(); + $client->request( Request::METHOD_POST, sprintf('/api/1.0/person/accompanying-course/%d/referrers-suggested.json', $periodId) ); - $this->assertTrue(in_array($this->client->getResponse()->getStatusCode(), [200, 422], true)); + $this->assertTrue(in_array($client->getResponse()->getStatusCode(), [200, 422], true)); } /** @@ -732,8 +724,9 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase public function testShow404() { - $this->client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', 99999)); - $response = $this->client->getResponse(); + $client = $this->getClientAuthenticated(); + $client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', 99999)); + $response = $client->getResponse(); $this->assertEquals(404, $response->getStatusCode(), "Test that the response of rest api has a status code 'not found' (404)"); } diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php index 2e1c58c64..e98539de5 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php @@ -137,20 +137,17 @@ final class HouseholdApiControllerTest extends WebTestCase $qb = self::$container->get(EntityManagerInterface::class) ->createQueryBuilder(); - $period = $qb - ->select('ap') - ->from(AccompanyingPeriod::class, 'ap') + $personIds = $qb + ->select("p.id AS pid") + ->from(Person::class, 'p') ->where( - $qb->expr()->gte('SIZE(ap.participations)', 2) + $qb->expr()->gte('SIZE(p.accompanyingPeriodParticipations)', 2) ) ->getQuery() ->setMaxResults(1) ->getSingleResult(); - $person = $period->getParticipations() - ->first()->getPerson(); - - yield [$person->getId()]; + yield [$personIds['pid']]; self::ensureKernelShutdown(); } diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/AccompanyingPeriodWorkTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/AccompanyingPeriodWorkTest.php new file mode 100644 index 000000000..6771b0305 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/AccompanyingPeriodWorkTest.php @@ -0,0 +1,96 @@ +getReferrers()); + + $work->addReferrer($userA); + + self::assertCount(1, $work->getReferrers()); + self::assertContains($userA, $work->getReferrers()); + + $work->addReferrer($userB); + + self::assertCount(2, $work->getReferrers()); + self::assertContains($userA, $work->getReferrers()); + self::assertContains($userB, $work->getReferrers()); + + $work->addReferrer($userC); + $work->removeReferrer($userB); + + self::assertCount(2, $work->getReferrers()); + self::assertContains($userA, $work->getReferrers()); + self::assertNotContains($userB, $work->getReferrers()); + self::assertContains($userC, $work->getReferrers()); + + $work->removeReferrer($userA); + self::assertNotContains($userA, $work->getReferrers()); + self::assertNotContains($userB, $work->getReferrers()); + self::assertContains($userC, $work->getReferrers()); + } + + public function testReferrerHistoryOnDifferentDays(): void + { + + $work = new AccompanyingPeriodWork(); + $userA = new User(); + $userB = new User(); + $userC = new User(); + + $work->addReferrer($userA); + + $historyA = $work->getReferrersHistory()->first(); + $reflection = new \ReflectionClass($historyA); + $startDateReflection = $reflection->getProperty('startDate'); + $startDateReflection->setAccessible(true); + $startDateReflection->setValue($historyA, new \DateTimeImmutable('1 year ago')); + + $work->addReferrer($userB); + $work->addReferrer($userC); + + $work->removeReferrer($userB); + $work->removeReferrer($userA); + + self::assertCount(1, $work->getReferrers()); + self::assertNotContains($userA, $work->getReferrers()); + self::assertNotContains($userB, $work->getReferrers()); + self::assertContains($userC, $work->getReferrers()); + + self::assertCount(2, $work->getReferrersHistory()); + + $historyA = $work->getReferrersHistory() + ->filter(fn (AccompanyingPeriodWorkReferrerHistory $h) => $userA === $h->getUser()) + ->first(); + + self::assertNotFalse($historyA); + self::assertSame($userA, $historyA->getUser()); + self::assertEquals((new \DateTimeImmutable())->format('Y-m-d'), $historyA->getEndDate()->format('Y-m-d')); + } +} diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php index 6e17b2059..c69e775be 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php @@ -71,7 +71,6 @@ final class ReferrerScopeAggregatorTest extends AbstractAggregatorTest $em->createQueryBuilder() ->select('count(acp.id)') ->from(AccompanyingPeriod::class, 'acp') - ->join('acp.scopes', 'acpscope'), ]; } } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregatorTest.php index 3b692f782..cd070aca8 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregatorTest.php @@ -11,6 +11,7 @@ declare(strict_types=1); namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators; +use Chill\MainBundle\Service\RollingDate\RollingDate; use Chill\MainBundle\Test\Export\AbstractAggregatorTest; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\UserJobAggregator; @@ -39,7 +40,9 @@ final class UserJobAggregatorTest extends AbstractAggregatorTest public function getFormData(): array { return [ - [], + [ + 'job_at' => new RollingDate(RollingDate::T_FIXED_DATE, \DateTimeImmutable::createFromFormat('Y-m-d', '2020-01-01')), + ], ]; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php index 39cc20083..dfd6db053 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php @@ -11,6 +11,7 @@ declare(strict_types=1); namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators; +use Chill\MainBundle\Service\RollingDate\RollingDate; use Chill\MainBundle\Test\Export\AbstractAggregatorTest; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\JobAggregator; @@ -54,7 +55,6 @@ final class JobAggregatorTest extends AbstractAggregatorTest ->select('count(acp.id)') ->from(AccompanyingPeriod::class, 'acp') ->join('acp.works', 'acpw') - ->join('acpw.referrers', 'acpwuser'), ]; } } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php index 21f185469..19ca8b615 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php @@ -11,6 +11,7 @@ declare(strict_types=1); namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators; +use Chill\MainBundle\Service\RollingDate\RollingDate; use Chill\MainBundle\Test\Export\AbstractAggregatorTest; use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork; use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ReferrerAggregator; @@ -39,7 +40,10 @@ final class ReferrerAggregatorTest extends AbstractAggregatorTest public function getFormData(): array { return [ - [], + [], // there are previous saved export which does not contains any data + [ + 'referrer_at' => new RollingDate(RollingDate::T_TODAY) + ] ]; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php index 9a31d88bc..3cd8c93fe 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php @@ -11,6 +11,7 @@ declare(strict_types=1); namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators; +use Chill\MainBundle\Service\RollingDate\RollingDate; use Chill\MainBundle\Test\Export\AbstractAggregatorTest; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ScopeAggregator; @@ -54,7 +55,6 @@ final class ScopeAggregatorTest extends AbstractAggregatorTest ->select('count(acp.id)') ->from(AccompanyingPeriod::class, 'acp') ->join('acp.works', 'acpw') - ->join('acpw.referrers', 'acpwuser'), ]; } } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodTest.php new file mode 100644 index 000000000..24a49bab3 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodTest.php @@ -0,0 +1,53 @@ +listAccompanyingPeriod = self::$container->get(ListAccompanyingPeriod::class); + $this->centerRepository = self::$container->get(CenterRepositoryInterface::class); + } + + public function testQuery(): void + { + $centers = $this->centerRepository->findAll(); + + $query = $this->listAccompanyingPeriod->initiateQuery([], array_map(fn (Center $c) => ['center' => $c ], $centers), $exportOpts = ['calc_date' => new RollingDate(RollingDate::T_TODAY)]); + + $query->setMaxResults(1); + + $actual = $query->getQuery()->getResult(AbstractQuery::HYDRATE_ARRAY); + + self::assertIsArray($actual); + } +} diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodWorkTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodWorkTest.php new file mode 100644 index 000000000..3467f15a7 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodWorkTest.php @@ -0,0 +1,49 @@ +listAccompanyingPeriodWork = self::$container->get(ListAccompanyingPeriodWork::class); + $this->centerRepository = self::$container->get(CenterRepositoryInterface::class); + } + + public function testQuery(): void + { + $centers = $this->centerRepository->findAll(); + + $query = $this->listAccompanyingPeriodWork->initiateQuery([], array_map(fn (Center $c) => ['center' => $c], $centers), ['calc_date' => new RollingDate(RollingDate::T_TODAY)]); + $query->setMaxResults(1); + + self::assertIsArray($query->getQuery()->getResult(AbstractQuery::HYDRATE_ARRAY)); + } +} diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListEvaluationTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListEvaluationTest.php new file mode 100644 index 000000000..d7db24a82 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListEvaluationTest.php @@ -0,0 +1,49 @@ +listEvaluation = self::$container->get(ListEvaluation::class); + $this->centerRepository = self::$container->get(CenterRepositoryInterface::class); + } + + public function testQuery(): void + { + $centers = $this->centerRepository->findAll(); + + $query = $this->listEvaluation->initiateQuery([], array_map(fn (Center $c) => ['center' => $c], $centers), ['calc_date' => new RollingDate(RollingDate::T_TODAY)]); + $query->setMaxResults(1); + + self::assertIsArray($query->getQuery()->getResult(AbstractQuery::HYDRATE_ARRAY)); + } +} diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php index 890222b5b..e8ed85ad4 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php @@ -12,6 +12,7 @@ declare(strict_types=1); namespace Chill\PersonBundle\Tests\Export\Filter\SocialWorkFilters; use Chill\MainBundle\Entity\UserJob; +use Chill\MainBundle\Service\RollingDate\RollingDate; use Chill\MainBundle\Test\Export\AbstractFilterTest; use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork; use Chill\PersonBundle\Export\Filter\SocialWorkFilters\JobFilter; @@ -49,7 +50,7 @@ final class JobFilterTest extends AbstractFilterTest return [ [ - 'job' => new ArrayCollection($jobs) + 'job' => new ArrayCollection($jobs), ] ]; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php index 68fab1250..a77c6d9c9 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php @@ -12,6 +12,7 @@ declare(strict_types=1); namespace Chill\PersonBundle\Tests\Export\Filter\SocialWorkFilters; use Chill\MainBundle\Entity\User; +use Chill\MainBundle\Service\RollingDate\RollingDate; use Chill\MainBundle\Test\Export\AbstractFilterTest; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\PersonBundle\Export\Filter\SocialWorkFilters\ReferrerFilter; @@ -47,8 +48,13 @@ final class ReferrerFilterTest extends AbstractFilterTest $data = []; foreach ($users as $u) { + $data[] = [ + 'accepted_agents' => $u, // some saved export does not have the parameter "agent_at" + ]; + $data[] = [ 'accepted_agents' => $u, + 'agent_at' => new RollingDate(RollingDate::T_TODAY) ]; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php index 1ff6c6d6e..c3e29f71e 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php @@ -12,6 +12,7 @@ declare(strict_types=1); namespace Chill\PersonBundle\Tests\Export\Filter\SocialWorkFilters; use Chill\MainBundle\Entity\Scope; +use Chill\MainBundle\Service\RollingDate\RollingDate; use Chill\MainBundle\Test\Export\AbstractFilterTest; use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork; use Chill\PersonBundle\Export\Filter\SocialWorkFilters\ScopeFilter; @@ -48,7 +49,7 @@ final class ScopeFilterTest extends AbstractFilterTest return [ [ - 'scope' => $scopes + 'scope' => $scopes, ] ]; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Repository/AccompanyingPeriodACLAwareRepositoryTest.php b/src/Bundle/ChillPersonBundle/Tests/Repository/AccompanyingPeriodACLAwareRepositoryTest.php index 050a839e6..83335c02a 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Repository/AccompanyingPeriodACLAwareRepositoryTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Repository/AccompanyingPeriodACLAwareRepositoryTest.php @@ -518,7 +518,7 @@ class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase /** * @param array $scopes */ - private function buildPeriod(Person $person, array $scopes, User|null $creator, bool $confirm): AccompanyingPeriod + private function buildPeriod(Person $person, array $scopes, null|User $creator, bool $confirm): AccompanyingPeriod { $period = new AccompanyingPeriod(); $period->addPerson($person); diff --git a/src/Bundle/ChillPersonBundle/Tests/Repository/UserRepositoryTest.php b/src/Bundle/ChillPersonBundle/Tests/Repository/UserRepositoryTest.php new file mode 100644 index 000000000..5a99b8e4c --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Tests/Repository/UserRepositoryTest.php @@ -0,0 +1,44 @@ +userRepository = self::$container->get(UserRepository::class); + } + + public function testFindAllAsArray(): void + { + $userIterator = $this->userRepository->findAllAsArray('fr'); + + self::assertIsIterable($userIterator); + $i = 0; + foreach ($userIterator as $u) { + self::assertIsArray($u); + $i++; + } + self::assertGreaterThan(0, $i); + } +} diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20231004142738.php b/src/Bundle/ChillPersonBundle/migrations/Version20231004142738.php new file mode 100644 index 000000000..0c9840fff --- /dev/null +++ b/src/Bundle/ChillPersonBundle/migrations/Version20231004142738.php @@ -0,0 +1,85 @@ +addSql('CREATE SEQUENCE chill_person_accompanying_period_work_referrer_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP CONSTRAINT fk_3619f5ebb99f6060'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP CONSTRAINT FK_3619F5EBA76ED395'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP CONSTRAINT chill_person_accompanying_period_work_referrer_pkey'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD id INT NOT NULL DEFAULT nextval(\'chill_person_accompanying_period_work_referrer_id_seq\')'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD endDate DATE DEFAULT NULL'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD startDate DATE DEFAULT NULL'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ALTER accompanyingperiodwork_id DROP NOT NULL'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ALTER user_id DROP NOT NULL'); + $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_referrer.endDate IS \'(DC2Type:date_immutable)\''); + $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_referrer.startDate IS \'(DC2Type:date_immutable)\''); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT FK_3619F5EBC55C1209 FOREIGN KEY (accompanyingPeriodWork_id) REFERENCES chill_person_accompanying_period_work (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT FK_3619F5EBA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD PRIMARY KEY (id)'); + $this->addSql('ALTER INDEX idx_3619f5ebb99f6060 RENAME TO IDX_3619F5EBC55C1209'); + + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL;'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL;'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD createdBy_id INT DEFAULT NULL;'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD updatedBy_id INT DEFAULT NULL;'); + $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_referrer.endDate IS \'(DC2Type:date_immutable)\''); + $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_referrer.startDate IS \'(DC2Type:date_immutable)\''); + $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_referrer.createdAt IS \'(DC2Type:datetime_immutable)\''); + $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_referrer.updatedAt IS \'(DC2Type:datetime_immutable)\''); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT FK_3619F5EB3174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE;'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT FK_3619F5EB65FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE;'); + $this->addSql('CREATE INDEX IDX_3619F5EB3174800F ON chill_person_accompanying_period_work_referrer (createdBy_id);'); + $this->addSql('CREATE INDEX IDX_3619F5EB65FF1AEC ON chill_person_accompanying_period_work_referrer (updatedBy_id);'); + + // set a default date on startDate + $this->addSql('UPDATE chill_person_accompanying_period_work_referrer r SET startdate=w.startdate FROM chill_person_accompanying_period_work w WHERE w.id = r.accompanyingperiodwork_id'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ALTER startDate SET NOT NULL'); + + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT cpapwr_start_date_before_end CHECK (startdate <= enddate OR enddate IS NULL)'); + + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer + ADD CONSTRAINT acc_period_work_ref_history_not_overlaps + EXCLUDE USING GIST (accompanyingperiodwork_id with =, user_id with =, tsrange(startdate, enddate) with &&) + DEFERRABLE INITIALLY DEFERRED'); + } + + public function down(Schema $schema): void + { + $this->addSql('DROP SEQUENCE chill_person_accompanying_period_work_referrer_id_seq CASCADE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP CONSTRAINT FK_3619F5EBC55C1209'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP CONSTRAINT fk_3619f5eba76ed395'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP CONSTRAINT cpapwr_start_date_before_end'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP CONSTRAINT acc_period_work_ref_history_not_overlaps'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP CONSTRAINT chill_person_accompanying_period_work_referrer_pkey'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP id'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP endDate'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP startDate'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ALTER user_id SET NOT NULL'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ALTER accompanyingPeriodWork_id SET NOT NULL'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT fk_3619f5ebb99f6060 FOREIGN KEY (accompanyingperiodwork_id) REFERENCES chill_person_accompanying_period_work (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT fk_3619f5eba76ed395 FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD PRIMARY KEY (accompanyingperiodwork_id, user_id)'); + $this->addSql('ALTER INDEX idx_3619f5ebc55c1209 RENAME TO idx_3619f5ebb99f6060'); + } +} diff --git a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml index 250bca9c7..a8d2080fb 100644 --- a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml +++ b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml @@ -135,7 +135,11 @@ exports: by_person: Filtered by person\'s geographical unit (based on address) computed at date, only units: "Filtré par zone géographique sur base de l'adresse, calculé à {datecalc, date, short}, seulement les zones suivantes: {units}" - + filter: + work: + by_treating_agent: + Filtered by treating agent at date: >- + Les agents traitant au { agent_at, date, medium }, seulement {agents} 'total persons matching the search pattern': >- { total, plural, =0 {Aucun usager ne correspond aux termes de recherche} diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml index 0a8371f38..e142e0f8e 100644 --- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml @@ -458,15 +458,6 @@ 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 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%" -Group by user job: Grouper les parcours par métier du référent - Filter by social issue: Filtrer les parcours par problématiques sociales Accepted socialissues: Problématiques sociales "Filtered by socialissues: only %socialissues%": "Filtré par problématique sociale: uniquement %socialissues%" @@ -580,9 +571,6 @@ Filtered acp which has no actions: 'Filtré: uniquement les parcours qui n''ont Group by number of actions: Grouper les parcours par nombre d’actions Filter by creator: Filtrer les parcours par créateur 'Filtered by creator: only %creators%': 'Filtré par créateur: uniquement %creators%' -Filter by creator job: Filtrer les parcours par métier du créateur -'Filtered by creator job: only %jobs%': 'Filtré par métier du créateur: uniquement %jobs%' -Group by creator job: Grouper les parcours par métier du créateur Filter actions without end date: Filtre les actions sans date de fin (ouvertes) Filtered actions without end date: 'Filtré: uniquement les actions sans date de fin (ouvertes)' @@ -598,20 +586,8 @@ Filter by current evaluations: Filtrer les évaluations en cours 'Filtered by geographic unit: computed at %date%, only in %units%': 'Filtré par unité géographique: adresse le %date%, seulement les unités %units%' ## social actions filters/aggr -Filter by treating agent scope: Filtrer les actions par service de l'agent traitant -"Filtered by treating agent scope: only %scopes%": "Filtré par service de l'agent traitant: uniquement %scopes%" -Group by treating agent scope: Grouper les actions par service de l'agent traitant - Filter by scope: Filtrer par service -Filter by treating agent job: Filtrer les actions par métier de l'agent traitant -"Filtered by treating agent job: only %jobs%": "Filtré par métier de l'agent traitant: uniquement %jobs%" -Group by treating agent job: Grouper les actions par métier de l'agent traitant - -Filter by treating agent: Filtrer les actions par agent traitant -Accepted agents: Agent traitant -"Filtered by treating agent: only %agents%": "Filtré par agent traitant: uniquement %agents%" -Group by treating agent: Grouper les actions par agent traitant Group social work actions by action type: Grouper les actions par type Group social work actions by goal: Grouper les actions par objectif @@ -1008,12 +984,14 @@ export: count_participations: Nombre de participations distinctes count_persons: Nombre d'usagers concernés distincts count_acps: Nombre de parcours distincts + nb_household_with_course: Count households with accompanying course: Nombre de ménages impliqués dans un parcours Count households: Nombre de ménages Count accompanying periods: Nombre de parcours Count household with accompanying course by various parameters.: Compte le nombre de ménages impliqués dans un parcours selon différents filtres. Date of calculation of household members: Date à laquelle les membres du ménages sont comptabilisés + aggregator: person: by_household_composition: @@ -1030,8 +1008,9 @@ export: Computation date for referrer: Date à laquelle le référent était actif by_user_scope: Group course by referrer's scope: Grouper les parcours par service du référent - Computation date for referrer: Date à laquelle le référent était actif Referrer's scope: Service du référent de parcours + by_user_job: + Group by user job: Grouper les parcours par métier du référent duration: day: Durée du parcours en jours week: Durée du parcours en semaines @@ -1041,21 +1020,37 @@ export: Number of actions: Nombre d'actions by_creator_job: Creator's job: Métier du créateur + Group by creator job: Grouper les parcours par métier du créateur by_user_working: title: Grouper les parcours par intervenant user: Intervenant by_job_working: title: Grouper les parcours par métier de l'intervenant job: Métier de l'intervenant + Calc date: Date de calcul du métier de l'intervenant by_scope_working: title: Grouper les parcours par service de l'intervenant scope: Service de l'intervenant + Calc date: Date de calcul du service de l'intervenant + by_scope: + Group course by scope: Grouper les parcours par service + course_work: + by_treating_agent: + Calc date: Référent à la date + Group by treating agent: Grouper les actions par agent traitant by_current_action: Current action ?: Action en cours ? Group by current actions: Grouper les actions en cours Current action: Action en cours Not current action: Action terminée + by_agent_scope: + Group by treating agent scope: Grouper les actions par service de l'agent traitant + Calc date: Date de calcul du service de l'agent traitant + by_agent_job: + Group by treating agent job: Grouper les actions par métier de l'agent traitant + Calc date: Date de calcul du métier de l'agent traitant + eval: by_end_date: Has end date ?: Évaluation en cours ? @@ -1074,6 +1069,7 @@ export: filter: by_geog_unit: Filtered by person's geographical unit (based on address) computed at %datecalc%, only %units%: Filtré par unité géographique (sur base de l'adresse), calculé le %datecalc%, seulement %units% + person: by_composition: Filter by household composition: Filtrer les usagers par composition du ménage @@ -1108,11 +1104,13 @@ export: 'Filtered by job working on course: only %jobs%, between %start_date% and %end_date%': 'Filtré par métier des intervenants sur le parcours: seulement %jobs%, entre le %start_date% et le %end_date%' Job working after: Intervention après le Job working before: Intervention avant le + Calc date: by_scope_working: title: Filtrer les parcours par service de l'intervenant, entre deux dates 'Filtered by scope working on course: only %scopes%, between %start_date% and %end_date%': 'Filtré par service des intervenants sur le parcours: seulement %scopes%, entre le %start_date% et le %end_date%' Scope working after: Intervention après le Scope working before: Intervention avant le + Calc date: by_step: Filter by step: Filtrer les parcours par statut du parcours Filter by step between dates: Filtrer les parcours par statut du parcours entre deux dates @@ -1122,7 +1120,8 @@ export: date_to: Statuts acquis avant cette date 'Filtered by steps: only %step% and between %date_from% and %date_to%': 'Filtré par statut: seulement %step%, entre %date_from% et %date_to%' by_user_scope: - Computation date for referrer: Date à laquelle le référent était actif + 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%" by_referrer: Computation date for referrer: Date à laquelle le référent était actif having_temporarily: @@ -1131,7 +1130,12 @@ export: Having a person's location: Ayant une localisation auprès d'un usager Calculation date: Date de la localisation creator_job: - 'Filtered by creator job: only %jobs%': 'Filtré par métier du créateur: seulement %jobs%' + Filter by creator job: Filtrer les parcours par métier du créateur + 'Filtered by creator job: only %jobs%': "Filtré par métier du créateur: uniquement %jobs%" + by_user_job: + 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%" + work: start_between_dates: title: Filtre les actions d'accompagnement dont la date d'ouverture est entre deux dates @@ -1147,12 +1151,28 @@ export: keep_null: Conserver les actions dont la date de fin n'est pas indiquée (actions en cours) keep_null_help: Si coché, les actions dont la date de fin est vide seront prises en compte. Si non coché, elles ne seront pas comptabilisée. Only where start date is between %startDate% and %endDate%: Seulement les actions dont la date de fin est entre le %startDate% et le %endDate% + by_user_job: + Filter by treating agent job: Filtrer les actions par métier de l'agent traitant + "Filtered by treating agent job: only %jobs%": "Filtré par métier de l'agent traitant: uniquement %jobs%" + Calc date: Date de calcul du métier de l'agent traitant + by_user_scope: + Filter by treating agent scope: Filtrer les actions par service de l'agent traitant + "Filtered by treating agent scope: only %scopes%": "Filtré par service de l'agent traitant: uniquement %scopes%" + Calc date: Date de calcul du service de l'agent traitant + by_treating_agent: + Filter by treating agent: Filtrer les actions par agent traitant + Accepted agents: Agent traitant + Calc date: Date à laquelle l'agent est en situation de désignation sur l'action + calc_date_help: Il s'agit de la date à laquelle l'agent est actif comme agent traitant de l'action, et non la date à la quelle l'agent est désigné comme agent traitant. + "Filtered by treating agent: only %agents%": "Filtré par agent traitant: uniquement %agents%" + list: person_with_acp: List peoples having an accompanying period: Liste des usagers ayant un parcours d'accompagnement List peoples having an accompanying period with period details: Liste des usagers concernés avec détail de chaque parcours Create a list of people having an accompaying periods, according to various filters.: Génère une liste des usagers ayant un parcours d'accompagnement, selon différents critères liés au parcours ou à l'usager Create a list of people having an accompaying periods with details of period, according to various filters.: Génère une liste des usagers ayant un parcours d'accompagnement, selon différents critères liés au parcours ou à l'usager. Ajoute les détails du parcours à la liste. + acp: List of accompanying periods: Liste des parcours d'accompagnements Generate a list of accompanying periods, filtered on different parameters.: Génère une liste des parcours d'accompagnement, filtrée sur différents paramètres. @@ -1172,7 +1192,9 @@ export: origin: Origine du parcours acpClosingMotive: Motif de fermeture acpJob: Métier du parcours + acpCreatedBy_id: Créé par (identifiant) acpCreatedBy: Créé par + acpUpdatedBy_id: Dernière modificaton par (identifiant) acpUpdatedBy: Dernière modification par administrativeLocation: Location administrative step: Etape @@ -1191,6 +1213,7 @@ export: socialIssues: Problématiques sociales requestorPerson: Demandeur (personne) requestorThirdParty: Demandeur (tiers) + eval: List of evaluations: Liste des évaluations Generate a list of evaluations, filtered on different parameters: Génère une liste des évaluations, filtrée sur différents paramètres. @@ -1220,6 +1243,7 @@ export: createdBy: Créé par updatedBy: Modifié par timeSpent: Temps de rédaction (minutes) + acpw: List of accompanying period works: Liste des actions List description: Génère une liste des actions d'accompagnement, filtrée sur différents paramètres. @@ -1249,6 +1273,7 @@ export: resultsTitle: Résultats evaluationsId: Identifiants des évaluations evaluationsTitle: Évaluations + household: List household associated with accompanying period title: Liste des ménages impliqués dans un parcours List description: Génère la liste des ménages, filtrée selon divers paramètres. @@ -1262,6 +1287,7 @@ export: compositionNumberOfChildren: Nombre d'enfants dans la composition compositionComment: Commentaire sur la composition compositionType: Type de composition + acpaddress_fieldscountry: Pays # addressHelper effect social_action: diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php index 80c1edd87..3593b612c 100644 --- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php +++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php @@ -165,7 +165,7 @@ final class LoadReports extends AbstractFixture implements OrderedFixtureInterfa * * @return string|string[] */ - private function getRandomChoice(CustomField $field): string|array + private function getRandomChoice(CustomField $field): array|string { $choices = $field->getOptions()['choices']; $multiple = $field->getOptions()['multiple']; diff --git a/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php b/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php index 203963d80..de8b52c4c 100644 --- a/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php +++ b/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php @@ -27,7 +27,7 @@ class AuthorizationEvent extends \Symfony\Contracts\EventDispatcher\Event protected $vote; public function __construct( - private readonly Person|AbstractTask|AccompanyingPeriod|null $subject, + private readonly null|AbstractTask|AccompanyingPeriod|Person $subject, private readonly string $attribute, private readonly TokenInterface $token ) {} diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Convert.php b/src/Bundle/ChillWopiBundle/src/Controller/Convert.php index 665386ffe..c4702c2b2 100644 --- a/src/Bundle/ChillWopiBundle/src/Controller/Convert.php +++ b/src/Bundle/ChillWopiBundle/src/Controller/Convert.php @@ -78,7 +78,7 @@ class Convert return new Response($response->getContent(), Response::HTTP_OK, [ 'Content-Type' => 'application/pdf', ]); - } catch (ClientExceptionInterface|TransportExceptionInterface|RedirectionExceptionInterface|ServerExceptionInterface $exception) { + } catch (ClientExceptionInterface|RedirectionExceptionInterface|ServerExceptionInterface|TransportExceptionInterface $exception) { return $this->onConversionFailed($url, $exception->getResponse()); } } diff --git a/tests/Kernel.php b/tests/Kernel.php index 5047bfa32..a0ede51ac 100644 --- a/tests/Kernel.php +++ b/tests/Kernel.php @@ -1,5 +1,14 @@ ['all' => true], Chill\ActivityBundle\ChillActivityBundle::class => ['all' => true], diff --git a/tests/app/config/preload.php b/tests/app/config/preload.php index 064bdcd6a..d98989af6 100644 --- a/tests/app/config/preload.php +++ b/tests/app/config/preload.php @@ -1,5 +1,14 @@