Merge pull request #362 from cultuurnet/PPF-230-map-platform-id

PPF-230 add projectRepository to OpenProject
cultuurnet · Nov 24, 2023 · f2d510a · f2d510a
2 parents 2588480 + 3d67e21
commit f2d510a
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 42 deletions.
diff --git a/app/Project/ProjectControllerProvider.php b/app/Project/ProjectControllerProvider.php
@@ -29,16 +29,14 @@ public function connect(Application $app)
         };
 
         $app['import_project_controller'] = function (Application $app) {
-            return new ImportProjectController(
-                $app['command_bus'],
-                $app['project_repository']
-            );
+            return new ImportProjectController($app['command_bus']);
         };
 
         $app['open_project_controller'] = function (Application $app) {
             return new OpenProjectController(
                 $app['uitid_user_session_service'],
                 $app['session'],
+                $app['project_repository'],
                 $app['config']['platform_host'],
                 $app['config']['widget_host']
             );

diff --git a/app/WebApplication.php b/app/WebApplication.php
@@ -113,7 +113,7 @@ protected function registerProviders()
                         new Path('^/event/', 'GET'),
                         new Path('^/upload', 'POST'),
                         new Path('^/project/.*$', 'POST'),
-                        new Path('^/project/[0-9]*/widget/.*$', 'GET'),
+                        new Path('^/project/[A-z0-9\-]*/widget/.*$', 'GET'),
                         new Path('^.*$', 'OPTIONS'),
                     ]
                 ),

diff --git a/src/Project/Controller/ImportProjectController.php b/src/Project/Controller/ImportProjectController.php
@@ -2,9 +2,7 @@
 
 namespace CultuurNet\ProjectAanvraag\Project\Controller;
 
-use CultuurNet\ProjectAanvraag\Entity\Project;
 use CultuurNet\ProjectAanvraag\Project\Command\ImportProject;
-use Doctrine\ORM\EntityRepository;
 use SimpleBus\Message\Bus\Middleware\MessageBusSupportingMiddleware;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -18,15 +16,9 @@ class ImportProjectController
      */
     private $commandBus;
 
-    /**
-     * @var EntityRepository
-     */
-    protected $projectRepository;
-
-    public function __construct(MessageBusSupportingMiddleware $commandBus, EntityRepository $projectRepository)
+    public function __construct(MessageBusSupportingMiddleware $commandBus)
     {
         $this->commandBus = $commandBus;
-        $this->projectRepository = $projectRepository;
     }
 
     public function importProject(string $uuid, Request $request): JsonResponse
@@ -50,9 +42,6 @@ public function importProject(string $uuid, Request $request): JsonResponse
             )
         );
 
-        /** @var Project $project */
-        $project = $this->projectRepository->findOneBy(['platformUuid' => $uuid]);
-
-        return new JsonResponse(['databaseId' => $project->getId()]);
+        return new JsonResponse();
     }
 }
diff --git a/src/Project/Controller/OpenProjectController.php b/src/Project/Controller/OpenProjectController.php
@@ -6,7 +6,9 @@
 
 use CultuurNet\Auth\TokenCredentials;
 use CultuurNet\Auth\User;
+use CultuurNet\ProjectAanvraag\Entity\Project;
 use CultuurNet\UiTIDProvider\User\UserSessionService;
+use Doctrine\ORM\EntityRepository;
 use Guzzle\Http\Client;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -23,20 +25,32 @@ final class OpenProjectController
      * @var Session
      */
     private $session;
+
+    /**
+     * @var EntityRepository
+     */
+    protected $projectRepository;
+
     /**
      * @var string
      */
     private $platformUrl;
 
-    /*
+    /**
      * @var string
      */
     private $widgetUrl;
 
-    public function __construct(UserSessionService $userSessionService, Session $session, string $platformUrl, string $widgetUrl)
-    {
+    public function __construct(
+        UserSessionService $userSessionService,
+        Session $session,
+        EntityRepository $projectRepository,
+        string $platformUrl,
+        string $widgetUrl
+    ) {
         $this->userSessionService = $userSessionService;
         $this->session = $session;
+        $this->projectRepository = $projectRepository;
         $this->platformUrl = $platformUrl;
         $this->widgetUrl = $widgetUrl;
     }
@@ -60,7 +74,10 @@ public function openProject(Request $request, string $id): RedirectResponse
             )
         );
 
+        /** @var Project $project */
+        $project = $this->projectRepository->findOneBy(['platformUuid' => $id]);
+
         $this->session->set('id_token', $tokenString);
-        return new RedirectResponse($this->widgetUrl . '/project/' . $id);
+        return new RedirectResponse($this->widgetUrl . '/project/' . $project->getId());
     }
 }
diff --git a/test/Project/Controller/ImportProjectControllerTest.php b/test/Project/Controller/ImportProjectControllerTest.php
@@ -2,9 +2,7 @@
 
 namespace CultuurNet\ProjectAanvraag\Project\Controller;
 
-use CultuurNet\ProjectAanvraag\Entity\Project;
 use CultuurNet\ProjectAanvraag\Project\Command\ImportProject;
-use Doctrine\ORM\EntityRepository;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use SimpleBus\Message\Bus\Middleware\MessageBusSupportingMiddleware;
@@ -23,11 +21,6 @@ class ImportProjectControllerTest extends TestCase
      */
     private $messageBus;
 
-    /**
-     * @var EntityRepository & MockObject
-     */
-    private $projectRepository;
-
     /**
      * @var Request & MockObject
      */
@@ -39,12 +32,7 @@ public function setUp()
 
         $this->request = $this->createMock(Request::class);
 
-        $this->projectRepository = $this->createMock(EntityRepository::class);
-
-        $this->controller = new ImportProjectController(
-            $this->messageBus,
-            $this->projectRepository
-        );
+        $this->controller = new ImportProjectController($this->messageBus);
     }
 
     public function testImportProject()
@@ -79,13 +67,7 @@ public function testImportProject()
             ->method('handle')
             ->with($importProject);
 
-        $this->projectRepository
-            ->expects($this->once())
-            ->method('findOneBy')
-            ->with(['platformUuid' => $platformUuid])
-            ->willReturn((new Project())->setId(123));
-
         $response = $this->controller->importProject($platformUuid, $this->request);
-        $this->assertEquals(new JsonResponse(['databaseId' => 123]), $response, 'It correctly handles the request');
+        $this->assertEquals(new JsonResponse(), $response, 'It correctly handles the request');
     }
 }