Merge branch 'master' of https://framagit.org/tykayn/date-poll-api

src/Controller/DefaultController.php

@@ -1,32 +1,32 @@
 <?php
 
-namespace App\Controller;
+	namespace App\Controller;
 
-use App\Entity\Choice;
+	use App\Entity\Choice;
-use App\Entity\Comment;
+	use App\Entity\Comment;
-use App\Entity\Owner;
+	use App\Entity\Owner;
-use App\Entity\Poll;
+	use App\Entity\Poll;
-use App\Entity\StackOfVotes;
+	use App\Entity\StackOfVotes;
-use App\Entity\Vote;
+	use App\Entity\Vote;
-use DateTime;
+	use DateTime;
-use DateTimeZone;
+	use DateTimeZone;
-use FOS\RestBundle\Controller\Annotations\Delete;
+	use FOS\RestBundle\Controller\Annotations\Delete;
-use FOS\RestBundle\Controller\Annotations\Get;
+	use FOS\RestBundle\Controller\Annotations\Get;
-use FOS\RestBundle\Controller\Annotations\Post;
+	use FOS\RestBundle\Controller\Annotations\Post;
-use FOS\RestBundle\Controller\Annotations\Put;
+	use FOS\RestBundle\Controller\Annotations\Put;
-use FOS\RestBundle\Controller\Annotations\Route;
+	use FOS\RestBundle\Controller\Annotations\Route;
-use JMS\Serializer\SerializerBuilder;
+	use JMS\Serializer\SerializerBuilder;
-use Swift_Message;
+	use Swift_Message;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+	use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\JsonResponse;
+	use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Request;
+	use Symfony\Component\HttpFoundation\Request;
 
-/**
+	/**
 	 * Class DefaultController
 	 * @package App\Controller
 	 * @Route("/api/v1",name="api_")
 	 */
-class DefaultController extends AbstractController {
+	class DefaultController extends AbstractController {
 
 
 		/**
@@ -275,7 +275,7 @@ class DefaultController extends AbstractController {
 					'poll'           => $poll,
 					'stacks_count'   => count( $poll->getStacksOfVotes() ),
 					'stacks'         => $stacks,
-			'choices_count'  => count( $poll->getChoices() ),
+					'choices_count'  => $poll->computeAnswers(),
 					'choices'        => $choices,
 					'comments'       => $comments,
 					'comments_count' => count( $comments ),
@@ -646,4 +646,4 @@ class DefaultController extends AbstractController {
 
 		}
 
-}
+	}

src/Entity/Choice.php

@@ -1,20 +1,20 @@
 <?php
 
-namespace App\Entity;
+	namespace App\Entity;
 
-use DateTime;
+	use DateTime;
-use DateTimeInterface;
+	use DateTimeInterface;
-use Doctrine\Common\Collections\ArrayCollection;
+	use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
+	use Doctrine\Common\Collections\Collection;
-use Doctrine\ORM\Mapping as ORM;
+	use Doctrine\ORM\Mapping as ORM;
-use JMS\Serializer\Annotation as Serializer;
+	use JMS\Serializer\Annotation as Serializer;
 
-/**
+	/**
 	 * one poll choice, could be a text or a date
 	 * @ORM\Entity(repositoryClass="App\Repository\ChoiceRepository")
 	 * @Serializer\ExclusionPolicy("all")
 	 */
-class Choice {
+	class Choice {
 		/**
 		 * @ORM\Id()
 		 * @ORM\GeneratedValue()
@@ -61,6 +61,7 @@ class Choice {
 			}
 		}
 
+
 		public function display() {
 			return [
 					'id'   => $this->getId(),
@@ -141,4 +142,4 @@ class Choice {
 
 			return $this;
 		}
-}
+	}

src/Entity/Poll.php

@@ -1,18 +1,18 @@
 <?php
 
-namespace App\Entity;
+	namespace App\Entity;
 
-use DateTimeInterface;
+	use DateTimeInterface;
-use Doctrine\Common\Collections\ArrayCollection;
+	use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
+	use Doctrine\Common\Collections\Collection;
-use Doctrine\ORM\Mapping as ORM;
+	use Doctrine\ORM\Mapping as ORM;
-use JMS\Serializer\Annotation as Serializer;
+	use JMS\Serializer\Annotation as Serializer;
 
-/**
+	/**
 	 * @ORM\Entity(repositoryClass="App\Repository\PollRepository")
 	 * @Serializer\ExclusionPolicy("all")
 	 */
-class Poll {
+	class Poll {
 		/**
 		 * @ORM\Id()
 		 * @ORM\GeneratedValue()
@@ -152,6 +152,47 @@ class Poll {
 		public $defaultExpiracyDaysFromNow = 60;
 		private $maxChoicesLimit = 25;
 
+		public function computeAnswers() {
+			// counts each number of answer for this choice
+			$computedArray = [];
+			$people        = [];
+
+			foreach ( $this->getStacksOfVotes() as $stack_of_vote ) {
+				foreach ( $stack_of_vote->getVotes() as $vote ) {
+					if ( ! isset( $computedArray[ $vote->getChoice()->getId() ] ) ) {
+						$computedArray[ $vote->getChoice()->getId() ] = [
+								'yes'   => [
+										'count'  => 0,
+										'people' => [],
+								],
+								'maybe' => [
+										'count'  => 0,
+										'people' => [],
+								],
+								'no'    => [
+										'count'  => 0,
+										'people' => [],
+								],
+						];
+					}
+					$computedArray[ $vote->getChoice()->getId() ][ $vote->getValue() ][ 'count' ] ++;
+					$computedArray[ $vote->getChoice()->getId() ][ $vote->getValue() ][ 'people' ][] = $stack_of_vote->getOwner()->getPseudo();
+
+				}
+			}
+
+			return [
+					'counts' => $computedArray,
+			];
+		}
+
+		public function display() {
+			return [
+					'poll'    => $this,
+					'answers' => $this->computeAnswers(),
+			];
+		}
+
 		public function __construct() {
 			$this->votes         = new ArrayCollection();
 			$this->stacksOfVotes = new ArrayCollection();
@@ -171,6 +212,7 @@ class Poll {
 			$this->setAllowedAnswers( [ 'yes' ] );
 		}
 
+
 		public function generateAdminKey() {
 			$rand = random_int( PHP_INT_MIN, PHP_INT_MAX );
 
@@ -543,4 +585,4 @@ class Poll {
 
 			return $this;
 		}
-}
+	}

src/Entity/StackOfVotes.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Entity;
+	namespace App\Entity;
 
-use Doctrine\Common\Collections\ArrayCollection;
+	use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
+	use Doctrine\Common\Collections\Collection;
-use Doctrine\ORM\Mapping as ORM;
+	use Doctrine\ORM\Mapping as ORM;
-use JMS\Serializer\Annotation as Serializer;
+	use JMS\Serializer\Annotation as Serializer;
 
-/**
+	/**
 	 * contains the votes for one answer to a poll
 	 * @ORM\Entity(repositoryClass="App\Repository\StackOfVotesRepository")
 	 */
-class StackOfVotes {
+	class StackOfVotes {
 		/**
 		 * @ORM\Id()
 		 * @ORM\GeneratedValue()
@@ -49,8 +49,15 @@ class StackOfVotes {
 					'creation_date' => '',
 					'votes'         => [],
 			];
+			// prefill votes with all choices ids
+			foreach ( $this->getPoll()->getChoices() as $choice ) {
+				$tab[ 'votes' ][ $choice->getId() ] = [
+						'choice_id' => $choice->getId(),
+				];
+			}
+
 			foreach ( $this->getVotes() as $vote ) {
-			$tab[ 'votes' ][]       = [
+				$tab[ 'votes' ][ $vote->getChoice()->getId() ] = [
 						'id'        => $this->getId(),
 						'vote_id'   => $vote->getId(),
 						'value'     => $vote->getValue(),
@@ -131,4 +138,4 @@ class StackOfVotes {
 
 			return $this;
 		}
-}
+	}