Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch '106-fix-keys-generation-doc-filtering-activities' into 'master'

Browse Source 
Fix: force list of activities to be a list with incremental keys

Closes #106

See merge request Chill-Projet/chill-bundles!543
This commit is contained in:
Julien Fastré 2023-05-25 19:19:38 +00:00
commit bd5dab2215
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
View File

@ -140,26 +140,36 @@ class ListActivitiesByAccompanyingPeriodContext implements
return $normalized; return $normalized;
} }
/**
* @return list
*/
private function filterActivitiesByUser(array $activities, User $user): array private function filterActivitiesByUser(array $activities, User $user): array
{ {
return array_filter( return array_values(
$activities, array_filter(
function ($activity) use ($user) { $activities,
$activityUsernames = array_map(static fn ($user) => $user['username'], $activity['users'] ?? []); function ($activity) use ($user) {
return in_array($user->getUsername(), $activityUsernames, true); $activityUsernames = array_map(static fn ($user) => $user['username'], $activity['users'] ?? []);
} return in_array($user->getUsername(), $activityUsernames, true);
}
)
); );
} }
/**
* @return list
*/
private function filterWorksByUser(array $works, User $user): array private function filterWorksByUser(array $works, User $user): array
{ {
return array_filter( return array_values(
$works, array_filter(
function ($work) use ($user) { $works,
$workUsernames = array_map(static fn ($user) => $user['username'], $work['referrers'] ?? []); function ($work) use ($user) {
$workUsernames = array_map(static fn ($user) => $user['username'], $work['referrers'] ?? []);
return in_array($user->getUsername(), $workUsernames, true); return in_array($user->getUsername(), $workUsernames, true);
} }
)
); );
} }