Evolution #57: Modifier le système de Type (element)

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -155,9 +155,10 @@ class CoreController extends Controller
     }
     
     $element = new Element();
+    $element->setType('none');
     $form = $this->getAddForm($element);
-    
     $form->bindRequest($this->getRequest());
+    
     if ($form->isValid())
     {
 

src/Muzich/CoreBundle/DataFixtures/ORM/LoadElementData.php

@@ -80,69 +80,63 @@ class LoadElementData  extends AbstractFixture implements OrderedFixtureInterfac
     $paul = $this->entity_manager->merge($this->getReference('user_paul'));
     $bob  = $this->entity_manager->merge($this->getReference('user_bob'));
     $joelle  = $this->entity_manager->merge($this->getReference('user_joelle'));
-
-    // 'youtube', 'soundclound', 'son2teuf', 'jamendo'
-    $youtube     = $this->entity_manager->merge($this->getReference('element_type_youtube.com'));
-    $soundclound = $this->entity_manager->merge($this->getReference('element_type_soundcloud.com'));
-    $son2teuf    = $this->entity_manager->merge($this->getReference('element_type_son2teuf.org'));
-    $jamendo     = $this->entity_manager->merge($this->getReference('element_type_jamendo.com'));
     
     $this->createElement('youtube_heretik_1', 'Heretik System Popof - Resistance', 
       'http://www.youtube.com/watch?v=tq4DjQK7nsM',
       $this->getArrayOfTag(array('hardtek')),
-    $youtube, $bux, null, '2011-12-10 17:35:07');
+    'youtube.com', $bux, null, '2011-12-10 17:35:07');
     
     $this->createElement('youtube_dtc_passdrop', 'dtc che passdrop', 
       'http://www.youtube.com/watch?v=2A4buFCp7qM', 
       $this->getArrayOfTag(array('hardtek')),
-    $youtube, $bux, null, '2011-12-10 18:35:07');
+    'youtube.com', $bux, null, '2011-12-10 18:35:07');
     
     $this->createElement('youtube_antroppod_1', 'Antropod - Polakatek', 
       'http://www.youtube.com/watch?v=VvpF3lCh1hk&NR=1', 
       $this->getArrayOfTag(array('hardtek')),
-    $youtube, $bux, null, '2011-12-10 19:45:07');
+    'youtube.com', $bux, null, '2011-12-10 19:45:07');
     
     $this->createElement('youtube_koinkoin_1', 'koinkOin - H5N1', 
       'http://www.son2teuf.org/Voir-details/Sons/Lives/Hardtek-_-Tribe/koinkOin-_-H5N1', 
       $this->getArrayOfTag(array('hardtek', 'electro')),
-    $youtube, $bux, null, '2011-12-10 21:35:07');
+    'son2teuf.org', $bux, null, '2011-12-10 21:35:07');
     
     
     $this->createElement('youtube_djfab_1', 'DJ FAB', 
       'http://www.jamendo.com/fr/album/42567', 
       $this->getArrayOfTag(array('hardtek')),
-    $jamendo, $jean, null, '2011-11-11 17:35:07');
+    'jamendo.com', $jean, null, '2011-11-11 17:35:07');
     
     $this->createElement('youtube_djantoine_1', 'dj antoine', 
       'http://www.jamendo.com/fr/album/75206', 
       $this->getArrayOfTag(array('hardtek', 'tribe')),
-    $jamendo, $jean, null, '2011-11-11 19:35:07');
+    'jamendo.com', $jean, null, '2011-11-11 19:35:07');
     
     $this->createElement('youtube_acroyek_1', 'Acrotek Hardtek G01', 
       'http://www.jamendo.com/fr/album/3409', 
       $this->getArrayOfTag(array('hardtek')),
-    $jamendo, $jean, null, '2011-12-11 14:35:07');
+    'jamendo.com', $jean, null, '2011-12-11 14:35:07');
     
     
     $this->createElement('jamendo_caio_1', 'All Is Full Of Pain', 
       'http://soundcloud.com/keytek/all-is-full-of-pain', 
       $this->getArrayOfTag(array('tribe', 'hardtek')),
-    $soundclound, $paul, null, '2011-12-02 01:35:07');
+    'soundcloud.com', $paul, null, '2011-12-02 01:35:07');
     
     $this->createElement('jamendo_reverb_1', 'RE-FUCK (ReVeRB_FBC) mix.', 
       'http://soundcloud.com/reverb-2/re-fuck-reverb_fbc-mix', 
       $this->getArrayOfTag(array('tribe')),
-    $soundclound, $paul, null, '2011-12-04 14:35:07');
+    'soundcloud.com', $paul, null, '2011-12-04 14:35:07');
     
     $this->createElement('jamendo_cardio_1', 'CardioT3K - Juggernaut Trap', 
       'http://soundcloud.com/cardiot3k/cardiot3k-juggernaut-trap', 
       $this->getArrayOfTag(array('tribe')),
-    $soundclound, $paul, null, '2011-12-12 13:35:07');
+    'soundcloud.com', $paul, null, '2011-12-12 13:35:07');
     
     $this->createElement('dudeldrum', 'DUDELDRUM', 
       'http://www.jamendo.com/fr/album/89109', 
       $this->getArrayOfTag(array('medieval')),
-      $jamendo, $joelle,
+      'jamendo.com', $joelle,
       $this->entity_manager->merge($this->getReference('group_dudeldrum'))
       , '2011-12-16 18:11:07'
     );
@@ -150,7 +144,7 @@ class LoadElementData  extends AbstractFixture implements OrderedFixtureInterfac
     $this->createElement('infected_psycho', 'Infected Mushroom - Psycho', 
       'http://www.youtube.com/watch?v=dLWXSsYJoWY', 
       $this->getArrayOfTag(array('psytrance')),
-      $youtube, $paul,
+      'youtube.com', $paul,
       $this->entity_manager->merge($this->getReference('group_fan_de_psytrance'))
       , '2011-12-10 16:11:17'
     );
@@ -158,7 +152,7 @@ class LoadElementData  extends AbstractFixture implements OrderedFixtureInterfac
     $this->createElement('infected_muse', 'Infected mushroom - Muse Breaks', 
       'http://www.youtube.com/watch?v=g0Cbfm1PStA', 
       $this->getArrayOfTag(array('psytrance')),
-      $youtube, $bob,
+      'youtube.com', $bob,
       $this->entity_manager->merge($this->getReference('group_fan_de_psytrance'))
       , '2011-12-08 17:35:07'
     );
@@ -166,13 +160,13 @@ class LoadElementData  extends AbstractFixture implements OrderedFixtureInterfac
     $this->createElement('joelle_1', 'Cents Pas - Joëlle', 
       'http://www.youtube.com/watch?v=bIAFB4vRdGw', 
       $this->getArrayOfTag(array('chanteuse')),
-      $youtube, $joelle, null, '2011-12-08 14:21:07'
+      'youtube.com', $joelle, null, '2011-12-08 14:21:07'
     );
     
     $this->createElement('joelle_2', 'Cents Pas - Joëlle (bis)', 
       'http://www.youtube.com/watch?v=bIAFB4vRdGw', 
       $this->getArrayOfTag(array('chanteuse')),
-      $youtube, $joelle,
+      'youtube.com', $joelle,
       $this->entity_manager->merge($this->getReference('group_joelle'))
       , '2011-12-07 14:12:07'
     );
@@ -180,37 +174,37 @@ class LoadElementData  extends AbstractFixture implements OrderedFixtureInterfac
     $this->createElement('ukf_1', 'UKF Dubstep Mix - August ', 
       'http://www.youtube.com/watch?v=SFu2DfPDGeU', 
       $this->getArrayOfTag(array('dubstep')),
-      $youtube, $joelle, null, '2011-12-10 00:35:07'
+      'youtube.com', $joelle, null, '2011-12-10 00:35:07'
     );
     
     $this->createElement('beatbox_1', 'Dubstep Beatbox', 
       'http://www.dailymotion.com/video/xm5omz_dubstep-beatbox_creation', 
       $this->getArrayOfTag(array('dubstep', 'beatbox')),
-      null, $joelle, null, '2011-12-10 11:11:11'
+      'dailymotion.com', $joelle, null, '2011-12-10 11:11:11'
     );
     
     $this->createElement('soulfly_1', 'SOULFLY - Prophecy', 
       'http://www.youtube.com/watch?v=zCc_jLctZkA', 
       $this->getArrayOfTag(array('metal')),
-      $youtube, $bux, null, '2011-12-12 17:39:07'
+      'youtube.com', $bux, null, '2011-12-12 17:39:07'
     );
     
     $this->createElement('azyd_azylum_1', 'AZYD AZYLUM Live au Café Provisoire', 
       'http://www.youtube.com/watch?v=8AXhRXAt2E4', 
       $this->getArrayOfTag(array('metal')),
-      $youtube, $bux, null, '2011-11-11 11:11:11'
+      'youtube.com', $bux, null, '2011-11-11 11:11:11'
     );
     
     $this->createElement('babylon_pression_1', 'Babylon Pression - Des Tasers et des Pauvres', 
       'http://www.youtube.com/watch?v=XWkbaHxRvds&feature=related', 
       $this->getArrayOfTag(array('metal', 'hardcore')),
-      $youtube, $bux, null, '2011-12-14 18:35:07'
+      'youtube.com', $bux, null, '2011-12-14 18:35:07'
     );
     
     $this->createElement('ed_cox_1', 'Ed Cox - La fanfare des teuffeurs (Hardcordian)', 
       'http://www.youtube.com/watch?v=Lk1gnh-JCDs&feature=related', 
       $this->getArrayOfTag(array('electro')),
-      $youtube, $bux, null, '2011-12-15 21:35:07'
+      'youtube.com', $bux, null, '2011-12-15 21:35:07'
     );
     
 

src/Muzich/CoreBundle/DataFixtures/ORM/LoadElementTypeData.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace Muzich\UserBundle\DataFixtures\ORM;
-
-use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Muzich\CoreBundle\Entity\ElementType;
-
-class LoadElementTypeData  extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
-{
-  
-  private $container;
-  private $entity_manager;
-  
-  public function setContainer(ContainerInterface $container = null)
-  {
-    $this->container = $container;
-  }
-  
-  public function getOrder()
-  {
-    return 3; // the order in which fixtures will be loaded
-  }
-  
-  /**
-   *  
-   */
-  protected function createElementType($id, $name)
-  {
-    $elementType = new ElementType();
-    $elementType->setId($id);
-    $elementType->setName(ucfirst($name));
-    $this->entity_manager->persist($elementType);
-    $this->addReference('element_type_'.$id, $elementType);
-  }
-  
-  public function load($entity_manager)
-  {
-    $this->entity_manager = $entity_manager;
-    
-    foreach (array(
-      'youtube.com' => 'Youtube', 'soundcloud.com' => 'SoundCloud', 
-      'son2teuf.org' => 'Son2Teuf', 'jamendo.com' => 'jamendo',
-      'dailymotion.com' => 'Dailymotion'
-      ) as $id => $name)
-    {
-      $this->createElementType($id, $name);
-    }
-
-    $this->entity_manager->flush();
-  }
-}

src/Muzich/CoreBundle/ElementFactory/ElementManager.php

@@ -7,11 +7,10 @@ use Muzich\CoreBundle\Entity\User;
 use Doctrine\ORM\EntityManager;
 use Symfony\Component\DependencyInjection\Container;
 
-use Muzich\CoreBundle\ElementFactory\Site\YoutubeFactory;
-use Muzich\CoreBundle\ElementFactory\Site\DailymotionFactory;
-use Muzich\CoreBundle\ElementFactory\Site\Son2TeufFactory;
-use Muzich\CoreBundle\ElementFactory\Site\JamendoFactory;
-use Muzich\CoreBundle\ElementFactory\Site\SoundCloudFactory;
+use Muzich\CoreBundle\ElementFactory\Site\YoutubecomFactory;
+use Muzich\CoreBundle\ElementFactory\Site\DailymotioncomFactory;
+use Muzich\CoreBundle\ElementFactory\Site\JamendocomFactory;
+use Muzich\CoreBundle\ElementFactory\Site\SoundcloudcomFactory;
 
 /**
  * 
@@ -19,19 +18,11 @@ use Muzich\CoreBundle\ElementFactory\Site\SoundCloudFactory;
  * @author bux
  */
 class ElementManager
-{
-  
-  protected $types = array(
-    'youtube.com', 
-    'soundcloud.com', 
-    'son2teuf.org', 
-    'jamendo.com',
-    'dailymotion.com'
-  );
-  
+{  
   protected $em;
   protected $element;
   protected $container;
+  protected $factories;
   
   /**
    * Procédure chargé de retourner des information destiné au 
@@ -60,7 +51,8 @@ class ElementManager
     $this->element = $element;
     $this->em = $em;
     $this->container = $container;
-    
+    $this->factories = $this->container->getParameter('factories');
+        
     $evm = new \Doctrine\Common\EventManager();
     $timestampableListener = new \Gedmo\Timestampable\TimestampableListener();
     $evm->addEventSubscriber($timestampableListener);
@@ -106,17 +98,16 @@ class ElementManager
     
     preg_match("/^(http:\/\/)?([^\/]+)/i", $url, $chaines);
     
+    $type = 'unknow';
     if (array_key_exists(2, $chaines))
     {
       $host = $chaines[2];
       // Repérer les derniers segments
       preg_match("/[^\.\/]+\.[^\.\/]+$/",$host,$chaines);
 
-      $type = null;
-
-      if (in_array($chaines[0], $this->types))
+      if (array_key_exists(0, $chaines))
       {
-        $type = $this->em->getRepository('MuzichCoreBundle:ElementType')->find($chaines[0]);
+        $type = $chaines[0];
       }
     }
     
@@ -134,7 +125,7 @@ class ElementManager
     // Instanciation d'un objet factory correspondant au type, par exemple
     // YoutubeFactory, qui répondant a une implementation retournera ces infos.
   
-    if ($this->element->getType())
+    if (in_array($this->element->getType(), $this->factories))
     {
       $site_factory = $this->getFactory();
       $this->element->setEmbed($site_factory->getEmbedCode());
@@ -144,27 +135,28 @@ class ElementManager
   
   protected function getFactory()
   { 
-    switch ($this->element->getType()->getId())
+//    $factory_name = ucfirst(str_replace('.', '', $this->element->getType())).'Factory';
+//    return new $factory_name($this->element, $this->container);
+    
+    switch ($this->element->getType())
     {
       case 'youtube.com':
-        return new YoutubeFactory($this->element, $this->container);
+        return new YoutubecomFactory($this->element, $this->container);
       break;
       case 'soundcloud.com':
-        return new SoundCloudFactory($this->element, $this->container);
-      break;
-      case 'son2teuf.org':
-        return new Son2TeufFactory($this->element, $this->container);
+        return new SoundcloudcomFactory($this->element, $this->container);
       break;
       case 'jamendo.com':
-        return new JamendoFactory($this->element, $this->container);
+        return new JamendocomFactory($this->element, $this->container);
       break;
       case 'dailymotion.com':
-        return new DailymotionFactory($this->element, $this->container);
+        return new DailymotioncomFactory($this->element, $this->container);
       break;
       default:
-        throw new Exception("La Factory n'est pas connu pour ce type.");
+        throw new Exception("La Factory n'est pas prise en charge pour ce type.");
       break;
     }
+    
   }
     
 }

src/Muzich/CoreBundle/ElementFactory/Site/DailymotionFactory.php → src/Muzich/CoreBundle/ElementFactory/Site/DailymotioncomFactory.php

@@ -9,7 +9,7 @@ use Muzich\CoreBundle\ElementFactory\Site\base\VideoSiteFactory;
  *
  * @author bux
  */
-class DailymotionFactory extends VideoSiteFactory
+class DailymotioncomFactory extends VideoSiteFactory
 {
   
 }

src/Muzich/CoreBundle/ElementFactory/Site/JamendoFactory.php → src/Muzich/CoreBundle/ElementFactory/Site/JamendocomFactory.php

@@ -9,7 +9,7 @@ use Muzich\CoreBundle\ElementFactory\Site\base\BaseFactory;
  *
  * @author bux
  */
-class JamendoFactory extends BaseFactory
+class JamendocomFactory extends BaseFactory
 {
   public function getEmbedCode()
   {

src/Muzich/CoreBundle/ElementFactory/Site/Son2TeufFactory.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace Muzich\CoreBundle\ElementFactory\Site;
-
-use Muzich\CoreBundle\ElementFactory\Site\base\BaseFactory;
-
-/**
- * 
- *
- * @author bux
- */
-class Son2TeufFactory extends BaseFactory
-{
-  
-}
-
-?>

src/Muzich/CoreBundle/ElementFactory/Site/SoundCloudFactory.php → src/Muzich/CoreBundle/ElementFactory/Site/SoundcloudcomFactory.php

@@ -11,7 +11,7 @@ use Symfony\Component\DependencyInjection\Container;
  *
  * @author bux
  */
-class SoundCloudFactory extends BaseFactory
+class SoundcloudcomFactory extends BaseFactory
 {
   public function getEmbedCode()
   {

src/Muzich/CoreBundle/ElementFactory/Site/YoutubeFactory.php → src/Muzich/CoreBundle/ElementFactory/Site/YoutubecomFactory.php

@@ -9,7 +9,7 @@ use Muzich\CoreBundle\ElementFactory\Site\base\VideoSiteFactory;
  *
  * @author bux
  */
-class YoutubeFactory extends VideoSiteFactory
+class YoutubecomFactory extends VideoSiteFactory
 {
   
 }

src/Muzich/CoreBundle/Entity/Element.php

@@ -32,8 +32,9 @@ class Element
   /**
    * Cet attribut stocke le type d'élément.
    * 
-   * @ORM\ManyToOne(targetEntity="ElementType", inversedBy="elements")
-   * @ORM\JoinColumn(name="element_type_id", referencedColumnName="id")
+   * @ORM\Column(type="string", length=64)
+   * @Assert\NotBlank()
+   * @Assert\MaxLength(1024)
    */
   protected $type;
   
@@ -171,9 +172,9 @@ class Element
   /**
    * Set type
    *
-   * @param ElementType $type
+   * @param string $type
    */
-  public function setType(ElementType $type = null)
+  public function setType($type)
   {
     $this->type = $type;
   }
@@ -181,7 +182,7 @@ class Element
   /**
    * Get type
    *
-   * @return ElementType 
+   * @return string 
    */
   public function getType()
   {

src/Muzich/CoreBundle/Entity/ElementType.php

@@ -1,114 +0,0 @@
-<?php
-
-namespace Muzich\CoreBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-use \Doctrine\Common\Collections\ArrayCollection;
-
-/**
- * Type d'element
- *  * Youtube
- *  * Jamendo
- *  * ...
- * 
- * @ORM\Entity
- * @ORM\Table(name="element_type")
- */
-class ElementType
-{
-  
-  /**
-   * @ORM\Id
-   * @ORM\Column(type="string", length=18)
-   * @var type string
-   */
-  protected $id;
-  
-  /**
-   * Liste des elements de ce type
-   * 
-   * @ORM\OneToMany(targetEntity="Element", mappedBy="element_type")
-   */
-  protected $elements;
-  
-  /**
-   * Libelle du type
-   * 
-   * @ORM\Column(type="string", length=128)
-   * @var type string
-   */
-  protected $name;
-  
-  /**
-   * 
-   */
-  public function __construct()
-  {
-    $this->elements = new ArrayCollection();
-  }
-  
-  public function __toString()
-  {
-    return $this->name;
-  }
-
-  /**
-   * Set name
-   *
-   * @param string $name
-   */
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-
-  /**
-   * Get name
-   *
-   * @return string 
-   */
-  public function getName()
-  {
-    return $this->name;
-  }
-  
-  /**
-   * Set id
-   *
-   * @param string $id
-   */
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-
-  /**
-   * Get id
-   *
-   * @return string 
-   */
-  public function getId()
-  {
-    return $this->id;
-  }
-
-  /**
-   * Add elements
-   *
-   * @param Element $elements
-   */
-  public function addElement(Element $elements)
-  {
-    $this->elements[] = $elements;
-  }
-
-  /**
-   * Get elements
-   *
-   * @return Doctrine\Common\Collections\Collection 
-   */
-  public function getElements()
-  {
-    return $this->elements;
-  }
-}

src/Muzich/CoreBundle/Repository/ElementRepository.php

@@ -18,8 +18,7 @@ class ElementRepository extends EntityRepository
   {
     return $this->getEntityManager()
       ->createQuery('
-        SELECT e, t FROM MuzichCoreBundle:Element e 
-        JOIN e.type t
+        SELECT e FROM MuzichCoreBundle:Element e 
         ORDER BY e.name ASC'
       )
       ->getResult()
@@ -165,10 +164,9 @@ class ElementRepository extends EntityRepository
       }
 
       // C'est la requête qui récupérera les données element avec ses jointures.
-      $query_select = "SELECT e, ty, t, o, g, fav
+      $query_select = "SELECT e, t, o, g, fav
         FROM MuzichCoreBundle:Element e 
         LEFT JOIN e.group g 
-        LEFT JOIN e.type ty 
         LEFT JOIN e.tags t 
         LEFT JOIN e.elements_favorites fav WITH fav.user = :uid
         JOIN e.owner o