tykayn/date-poll-api
1
0
Fork 0
mirror of https://framagit.org/tykayn/date-poll-api synced 2023-08-25 08:23:11 +02:00
Code Issues Releases Wiki Activity

⚡ update modeling of entities

Browse Source
This commit is contained in:
Baptiste Lemoine 2019-11-12 11:26:19 +01:00
parent b7d1a51e2a
commit 324f3e7f32
6 changed files with 534 additions and 482 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/Entity/Choice.php
View File

@ -2,12 +2,14 @@
namespace App\Entity;
use DateTimeInterface;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM;
use JMS\Serializer\Annotation as Serializer;
/**
* one poll choice, could be a text or a date
* @ORM\Entity(repositoryClass="App\Repository\ChoiceRepository")
*/
class Choice {
@ -36,14 +38,21 @@ class Choice {
*/
private $poll;
/**
* @ORM\OneToMany(targetEntity="App\Entity\Choice", mappedBy="choice")
* @Serializer\Type("App\Entity\Choice")
* @ORM\OneToMany(targetEntity="App\Entity\StackOfVotes", mappedBy="choice")
* @Serializer\Type("App\Entity\StackOfVotes")
*/
private $votes;
private $stackOfVotes;
/**
* @ORM\OneToMany(targetEntity="App\Entity\Vote", mappedBy="choice")
* @Serializer\Type("App\Entity\Vote")
*/
private $vote;
public function __construct() {
$this->poll = new ArrayCollection();
$this->votes = new ArrayCollection();
$this->stackOfVotes = new ArrayCollection();
$this->vote = new ArrayCollection();
}
@ -61,11 +70,11 @@ class Choice {
return $this;
}
public function getDateTime(): ?\DateTimeInterface {
public function getDateTime(): ?DateTimeInterface {
return $this->dateTime;
}
public function setDateTime( ?\DateTimeInterface $dateTime ): self {
public function setDateTime( ?DateTimeInterface $dateTime ): self {
$this->dateTime = $dateTime;
return $this;
@ -102,13 +111,13 @@ class Choice {
/**
* @return Collection|Choice[]
*/
public function getVotes(): Collection {
return $this->votes;
public function getStackOfVotes(): Collection {
return $this->stackOfVotes;
}
public function addVote( Choice $vote ): self {
if ( ! $this->votes->contains( $vote ) ) {
$this->votes[] = $vote;
if ( ! $this->stackOfVotes->contains( $vote ) ) {
$this->stackOfVotes[] = $vote;
$vote->setChoice( $this );
}
@ -116,8 +125,8 @@ class Choice {
}
public function removeVote( Choice $vote ): self {
if ( $this->votes->contains( $vote ) ) {
$this->votes->removeElement( $vote );
if ( $this->stackOfVotes->contains( $vote ) ) {
$this->stackOfVotes->removeElement( $vote );
// set the owning side to null (unless already changed)
if ( $vote->getChoice() === $this ) {
$vote->setChoice( null );
@ -126,4 +135,35 @@ class Choice {
return $this;
}
public function addStackOfVote(StackOfVotes $stackOfVote): self
{
if (!$this->stackOfVotes->contains($stackOfVote)) {
$this->stackOfVotes[] = $stackOfVote;
$stackOfVote->setChoice($this);
}
return $this;
}
public function removeStackOfVote(StackOfVotes $stackOfVote): self
{
if ($this->stackOfVotes->contains($stackOfVote)) {
$this->stackOfVotes->removeElement($stackOfVote);
// set the owning side to null (unless already changed)
if ($stackOfVote->getChoice() === $this) {
$stackOfVote->setChoice(null);
}
}
return $this;
}
/**
* @return Collection|Vote[]
*/
public function getVote(): Collection
{
return $this->vote;
}
}

5
src/Entity/Comment.php
View File

@ -2,6 +2,7 @@
namespace App\Entity;
use DateTimeInterface;
use Doctrine\ORM\Mapping as ORM;
/**
@ -59,11 +60,11 @@ class Comment {
return $this;
}
public function getCreatedAt(): ?\DateTimeInterface {
public function getCreatedAt(): ?DateTimeInterface {
return $this->createdAt;
}
public function setCreatedAt( \DateTimeInterface $createdAt ): self {
public function setCreatedAt( DateTimeInterface $createdAt ): self {
$this->createdAt = $createdAt;
return $this;

77
src/Entity/Owner.php
View File

@ -11,27 +11,24 @@ use JMS\Serializer\Annotation as Serializer;
* @ORM\Entity(repositoryClass="App\Repository\OwnerRepository")
*/
class Owner {
/**
* @ORM\Column(type="string", length=255)
* @Serializer\Type("string")
* @Serializer\Expose()
*/
public $pseudo;
/**
* @ORM\Id()
* @ORM\GeneratedValue()
* @ORM\Column(type="integer")
*/
private $id;
/**
* @ORM\Column(type="string", length=255)
* @Serializer\Type("string")
* @Serializer\Expose()
*/
private $email;
/**
* @ORM\Column(type="string", length=255)
* @Serializer\Type("string")
* @Serializer\Expose()
*/
public $pseudo;
/**
* @ORM\OneToMany(targetEntity="App\Entity\Poll", mappedBy="owner",cascade={"persist"})
* @Serializer\Type("App\Entity\Poll")
@ -39,15 +36,21 @@ class Owner {
private $polls;
/**
* @ORM\OneToMany(targetEntity="App\Entity\Comment", mappedBy="owner")
* @ORM\OneToMany(targetEntity="App\Entity\Comment", mappedBy="owner", cascade={"persist","remove"})
*/
private $comments;
/**
* @ORM\OneToMany(targetEntity="App\Entity\StackOfVotes", mappedBy="owner")
* @ORM\OneToMany(targetEntity="App\Entity\StackOfVotes", mappedBy="owner", cascade={"persist","remove"})
*/
private $stackOfVotes;
/**
* @ORM\Column(type="string", length=255)
*/
private $modifierToken;
public function __construct() {
$this->polls = new ArrayCollection();
$this->comments = new ArrayCollection();
@ -137,28 +140,56 @@ class Owner {
/**
* @return Collection|StackOfVotes[]
*/
public function getStackOfVotes(): Collection
{
public function getStackOfVotes(): Collection {
return $this->stackOfVotes;
}
public function addStackOfVote(StackOfVotes $stackOfVote): self
{
if (!$this->stackOfVotes->contains($stackOfVote)) {
public function addStackOfVote( StackOfVotes $stackOfVote ): self {
if ( ! $this->stackOfVotes->contains( $stackOfVote ) ) {
$this->stackOfVotes[] = $stackOfVote;
$stackOfVote->setOwner($this);
$stackOfVote->setOwner( $this );
}
return $this;
}
public function removeStackOfVote(StackOfVotes $stackOfVote): self
{
if ($this->stackOfVotes->contains($stackOfVote)) {
$this->stackOfVotes->removeElement($stackOfVote);
public function removeStackOfVote( StackOfVotes $stackOfVote ): self {
if ( $this->stackOfVotes->contains( $stackOfVote ) ) {
$this->stackOfVotes->removeElement( $stackOfVote );
// set the owning side to null (unless already changed)
if ($stackOfVote->getOwner() === $this) {
$stackOfVote->setOwner(null);
if ( $stackOfVote->getOwner() === $this ) {
$stackOfVote->setOwner( null );
}
}
return $this;
}
public function getModifierToken(): ?string {
return $this->modifierToken;
}
public function setModifierToken( string $modifierToken ): self {
$this->modifierToken = $modifierToken;
return $this;
}
public function addComment( Comment $comment ): self {
if ( ! $this->comments->contains( $comment ) ) {
$this->comments[] = $comment;
$comment->setOwner( $this );
}
return $this;
}
public function removeComment( Comment $comment ): self {
if ( $this->comments->contains( $comment ) ) {
$this->comments->removeElement( $comment );
// set the owning side to null (unless already changed)
if ( $comment->getOwner() === $this ) {
$comment->setOwner( null );
}
}

87
src/Entity/Poll.php
View File

@ -2,6 +2,7 @@
namespace App\Entity;
use DateTimeInterface;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM;
@ -32,44 +33,27 @@ class Poll {
* @Serializer\Type("string")
*/
public $customUrl;
/**
* vote restricted by a password in md5 format
* @ORM\Column(type="string", length=255, nullable=true)
*/
private $password;
/**
* @ORM\Column(type="string", length=1000)
* @Serializer\Expose()
* @Serializer\Type("string")
*/
public $description;
/**
* @ORM\Column(type="datetime")
* @Serializer\Expose()
*/
public $creationDate;
/**
* @ORM\Column(type="datetime")
*/
public $expiracyDate;
/**
* @ORM\ManyToOne(targetEntity="App\Entity\Owner", inversedBy="polls",cascade={"persist"})
* @ORM\JoinColumn(nullable=false)
* @Serializer\Type("App\Entity\Owner")
*/
public $owner;
/**
* used to allow administration
* @ORM\Column(type="string", length=255)
* @Serializer\Type("string")
*/
private $adminKey;
/**
* kind of poll, text or date
* @ORM\Column(type="string", length=255)
@ -110,24 +94,37 @@ class Poll {
* @Serializer\Type("boolean")
*/
public $showResultEvenIfPasswords;
/**
* @ORM\OneToMany(targetEntity="App\Entity\Vote", mappedBy="poll", orphanRemoval=true,cascade={"persist"})
* @ORM\OneToMany(targetEntity="App\Entity\Vote", mappedBy="poll", orphanRemoval=true,cascade={"persist", "remove"})
* @Serializer\Type("App\Entity\Vote")
*/
public $votes;
/**
* @ORM\OneToMany(targetEntity="App\Entity\Choice", mappedBy="poll", orphanRemoval=true,cascade={"persist"})
* @ORM\OneToMany(targetEntity="App\Entity\StackOfVotes", mappedBy="poll", orphanRemoval=true,cascade={"persist", "remove"})
* @Serializer\Type("App\Entity\StackOfVotes")
*/
public $stackOfVotes;
/**
* @ORM\OneToMany(targetEntity="App\Entity\Choice", mappedBy="poll", orphanRemoval=true,cascade={"persist", "remove"})
* @Serializer\Type("App\Entity\Choice")
*/
public $choices;
/**
* @ORM\OneToMany(targetEntity="App\Entity\Comment", mappedBy="poll")
* @Serializer\Type("App\Entity\Comment")
*/
public $comments;
/**
* vote restricted by a password in md5 format
* @ORM\Column(type="string", length=255, nullable=true)
*/
private $password;
/**
* used to allow administration
* @ORM\Column(type="string", length=255)
* @Serializer\Type("string")
*/
private $adminKey;
/**
* @ORM\ManyToOne(targetEntity="App\Entity\StackOfVotes", inversedBy="votes")
*/
@ -137,6 +134,7 @@ class Poll {
$this->votes = new ArrayCollection();
$this->choices = new ArrayCollection();
$this->comments = new ArrayCollection();
$this->stackOfVotes = new ArrayCollection();
}
public function getId(): ?int {
@ -153,21 +151,21 @@ class Poll {
return $this;
}
public function getCreationDate(): ?\DateTimeInterface {
public function getCreationDate(): ?DateTimeInterface {
return $this->creationDate;
}
public function setCreationDate( \DateTimeInterface $creationDate ): self {
public function setCreationDate( DateTimeInterface $creationDate ): self {
$this->creationDate = $creationDate;
return $this;
}
public function getExpiracyDate(): ?\DateTimeInterface {
public function getExpiracyDate(): ?DateTimeInterface {
return $this->expiracyDate;
}
public function setExpiracyDate( \DateTimeInterface $expiracyDate ): self {
public function setExpiracyDate( DateTimeInterface $expiracyDate ): self {
$this->expiracyDate = $expiracyDate;
return $this;
@ -367,15 +365,44 @@ class Poll {
return $this;
}
public function getStacksOfVotes(): ?StackOfVotes
{
public function getStacksOfVotes(): ?StackOfVotes {
return $this->stacksOfVotes;
}
public function setStacksOfVotes(?StackOfVotes $stacksOfVotes): self
{
public function setStacksOfVotes( ?StackOfVotes $stacksOfVotes ): self {
$this->stacksOfVotes = $stacksOfVotes;
return $this;
}
/**
* @return Collection|StackOfVotes[]
*/
public function getStackOfVotes(): Collection
{
return $this->stackOfVotes;
}
public function addStackOfVote(StackOfVotes $stackOfVote): self
{
if (!$this->stackOfVotes->contains($stackOfVote)) {
$this->stackOfVotes[] = $stackOfVote;
$stackOfVote->setPoll($this);
}
return $this;
}
public function removeStackOfVote(StackOfVotes $stackOfVote): self
{
if ($this->stackOfVotes->contains($stackOfVote)) {
$this->stackOfVotes->removeElement($stackOfVote);
// set the owning side to null (unless already changed)
if ($stackOfVote->getPoll() === $this) {
$stackOfVote->setPoll(null);
}
}
return $this;
}
}

65
src/Entity/StackOfVotes.php
View File

@ -7,10 +7,10 @@ use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM;
/**
* contains the votes for one answer to a poll
* @ORM\Entity(repositoryClass="App\Repository\StackOfVotesRepository")
*/
class StackOfVotes
{
class StackOfVotes {
/**
* @ORM\Id()
* @ORM\GeneratedValue()
@ -23,93 +23,62 @@ class StackOfVotes
*/
private $votes;
/**
* @ORM\Column(type="string", length=255, nullable=true)
*/
private $pseudo;
/**
* @ORM\Column(type="string", length=255)
*/
private $modifierToken;
/**
* @ORM\ManyToOne(targetEntity="App\Entity\Owner", inversedBy="stackOfVotes")
*/
private $owner;
public function __construct()
{
public function __construct() {
$this->votes = new ArrayCollection();
}
public function getId(): ?int
{
public function getId(): ?int {
return $this->id;
}
/**
* @return Collection|poll[]
*/
public function getVotes(): Collection
{
public function getVotes(): Collection {
return $this->votes;
}
public function addVote(poll $vote): self
{
if (!$this->votes->contains($vote)) {
public function addVote( poll $vote ): self {
if ( ! $this->votes->contains( $vote ) ) {
$this->votes[] = $vote;
$vote->setStacksOfVotes($this);
$vote->setStacksOfVotes( $this );
}
return $this;
}
public function removeVote(poll $vote): self
{
if ($this->votes->contains($vote)) {
$this->votes->removeElement($vote);
public function removeVote( poll $vote ): self {
if ( $this->votes->contains( $vote ) ) {
$this->votes->removeElement( $vote );
// set the owning side to null (unless already changed)
if ($vote->getStacksOfVotes() === $this) {
$vote->setStacksOfVotes(null);
if ( $vote->getStacksOfVotes() === $this ) {
$vote->setStacksOfVotes( null );
}
}
return $this;
}
public function getPseudo(): ?string
{
public function getPseudo(): ?string {
return $this->pseudo;
}
public function setPseudo(?string $pseudo): self
{
public function setPseudo( ?string $pseudo ): self {
$this->pseudo = $pseudo;
return $this;
}
public function getModifierToken(): ?string
{
return $this->modifierToken;
}
public function setModifierToken(string $modifierToken): self
{
$this->modifierToken = $modifierToken;
return $this;
}
public function getOwner(): ?Owner
{
public function getOwner(): ?Owner {
return $this->owner;
}
public function setOwner(?Owner $owner): self
{
public function setOwner( ?Owner $owner ): self {
$this->owner = $owner;
return $this;

90
src/Entity/Vote.php
View File

@ -2,6 +2,7 @@
namespace App\Entity;
use DateTimeInterface;
use Doctrine\ORM\Mapping as ORM;
use JMS\Serializer\Annotation as Serializer;
@ -9,84 +10,47 @@ use JMS\Serializer\Annotation as Serializer;
* @ORM\Entity(repositoryClass="App\Repository\VoteRepository")
*/
class Vote {
/**
* @ORM\Id()
* @ORM\GeneratedValue()
* @ORM\Column(type="integer")
* @Serializer\Type("integer")
*/
private $id;
/**
* @ORM\Column(type="string", length=255, nullable=true)
* @Serializer\Type("string")
*/
public $pseudo;
/**
* for a text kind of choice: could be "yes" "no" "maybe" and emptu.
* for a date kind, the choice linked is equivalent to the value selected
* @ORM\Column(type="string", length=255, nullable=true)
* @Serializer\Type("string")
*/
public $answerTxt;
/**
* @ORM\Column(type="datetime", nullable=true)
* @Serializer\Type("datetime")
*/
private $answerDate;
public $value;
/**
* @ORM\Column(type="datetime")
* @Serializer\Type("datetime")
*/
public $creationDate;
/**
* @ORM\ManyToOne(targetEntity="App\Entity\Poll", inversedBy="votes")
* @ORM\JoinColumn(nullable=false)
* @Serializer\Type("App\Entity\Poll")
*/
private $poll;
/**
* @ORM\ManyToOne(targetEntity="App\Entity\Choice", inversedBy="votes")
* @ORM\JoinColumn(nullable=false)
* @Serializer\Type("App\Entity\choice")
*/
public $choice;
/**
* @ORM\Id()
* @ORM\GeneratedValue()
* @ORM\Column(type="integer")
* @Serializer\Type("integer")
*/
private $id;
/**
* @ORM\ManyToOne(targetEntity="App\Entity\Poll", inversedBy="votes")
* @ORM\JoinColumn(nullable=false)
* @Serializer\Type("App\Entity\Poll")
*/
private $poll;
public function getId(): ?int {
return $this->id;
}
public function getAnswerTxt(): ?string {
return $this->answerTxt;
}
public function setAnswerTxt( ?string $answerTxt ): self {
$this->answerTxt = $answerTxt;
return $this;
}
public function getAnswerDate(): ?\DateTimeInterface {
return $this->answerDate;
}
public function setAnswerDate( ?\DateTimeInterface $answerDate ): self {
$this->answerDate = $answerDate;
return $this;
}
public function getCreationDate(): ?\DateTimeInterface {
return $this->creationDate;
}
public function setCreationDate( \DateTimeInterface $creationDate ): self {
$this->creationDate = $creationDate;
return $this;
}
public function getPoll(): ?Poll {
return $this->poll;
}
@ -116,4 +80,24 @@ class Vote {
return $this;
}
public function getValue(): ?string {
return $this->value;
}
public function setValue( ?string $value ): self {
$this->value = $value;
return $this;
}
public function getCreationDate(): ?DateTimeInterface {
return $this->creationDate;
}
public function setCreationDate( DateTimeInterface $creationDate ): self {
$this->creationDate = $creationDate;
return $this;
}
}