Merge branch '15.0' into session

claroline · Sep 13, 2024 · f861070 · f861070
2 parents 8f9fcd3 + 3e936ad
commit f861070
Show file tree

Hide file tree

Showing 33 changed files with 513 additions and 95 deletions.
diff --git a/src/main/core/Entity/Planning/PlannedObject.php b/src/main/core/Entity/Planning/PlannedObject.php
@@ -24,7 +24,8 @@
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity()
+ * @ORM\Entity(repositoryClass="Claroline\CoreBundle\Repository\Planning\PlannedObjectRepository")
+ *
  * @ORM\Table(name="claro_planned_object")
  */
 class PlannedObject
@@ -74,6 +75,7 @@ class PlannedObject
 
     /**
      * @ORM\ManyToOne(targetEntity="Claroline\CoreBundle\Entity\Location")
+     *
      * @ORM\JoinColumn(name="location_id", nullable=true, onDelete="SET NULL")
      */
     private ?Location $location = null;

diff --git a/src/main/core/Repository/Planning/PlannedObjectRepository.php b/src/main/core/Repository/Planning/PlannedObjectRepository.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Claroline Connect package.
+ *
+ * (c) Claroline Consortium <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Claroline\CoreBundle\Repository\Planning;
+
+use Claroline\AppBundle\Repository\UniqueValueFinder;
+use Doctrine\ORM\EntityRepository;
+
+class PlannedObjectRepository extends EntityRepository
+{
+    use UniqueValueFinder;
+}
diff --git a/src/main/core/Subscriber/Crud/Planning/AbstractPlannedSubscriber.php b/src/main/core/Subscriber/Crud/Planning/AbstractPlannedSubscriber.php
@@ -2,15 +2,16 @@
 
 namespace Claroline\CoreBundle\Subscriber\Crud\Planning;
 
+use Claroline\AppBundle\Event\Crud\CopyEvent;
 use Claroline\AppBundle\Event\Crud\CreateEvent;
 use Claroline\AppBundle\Event\Crud\DeleteEvent;
 use Claroline\AppBundle\Event\Crud\UpdateEvent;
+use Claroline\AppBundle\Event\CrudEvents;
 use Claroline\AppBundle\Persistence\ObjectManager;
 use Claroline\CoreBundle\Entity\Location;
 use Claroline\CoreBundle\Entity\Planning\AbstractPlanned;
 use Claroline\CoreBundle\Entity\Planning\PlannedObject;
 use Claroline\CoreBundle\Entity\User;
-use Claroline\AppBundle\Event\CrudEvents;
 use Claroline\CoreBundle\Manager\FileManager;
 use Claroline\CoreBundle\Manager\PlanningManager;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -55,6 +56,7 @@ public static function getSubscribedEvents(): array
             CrudEvents::getEventName(CrudEvents::POST_CREATE, static::getPlannedClass()) => 'postCreate',
             CrudEvents::getEventName(CrudEvents::PRE_UPDATE, static::getPlannedClass()) => 'preUpdate',
             CrudEvents::getEventName(CrudEvents::POST_DELETE, static::getPlannedClass()) => 'postDelete',
+            CrudEvents::getEventName(CrudEvents::PRE_COPY, static::getPlannedClass()) => 'preCopy',
         ];
     }
 
@@ -151,4 +153,21 @@ public function postDelete(DeleteEvent $event): void
             $this->fileManager->unlinkFile(PlannedObject::class, $object->getUuid(), $object->getThumbnail());
         }
     }
+
+    public function preCopy(CopyEvent $event): void
+    {
+        /** @var AbstractPlanned $original */
+        $original = $event->getObject();
+
+        /** @var AbstractPlanned $copy */
+        $copy = $event->getCopy();
+
+        $copy->setCreatedAt(new \DateTime());
+        $copy->setUpdatedAt(new \DateTime());
+
+        $plannedObjectRepo = $this->om->getRepository(PlannedObject::class);
+
+        $copyName = $plannedObjectRepo->findNextUnique('name', $original->getPlannedObject()->getName());
+        $copy->getPlannedObject()->setName($copyName);
+    }
 }
diff --git a/src/plugin/cursus/Controller/CourseController.php b/src/plugin/cursus/Controller/CourseController.php
@@ -13,10 +13,12 @@
 
 use Claroline\AppBundle\API\Options;
 use Claroline\AppBundle\Controller\AbstractCrudController;
+use Claroline\AppBundle\Controller\RequestDecoderTrait;
 use Claroline\AppBundle\Manager\PdfManager;
 use Claroline\CoreBundle\Component\Context\DesktopContext;
 use Claroline\CoreBundle\Entity\Organization\Organization;
 use Claroline\CoreBundle\Entity\User;
+use Claroline\CoreBundle\Entity\Workspace\Workspace;
 use Claroline\CoreBundle\Library\Normalizer\TextNormalizer;
 use Claroline\CoreBundle\Library\RoutingHelper;
 use Claroline\CoreBundle\Manager\Tool\ToolManager;
@@ -42,6 +44,7 @@
 class CourseController extends AbstractCrudController
 {
     use PermissionCheckerTrait;
+    use RequestDecoderTrait;
 
     private TokenStorageInterface $tokenStorage;
     private RoutingHelper $routing;
@@ -201,6 +204,46 @@ public function restoreAction(Request $request): JsonResponse
         }, $processed));
     }
 
+    /**
+     * @Route("/copy", name="copy", methods={"POST"})
+     */
+    public function copyAction(Request $request): JsonResponse
+    {
+        $processed = [];
+
+        $this->om->startFlushSuite();
+
+        $data = $this->decodeRequest($request);
+
+        $workspaceData = $data['workspace'] ?? null;
+        $workspace = null;
+
+        if ($workspaceData) {
+            $workspace = $this->om->getRepository(Workspace::class)->findOneBy(['uuid' => $data['workspace']['id']]);
+        }
+
+        /** @var Course[] $courses */
+        $courses = $this->om->getRepository(Course::class)->findBy([
+            'uuid' => $data['ids'],
+        ]);
+
+        foreach ($courses as $course) {
+            if ($this->authorization->isGranted('ADMINISTRATE', $course)) {
+                $copy = $this->crud->copy($course);
+                if (1 === count($courses) && $workspace) {
+                    $copy->setWorkspace($workspace);
+                }
+                $processed[] = $copy;
+            }
+        }
+
+        $this->om->endFlushSuite();
+
+        return new JsonResponse(array_map(function (Course $course) {
+            return $this->serializer->serialize($course);
+        }, $processed));
+    }
+
     /**
      * @Route("/{slug}/open", name="open", methods={"GET"})
      *

diff --git a/src/plugin/cursus/Controller/EventController.php b/src/plugin/cursus/Controller/EventController.php
@@ -12,6 +12,7 @@
 namespace Claroline\CursusBundle\Controller;
 
 use Claroline\AppBundle\Controller\AbstractCrudController;
+use Claroline\AppBundle\Controller\RequestDecoderTrait;
 use Claroline\AppBundle\Manager\PdfManager;
 use Claroline\CoreBundle\Entity\Group;
 use Claroline\CoreBundle\Entity\Organization\Organization;
@@ -41,6 +42,7 @@
 class EventController extends AbstractCrudController
 {
     use PermissionCheckerTrait;
+    use RequestDecoderTrait;
 
     public function __construct(
         AuthorizationCheckerInterface $authorization,
@@ -87,6 +89,35 @@ protected function getDefaultHiddenFilters(): array
         return [];
     }
 
+    /**
+     * @Route("/copy", name="copy", methods={"POST"})
+     */
+    public function copyAction(Request $request): JsonResponse
+    {
+        $processed = [];
+
+        $this->om->startFlushSuite();
+
+        $data = $this->decodeRequest($request);
+
+        /** @var Event[] $events */
+        $events = $this->om->getRepository(Event::class)->findBy([
+            'uuid' => $data['ids'],
+        ]);
+
+        foreach ($events as $event) {
+            if ($this->authorization->isGranted('EDIT', $event)) {
+                $processed[] = $this->crud->copy($event, [], ['parent' => $event->getSession()]);
+            }
+        }
+
+        $this->om->endFlushSuite();
+
+        return new JsonResponse(array_map(function (Event $event) {
+            return $this->serializer->serialize($event);
+        }, $processed));
+    }
+
     /**
      * @Route("/{workspace}", name="list", methods={"GET"})
      *

diff --git a/src/plugin/cursus/Controller/SessionController.php b/src/plugin/cursus/Controller/SessionController.php
@@ -12,6 +12,7 @@
 namespace Claroline\CursusBundle\Controller;
 
 use Claroline\AppBundle\Controller\AbstractCrudController;
+use Claroline\AppBundle\Controller\RequestDecoderTrait;
 use Claroline\AppBundle\Manager\PdfManager;
 use Claroline\CoreBundle\Component\Context\DesktopContext;
 use Claroline\CoreBundle\Entity\Group;
@@ -46,6 +47,7 @@
 class SessionController extends AbstractCrudController
 {
     use PermissionCheckerTrait;
+    use RequestDecoderTrait;
 
     private TokenStorageInterface $tokenStorage;
     private TranslatorInterface $translator;
@@ -132,6 +134,35 @@ public function listPublicAction(Request $request): JsonResponse
         );
     }
 
+    /**
+     * @Route("/copy", name="copy", methods={"POST"})
+     */
+    public function copyAction(Request $request): JsonResponse
+    {
+        $processed = [];
+
+        $this->om->startFlushSuite();
+
+        $data = $this->decodeRequest($request);
+
+        /** @var Session[] $sessions */
+        $sessions = $this->om->getRepository(Session::class)->findBy([
+            'uuid' => $data['ids'],
+        ]);
+
+        foreach ($sessions as $session) {
+            if ($this->authorization->isGranted('EDIT', $session)) {
+                $processed[] = $this->crud->copy($session, [], ['parent' => $session->getCourse()]);
+            }
+        }
+
+        $this->om->endFlushSuite();
+
+        return new JsonResponse(array_map(function (Session $session) {
+            return $this->serializer->serialize($session);
+        }, $processed));
+    }
+
     /**
      * @Route("/cancel", name="cancel", methods={"POST"})
      */
@@ -157,9 +188,9 @@ public function cancelAction(Request $request): JsonResponse
                 $templateRepo = $this->om->getRepository(Template::class);
                 if (!empty($data['canceledTemplate']) && $data['canceledTemplate']['id']) {
                     $cancelTemplate = $templateRepo->findOneBy(['uuid' => $data['canceledTemplate']['id']]);
-                    if ($cancelTemplate) {
-                        $this->manager->sendSessionCancel($session);
-                    }
+                    //                    if ($cancelTemplate) {
+                    //                        $this->manager->sendSessionCancel($session);
+                    //                    }
                 }
                 $session->setCanceledTemplate($cancelTemplate);
 

diff --git a/src/plugin/cursus/Entity/Session.php b/src/plugin/cursus/Entity/Session.php
@@ -107,7 +107,6 @@ class Session extends AbstractTraining implements IdentifiableInterface
      */
     private ?Template $canceledTemplate = null;
 
-
     public function __construct()
     {
         $this->refreshUuid();

diff --git a/src/plugin/cursus/Manager/SessionManager.php b/src/plugin/cursus/Manager/SessionManager.php
@@ -462,7 +462,7 @@ public function sendSessionCancel(Session $session): void
             'session_description' => $session->getDescription(),
             'session_trainers' => $trainersList,
             'cancel_reason' => $session->getCancelReason(),
-            'workspace_url' => $workspace ? $this->routingHelper->workspaceUrl($workspace) : ''
+            'workspace_url' => $workspace ? $this->routingHelper->workspaceUrl($workspace) : '',
         ],
             $this->templateManager->formatDatePlaceholder('session_start', $session->getStartDate()),
             $this->templateManager->formatDatePlaceholder('session_end', $session->getEndDate()),
@@ -501,12 +501,12 @@ public function sendSessionCancel(Session $session): void
                 $content = $this->templateManager->getTemplate($templateName, $placeholders, $locale);
             }
 
-//            $this->eventDispatcher->dispatch(new SendMessageEvent(
-//                $content,
-//                $title,
-//                [$user],
-//                $session->getCreator()
-//            ), MessageEvents::MESSAGE_SENDING);
+            $this->eventDispatcher->dispatch(new SendMessageEvent(
+                $content,
+                $title,
+                [$user],
+                $session->getCreator()
+            ), MessageEvents::MESSAGE_SENDING);
         }
     }
 

diff --git a/src/plugin/cursus/Repository/CourseRepository.php b/src/plugin/cursus/Repository/CourseRepository.php
@@ -11,6 +11,7 @@
 
 namespace Claroline\CursusBundle\Repository;
 
+use Claroline\AppBundle\Repository\UniqueValueFinder;
 use Claroline\CoreBundle\Entity\Facet\FieldFacet;
 use Claroline\CoreBundle\Entity\User;
 use Claroline\CoreBundle\Entity\Workspace\Workspace;
@@ -21,6 +22,8 @@
 
 class CourseRepository extends EntityRepository
 {
+    use UniqueValueFinder;
+
     public function search(string $search, int $nbResults)
     {
         return $this->createQueryBuilder('c')

diff --git a/src/plugin/cursus/Repository/EventRepository.php b/src/plugin/cursus/Repository/EventRepository.php
@@ -11,13 +11,16 @@
 
 namespace Claroline\CursusBundle\Repository;
 
+use Claroline\AppBundle\Repository\UniqueValueFinder;
 use Claroline\CoreBundle\Entity\User;
 use Claroline\CursusBundle\Entity\Event;
 use Claroline\CursusBundle\Entity\Registration\AbstractRegistration;
 use Doctrine\ORM\EntityRepository;
 
 class EventRepository extends EntityRepository
 {
+    use UniqueValueFinder;
+
     public function countParticipants(Event $event): array
     {
         return [

diff --git a/src/plugin/cursus/Repository/SessionRepository.php b/src/plugin/cursus/Repository/SessionRepository.php
@@ -11,6 +11,7 @@
 
 namespace Claroline\CursusBundle\Repository;
 
+use Claroline\AppBundle\Repository\UniqueValueFinder;
 use Claroline\CoreBundle\Entity\User;
 use Claroline\CoreBundle\Entity\Workspace\Workspace;
 use Claroline\CursusBundle\Entity\Course;
@@ -20,6 +21,8 @@
 
 class SessionRepository extends EntityRepository
 {
+    use UniqueValueFinder;
+
     public function findByWorkspace(Workspace $workspace)
     {
         return $this->getEntityManager()

diff --git a/src/plugin/cursus/Resources/config/services/subscriber.yml b/src/plugin/cursus/Resources/config/services/subscriber.yml
@@ -20,6 +20,7 @@ services:
             - '@security.token_storage'
             - '@Claroline\AppBundle\Persistence\ObjectManager'
             - '@Claroline\CoreBundle\Manager\FileManager'
+            - '@Claroline\AppBundle\API\Crud'
         tags:
             - { name: kernel.event_subscriber }
 
@@ -33,8 +34,10 @@ services:
     Claroline\CursusBundle\Subscriber\Crud\SessionSubscriber:
         arguments:
             - '@security.token_storage'
+            - '@Claroline\AppBundle\Persistence\ObjectManager'
             - '@Claroline\CoreBundle\Manager\FileManager'
             - '@Claroline\CursusBundle\Manager\SessionManager'
+            - '@Claroline\AppBundle\API\Crud'
         tags:
             - { name: kernel.event_subscriber }
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         private ?Template $canceledTemplate = null;
         public function __construct()
         {
             $this->refreshUuid();
@@ Expand Down @@