Merge branch 'calendar/finalization' into testing

src/Bundle/ChillCalendarBundle/Controller/CalendarController.php

@@ -15,6 +15,7 @@ use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Form\CalendarType;
 use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface;
 use Chill\CalendarBundle\Repository\CalendarACLAwareRepositoryInterface;
+use Chill\CalendarBundle\Security\Voter\CalendarVoter;
 use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactory;
@@ -147,6 +148,8 @@ class CalendarController extends AbstractController
      */
     public function editAction(Calendar $entity, Request $request): Response
     {
+        $this->denyAccessUnlessGranted(CalendarVoter::EDIT, $entity);
+
         if (!$this->remoteCalendarConnector->isReady()) {
             return $this->remoteCalendarConnector->getMakeReadyResponse($request->getUri());
         }
@@ -208,6 +211,8 @@ class CalendarController extends AbstractController
      */
     public function listActionByCourse(AccompanyingPeriod $accompanyingPeriod): Response
     {
+        $this->denyAccessUnlessGranted(CalendarVoter::SEE, $accompanyingPeriod);
+
         $filterOrder = $this->buildListFilterOrder();
         ['from' => $from, 'to' => $to] = $filterOrder->getDateRangeData('startDate');
 
@@ -228,6 +233,7 @@ class CalendarController extends AbstractController
             'accompanyingCourse' => $accompanyingPeriod,
             'paginator' => $paginator,
             'filterOrder' => $filterOrder,
+            'nbIgnored' => $this->calendarACLAwareRepository->countIgnoredByAccompanyingPeriod($accompanyingPeriod, $from, $to),
             'hasDocs' => 0 < $this->docGeneratorTemplateRepository->countByEntity(Calendar::class),
         ]);
     }
@@ -239,6 +245,8 @@ class CalendarController extends AbstractController
      */
     public function listActionByPerson(Person $person): Response
     {
+        $this->denyAccessUnlessGranted(CalendarVoter::SEE, $person);
+
         $filterOrder = $this->buildListFilterOrder();
         ['from' => $from, 'to' => $to] = $filterOrder->getDateRangeData('startDate');
 
@@ -259,6 +267,7 @@ class CalendarController extends AbstractController
             'person' => $person,
             'paginator' => $paginator,
             'filterOrder' => $filterOrder,
+            'nbIgnored' => $this->calendarACLAwareRepository->countIgnoredByPerson($person, $from, $to),
             'hasDocs' => 0 < $this->docGeneratorTemplateRepository->countByEntity(Calendar::class),
         ]);
     }
@@ -309,7 +318,7 @@ class CalendarController extends AbstractController
             $view = '@ChillCalendar/Calendar/newByAccompanyingCourse.html.twig';
             $entity->setAccompanyingPeriod($accompanyingPeriod);
             $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_period', ['id' => $accompanyingPeriod->getId()]);
-        } elseif ($person) {
+        } elseif (null !== $person) {
             $view = '@ChillCalendar/Calendar/newByPerson.html.twig';
             $entity->setPerson($person)->addPerson($person);
             $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_person', ['id' => $person->getId()]);
@@ -319,6 +328,8 @@ class CalendarController extends AbstractController
             $entity->setMainUser($this->userRepository->find($request->query->getInt('mainUser')));
         }
 
+        $this->denyAccessUnlessGranted(CalendarVoter::CREATE, $entity);
+
         $form = $this->createForm(CalendarType::class, $entity)
             ->add('save', SubmitType::class);
 
@@ -442,6 +453,8 @@ class CalendarController extends AbstractController
      */
     public function toActivity(Request $request, Calendar $calendar): RedirectResponse
     {
+        $this->denyAccessUnlessGranted(CalendarVoter::SEE, $calendar);
+
         $personsId = array_map(
             static fn (Person $p): int => $p->getId(),
             $calendar->getPersons()->toArray()

src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php

@@ -12,12 +12,20 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Controller;
 
 use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Entity\CalendarDoc;
+use Chill\CalendarBundle\Form\CalendarDocCreateType;
+use Chill\CalendarBundle\Form\CalendarDocEditType;
+use Chill\CalendarBundle\Security\Voter\CalendarDocVoter;
 use Chill\CalendarBundle\Security\Voter\CalendarVoter;
 use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
+use Doctrine\ORM\EntityManagerInterface;
 use RuntimeException;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
@@ -32,18 +40,202 @@ class CalendarDocController
 
     private EngineInterface $engine;
 
+    private EntityManagerInterface $entityManager;
+
+    private FormFactoryInterface $formFactory;
+
     private Security $security;
 
     private SerializerInterface $serializer;
 
     private UrlGeneratorInterface $urlGenerator;
 
-    public function __construct(Security $security, DocGeneratorTemplateRepository $docGeneratorTemplateRepository, UrlGeneratorInterface $urlGenerator, EngineInterface $engine)
-    {
-        $this->security = $security;
+    public function __construct(
+        DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
+        EngineInterface $engine,
+        EntityManagerInterface $entityManager,
+        FormFactoryInterface $formFactory,
+        Security $security,
+        UrlGeneratorInterface $urlGenerator
+    ) {
         $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
-        $this->urlGenerator = $urlGenerator;
         $this->engine = $engine;
+        $this->entityManager = $entityManager;
+        $this->formFactory = $formFactory;
+        $this->security = $security;
+        $this->urlGenerator = $urlGenerator;
+    }
+
+    /**
+     * @Route("/{_locale}/calendar/calendar-doc/{id}/new", name="chill_calendar_calendardoc_new")
+     */
+    public function create(Calendar $calendar, Request $request): Response
+    {
+        $calendarDoc = (new CalendarDoc($calendar, null))->setCalendar($calendar);
+
+        if (!$this->security->isGranted(CalendarDocVoter::EDIT, $calendarDoc)) {
+            throw new AccessDeniedHttpException();
+        }
+
+        // set variables
+        switch ($calendarDoc->getCalendar()->getContext()) {
+            case 'accompanying_period':
+                $view = '@ChillCalendar/CalendarDoc/new_accompanying_period.html.twig';
+                $returnRoute = 'chill_calendar_calendar_list_by_period';
+                $returnParams = ['id' => $calendarDoc->getCalendar()->getAccompanyingPeriod()->getId()];
+
+                break;
+
+            case 'person':
+                $view = '@ChillCalendar/CalendarDoc/new_person.html.twig';
+                $returnRoute = 'chill_calendar_calendar_list_by_person';
+                $returnParams = ['id' => $calendarDoc->getCalendar()->getPerson()->getId()];
+
+                break;
+
+            default:
+                throw new UnexpectedValueException('Unsupported context');
+        }
+
+        $calendarDocDTO = new CalendarDoc\CalendarDocCreateDTO();
+        $form = $this->formFactory->create(CalendarDocCreateType::class, $calendarDocDTO);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $calendarDoc->createFromDTO($calendarDocDTO);
+
+            $this->entityManager->persist($calendarDoc);
+            $this->entityManager->flush();
+
+            if ($request->query->has('returnPath')) {
+                return new RedirectResponse($request->query->get('returnPath'));
+            }
+
+            return new RedirectResponse(
+                $this->urlGenerator->generate($returnRoute, $returnParams)
+            );
+        }
+
+        return new Response(
+            $this->engine->render(
+                $view,
+                ['calendar_doc' => $calendarDoc, 'form' => $form->createView()]
+            )
+        );
+    }
+
+    /**
+     * @Route("/{_locale}/calendar/calendar-doc/{id}/delete", name="chill_calendar_calendardoc_delete")
+     */
+    public function delete(CalendarDoc $calendarDoc, Request $request): Response
+    {
+        if (!$this->security->isGranted(CalendarDocVoter::EDIT, $calendarDoc)) {
+            throw new AccessDeniedHttpException('Not authorized to delete document');
+        }
+
+        switch ($calendarDoc->getCalendar()->getContext()) {
+            case 'accompanying_period':
+                $view = '@ChillCalendar/CalendarDoc/delete_accompanying_period.html.twig';
+                $returnRoute = 'chill_calendar_calendar_list_by_period';
+                $returnParams = ['id' => $calendarDoc->getCalendar()->getAccompanyingPeriod()->getId()];
+
+                break;
+
+            case 'person':
+                $view = '@ChillCalendar/CalendarDoc/delete_person.html.twig';
+                $returnRoute = 'chill_calendar_calendar_list_by_person';
+                $returnParams = ['id' => $calendarDoc->getCalendar()->getPerson()->getId()];
+
+                break;
+        }
+
+        $form = $this->formFactory->createBuilder()
+            ->add('submit', SubmitType::class, [
+                'label' => 'Delete',
+            ])
+            ->getForm();
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted()) {
+            $this->entityManager->remove($calendarDoc);
+            $this->entityManager->flush();
+
+            if ($request->query->has('returnPath')) {
+                return new RedirectResponse($request->query->get('returnPath'));
+            }
+
+            return new RedirectResponse(
+                $this->urlGenerator->generate($returnRoute, $returnParams)
+            );
+        }
+
+        return new Response(
+            $this->engine->render(
+                $view,
+                [
+                    'calendar_doc' => $calendarDoc,
+                    'form' => $form->createView(),
+                ]
+            )
+        );
+    }
+
+    /**
+     * @Route("/{_locale}/calendar/calendar-doc/{id}/edit", name="chill_calendar_calendardoc_edit")
+     */
+    public function edit(CalendarDoc $calendarDoc, Request $request): Response
+    {
+        if (!$this->security->isGranted(CalendarDocVoter::EDIT, $calendarDoc)) {
+            throw new AccessDeniedHttpException();
+        }
+
+        // set variables
+        switch ($calendarDoc->getCalendar()->getContext()) {
+            case 'accompanying_period':
+                $view = '@ChillCalendar/CalendarDoc/edit_accompanying_period.html.twig';
+                $returnRoute = 'chill_calendar_calendar_list_by_period';
+                $returnParams = ['id' => $calendarDoc->getCalendar()->getAccompanyingPeriod()->getId()];
+
+                break;
+
+            case 'person':
+                $view = '@ChillCalendar/CalendarDoc/edit_person.html.twig';
+                $returnRoute = 'chill_calendar_calendar_list_by_person';
+                $returnParams = ['id' => $calendarDoc->getCalendar()->getPerson()->getId()];
+
+                break;
+
+            default:
+                throw new UnexpectedValueException('Unsupported context');
+        }
+
+        $calendarDocEditDTO = new CalendarDoc\CalendarDocEditDTO($calendarDoc);
+        $form = $this->formFactory->create(CalendarDocEditType::class, $calendarDocEditDTO);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $calendarDoc->editFromDTO($calendarDocEditDTO);
+
+            $this->entityManager->flush();
+
+            if ($request->query->has('returnPath')) {
+                return new RedirectResponse($request->query->get('returnPath'));
+            }
+
+            return new RedirectResponse(
+                $this->urlGenerator->generate($returnRoute, $returnParams)
+            );
+        }
+
+        return new Response(
+            $this->engine->render(
+                $view,
+                ['calendar_doc' => $calendarDoc, 'form' => $form->createView()]
+            )
+        );
     }
 
     /**