Implementation of sum of points for students statistics. ShadowAssignmentEvaluation added author column.

Author: Neloop

app/config/config.neon

@@ -342,6 +342,8 @@ services:
   - App\Model\Repository\Pipelines
   - App\Model\Repository\SisGroupBindings
   - App\Model\Repository\SisValidTerms
+  - App\Model\Repository\ShadowAssignments
+  - App\Model\Repository\ShadowAssignmentEvaluations
 
   # views factories
   - App\Model\View\ExerciseViewFactory

app/model/entity/ShadowAssignmentEvaluation.php

@@ -11,17 +11,19 @@
  * @method string getId()
  * @method string getNote()
  * @method ShadowAssignment getShadowAssignment()
+ * @method User getAuthor()
  * @method int getPoints()
  * @method setPoints(int $points)
  */
 class ShadowAssignmentEvaluation
 {
   use MagicAccessors;
 
-  public function __construct(string $note, ShadowAssignment $shadowAssignment) {
-    $this->points = 0;
+  public function __construct(int $points, string $note, ShadowAssignment $shadowAssignment, User $author) {
+    $this->points = $points;
     $this->shadowAssignment = $shadowAssignment;
     $this->note = $note;
+    $this->author = $author;
   }
 
   /**
@@ -31,6 +33,11 @@ public function __construct(string $note, ShadowAssignment $shadowAssignment) {
    */
   protected $id;
 
+  /**
+   * @ORM\Column(type="integer")
+   */
+  protected $points;
+
   /**
    * @ORM\Column(type="text")
    */
@@ -43,8 +50,8 @@ public function __construct(string $note, ShadowAssignment $shadowAssignment) {
   protected $shadowAssignment;
 
   /**
-   * @ORM\Column(type="integer")
+   * @ORM\ManyToOne(targetEntity="User")
    */
-  protected $points;
+  protected $author;
 
 }

app/model/repository/ShadowAssignmentEvaluations.php

@@ -2,16 +2,31 @@
 
 namespace App\Model\Repository;
 
+use App\Model\Entity\ShadowAssignment;
 use App\Model\Entity\ShadowAssignmentEvaluation;
+use App\Model\Entity\User;
 use Kdyby\Doctrine\EntityManager;
 
 /**
  * @method ShadowAssignmentEvaluation findOrThrow($id)
  */
-class ShadowAssignmentEvaluations extends BaseSoftDeleteRepository {
+class ShadowAssignmentEvaluations extends BaseRepository {
 
   public function __construct(EntityManager $em) {
     parent::__construct($em, ShadowAssignmentEvaluation::class);
   }
 
+  /**
+   * Find best solutions of given assignments for user.
+   * @param ShadowAssignment[] $shadowAssignments
+   * @param User $user
+   * @return ShadowAssignmentEvaluation[]
+   */
+  public function findEvaluationsForAssignment(array $shadowAssignments, User $user): array {
+    return $this->findBy([
+      "author" => $user,
+      "assignment" => $shadowAssignments,
+    ]);
+  }
+
 }

app/model/view/GroupViewFactory.php

@@ -11,8 +11,11 @@
 use App\Model\Entity\AssignmentSolution;
 use App\Model\Entity\Group;
 use App\Model\Entity\LocalizedGroup;
+use App\Model\Entity\ShadowAssignment;
+use App\Model\Entity\ShadowAssignmentEvaluation;
 use App\Model\Entity\User;
 use App\Model\Repository\AssignmentSolutions;
+use App\Model\Repository\ShadowAssignmentEvaluations;
 use App\Security\ACL\IAssignmentPermissions;
 use App\Security\ACL\IGroupPermissions;
 use Doctrine\Common\Collections\Collection;
@@ -24,30 +27,29 @@
  */
 class GroupViewFactory {
 
-  /**
-   * @var AssignmentSolutions
-   */
+  /** @var AssignmentSolutions */
   private $assignmentSolutions;
 
-  /**
-   * @var IGroupPermissions
-   */
+  /** @var IGroupPermissions */
   private $groupAcl;
 
-  /**
-   * @var IAssignmentPermissions
-   */
+  /** @var IAssignmentPermissions */
   private $assignmentAcl;
 
   /** @var GroupBindingAccessor */
   private $bindings;
 
+  /** @var ShadowAssignmentEvaluations */
+  private $shadowAssignmentEvaluations;
+
   public function __construct(AssignmentSolutions $assignmentSolutions, IGroupPermissions $groupAcl,
-                              IAssignmentPermissions $assignmentAcl, GroupBindingAccessor $bindings) {
+                              IAssignmentPermissions $assignmentAcl, GroupBindingAccessor $bindings,
+                              ShadowAssignmentEvaluations $shadowAssignmentEvaluations) {
     $this->assignmentSolutions = $assignmentSolutions;
     $this->groupAcl = $groupAcl;
     $this->assignmentAcl = $assignmentAcl;
     $this->bindings = $bindings;
+    $this->shadowAssignmentEvaluations = $shadowAssignmentEvaluations;
   }
 
 
@@ -72,12 +74,16 @@ function ($carry, Pair $solutionPair) {
   }
 
   /**
-   * @param Group $group
-   * @param User $user
+   * Get total sum of points which given user gained in given shadow assignments.
+   * @param ShadowAssignmentEvaluation[] $shadowEvaluations
    * @return int
    */
-  private function getPointsForShadowAssignments(Group $group, User $user): int {
-    // TODO
+  private function getPointsForShadowAssignments(array $shadowEvaluations): int {
+    return array_reduce($shadowEvaluations,
+      function ($carry, ShadowAssignmentEvaluation $evaluation) {
+        return $carry + $evaluation->getPoints();
+      },
+      0);
   }
 
   /**
@@ -88,12 +94,13 @@ private function getPointsForShadowAssignments(Group $group, User $user): int {
    */
   public function getStudentsStats(Group $group, User $student) {
     $maxPoints = $group->getMaxPoints();
-    $solutions = $this->assignmentSolutions->findBestSolutionsForAssignments($group->getAssignments()->getValues(), $student);
-    $gainedPoints = $this->getPointsGainedByStudentForSolutions($solutions);
-    $gainedPoints += $this->getPointsForShadowAssignments($group, $student);
+    $assignmentSolutions = $this->assignmentSolutions->findBestSolutionsForAssignments($group->getAssignments()->getValues(), $student);
+    $shadowEvaluations = $this->shadowAssignmentEvaluations->findEvaluationsForAssignment($group->getShadowAssignments()->getValues(), $student);
+    $gainedPoints = $this->getPointsGainedByStudentForSolutions($assignmentSolutions);
+    $gainedPoints += $this->getPointsForShadowAssignments($shadowEvaluations);
 
     $assignments = [];
-    foreach ($solutions as $solutionPair) {
+    foreach ($assignmentSolutions as $solutionPair) {
       /**
        * @var Assignment $assignment
        * @var AssignmentSolution $best
@@ -113,8 +120,17 @@ public function getStudentsStats(Group $group, User $student) {
       ];
     }
 
-    // TODO: points assignments
-    $shadowAssignments = null;
+    $shadowAssignments = [];
+    foreach ($shadowEvaluations as $evaluation) {
+      $assignment = $evaluation->getShadowAssignment();
+      $shadowAssignments[] = [
+        "id" => $assignment->getId(),
+        "points" => [
+          "total" => $assignment->getMaxPoints(),
+          "gained" => $evaluation->getPoints()
+        ]
+      ];
+    }
 
     return [
       "userId" => $student->getId(),