TLD-538

Controller/BackOffice/JupyterVirtualClassroomController.php

@@ -10,7 +10,6 @@ use Logipro\Bundle\PhoenixJupyterBundle\Components\ModalLayer;
 use Logipro\Bundle\PhoenixJupyterBundle\Components\FormLayer;
 use Logipro\Bundle\PhoenixJupyterBundle\Form\JupyterUpdateType;
 use Logipro\Bundle\PhoenixJupyterBundle\Entity\JupyterToken;
-use Logipro\Bundle\PhoenixJupyterBundle\Components\ApiLayer\ApiLayer;
 use Logipro\Bundle\PhoenixJupyterBundle\Entity\JupyterClassroomRegistration;
 use Logipro\Bundle\PhoenixJupyterBundle\Controller\JupyterVirtualClassroomTrait;
 

Controller/JupyterVirtualClassroomTrait.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace Logipro\Bundle\PhoenixJupyterBundle\Controller;
-
-use Logipro\Phoenix\Entity\Person\Person;
-
-use Logipro\Bundle\PhoenixJupyterBundle\Components\ApiLayer\ApiLayer;
-use Logipro\Bundle\PhoenixJupyterBundle\Entity\JupyterToken;
-
-trait JupyterVirtualClassroomTrait
-{
-}

Controller/LearningSpace/JupyterVirtualClassroomController.php

@@ -11,7 +11,6 @@ use Logipro\Bundle\PhoenixJupyterBundle\Components\ModalLayer;
 use Logipro\Bundle\PhoenixJupyterBundle\Components\FormLayer;
 use Logipro\Bundle\PhoenixJupyterBundle\Form\JupyterUpdateType;
 use Logipro\Bundle\PhoenixJupyterBundle\Entity\JupyterToken;
-use Logipro\Bundle\PhoenixJupyterBundle\Components\ApiLayer\ApiLayer;
 use Logipro\Bundle\PhoenixJupyterBundle\Entity\JupyterClassroomRegistration;
 use Logipro\Bundle\PhoenixJupyterBundle\Controller\JupyterVirtualClassroomTrait;
 
@@ -137,7 +136,7 @@ class JupyterVirtualClassroomController extends LearningSpaceController
 		return $this->json($response);
 	}
 
-    public function drawNotebookLoadingPage(Request $request,$jupyterVirtualClassroomId)
+    public function drawNotebookLoadingPage(Request $request,int $jupyterVirtualClassroomId)
     {
 		return $this->phxRender('@LogiproPhoenixJupyter/learning_space/notebookLoading.html.twig', array('sequenceItemId' => $jupyterVirtualClassroomId));
 	}

Entity/JupyterVirtualClassroom.php

@@ -7,6 +7,9 @@ use Logipro\Phoenix\Entity\SequenceItem\SequenceItem;
 use Logipro\Phoenix\Entity\Person\Trainer;
 use Logipro\Phoenix\Entity\SequenceItem\ActivityInterface;
 
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\Mapping\ClassMetadata;
+
 class JupyterVirtualClassroom extends SequenceItem
 implements ActivityInterface
 {
@@ -188,4 +191,18 @@ implements ActivityInterface
 		return false;
 	}
 
+	/**
+	 * Définit les contraintes de validation des données de formulaire.
+	 * @param ClassMetadata $metadata
+	 */
+	public static function loadValidatorMetadata(ClassMetadata $metadata)
+	{
+		parent::loadValidatorMetadata($metadata);
+
+		// au moins trois lettres
+		$metadata->addPropertyConstraint('title', new Assert\Regex([
+            'pattern' => '/[a-zA-Z]{3,}/',
+		]));
+	}
+
 }

EntityListener/JupyterEventListener.php

@@ -6,23 +6,28 @@ use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\Common\Collections\ArrayCollection;
 
 use Logipro\Bundle\PhoenixJupyterBundle\Entity\JupyterVirtualClassroom;
-use Logipro\Bundle\PhoenixJupyterBundle\Components\ApiLayer\ApiLayer;
 use Logipro\Bundle\PhoenixJupyterBundle\Entity\JupyterToken;
 use Doctrine\ORM\Event\PostFlushEventArgs;
+use Logipro\Bundle\PhoenixJupyterBundle\Services\ApiLayer\ApiLayerService;
 /**
  * Event listener relatif aux entités constituant le learningPath.
  */
 class JupyterEventListener
 {
+
 	private $needsFlush = false;
+	private $layer;
+
+	public function __construct(ApiLayerService $layer)
+	{
+		$this->layer = $layer;
+	}
 
 	public function postPersist (LifecycleEventArgs $args)
 	{
 		$jupyterVirtualClassroom = $args->getEntity();
 		if (is_a($jupyterVirtualClassroom,JupyterVirtualClassroom::class))
 		{
-			$layer = ApiLayer::getInstanceIfAvalaible();
-
 			$trainer = $jupyterVirtualClassroom->getTrainer();
 
 			$manager = $args->getEntityManager();
@@ -34,12 +39,12 @@ class JupyterEventListener
 				$token = $repository->findOneBy(array('person' => $trainer));
 			}
 		
-			if ($layer && $token)
+			if ($this->layer && $token)
 			{
 				$learningPath = $jupyterVirtualClassroom->getLearningPath();
 				if ($learningPath->getIsClone())
 				{
-					$layer->cloneNotebook($token,$jupyterVirtualClassroom);
+					$this->layer->cloneNotebook($token,$jupyterVirtualClassroom);
 
 					$this->needsFlush = true;
 				}

EntityListener/JupyterVirtualClassroomListener.php

@@ -7,8 +7,8 @@ use Doctrine\ORM\Event\PostFlushEventArgs;
 use Doctrine\Common\Collections\ArrayCollection;
 
 use Logipro\Bundle\PhoenixJupyterBundle\Entity\JupyterVirtualClassroom;
-use Logipro\Bundle\PhoenixJupyterBundle\Components\ApiLayer\ApiLayer;
 use Logipro\Bundle\PhoenixJupyterBundle\Entity\JupyterToken;
+use Logipro\Bundle\PhoenixJupyterBundle\Services\ApiLayer\ApiLayerService;
 
 /**
  * Event listener relatif aux entités constituant le learningPath.
@@ -17,10 +17,14 @@ class JupyterVirtualClassroomListener
 {
 	private $needsFlush = false;
 
+	public function __construct(ApiLayerService $layer)
+	{
+		$this->layer = $layer;
+	}
+
 	public function preRemove(JupyterVirtualClassroom $jupyterVirtualClassroom,LifecycleEventArgs $args)
 	{
-		$layer = ApiLayer::getInstanceIfAvalaible();
-		if ($layer)
+		if ($this->layer)
 		{
 			// supprime le notebook du formateur
 			$manager = $args->getEntityManager();
@@ -28,7 +32,7 @@ class JupyterVirtualClassroomListener
 			$token = $tokenRepository->findOneBy(array('person' => $jupyterVirtualClassroom->getTrainer()));
 			if ($token)
 			{
-				$layer->deleteNotebook($token,$jupyterVirtualClassroom);
+				$this->layer->deleteNotebook($token,$jupyterVirtualClassroom);
 			}
 		}
 	}

Resources/config/routes.yaml

@@ -5,27 +5,29 @@ open_trainer_jupyter_classroom:
   path: /jupyter/trainer/open/{jupyterVirtualClassroomId}
   controller: Logipro\Bundle\PhoenixJupyterBundle\Controller\BackOffice\JupyterVirtualClassroomController::openTrainerJupyterVirtualClassroom
   requirements:
-    template_path: '.*'
+    jupyterVirtualClassroomId: '\d+'
 
 open_student_jupyter_classroom:
   path: /learning-space/jupyter/student/open/{jupyterVirtualClassroomId}
   controller: Logipro\Bundle\PhoenixJupyterBundle\Controller\LearningSpace\JupyterVirtualClassroomController::openStudentJupyterVirtualClassroom
   requirements:
-    template_path: '.*'
+    jupyterVirtualClassroomId: '\d+'
 
 send_student_jupyter_notebook:
   path: /learning-space/jupyter/student/send/{jupyterVirtualClassroomId}
   controller: Logipro\Bundle\PhoenixJupyterBundle\Controller\LearningSpace\JupyterVirtualClassroomController::sendStudentJupyterNotebook
   requirements:
-    template_path: '.*'
+    jupyterVirtualClassroomId: '\d+'
 
 draw_loading_jupyter_notebook:
   path: /learning-space/jupyter/student/loading/{jupyterVirtualClassroomId}
   controller: Logipro\Bundle\PhoenixJupyterBundle\Controller\LearningSpace\JupyterVirtualClassroomController::drawNotebookLoadingPage
   requirements:
-    template_path: '.*'
+    jupyterVirtualClassroomId: '\d+'
 
 
 reset_notebook:
   path: /learning-space/jupyter/student/reset/{jupyterVirtualClassroomId}
   controller: Logipro\Bundle\PhoenixJupyterBundle\Controller\LearningSpace\JupyterVirtualClassroomController::resetNotebook
+  requirements:
+    jupyterVirtualClassroomId: '\d+'

Resources/config/services.yaml

@@ -22,7 +22,12 @@ services:
     calls:
         - [ setContainer, [ '@service_container' ]]
         
+  # Entity Listeners
+  Logipro\Bundle\PhoenixJupyterBundle\EntityListener\:
+    resource: '../../EntityListener/*'
+    tags: [doctrine.orm.entity_listener]
+
   Logipro\Bundle\PhoenixJupyterBundle\EntityListener\JupyterEventListener:
     tags:
        - { name: "doctrine.event_listener",  event: "postPersist" }
-       - { name: "doctrine.event_listener",  event: "postFlush" }
+       - { name: "doctrine.event_listener",  event: "postFlush" }

Components/ApiLayer/ApiLayer.php → Services/ApiLayer/ApiLayerService.php

@@ -1,5 +1,5 @@
 <?php
-namespace Logipro\Bundle\PhoenixJupyterBundle\Components\ApiLayer;
+namespace Logipro\Bundle\PhoenixJupyterBundle\Services\ApiLayer;
 
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Component\HttpClient\Exception\TransportException;
@@ -10,7 +10,7 @@ use Logipro\Bundle\PhoenixJupyterBundle\Entity\JupyterToken;
 use Logipro\Bundle\PhoenixJupyterBundle\Entity\JupyterVirtualClassroom;
 use Logipro\Phoenix\Component\PhxFileGuesser;
 
-class ApiLayer
+class ApiLayerService
 {
     private static $instance = null;
     
@@ -39,7 +39,7 @@ class ApiLayer
      */
     private $token = null;
 
-    private function __construct()
+    public function __construct()
     {
         $server = $_SERVER['JUPYTER_URL'].trim('/');
 
@@ -87,7 +87,7 @@ class ApiLayer
             {
                 /*echo 'erreur :';
                 dump($response->getContent());*/
-                // @FIXME peut être mettre une erreur
+                // FIXME peut être mettre une erreur
                 return null;
             }
             return \json_decode($this->response->getContent(),true);
@@ -301,26 +301,6 @@ class ApiLayer
         return false;
     }
     
-    /**
-     * retourne l'instance de la classe si le service est disponible
-     */
-    public static function getInstanceIfAvalaible()
-    {
-        if (!self::$instance)
-        {
-            $layer = new ApiLayer();
-
-            // test si le service http est disponible sur le distant (url à configurer dans le .env)
-            if (!$layer->serviceIsAvalaible())
-            {
-                return null;
-            }
-
-            self::$instance = $layer;
-        }
-        return self::$instance;
-    }
-
     /**
      * échappe le texte
      * et retourne le contenu échappé
@@ -624,7 +604,7 @@ class ApiLayer
     }
 
     /**
-     * @FIXME à dev
+     * FIXME à dev
      */
     public function stopServer($token)
     {

Services/PhoenixServices.php

@@ -10,44 +10,30 @@ use Symfony\Component\HttpFoundation\Request;
 use Logipro\Bundle\PhoenixJupyterBundle\Components\ModalLayer;
 use Logipro\Bundle\PhoenixJupyterBundle\Components\FormLayer;
 
+use Symfony\Component\Form\FormFactoryInterface;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Routing\RouterInterface;
+
 use Logipro\Bundle\PhoenixJupyterBundle\Entity\JupyterToken;
 use Logipro\Phoenix\Entity\Person\Trainer;
 use Logipro\Bundle\PhoenixJupyterBundle\Form\JupyterUpdateType;
-use Logipro\Bundle\PhoenixJupyterBundle\Components\ApiLayer\ApiLayer;
 use Logipro\Phoenix\Entity\Person\Person;
 use Logipro\Bundle\PhoenixJupyterBundle\Entity\JupyterClassroomRegistration;
+use Logipro\Bundle\PhoenixJupyterBundle\Services\ApiLayer\ApiLayerService;
 
 class PhoenixServices extends Services
 {
-	private $apiService;
+	private $layer;
+	private $isAvalaible;
 	private $layoutPath = '@LogiproPhoenixJupyter/back-office/';
 
-	public function __construct(FormFactoryInterface $formFactory,EntityManagerInterface $manager,RouterInterface $router)
-	{
-        $this->layer = ApiLayer::getInstanceIfAvalaible();
-        $this->manager = $manager;
-        $this->router = $router;
-	}
-	
-
-	public function setLayer()
+	public function __construct(FormFactoryInterface $formFactory,EntityManagerInterface $manager,RouterInterface $router,ApiLayerService $layer)
 	{
+		parent::__construct($formFactory,$manager,$router);
 
+		$this->layer = $layer;
 	}
 
-    /**
-     * dit si le service jupyter est entièrement accessible
-     * @return bool
-     */
-    public static function serviceIsAvalaible() : boolval
-    {
-        // test l'api jupyter
-        if (ApiLayer::getInstanceIfAvalaible())
-        {
-            return true;
-        }
-        return false;
-    }
     /**
      * retourne le chemin de la classe de l'entité du bundle
      * @return string
@@ -55,19 +41,33 @@ class PhoenixServices extends Services
     public function getEntityClass() : string
     {
         return JupyterVirtualClassroom::class;
-    }
+	}
+	
+	public function serviceIsAvalaible()
+	{
+		if (is_null($this->isAvalaible))
+		{
+			$this->isAvalaible = $this->layer->serviceIsAvalaible();
+		}
+		return $this->isAvalaible;
+	}
 
-    private function getApiService() : ApiLayer
+    protected function getApiService()
     {
-        if (!$this->apiService)
-        {
-            $this->apiService = ApiLayer::getInstanceIfAvalaible();
-            if (!$this->apiService)
-            {
-                throw new \Exception();
-            }
-        }
-        return  $this->apiService;
+		if (!$this->isAvalaible)
+		{
+			$this->isAvalaible = $this->layer->serviceIsAvalaible();
+		}
+		
+		if ($this->isAvalaible)
+		{
+			return $this->layer;
+		}
+		else
+		{
+			throw new \Exception('Service Jupyter indisponible');
+		}
+		return null;
     }
 
     /**
@@ -243,34 +243,35 @@ class PhoenixServices extends Services
 			}
 
 			$form->handleRequest($request);
-			try
+			if ($form->isSubmitted())
 			{
-				if ($form->isSubmitted())
+				if ($form->isValid())
 				{
-					if ($form->isValid())
+					// créé la classe distante
+					$repository = $this->getRepository(Trainer::class);
+					$trainer = $jupyter->getTrainer();
+					if ($trainer)
 					{
-						// créé la classe distante
-						$repository = $this->getRepository(Trainer::class);
-						$trainer = $jupyter->getTrainer();
-						if ($trainer)
-						{
-							$jupyter->setTrainer($trainer);
-							$this->createTrainerJupyterServer($jupyter);
-						}
-
-						$jupyter->setItemOrder($order);
-
-						$manager = $this->getManager();
-						$manager->persist($jupyter);
-						$manager->flush();
-
-						return $jupyter->getSequenceItemId();
+						$jupyter->setTrainer($trainer);
+						$this->createTrainerJupyterServer($jupyter);
 					}
+
+					$jupyter->setItemOrder($order);
+
+					$manager = $this->getManager();
+					$manager->persist($jupyter);
+					$manager->flush();
+
+					return $jupyter->getSequenceItemId();
+				}
+				else
+				{
+					throw new \InvalidArgumentException($form->getErrors(true));
 				}
 			}
-			catch (\Exception $exp)
+			else
 			{
-				dump($exp->getMessage());
+				throw new \InvalidArgumentException($form->getErrors(true));
 			}
 		}
 		return null;
@@ -412,7 +413,11 @@ class PhoenixServices extends Services
 			// si l'item a un formateur
 			if ($currentTrainer)
 			{
-				$fromUrl = $oldEntityData['url'];
+				$fromUrl = null;
+				if ($oldTrainer)
+				{
+					$fromUrl = $oldEntityData['url'];
+				}
 				
 				// met en place le compte et le contenu du notebook
 				$url = $this->createTrainerJupyterServer($sequenceItem,$fromUrl,$content,false);
@@ -436,7 +441,7 @@ class PhoenixServices extends Services
 		}
 		foreach ($mustStopServer as $token)
 		{
-			// @fixme a dev
+			// fixme a dev
 			//$layer->stopServer($token);
 		}
     }
@@ -595,7 +600,7 @@ class PhoenixServices extends Services
 	/**
 	 * envoi le notebook de l'apprenant afin d'obtenir son évaluation
 	 * 
-	 * @FIXME a tester
+	 * FIXME a tester
 	 *
 	 * @param JupyterVirtualClassroom $sequenceItem
 	 * @return void

Tests/Services/ApiLayer/ApiLayerMock.php

@@ -1,36 +0,0 @@
-<?php
-class ApiLayerMock {
-	/**
-	 * Generates a mock object on the singleton Someclass util object.
-	 *
-	 * @param array $name
-	 * @return void
-	 */
-	public static function expects($name, $replace) {
-		// Mock the object
-		$mock = \PHPUnit_Framework_MockObject_Generator::getMock(
-			'ApiLayer',
-			array('getInstanceIfAvalaible'),
-			array(),
-			'',
-			false
-		);
-		// Replace protected self reference with mock object
-		$ref = new \ReflectionProperty('ApiLayer', 'self');
-		$ref->setAccessible(true);
-		$ref->setValue(null, $mock);
-		// Set expectations and return values
-		$mock
-			->expects(new \PHPUnit_Framework_MockObject_Matcher_InvokedCount(1))
-			->method('getInstanceIfAvalaible')
-			->with(
-				\PHPUnit_Framework_Assert::equalTo($name)
-			)
-			->will(new \PHPUnit_Framework_MockObject_Stub_Return($replace));
-	}
-	public static function cleanup() {
-		$ref = new \ReflectionProperty('ApiLayer', 'self');
-		$ref->setAccessible(true);
-		$ref->setValue(null, null);
-	}
-}

Tests/Services/PhoenixServicesMock.php

@@ -0,0 +1,12 @@
+<?php
+namespace Logipro\Bundle\PhoenixJupyterBundle\Tests\Services;
+
+use Logipro\Bundle\PhoenixJupyterBundle\Services\PhoenixServices;
+
+class PhoenixServicesMock extends PhoenixServices
+{
+    public function getApiService()
+    {
+        return parent::getApiService();
+    }
+}

Tests/Services/PhoenixServicesTest.php

@@ -6,52 +6,51 @@ use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\FormFactoryInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Routing\RouterInterface;
-use Logipro\Bundle\PhoenixJupyterBundle\Components\ApiLayer\ApiLayer;
-use Logipro\Bundle\PhoenixJupyterBundle\Services\PhoenixServices;
+use Logipro\Bundle\PhoenixJupyterBundle\Repository\JupyterVirtualClassroomRepository;
+use Logipro\Phoenix\Entity\Person\Person;
+use Logipro\Bundle\PhoenixJupyterBundle\Services\ApiLayer\ApiLayerService;
 
 class PhoenixServicesTest extends TestCase
 {
-	/**
-     * @expectedException Exception
-     */
 	private function mockPhoenixServices($serviceIsAvalaible = true)
 	{
 		// mock FormFactoryInterface
-		$formFactory = $this->getMockBuilder(FormFactoryInterface::class);
+		$formFactory = $this->createMock(FormFactoryInterface::class);
 
 		// mock EntityManagerInterface
-		$entityManager = $this->getMockBuilder(EntityManagerInterface::class);
+		$entityManager = $this->createMock(EntityManagerInterface::class);
 
 		// mock RouterInterface
-		$router = $this->getMockBuilder(RouterInterface::class);
+		$router = $this->createMock(RouterInterface::class);
 
 		// mock layer
-		$layerMock = $this->getMockBuilder(ApiLayer::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getInstanceIfAvalaible'])
-			->getMock();
-			
-		if ($serviceIsAvalaible)
-		{
+		$layerMock = $this->createMock(ApiLayerService::class);
+        if (!$serviceIsAvalaible) {
 			$layerMock
-            	->method('getInstanceIfAvalaible');
-		}
+            	->method('serviceIsAvalaible')
+                ->willReturn(false);
+        }
 		else
 		{
 			$layerMock
-				->method('getInstanceIfAvalaible')
-				->willReturn($layerMock);
+            	->method('serviceIsAvalaible')
+                ->willReturn(true);
 		}
 		
-		return new PhoenixServices($formFactory,$entityManager,$router,$layerMock);
+		$service = new PhoenixServicesMock($formFactory,$entityManager,$router,$layerMock);
+		return $service;
 	}
 
-	public function testStartTrainerServerWhitoutApi()
+	/**
+     * @expectedException \Exception
+     */
+	public function testGetApiServiceWithoutApiService()
 	{
 		$service = $this->mockPhoenixServices(false);
-
-		$classRoom = new JupyterVirtualClassRoom();
-		$service->startTrainerServer($classRoom);
+		
+		$person = new Person();
+		
+		$service->getApiService($person);
 
 	}