person: do not suggest the current household of the person

This commit is contained in:
nobohan 2021-11-15 12:00:42 +01:00
parent dcf5f1ed66
commit 3417aa8207

View File

@ -47,13 +47,22 @@ class HouseholdApiController extends ApiController
$count = $this->householdRepository->countByAccompanyingPeriodParticipation($person); $count = $this->householdRepository->countByAccompanyingPeriodParticipation($person);
$paginator = $this->getPaginatorFactory()->create($count); $paginator = $this->getPaginatorFactory()->create($count);
if ($count === 0) {
$households = []; $households = [];
} else { if ($count !== 0) {
$households = $this->householdRepository->findByAccompanyingPeriodParticipation($person, $allHouseholds = $this->householdRepository->findByAccompanyingPeriodParticipation($person,
$paginator->getItemsPerPage(), $paginator->getCurrentPageFirstItemNumber()); $paginator->getItemsPerPage(), $paginator->getCurrentPageFirstItemNumber());
} $currentHouseholdPerson = $person->getCurrentHousehold();
foreach ($allHouseholds as $h) {
if ($h !== $currentHouseholdPerson) {
array_push($households, $h);
}
}
if (null !== $currentHouseholdPerson) {
$count = $count - 1;
$paginator = $this->getPaginatorFactory()->create($count);
}
}
$collection = new Collection($households, $paginator); $collection = new Collection($households, $paginator);
return $this->json($collection, Response::HTTP_OK, [], return $this->json($collection, Response::HTTP_OK, [],