X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/c6f4483147eb5c725af37296a02c9fc5006d1b3f..45d4262949d2f96811d692cf1e6608c83963ea64:/Entity/User.php?ds=inline diff --git a/Entity/User.php b/Entity/User.php index fe838c3..7a82144 100644 --- a/Entity/User.php +++ b/Entity/User.php @@ -1,84 +1,97 @@ + * (c) Raphaël Gertz * - * for the full copyright and license information, please view the license + * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ namespace Rapsys\AirBundle\Entity; +use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\ArrayCollection; +use Rapsys\UserBundle\Entity\Civility; use Rapsys\UserBundle\Entity\User as BaseUser; class User extends BaseUser { /** - * @var string + * City */ - protected $city; + private ?string $city; /** - * @var string + * Phone */ - protected $phone; + private ?string $phone; /** - * @var Country + * Country */ - protected $country; + private ?Country $country; /** - * @var string + * Pseudonym */ - protected $pseudonym; + private ?string $pseudonym; /** - * @var string + * Zipcode */ - protected $zipcode; + private ?string $zipcode; /** - * @var ArrayCollection + * Applications collection */ - private $applications; + private Collection $applications; /** - * @var ArrayCollection + * Dances collection */ - private $dances; + private Collection $dances; /** - * @var ArrayCollection + * Locations collection */ - private $locations; + private Collection $locations; /** - * @var ArrayCollection + * Snippets collection */ - private $snippets; + private Collection $snippets; /** - * @var ArrayCollection + * Subscribers collection */ - private $subscribers; + private Collection $subscribers; /** - * @var ArrayCollection + * Subscriptions collection */ - private $subscriptions; + private Collection $subscriptions; + + /** + * Google tokens collection + */ + private Collection $googleTokens; /** * Constructor * * @param string $mail The user mail - */ - public function __construct(string $mail) { + * @param string $password The user password + * @param ?Civility $civility The user civility + * @param ?string $forename The user forename + * @param ?string $surname The user surname + * @param bool $active The user active + * @param bool $enable The user enable + */ + public function __construct(protected string $mail, protected string $password, protected ?Civility $civility = null, protected ?string $forename = null, protected ?string $surname = null, protected bool $active = false, protected bool $enable = true) { //Call parent constructor - parent::__construct($mail); + parent::__construct($this->mail, $this->password, $this->civility, $this->forename, $this->surname, $this->active, $this->enable); //Set defaults $this->city = null; @@ -94,50 +107,51 @@ class User extends BaseUser { $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; } /** - * 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 */ - public function setCity(?string $city): User { - $this->city = $city; + public function setCountry(?Country $country): User { + $this->country = $country; 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 +245,9 @@ class User extends BaseUser { /** * Get applications * - * @return ArrayCollection + * @return \Doctrine\Common\Collections\Collection */ - public function getApplications(): ArrayCollection { + public function getApplications(): Collection { return $this->applications; } @@ -264,9 +278,9 @@ class User extends BaseUser { /** * Get dances * - * @return ArrayCollection + * @return \Doctrine\Common\Collections\Collection */ - public function getDances(): ArrayCollection { + public function getDances(): Collection { return $this->dances; } @@ -295,9 +309,9 @@ class User extends BaseUser { /** * Get locations * - * @return ArrayCollection + * @return \Doctrine\Common\Collections\Collection */ - public function getLocations(): ArrayCollection { + public function getLocations(): Collection { return $this->locations; } @@ -326,9 +340,9 @@ class User extends BaseUser { /** * Get snippets * - * @return ArrayCollection + * @return \Doctrine\Common\Collections\Collection */ - public function getSnippets(): ArrayCollection { + public function getSnippets(): Collection { return $this->snippets; } @@ -340,6 +354,9 @@ class User extends BaseUser { * @return User */ public function addSubscriber(User $subscriber): User { + //Add from owning side + $subscriber->addSubscription($this); + $this->subscribers[] = $subscriber; return $this; @@ -351,15 +368,22 @@ class User extends BaseUser { * @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 ArrayCollection + * @return \Doctrine\Common\Collections\Collection */ - public function getSubscribers(): ArrayCollection { + public function getSubscribers(): Collection { return $this->subscribers; } @@ -388,9 +412,40 @@ class User extends BaseUser { /** * Get subscriptions * - * @return ArrayCollection + * @return \Doctrine\Common\Collections\Collection */ - public function getSubscriptions(): ArrayCollection { + public function getSubscriptions(): Collection { 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; + } }