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

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php

@@ -15,6 +15,7 @@ use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkVoter;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
@@ -23,7 +24,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Serializer\SerializerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingCourseWorkController extends AbstractController
 {
@@ -60,7 +61,7 @@ class AccompanyingCourseWorkController extends AbstractController
      */
     public function createWork(AccompanyingPeriod $period): Response
     {
-        // TODO ACL
+        $this->denyAccessUnlessGranted(AccompanyingPeriodWorkVoter::CREATE, $period);
 
         if ($period->getSocialIssues()->count() === 0) {
             $this->addFlash(
@@ -93,7 +94,8 @@ class AccompanyingCourseWorkController extends AbstractController
      */
     public function deleteWork(AccompanyingPeriodWork $work, Request $request): Response
     {
-        // TODO ACL
+        $this->denyAccessUnlessGranted(AccompanyingPeriodWorkVoter::UPDATE, $work);
+
         $em = $this->getDoctrine()->getManager();
 
         $form = $this->createDeleteForm($work->getId());
@@ -138,7 +140,8 @@ class AccompanyingCourseWorkController extends AbstractController
      */
     public function editWork(AccompanyingPeriodWork $work): Response
     {
-        // TODO ACL
+        $this->denyAccessUnlessGranted(AccompanyingPeriodWorkVoter::UPDATE, $work);
+
         $json = $this->serializer->normalize($work, 'json', ['groups' => ['read']]);
 
         return $this->render('@ChillPerson/AccompanyingCourseWork/edit.html.twig', [
@@ -157,13 +160,13 @@ class AccompanyingCourseWorkController extends AbstractController
      */
     public function listWorkByAccompanyingPeriod(AccompanyingPeriod $period): Response
     {
-        // TODO ACL
+        $this->denyAccessUnlessGranted(AccompanyingPeriodWorkVoter::SEE, $period);
+
         $totalItems = $this->workRepository->countByAccompanyingPeriod($period);
         $paginator = $this->paginator->create($totalItems);
 
-        $works = $this->workRepository->findByAccompanyingPeriod(
+        $works = $this->workRepository->findByAccompanyingPeriodOpenFirst(
             $period,
-            ['startDate' => 'DESC', 'endDate' => 'DESC'],
             $paginator->getItemsPerPage(),
             $paginator->getCurrentPageFirstItemNumber()
         );

src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php

@@ -99,7 +99,7 @@ class AccompanyingPeriodWorkEvaluationApiController
 
         if ($request->query->getBoolean('countOnly', false)) {
             return new JsonResponse(
-                $this->serializer->serialize(new Counter($total), 'json', ['groups' => 'read']),
+                $this->serializer->serialize(new Counter($total), 'json', ['groups' => ['read']]),
                 JsonResponse::HTTP_OK,
                 [],
                 true
@@ -117,7 +117,7 @@ class AccompanyingPeriodWorkEvaluationApiController
         $collection = new Collection($works, $paginator);
 
         return new JsonResponse(
-            $this->serializer->serialize($collection, 'json', ['groups' => 'read']),
+            $this->serializer->serialize($collection, 'json', ['groups' => ['read', 'read:evaluation:include-work']]),
             JsonResponse::HTTP_OK,
             [],
             true

src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php

@@ -16,9 +16,12 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdComposition;
 use Chill\PersonBundle\Form\HouseholdCompositionType;
 use Chill\PersonBundle\Repository\Household\HouseholdCompositionRepository;
+use Chill\PersonBundle\Repository\Household\HouseholdRepository;
 use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -31,7 +34,7 @@ use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-class HouseholdCompositionController
+class HouseholdCompositionController extends AbstractController
 {
     private EngineInterface $engine;
 
@@ -41,6 +44,8 @@ class HouseholdCompositionController
 
     private HouseholdCompositionRepository $householdCompositionRepository;
 
+    private HouseholdRepository $householdRepository;
+
     private PaginatorFactory $paginatorFactory;
 
     private Security $security;
@@ -52,6 +57,7 @@ class HouseholdCompositionController
     public function __construct(
         Security $security,
         HouseholdCompositionRepository $householdCompositionRepository,
+        HouseholdRepository $householdRepository,
         PaginatorFactory $paginatorFactory,
         FormFactoryInterface $formFactory,
         EntityManagerInterface $entityManager,
@@ -67,6 +73,59 @@ class HouseholdCompositionController
         $this->translator = $translator;
         $this->engine = $engine;
         $this->urlGenerator = $urlGenerator;
+        $this->householdRepository = $householdRepository;
+    }
+
+    /**
+     * @Route("/{_locale}/person/household/{household_id}/composition/{composition_id}/delete", name="chill_person_household_composition_delete")
+     *
+     * @param mixed $household_id
+     * @param mixed $composition_id
+     */
+    public function deleteAction(Request $request, $household_id, $composition_id): Response
+    {
+        $composition = $this->householdCompositionRepository->find($composition_id);
+        $household = $this->householdRepository->find($household_id);
+
+        $this->denyAccessUnlessGranted(HouseholdVoter::EDIT, $household);
+
+        if (null === $composition) {
+            throw $this->createNotFoundException('Unable to find composition entity.');
+        }
+
+        $form = $this->createFormBuilder()
+            ->setAction($this->generateUrl('chill_person_household_composition_delete', [
+                'composition_id' => $composition_id,
+                'household_id' => $household_id,
+            ]))
+            ->setMethod('DELETE')
+            ->add('submit', SubmitType::class, ['label' => 'Delete'])
+            ->getForm();
+
+        if ($request->getMethod() === Request::METHOD_DELETE) {
+            $form->handleRequest($request);
+
+            if ($form->isValid()) {
+                $this->entityManager->remove($composition);
+                $this->entityManager->flush();
+
+                $this->addFlash('success', $this->translator
+                    ->trans('The composition has been successfully removed.'));
+
+                return $this->redirectToRoute('chill_person_household_composition_index', [
+                    'id' => $household_id,
+                ]);
+            }
+        }
+
+        return $this->render(
+            'ChillPersonBundle:HouseholdComposition:delete.html.twig',
+            [
+                'household' => $household,
+                'composition' => $composition,
+                'form' => $form->createView(),
+            ]
+        );
     }
 
     /**