Fix dance user add/remove from inverse side

[airbundle] / Entity / Location.php

diff --git a/Entity/Location.php b/Entity/Location.php
index 1fdca93803149aa9a4c241536af7b21366d0d3e4..613e46281c3664f841ddbc86f8790c8bfb50f966 100644 (file)
--- a/Entity/Location.php
+++ b/Entity/Location.php
@@ -31,7 +31,7 @@ class Location {
        /**
         * @var string
         */
-       private $short;
+       protected $description;
 
        /**
         * @var string
@@ -59,7 +59,12 @@ class Location {
        private $longitude;
 
        /**
-        * @var boolean
+        * @var bool
+        */
+       private $indoor;
+
+       /**
+        * @var bool
         */
        private $hotspot;
 
@@ -92,6 +97,10 @@ class Location {
         * Constructor
         */
        public function __construct() {
+               //Set defaults
+               $this->description = null;
+               $this->created = new \DateTime('now');
+               $this->updated = new \DateTime('now');
                $this->sessions = new ArrayCollection();
                $this->snippets = new ArrayCollection();
                $this->users = new ArrayCollection();
@@ -129,25 +138,25 @@ class Location {
        }
 
        /**
-        * Set short
+        * Set description
         *
-        * @param string $short
+        * @param string $description
         *
         * @return Location
         */
-       public function setShort(string $short): Location {
-               $this->short = $short;
+       public function setDescription(?string $description): Location {
+               $this->description = $description;
 
                return $this;
        }
 
        /**
-        * Get short
+        * Get description
         *
         * @return string
         */
-       public function getShort(): string {
-               return $this->short;
+       public function getDescription(): ?string {
+               return $this->description;
        }
 
        /**
@@ -260,10 +269,32 @@ class Location {
                return $this->longitude;
        }
 
+       /**
+        * Set indoor
+        *
+        * @param bool $indoor
+        *
+        * @return Session
+        */
+       public function setIndoor(bool $indoor): Location {
+               $this->indoor = $indoor;
+
+               return $this;
+       }
+
+       /**
+        * Get indoor
+        *
+        * @return bool
+        */
+       public function getIndoor(): bool {
+               return $this->indoor;
+       }
+
        /**
         * Set hotspot
         *
-        * @param boolean $hotspot
+        * @param bool $hotspot
         *
         * @return Session
         */
@@ -276,7 +307,7 @@ class Location {
        /**
         * Get hotspot
         *
-        * @return boolean
+        * @return bool
         */
        public function getHotspot(): bool {
                return $this->hotspot;
@@ -343,7 +374,7 @@ class Location {
         * Remove session
         *
         * @param Session $session
-        * @return boolean
+        * @return bool
         */
        public function removeSession(Session $session): bool {
                return $this->sessions->removeElement($session);
@@ -375,7 +406,7 @@ class Location {
         * Remove snippet
         *
         * @param Snippet $snippet
-        * @return boolean
+        * @return bool
         */
        public function removeSnippet(Snippet $snippet): bool {
                return $this->snippets->removeElement($snippet);
@@ -398,6 +429,9 @@ class Location {
         * @return Location
         */
        public function addUser(User $user): Location {
+               //Add from owning side
+               $user->addSubscriber($this);
+
                $this->users[] = $user;
 
                return $this;
@@ -407,9 +441,16 @@ class Location {
         * Remove user
         *
         * @param User $user
-        * @return boolean
+        * @return bool
         */
        public function removeUser(User $user): bool {
+               if (!$this->users->contains($user)) {
+                       return true;
+               }
+
+               //Remove from owning side
+               $user->removeSubscriber($this);
+
                return $this->users->removeElement($user);
        }
 
@@ -427,9 +468,9 @@ class Location {
         */
        public function preUpdate(PreUpdateEventArgs $eventArgs) {
                //Check that we have a location instance
-               if (($user = $eventArgs->getEntity()) instanceof Location) {
+               if (($location = $eventArgs->getEntity()) instanceof Location) {
                        //Set updated value
-                       $user->setUpdated(new \DateTime('now'));
+                       $location->setUpdated(new \DateTime('now'));
                }
        }