From 585bdc9f1980312689a29c6f6ced6237edf6934c Mon Sep 17 00:00:00 2001 From: Baptiste Lemoine Date: Tue, 21 Jan 2020 10:46:29 +0100 Subject: [PATCH] :zap: display vote stack data in new vote --- src/Controller/DefaultController.php | 7 ++++--- src/Entity/StackOfVotes.php | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/Controller/DefaultController.php b/src/Controller/DefaultController.php index 6c05a09..c4f10d6 100644 --- a/src/Controller/DefaultController.php +++ b/src/Controller/DefaultController.php @@ -407,8 +407,7 @@ class DefaultController extends AbstractController { return $this->json( [ 'message' => 'you created a comment', 'data' => [ - 'your_comment' => $comment->display(), - 'poll_comments' => $poll->getComments(), + 'your_comment' => $comment->display(), ], ], 201 ); @@ -444,6 +443,7 @@ class DefaultController extends AbstractController { } else { $existingOwner = true; } + // TODO anti flood $foundOwner ->setModifierToken( $poll->generateAdminKey() ); $stack = new StackOfVotes(); @@ -483,7 +483,8 @@ class DefaultController extends AbstractController { return $this->json( [ 'message' => 'you created a vote stack' . $precision, - 'vote_stack' => $stack, + 'vote_stack' => $stack->display(), + 'vote_count' => count( $poll->getStacksOfVotes() ), 'owner_modifier_token' => $foundOwner->getModifierToken(), 'json_you_sent' => $data, ], diff --git a/src/Entity/StackOfVotes.php b/src/Entity/StackOfVotes.php index bdcb900..98c752f 100644 --- a/src/Entity/StackOfVotes.php +++ b/src/Entity/StackOfVotes.php @@ -41,6 +41,21 @@ class StackOfVotes { */ private $owner; + + public function display() { + $tab = []; + foreach ( $this->getVotes() as $vote ) { + $tab[ $vote->getId() ] = [ + 'id' => $vote->getId(), + 'value' => $vote->getValue(), + 'choice_id' => $vote->getChoice()->getId(), + 'text' => $vote->getChoice()->getName(), + ]; + } + + return $tab; + } + public function __construct() { $this->votes = new ArrayCollection(); }