Optimization of polling code

Author: Toxantron

src/controllers/poll-controller.php

@@ -86,75 +86,93 @@ private function placeVote($sessionId, $memberId, $voteValue)
   }
 
   // Wrap up current poll in reponse object
-  private function currentPoll($sessionId)
+  private function current($sessionId)
   {
     // Load the user-vote.php required for this
     include __DIR__ .  "/user-vote.php";
 
     $session = $this->getSession($sessionId);
-    $cardSet = $this->getCardSet($session);
 
-    // Create response array
-    $votes = array();
-    $currentPoll = $session->getCurrentPoll();
-    foreach($session->getMembers() as $index=>$member)
-    {
-      $votes[$index] = UserVote::create($member, $currentPoll, $cardSet);
-    }
-
     // Create reponse object
     $response = new stdClass();
     $response->name = $session->getName();
-    $response->topic = $currentPoll != null ? $currentPoll->getTopic() : "";
-    // Time taken for estimation
-    if($currentPoll != null)
+    $response->votes = array();
+
+    // Include votes in response
+    $currentPoll = $session->getCurrentPoll();
+    if ($currentPoll == null)
     {
-      $diff = $currentPoll->getEndTime()->diff($currentPoll->getStartTime());
-      $response->duration = new stdClass();
-      $response->duration->min = $diff->i;
-      $response->duration->sec = $diff->s;
+      $response->topic = "";
+      $response->flipped = false;
+      $response->consensus = false;
     }
-    // Vote estimation
-    $response->votes = $votes;
-    $response->flipped = is_null($currentPoll) ? false : $currentPoll->getResult() >= 0;
-    $response->consensus = is_null($currentPoll) ? false : $currentPoll->getConsensus();
+    else
+    {
+      $response->topic = $currentPoll->getTopic();
+      $response->flipped = $currentPoll->getResult() >= 0;
+      $response->consensus = $currentPoll->getConsensus();
+
+      $diff = $currentPoll->getEndTime()->diff($currentPoll->getStartTime());
+      $response->duration = $diff;
+    } 
+
+    // Members votes
+    $cardSet = $this->getCardSet($session);
+    $query = $this->entityManager
+      ->createQuery('SELECT m.id, m.name, v.value, v.highlighted FROM member m LEFT JOIN m.votes v WITH (v.member = m AND v.poll = ?1) WHERE m.session = ?2')
+      ->setParameter(1, $currentPoll)
+      ->setParameter(2, $session);
+    $result = $query->getArrayResult();
+    foreach($result as $vote)
+      $response->votes[] = UserVote::fromQuery($cardSet, $vote);
 
     return $response;
   }
+
+  private function topic($sessionId)
+  {
+      $session = $this->getSession($sessionId);
+      $currentPoll = $session->getCurrentPoll();
+
+      // Result object. Only votable until all votes received
+      $result = new stdClass();
+      if ($currentPoll == null)
+      {
+          $result->topic = "No topic";
+          $result->votable = false;
+      }
+      else
+      {
+          $result->topic = $currentPoll->getTopic();
+          $result->votable = $currentPoll->getResult() < 0;
+      }
+
+      return $result;
+  }
 
   public function execute()
   {
     switch($this->requestedMethod())
     {
       case "current":
         $sessionId = $_GET["id"];
-        return $this->currentPoll($sessionId);
+        return $this->current($sessionId);
 
       case "start":
-        $data = $this->jsonInput();
-        
+        $data = $this->jsonInput();        
         $this->startPoll($data["sessionId"], $data["topic"]);
         return null;
 
       case "place":
         $data = $this->jsonInput();
-
         $this->placeVote($data["sessionId"], $data["memberId"], $data["vote"]);
         return null;
 
       case "topic":
-        $session = $this->getSession($_GET["sid"]);
-        $currentPoll = $session->getCurrentPoll();
-
-        // Result object. Only votable until all votes received
-        $result = new stdClass();
-        $result->topic = is_null($currentPoll) ? "No topic" : $currentPoll->getTopic();
-        $result->votable = is_null($currentPoll) ? false : $currentPoll->getResult() < 0;
-        
-        return $result;
+        $sessionId = $_GET["sid"];
+        return $this->topic($sessionId);
     }
   }
 }
 
-return new PollController($entityManager, $cardSets);
-?>
+return new PollController($entityManager, $cardSets);

src/controllers/user-vote.php

@@ -8,31 +8,17 @@ private function __construct()
     $this->active = false;
   }
 
-  // Create instance from member entity
-  public static function create($member, $currentPoll, $cardSet)
+  // Create vote object from query object
+  public static function fromQuery($cardSet, $entity)
   {
     $vote = new UserVote();
-    $vote->id = $member->getId();
-    $vote->name = $member->getName();
-    
-    // Poll related values
-    if(is_null($currentPoll))
-      return $vote;
-  
-    // Find matching member in poll
-    foreach($currentPoll->getVotes() as $candidate)
-    {
-      if($candidate->getMember() === $member)
-      {
-        $match = $candidate; 
-      }
-    }
-  
-    if(isset($match))
+    $vote->id = $entity['id'];
+    $vote->name = $entity['name'];
+    if($entity['value'] !== null)
     {
       $vote->placed = true;
-      $vote->value = $cardSet[$match->getValue()];  
-      $vote->active = $match->getHighlighted();
+      $vote->value = $cardSet[$entity['value']];  
+      $vote->active = $entity['highlighted'];
     }
 
     return $vote;

src/model/poll.php

@@ -32,7 +32,7 @@ function __construct()
     /** @ManyToOne(targetEntity="Session", inversedBy="polls") **/
     protected $session;
 
-    /** @OneToMany(targetEntity="Vote", mappedBy="poll", fetch="EAGER") **/
+    /** @OneToMany(targetEntity="Vote", mappedBy="poll") **/
     protected $votes;
 
     public function getId()

src/model/session.php

@@ -23,7 +23,7 @@ class Session
     /** @Column(type="datetime") **/ 
     protected $lastAction;
 
-    /** @OneToMany(targetEntity="Member", mappedBy="session", fetch="EAGER", orphanRemoval=true) **/
+    /** @OneToMany(targetEntity="Member", mappedBy="session", orphanRemoval=true) **/
     protected $members;
 
     /** @OneToMany(targetEntity="Poll", mappedBy="session", orphanRemoval=true) **/