Remove a bit of trashy code in assignment repositories and polish it so @krulis-martin likes it

Author: Neloop

app/model/repository/AssignmentSolutions.php

@@ -7,6 +7,7 @@
 use Kdyby\Doctrine\EntityManager;
 use App\Model\Entity\AssignmentSolution;
 use App\Model\Entity\Assignment;
+use Nette\Utils\Arrays;
 
 
 /**
@@ -49,7 +50,8 @@ public function findValidSolutions(Assignment $assignment, User $user) {
    * @return AssignmentSolution|null
    */
   public function findBestSolution(Assignment $assignment, User $user): ?AssignmentSolution {
-    return $this->findBestSolutionsForAssignments([$assignment], $user)[$assignment->getId()]->value;
+    $solutions = $this->findBestSolutionsForAssignments([$assignment], $user);
+    return Arrays::get($solutions, $assignment->getId(), null);
   }
 
   /**
@@ -87,36 +89,33 @@ private function findValidSolutionsForAssignments(array $assignments, User $user
    * Find best solutions of given assignments for user.
    * @param Assignment[] $assignments
    * @param User $user
-   * @return Pair[] An associative array (indexed by assignment id) of pairs where the first item is
-   * an assignment entity and the second is a solution entity (the best one for the assignment)
+   * @return AssignmentSolution[] An associative array indexed by assignment id
+   * with values of a solution entity (the best one for the assignment)
    */
   public function findBestSolutionsForAssignments(array $assignments, User $user): array {
     $result = [];
-    foreach ($assignments as $assignment) {
-      $result[$assignment->getId()] = new Pair($assignment, null);
-    }
-
     $solutions = $this->findValidSolutionsForAssignments($assignments, $user);
     foreach ($solutions as $solution) {
       $assignment = $solution->getAssignment();
-      $best = $result[$assignment->getId()]->value;
+      $best = Arrays::get($result, $assignment->getId(), null);
 
       if ($best === null) {
-        $result[$assignment->getId()]->value = $solution;
+        $result[$assignment->getId()] = $solution;
         continue;
       }
 
+
       if ($best->isAccepted()) {
         continue;
       }
 
       if ($solution->isAccepted()) {
-        $result[$assignment->getId()]->value = $solution;
+        $result[$assignment->getId()] = $solution;
         continue;
       }
 
       if ($best->getTotalPoints() < $solution->getTotalPoints()) {
-        $result[$assignment->getId()]->value = $solution;
+        $result[$assignment->getId()] = $solution;
       }
     }
 

app/model/repository/ShadowAssignmentPointsRepository.php

@@ -21,24 +21,19 @@ public function __construct(EntityManager $em) {
    * Find points for given user of given assignments.
    * @param ShadowAssignment[] $shadowAssignments
    * @param User $awardee
-   * @return Pair[] indexed by the shadow assignment identification, value is
-   * pair which key is assignment and value is points. Points can be null if
-   * there are no points for the assignment and user
+   * @return ShadowAssignmentPoints[] indexed by the shadow assignment
+   * identification, value is shadow assignment points for the assignment
    */
   public function findPointsForAssignments(array $shadowAssignments, User $awardee): array {
-    $result = [];
-    foreach ($shadowAssignments as $assignment) {
-      $result[$assignment->getId()] = new Pair($assignment, null);
-    }
-
     $pointsList = $this->findBy([
       "awardee" => $awardee,
       "shadowAssignment" => $shadowAssignments, // doctrine will handle given array with IN operator
     ]);
 
     /** @var ShadowAssignmentPoints $points */
+    $result = [];
     foreach ($pointsList as $points) {
-      $result[$points->getShadowAssignment()->getId()]->value = $points;
+      $result[$points->getShadowAssignment()->getId()] = $points;
     }
     return $result;
   }

app/model/view/GroupViewFactory.php

@@ -20,6 +20,7 @@
 use App\Security\ACL\IShadowAssignmentPermissions;
 use App\Security\ACL\IGroupPermissions;
 use Doctrine\Common\Collections\Collection;
+use Nette\Utils\Arrays;
 
 
 /**
@@ -63,19 +64,14 @@ public function __construct(AssignmentSolutions $assignmentSolutions,
 
   /**
    * Get total sum of points which given user gained in given solutions.
-   * @param Pair[] $solutions list of pairs, second item is solution, can be null
+   * @param AssignmentSolution[] $solutions list of assignment solutions
    * @return int
    */
   private function getPointsGainedByStudentForSolutions(array $solutions) {
     return array_reduce(
       $solutions,
-      function ($carry, Pair $solutionPair) {
-        $best = $solutionPair->value;
-        if ($best !== null) {
-          $carry += $best->getTotalPoints();
-        }
-
-        return $carry;
+      function ($carry, AssignmentSolution $solution) {
+        return $carry + $solution->getTotalPoints();
       },
       0
     );
@@ -88,12 +84,8 @@ function ($carry, Pair $solutionPair) {
    */
   private function getPointsForShadowAssignments(array $shadowPointsList): int {
     return array_reduce($shadowPointsList,
-      function ($carry, Pair $pointsPair) {
-        $points = $pointsPair->value;
-        if ($points !== null) {
-          $carry += $points->getPoints();
-        }
-        return $carry;
+      function ($carry, ShadowAssignmentPoints $points) {
+        return $carry + $points->getPoints();
       },
       0);
   }
@@ -107,18 +99,16 @@ function ($carry, Pair $pointsPair) {
   public function getStudentsStats(Group $group, User $student) {
     $maxPoints = $group->getMaxPoints();
     $assignmentSolutions = $this->assignmentSolutions->findBestSolutionsForAssignments($group->getAssignments()->getValues(), $student);
-    $shadowPointsList = $this->shadowAssignmentPointsRepository->findPointsForAssignments($group->getShadowAssignments()->getValues(), $student);
+    $shadowPointsMap = $this->shadowAssignmentPointsRepository->findPointsForAssignments($group->getShadowAssignments()->getValues(), $student);
     $gainedPoints = $this->getPointsGainedByStudentForSolutions($assignmentSolutions);
-    $gainedPoints += $this->getPointsForShadowAssignments($shadowPointsList);
+    $gainedPoints += $this->getPointsForShadowAssignments($shadowPointsMap);
 
     $assignments = [];
-    foreach ($assignmentSolutions as $solutionPair) {
+    foreach ($group->getAssignments()->getValues() as $assignment) {
       /**
        * @var Assignment $assignment
-       * @var AssignmentSolution $best
        */
-      $assignment = $solutionPair->key;
-      $best = $solutionPair->value;
+      $best = Arrays::get($assignmentSolutions, $assignment->getId(), null);
       $submission = $best ? $best->getLastSubmission() : null;
 
       $assignments[] = [
@@ -133,14 +123,16 @@ public function getStudentsStats(Group $group, User $student) {
     }
 
     $shadowAssignments = [];
-    foreach ($shadowPointsList as $pointsPair) {
-      $assignment = $pointsPair->key;
-      $shadowPoints = $pointsPair->value;
+    foreach ($group->getShadowAssignments()->getValues() as $shadowAssignment) {
+      /**
+       * @var ShadowAssignment $shadowAssignment
+       */
+      $shadowPoints = Arrays::get($shadowPointsMap, $shadowAssignment->getId(), null);
 
       $shadowAssignments[] = [
-        "id" => $assignment->getId(),
+        "id" => $shadowAssignment->getId(),
         "points" => [
-          "total" => $assignment->getMaxPoints(),
+          "total" => $shadowAssignment->getMaxPoints(),
           "gained" => $shadowPoints ? $shadowPoints->getPoints() : null
         ]
       ];