[Legislative] Show only elected deputies and candidates on the map + …

…wording
parti-renaissance · Nov 14, 2018 · e9a0143 · e9a0143
1 parent 27ec747
commit e9a0143
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 8 deletions.
diff --git a/docker-compose.override.yml.dist b/docker-compose.override.yml.dist
@@ -39,7 +39,7 @@ version: "3.2"
 #        environment:
 #            - BLACKFIRE_CLIENT_ID
 #            - BLACKFIRE_CLIENT_TOKEN
-#            - VIRTUAL_HOST=enmarche.code,test.enmarche.code
+#            - VIRTUAL_HOST=enmarche.code,test.enmarche.code,legislatives.enmarche.code,m.enmarche.code
 #            - VIRTUAL_PORT=80
 
 #    rabbitmq:

diff --git a/src/Api/LegislativeCandidateProvider.php b/src/Api/LegislativeCandidateProvider.php
@@ -2,6 +2,7 @@
 
 namespace AppBundle\Api;
 
+use AppBundle\Entity\LegislativeCandidate;
 use AppBundle\Repository\LegislativeCandidateRepository;
 use AppBundle\Twig\AssetRuntime;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
@@ -21,7 +22,7 @@ public function __construct(LegislativeCandidateRepository $repository, AssetRun
 
     public function getForApi(): array
     {
-        foreach ($this->repository->findAllForDirectory() as $candidate) {
+        foreach ($this->repository->findAllForDirectory(LegislativeCandidate::STATUS_WON) as $candidate) {
             if (!$candidate->getGeojson()) {
                 continue;
             }

diff --git a/src/DataFixtures/ORM/LoadLegislativesData.php b/src/DataFixtures/ORM/LoadLegislativesData.php
@@ -81,7 +81,7 @@ public function load(ObjectManager $manager)
             Genders::MALE,
             'Etienne',
             'de Monté-Cristo',
-            null,
+            file_get_contents(__DIR__.'/../legislatives/geojson-paris-1.json'),
             null,
             LegislativeCandidate::STATUS_QUALIFIED
         ));

diff --git a/src/DataFixtures/legislatives/geojson-paris-1.json b/src/DataFixtures/legislatives/geojson-paris-1.json
@@ -0,0 +1,39 @@
+{
+  "type": "Polygon",
+  "coordinates": [
+    [
+      [
+        2.3257616254697,
+        48.869546133476
+      ],
+      [
+        2.3278733621861,
+        48.869861088958
+      ],
+      [
+        2.3508413205563,
+        48.863344411573
+      ],
+      [
+        2.3500912644194,
+        48.861951749823
+      ],
+      [
+        2.3445592260856,
+        48.85398930556
+      ],
+      [
+        2.3328469000671,
+        48.859300907461
+      ],
+      [
+        2.3207773515807,
+        48.863075035941
+      ],
+      [
+        2.3257616254697,
+        48.869546133476
+      ]
+    ]
+  ]
+}
diff --git a/templates/legislatives/layout.html.twig b/templates/legislatives/layout.html.twig
@@ -34,7 +34,7 @@
                 <ul class="list__links list__links--row list__links--no-decor list__links--nav">
                     {% set currentRoute = app.request.attributes.get('_route') %}
                     {% for route, title in {
-                        'legislatives_map': 'La carte'
+                        'legislatives_map': 'Consulter la carte des député(e)s'
                     } %}
                         <li class="{{ route == currentRoute ? 'active' }}">
                             <a href="{{ path(route) }}">

diff --git a/templates/legislatives/map_candidates.html.twig b/templates/legislatives/map_candidates.html.twig
@@ -25,7 +25,7 @@
     <main class="legislatives__map">
         <header class="l__wrapper text--center b__nudge--bottom">
             <h1 class="text--large text--pink">
-                La carte des candidat(e)s <em>La République En Marche !</em>
+                La carte des député(e)s <em>La République En Marche !</em>
             </h1>
         </header>
 

diff --git a/tests/Controller/Api/LegislativesControllerTest.php b/tests/Controller/Api/LegislativesControllerTest.php
@@ -18,7 +18,7 @@ class LegislativesControllerTest extends WebTestCase
     use ControllerTestTrait;
     use ApiControllerTestTrait;
 
-    public function testApiApprovedCommittees()
+    public function testApiWonCandidates()
     {
         $this->client->request(Request::METHOD_GET, '/api/candidates');
 
@@ -28,7 +28,7 @@ public function testApiApprovedCommittees()
         $this->assertJson($content);
 
         // Check the payload
-        $this->assertNotEmpty(\GuzzleHttp\json_decode($content, true));
+        $this->assertSame(1, \count(\GuzzleHttp\json_decode($content, true)));
         $this->assertEachJsonItemContainsKey('id', $content);
         $this->assertEachJsonItemContainsKey('name', $content);
         $this->assertEachJsonItemContainsKey('district', $content);

diff --git a/tests/Controller/Api/ReferentsControllerTest.php b/tests/Controller/Api/ReferentsControllerTest.php
@@ -17,7 +17,7 @@ class ReferentsControllerTest extends WebTestCase
     use ControllerTestTrait;
     use ApiControllerTestTrait;
 
-    public function testApiApprovedCommittees()
+    public function testApiReferents()
     {
         $this->client->request(Request::METHOD_GET, '/api/referents');