Cleanup

[airbundle] / Resources / config / doctrine / User.orm.yml

diff --git a/Resources/config/doctrine/User.orm.yml b/Resources/config/doctrine/User.orm.yml
index 491ae32ee2ed844d59413dbba1f8d5f86d995c4b..8a9b7de6fcf787cb82a6b63bd8b832038c40b6fb 100644 (file)
--- a/Resources/config/doctrine/User.orm.yml
+++ b/Resources/config/doctrine/User.orm.yml
@@ -3,14 +3,20 @@ Rapsys\AirBundle\Entity\User:
     repositoryClass: Rapsys\AirBundle\Repository\UserRepository
     table: users
     fields:
     repositoryClass: Rapsys\AirBundle\Repository\UserRepository
     table: users
     fields:

+        pseudonym:
+            type: string
+            length: 32
+            nullable: true

         phone:
             type: string
             length: 16
             nullable: true
         phone:
             type: string
             length: 16
             nullable: true

+        slug:
+            type: string
+            unique: true
+            length: 32
+            nullable: true

     oneToMany:
     oneToMany:

-#        links:
-#            targetEntity: Rapsys\AirBundle\Entity\Link
-#            mappedBy: user

         applications:
             targetEntity: Rapsys\AirBundle\Entity\Application
             mappedBy: user
         applications:
             targetEntity: Rapsys\AirBundle\Entity\Application
             mappedBy: user


@@ -18,11 +24,22 @@ Rapsys\AirBundle\Entity\User:
             targetEntity: Rapsys\AirBundle\Entity\Snippet
             mappedBy: user
     manyToMany:
             targetEntity: Rapsys\AirBundle\Entity\Snippet
             mappedBy: user
     manyToMany:

+        dances:
+            targetEntity: Rapsys\AirBundle\Entity\Dance
+            inversedBy: users
+            joinTable:
+                name: users_dances
+                joinColumns:
+                    id:
+                        name: user_id
+                inverseJoinColumns:
+                    id:
+                        name: dance_id

         subscribers:
             targetEntity: Rapsys\AirBundle\Entity\User
             inversedBy: subscriptions
             joinTable:
         subscribers:
             targetEntity: Rapsys\AirBundle\Entity\User
             inversedBy: subscriptions
             joinTable:

-                name: subscriptions
+                name: users_subscriptions

                 joinColumns:
                     id:
                         name: user_id
                 joinColumns:
                     id:
                         name: user_id


@@ -32,6 +49,17 @@ Rapsys\AirBundle\Entity\User:
         subscriptions:
             targetEntity: Rapsys\AirBundle\Entity\User
             mappedBy: subscribers
         subscriptions:
             targetEntity: Rapsys\AirBundle\Entity\User
             mappedBy: subscribers

+        locations:
+            targetEntity: Rapsys\AirBundle\Entity\Location
+            inversedBy: users
+            joinTable:
+                name: users_locations
+                joinColumns:
+                    id:
+                        name: user_id
+                inverseJoinColumns:
+                    id:
+                        name: location_id

 #    manyToMany:
 #        groups:
 #            targetEntity: Group
 #    manyToMany:
 #        groups:
 #            targetEntity: Group


@@ -41,7 +69,7 @@ Rapsys\AirBundle\Entity\User:
     associationOverride:
         groups:
             joinTable:
     associationOverride:
         groups:
             joinTable:

-                name: groups_users
+                name: users_groups

                 joinColumns:
                     id:
                         name: user_id
                 joinColumns:
                     id:
                         name: user_id