Cleanup

[airbundle] / DataFixtures / AirFixtures.php

diff --git a/DataFixtures/AirFixtures.php b/DataFixtures/AirFixtures.php
index 4599f0b42fbd046d5b7c29372f05f4adf1976c37..8ccf57266b668fd4e3c37cbeaf8d4aefaf485048 100644 (file)
--- a/DataFixtures/AirFixtures.php
+++ b/DataFixtures/AirFixtures.php
@@ -2,7 +2,7 @@
 
 namespace Rapsys\AirBundle\DataFixtures;
 
-use Rapsys\AirBundle\Entity\Title;
+use Rapsys\AirBundle\Entity\Civility;
 use Rapsys\AirBundle\Entity\Group;
 use Rapsys\AirBundle\Entity\User;
 use Rapsys\AirBundle\Entity\Location;
@@ -24,24 +24,23 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
        public function load(\Doctrine\Common\Persistence\ObjectManager $manager) {
                $encoder = $this->container->get('security.password_encoder');
 
-               //Title tree
-               $titleTree = array(
+               //Civility tree
+               $civilityTree = array(
                        'Mr.' => 'Mister',
                        'Mrs.' => 'Madam',
                        'Ms.' => 'Miss'
                );
 
                //Create titles
-               $titles = array();
-               foreach($titleTree as $shortData => $titleData) {
-                       $title = new Title();
-                       $title->setShort($shortData);
-                       $title->setTitle($titleData);
-                       $title->setCreated(new \DateTime('now'));
-                       $title->setUpdated(new \DateTime('now'));
-                       $manager->persist($title);
-                       $titles[$shortData] = $title;
-                       unset($title);
+               $civilitys = array();
+               foreach($civilityTree as $shortData => $civilityData) {
+                       $civility = new Title($civilityData);
+                       $civility->setShort($shortData);
+                       $civility->setCreated(new \DateTime('now'));
+                       $civility->setUpdated(new \DateTime('now'));
+                       $manager->persist($civility);
+                       $civilitys[$shortData] = $civility;
+                       unset($civility);
                }
 
                //Group tree
@@ -80,7 +79,7 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
                                'phone' => '+33677952829',
                                'password' => 'test'
                        ),
-                       array(
+                       /*array(
                                'short' => 'Mr.',
                                'group' => 'Senior',
                                'mail' => 'denis.courvoisier@wanadoo.fr',
@@ -89,7 +88,7 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
                                'surname' => 'Courvoisier',
                                'phone' => '+33600000000',
                                'password' => 'test'
-                       ),
+                       ),*/
                        array(
                                'short' => 'Mr.',
                                'group' => 'Senior',
@@ -115,15 +114,13 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
                //Create users
                $users = array();
                foreach($userTree as $userData) {
-                       $user = new User();
-                       $user->setMail($userData['mail']);
+                       $user = new User($userData['mail']);
                        $user->setPseudonym($userData['pseudonym']);
                        $user->setForename($userData['forename']);
                        $user->setSurname($userData['surname']);
                        $user->setPhone($userData['phone']);
                        $user->setPassword($encoder->encodePassword($user, $userData['password']));
-                       $user->setActive(true);
-                       $user->setTitle($titles[$userData['short']]);
+                       $user->setCivility($civilitys[$userData['short']]);
                        $user->addGroup($groups[$userData['group']]);
                        $user->setCreated(new \DateTime('now'));
                        $user->setUpdated(new \DateTime('now'));
@@ -136,15 +133,17 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
                $manager->flush();
 
                //Location tree
+               //XXX: adding a new zipcode here requires matching accuweather uris in Command/WeatherCommand.php
                $locationTree = [
                        [
-                               'title' => 'Opera Garnier',
+                               'title' => 'Garnier opera',
                                'short' => 'Garnier',
                                'address' => '10 Place de l\'Opéra',
                                'zipcode' => '75009',
                                'city' => 'Paris',
                                'latitude' => 48.871268,
-                               'longitude' => 2.331832
+                               'longitude' => 2.331832,
+                               'hotspot' => true
                        ],
                        [
                                'title' => 'Tino-Rossi garden',
@@ -153,7 +152,8 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
                                'zipcode' => '75005',
                                'city' => 'Paris',
                                'latitude' => 48.847736,
-                               'longitude' => 2.360953
+                               'longitude' => 2.360953,
+                               'hotspot' => true
                        ],
                        [
                                'title' => 'Trocadero esplanade',
@@ -163,25 +163,28 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
                                'zipcode' => '75116',
                                'city' => 'Paris',
                                'latitude' => 48.861888,
-                               'longitude' => 2.288853
+                               'longitude' => 2.288853,
+                               'hotspot' => false
                        ],
                        [
-                               'title' => 'Colette square',
+                               'title' => 'Colette place',
                                'short' => 'Colette',
                                'address' => 'Galerie du Théâtre Français',
                                'zipcode' => '75001',
                                'city' => 'Paris',
                                'latitude' => 48.863219,
-                               'longitude' => 2.335847
+                               'longitude' => 2.335847,
+                               'hotspot' => false
                        ],
                        [
-                               'title' => 'Swan Island',
+                               'title' => 'Swan island',
                                'short' => 'Swan',
                                'address' => 'Allée des Cygnes',
                                'zipcode' => '75015',
                                'city' => 'Paris',
                                'latitude' => 48.849976, #48.849976
-                               'longitude' => 2.279603 #2.2796029
+                               'longitude' => 2.279603, #2.2796029,
+                               'hotspot' => false
                        ],
                        [
                                'title' => 'Jussieu esplanade',
@@ -190,7 +193,8 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
                                'zipcode' => '75005',
                                'city' => 'Paris',
                                'latitude' => 48.847955, #48.8479548
-                               'longitude' => 2.353291 #2.3532907
+                               'longitude' => 2.353291, #2.3532907,
+                               'hotspot' => false
                        ],
                        [
                                'title' => 'Orleans gallery',
@@ -199,7 +203,8 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
                                'zipcode' => '75001',
                                'city' => 'Paris',
                                'latitude' => 48.863885,
-                               'longitude' => 2.337387
+                               'longitude' => 2.337387,
+                               'hotspot' => false
                        ],
                        [
                                'title' => 'Orsay museum',
@@ -208,7 +213,8 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
                                'zipcode' => '75007',
                                'city' => 'Paris',
                                'latitude' => 48.860418,
-                               'longitude' => 2.325815
+                               'longitude' => 2.325815,
+                               'hotspot' => false
                        ],
                        [
                                'title' => 'Saint-Honore market',
@@ -217,7 +223,18 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
                                'zipcode' => '75001',
                                'city' => 'Paris',
                                'latitude' => 48.866992,
-                               'longitude' => 2.331752
+                               'longitude' => 2.331752,
+                               'hotspot' => false
+                       ],
+                       [
+                               'title' => 'Igor Stravinsky place',
+                               'short' => 'Stravinsky',
+                               'address' => '2 rue Brisemiche',
+                               'zipcode' => '75004',
+                               'city' => 'Paris',
+                               'latitude' => 48.859244,
+                               'longitude' => 2.351289,
+                               'hotspot' => false
                        ],
                        [
                                'title' => 'Tokyo palace',
@@ -226,7 +243,8 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
                                'zipcode' => '75116',
                                'city' => 'Paris',
                                'latitude' => 48.863827,
-                               'longitude' => 2.297339
+                               'longitude' => 2.297339,
+                               'hotspot' => false
                        ],
                        [
                                'title' => 'Drawings\' garden',
@@ -235,7 +253,28 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
                                'zipcode' => '75019',
                                'city' => 'Paris',
                                'latitude' => 48.892503,
-                               'longitude' => 2.389300
+                               'longitude' => 2.389300,
+                               'hotspot' => false
+                       ],
+                       [
+                               'title' => 'Louvre palace',
+                               'short' => 'Louvre',
+                               'address' => 'Quai François Mitterrand',
+                               'zipcode' => '75001',
+                               'city' => 'Paris',
+                               'latitude' => 48.860386,
+                               'longitude' => 2.332611,
+                               'hotspot' => false
+                       ],
+                       [
+                               'title' => 'Monde garden',
+                               'short' => 'Monde',
+                               'address' => '63 avenue Pierre Mendès-France',
+                               'zipcode' => '75013',
+                               'city' => 'Paris',
+                               'latitude' => 48.840451,
+                               'longitude' => 2.367638,
+                               'hotspot' => false
                        ]
                ];
 
@@ -250,6 +289,7 @@ class AirFixtures extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Sy
                        $location->setCity($locationData['city']);
                        $location->setLatitude($locationData['latitude']);
                        $location->setLongitude($locationData['longitude']);
+                       $location->setHotspot($locationData['hotspot']);
                        $location->setCreated(new \DateTime('now'));
                        $location->setUpdated(new \DateTime('now'));
                        $manager->persist($location);