Fix subscriber user add/remove from inverse side

[airbundle] / Entity / User.php

diff --git a/Entity/User.php b/Entity/User.php
index fe838c38cf6e18179d8a0f82a47c03e2a9cbb5a3..807fecececcbae08ceaf8626904a327c31cbf7f4 100644 (file)
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -11,65 +11,71 @@
 
 namespace Rapsys\AirBundle\Entity;
 
 
 namespace Rapsys\AirBundle\Entity;
 

+use Doctrine\Common\Collections\Collection;

 use Doctrine\Common\Collections\ArrayCollection;
 
 use Rapsys\UserBundle\Entity\User as BaseUser;
 
 class User extends BaseUser {
        /**
 use Doctrine\Common\Collections\ArrayCollection;
 
 use Rapsys\UserBundle\Entity\User as BaseUser;
 
 class User extends BaseUser {
        /**

-        * @var string
+        * @var ?string

         */
         */

-       protected $city;
+       private ?string $city;

 
        /**
 
        /**

-        * @var string
+        * @var ?string

         */
         */

-       protected $phone;
+       private ?string $phone;

 
        /**
         * @var Country
         */
 
        /**
         * @var Country
         */

-       protected $country;
+       private ?Country $country;

 
        /**
 
        /**

-        * @var string
+        * @var ?string

         */
         */

-       protected $pseudonym;
+       private ?string $pseudonym;

 
        /**
 
        /**

-        * @var string
+        * @var ?string

         */
         */

-       protected $zipcode;
+       private ?string $zipcode;

 
        /**
 
        /**

-        * @var ArrayCollection
+        * @var \Doctrine\Common\Collections\Collection

         */
         */

-       private $applications;
+       private Collection $applications;

 
        /**
 
        /**

-        * @var ArrayCollection
+        * @var \Doctrine\Common\Collections\Collection

         */
         */

-       private $dances;
+       private Collection $dances;

 
        /**
 
        /**

-        * @var ArrayCollection
+        * @var \Doctrine\Common\Collections\Collection

         */
         */

-       private $locations;
+       private Collection $locations;

 
        /**
 
        /**

-        * @var ArrayCollection
+        * @var \Doctrine\Common\Collections\Collection

         */
         */

-       private $snippets;
+       private Collection $snippets;

 
        /**
 
        /**

-        * @var ArrayCollection
+        * @var \Doctrine\Common\Collections\Collection

         */
         */

-       private $subscribers;
+       private Collection $subscribers;

 
        /**
 
        /**

-        * @var ArrayCollection
+        * @var \Doctrine\Common\Collections\Collection

         */
         */

-       private $subscriptions;
+       private Collection $subscriptions;
+
+       /**
+        * @var \Doctrine\Common\Collections\Collection
+        */
+       private Collection $googleTokens;

 
        /**
         * Constructor
 
        /**
         * Constructor


@@ -94,50 +100,51 @@ class User extends BaseUser {
                $this->snippets = new ArrayCollection();
                $this->subscribers = new ArrayCollection();
                $this->subscriptions = new ArrayCollection();
                $this->snippets = new ArrayCollection();
                $this->subscribers = new ArrayCollection();
                $this->subscriptions = new ArrayCollection();

+               $this->googleTokens = new ArrayCollection();

        }
 
        /**
        }
 
        /**

-        * Set country
+        * Set city

         *
         *

-        * @param Country $country
+        * @param string $city

         *
         *

-        * @return Snippet
+        * @return User

         */
         */

-       public function setCountry(Country $country) {
-               $this->country = $country;
+       public function setCity(?string $city): User {
+               $this->city = $city;

 
                return $this;
        }
 
        /**
 
                return $this;
        }
 
        /**

-        * Get country
+        * Get city

         *
         *

-        * @return Country
+        * @return string

         */
         */

-       public function getCountry() {
-               return $this->country;
+       public function getCity(): ?string {
+               return $this->city;

        }
 
        /**
        }
 
        /**

-        * Set city
+        * Set country

         *
         *

-        * @param string $city
+        * @param Country $country

         *
         * @return User
         */
         *
         * @return User
         */

-       public function setCity(?string $city): User {
-               $this->city = $city;
+       public function setCountry(?Country $country): User {
+               $this->country = $country;

 
                return $this;
        }
 
        /**
 
                return $this;
        }
 
        /**

-        * Get city
+        * Get country

         *
         *

-        * @return string
+        * @return Country

         */
         */

-       public function getCity(): ?string {
-               return $this->city;
+       public function getCountry(): ?Country {
+               return $this->country;

        }
 
        /**
        }
 
        /**


@@ -231,9 +238,9 @@ class User extends BaseUser {
        /**
         * Get applications
         *
        /**
         * Get applications
         *

-        * @return ArrayCollection
+        * @return \Doctrine\Common\Collections\Collection

         */
         */

-       public function getApplications(): ArrayCollection {
+       public function getApplications(): Collection {

                return $this->applications;
        }
 
                return $this->applications;
        }
 


@@ -264,9 +271,9 @@ class User extends BaseUser {
        /**
         * Get dances
         *
        /**
         * Get dances
         *

-        * @return ArrayCollection
+        * @return \Doctrine\Common\Collections\Collection

         */
         */

-       public function getDances(): ArrayCollection {
+       public function getDances(): Collection {

                return $this->dances;
        }
 
                return $this->dances;
        }
 


@@ -295,9 +302,9 @@ class User extends BaseUser {
        /**
         * Get locations
         *
        /**
         * Get locations
         *

-        * @return ArrayCollection
+        * @return \Doctrine\Common\Collections\Collection

         */
         */

-       public function getLocations(): ArrayCollection {
+       public function getLocations(): Collection {

                return $this->locations;
        }
 
                return $this->locations;
        }
 


@@ -326,9 +333,9 @@ class User extends BaseUser {
        /**
         * Get snippets
         *
        /**
         * Get snippets
         *

-        * @return ArrayCollection
+        * @return \Doctrine\Common\Collections\Collection

         */
         */

-       public function getSnippets(): ArrayCollection {
+       public function getSnippets(): Collection {

                return $this->snippets;
        }
 
                return $this->snippets;
        }
 


@@ -340,6 +347,9 @@ class User extends BaseUser {
         * @return User
         */
        public function addSubscriber(User $subscriber): User {
         * @return User
         */
        public function addSubscriber(User $subscriber): User {

+               //Add from owning side
+               $subscriber->addSubscription($this);
+

                $this->subscribers[] = $subscriber;
 
                return $this;
                $this->subscribers[] = $subscriber;
 
                return $this;


@@ -351,15 +361,22 @@ class User extends BaseUser {
         * @param User $subscriber
         */
        public function removeSubscriber(User $subscriber): bool {
         * @param User $subscriber
         */
        public function removeSubscriber(User $subscriber): bool {

+               if (!$this->subscriptions->contains($subscriber)) {
+                       return true;
+               }
+
+               //Remove from owning side
+               $subscriber->removeSubscription($this);
+

                return $this->subscribers->removeElement($subscriber);
        }
 
        /**
         * Get subscribers
         *
                return $this->subscribers->removeElement($subscriber);
        }
 
        /**
         * Get subscribers
         *

-        * @return ArrayCollection
+        * @return \Doctrine\Common\Collections\Collection

         */
         */

-       public function getSubscribers(): ArrayCollection {
+       public function getSubscribers(): Collection {

                return $this->subscribers;
        }
 
                return $this->subscribers;
        }
 


@@ -388,9 +405,40 @@ class User extends BaseUser {
        /**
         * Get subscriptions
         *
        /**
         * Get subscriptions
         *

-        * @return ArrayCollection
+        * @return \Doctrine\Common\Collections\Collection

         */
         */

-       public function getSubscriptions(): ArrayCollection {
+       public function getSubscriptions(): Collection {

                return $this->subscriptions;
        }
                return $this->subscriptions;
        }

+
+       /**
+        * Add google token
+        *
+        * @param GoogleToken $googleToken
+        *
+        * @return User
+        */
+       public function addGoogleToken(GoogleToken $googleToken): User {
+               $this->googleTokens[] = $googleToken;
+
+               return $this;
+       }
+
+       /**
+        * Remove google token
+        *
+        * @param GoogleToken $googleToken
+        */
+       public function removeGoogleToken(GoogleToken $googleToken): bool {
+               return $this->googleTokens->removeElement($googleToken);
+       }
+
+       /**
+        * Get googleTokens
+        *
+        * @return \Doctrine\Common\Collections\Collection
+        */
+       public function getGoogleTokens(): Collection {
+               return $this->googleTokens;
+       }

 }
 }