X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/d9d15337d88f4ca34c2e419f7782f750540fccb6..f2b9304f79c3dfbf8314d1f96762c628b790a87a:/Entity/User.php
diff --git a/Entity/User.php b/Entity/User.php
index 189e0ea..178bcec 100644
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -1,83 +1,100 @@
<?php declare(strict_types=1);
/*
- * this file is part of the rapsys packbundle package.
+ * This file is part of the Rapsys AirBundle package.
*
- * (c) raphaël gertz <symfony@rapsys.eu>
+ * (c) Raphaël Gertz <symfony@rapsys.eu>
*
- * 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\AirBundle\Entity\Application;
-use Rapsys\AirBundle\Entity\Group;
-use Rapsys\AirBundle\Entity\Link;
-use Rapsys\AirBundle\Entity\Snippet;
+use Rapsys\UserBundle\Entity\Civility;
use Rapsys\UserBundle\Entity\User as BaseUser;
+/**
+ * {@inheritdoc}
+ */
class User extends BaseUser {
/**
- * @var string
+ * City
+ */
+ private ?string $city = null;
+
+ /**
+ * Country
+ */
+ private ?Country $country = null;
+
+ /**
+ * Phone
+ */
+ private ?string $phone = null;
+
+ /**
+ * Pseudonym
*/
- protected $pseudonym;
+ private ?string $pseudonym = null;
/**
- * @var string
+ * Zipcode
*/
- protected $phone;
+ private ?string $zipcode = null;
/**
- * @var string
+ * Applications collection
*/
- protected $slug;
+ private Collection $applications;
/**
- * @var ArrayCollection
+ * Dances collection
*/
- private $applications;
+ private Collection $dances;
/**
- * @var ArrayCollection
+ * Locations collection
*/
- private $dances;
+ private Collection $locations;
/**
- * @var ArrayCollection
+ * Snippets collection
*/
- private $locations;
+ private Collection $snippets;
/**
- * @var ArrayCollection
+ * Subscribers collection
*/
- private $snippets;
+ private Collection $subscribers;
/**
- * @var ArrayCollection
+ * Subscriptions collection
*/
- private $subscribers;
+ private Collection $subscriptions;
/**
- * @var ArrayCollection
+ * Google tokens collection
*/
- private $subscriptions;
+ 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);
-
- //Set defaults
- $this->pseudonym = null;
- $this->phone = null;
- $this->slug = null;
+ parent::__construct($this->mail, $this->password, $this->civility, $this->forename, $this->surname, $this->active, $this->enable);
//Set collections
$this->applications = new ArrayCollection();
@@ -86,28 +103,51 @@ class User extends BaseUser {
$this->snippets = new ArrayCollection();
$this->subscribers = new ArrayCollection();
$this->subscriptions = new ArrayCollection();
+ $this->googleTokens = new ArrayCollection();
}
/**
- * Set pseudonym
+ * Set city
*
- * @param string $pseudonym
+ * @param string $city
*
* @return User
*/
- public function setPseudonym(?string $pseudonym): User {
- $this->pseudonym = $pseudonym;
+ public function setCity(?string $city): User {
+ $this->city = $city;
return $this;
}
/**
- * Get pseudonym
+ * Get city
*
* @return string
*/
- public function getPseudonym(): ?string {
- return $this->pseudonym;
+ public function getCity(): ?string {
+ return $this->city;
+ }
+
+ /**
+ * Set country
+ *
+ * @param Country $country
+ *
+ * @return User
+ */
+ public function setCountry(?Country $country): User {
+ $this->country = $country;
+
+ return $this;
+ }
+
+ /**
+ * Get country
+ *
+ * @return Country
+ */
+ public function getCountry(): ?Country {
+ return $this->country;
}
/**
@@ -133,25 +173,47 @@ class User extends BaseUser {
}
/**
- * Set slug
+ * Set pseudonym
*
- * @param string $slug
+ * @param string $pseudonym
*
* @return User
*/
- public function setSlug(?string $slug): User {
- $this->slug = $slug;
+ public function setPseudonym(?string $pseudonym): User {
+ $this->pseudonym = $pseudonym;
return $this;
}
/**
- * Get slug
+ * Get pseudonym
*
* @return string
*/
- public function getSlug(): ?string {
- return $this->slug;
+ public function getPseudonym(): ?string {
+ return $this->pseudonym;
+ }
+
+ /**
+ * Set zipcode
+ *
+ * @param string $zipcode
+ *
+ * @return User
+ */
+ public function setZipcode(?string $zipcode): User {
+ $this->zipcode = $zipcode;
+
+ return $this;
+ }
+
+ /**
+ * Get zipcode
+ *
+ * @return string
+ */
+ public function getZipcode(): ?string {
+ return $this->zipcode;
}
/**
@@ -179,9 +241,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;
}
@@ -212,9 +274,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;
}
@@ -243,9 +305,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;
}
@@ -274,9 +336,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;
}
@@ -288,6 +350,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;
@@ -299,15 +364,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;
}
@@ -336,9 +408,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;
+ }
}