Merge remote-tracking branch 'origin/master' into issue442_toggle_emergency

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php

@@ -32,6 +32,7 @@ use Symfony\Component\Workflow\Registry;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
+use function array_slice;
 use function is_array;
 
 /**
@@ -221,9 +222,11 @@ class AccompanyingCourseController extends Controller
 
         $activities = $this->getDoctrine()->getManager()->getRepository(Activity::class)->findBy(
             ['accompanyingPeriod' => $accompanyingCourse],
-            ['date' => 'DESC'],
+            ['date' => 'DESC', 'id' => 'DESC'],
         );
 
+        $activities = array_slice($activities, 0, 3);
+
         $works = $this->workRepository->findByAccompanyingPeriod(
             $accompanyingCourse,
             ['startDate' => 'DESC', 'endDate' => 'DESC'],

src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php

@@ -16,28 +16,37 @@ use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\AddressReference;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent;
 use Chill\PersonBundle\Repository\Household\HouseholdACLAwareRepositoryInterface;
 use Chill\PersonBundle\Repository\Household\HouseholdRepository;
+use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
+use DateTimeImmutable;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use function array_filter;
 use function array_values;
 
 class HouseholdApiController extends ApiController
 {
+    private EventDispatcherInterface $eventDispatcher;
+
     private HouseholdACLAwareRepositoryInterface $householdACLAwareRepository;
 
     private HouseholdRepository $householdRepository;
 
     public function __construct(
+        EventDispatcherInterface $eventDispatcher,
         HouseholdRepository $householdRepository,
         HouseholdACLAwareRepositoryInterface $householdACLAwareRepository
     ) {
+        $this->eventDispatcher = $eventDispatcher;
         $this->householdRepository = $householdRepository;
         $this->householdACLAwareRepository = $householdACLAwareRepository;
     }
@@ -66,9 +75,51 @@ class HouseholdApiController extends ApiController
         ]);
     }
 
-    public function householdAddressApi($id, Request $request, string $_format): Response
+    /**
+     * Add an address to a household.
+     *
+     * @Route("/api/1.0/person/household/{id}/address.{_format}", name="chill_api_single_household_address",
+     * methods={"POST"}, requirements={"_format": "json"})
+     */
+    public function householdAddressApi(Household $household, Request $request, string $_format): Response
     {
-        return $this->addRemoveSomething('address', $id, $request, $_format, 'address', Address::class, ['groups' => ['read']]);
+        $this->denyAccessUnlessGranted(HouseholdVoter::EDIT, $household);
+
+        /** @var Address $address */
+        $address = $this->getSerializer()->deserialize($request->getContent(), Address::class, $_format, [
+            AbstractNormalizer::GROUPS => ['write'],
+        ]);
+
+        $household->addAddress($address);
+
+        foreach ($household->getMembersOnRange(
+            DateTimeImmutable::createFromMutable($address->getValidFrom()),
+            null === $address->getValidTo() ? null :
+                DateTimeImmutable::createFromMutable($address->getValidTo())
+        ) as $member) {
+            /** @var HouseholdMember $member */
+            $event = new PersonAddressMoveEvent($member->getPerson());
+            $event
+                ->setPreviousAddress($household->getPreviousAddressOf($address))
+                ->setNextAddress($address);
+            dump($event);
+            $this->eventDispatcher->dispatch($event);
+        }
+
+        $errors = $this->getValidator()->validate($household);
+
+        if ($errors->count() > 0) {
+            return $this->json($errors, 422);
+        }
+
+        $this->getDoctrine()->getManager()->flush();
+
+        return $this->json(
+            $address,
+            Response::HTTP_OK,
+            [],
+            [AbstractNormalizer::GROUPS => ['read']]
+        );
     }
 
     /**

src/Bundle/ChillPersonBundle/Controller/HouseholdController.php

@@ -24,7 +24,7 @@ use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\SerializerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function array_key_exists;
 use function count;

src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php

@@ -26,7 +26,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Serializer\Exception;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function count;
 
@@ -180,6 +180,7 @@ class HouseholdMemberController extends ApiController
     public function move(Request $request, $_format): Response
     {
         try {
+            /** @var MembersEditor $editor */
             $editor = $this->getSerializer()
                 ->deserialize(
                     $request->getContent(),
@@ -199,6 +200,9 @@ class HouseholdMemberController extends ApiController
             return $this->json($errors, 422);
         }
 
+        // launch events on post move
+        $editor->postMove();
+
         $em = $this->getDoctrine()->getManager();
 
         // if new household, persist it

src/Bundle/ChillPersonBundle/Controller/PersonController.php

@@ -30,8 +30,8 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function count;
 use function hash;

src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php

@@ -28,7 +28,7 @@ use http\Exception\InvalidArgumentException;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function count;
 

src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php

@@ -12,12 +12,9 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
-use Chill\MainBundle\Doctrine\ORM\Hydration\FlatHierarchyEntityHydrator;
 use Chill\MainBundle\Pagination\PaginatorInterface;
 use DateTimeImmutable;
-use Doctrine\ORM\Query;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 
 class SocialIssueApiController extends ApiController
 {
@@ -32,22 +29,10 @@ class SocialIssueApiController extends ApiController
         $query->setParameter('now', new DateTimeImmutable());
     }
 
-    protected function getQueryResult(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $query)
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format)
     {
-        // In order to work, this hydrator only works with
-        // entities having the field "children" set up.
-        return $query
-            ->getQuery()
-            ->setHint(Query::HINT_INCLUDE_META_COLUMNS, true)
-            ->getResult(FlatHierarchyEntityHydrator::LIST);
-    }
+        $query->addOrderBy('e.ordering', 'ASC');
 
-    protected function onPostIndexBuildQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $query): ?Response
-    {
-        $query
-            ->orderBy('GET_JSON_FIELD_BY_KEY(e.title, :locale)', 'ASC')
-            ->setParameter(':locale', $request->getLocale());
-
-        return null;
+        return $query;
     }
 }