Updating group entity to contain points limit (along with threshold).

ReCodEx · Oct 10, 2024 · d749b3e · d749b3e
1 parent 80ce053
commit d749b3e
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 3 deletions.
diff --git a/app/model/entity/Group.php b/app/model/entity/Group.php
@@ -102,6 +102,11 @@ public function __construct(
      */
     protected $threshold;
 
+    /**
+     * @ORM\Column(type="integer", nullable=true)
+     */
+    protected $pointsLimit;
+
     /**
      * @ORM\Column(type="boolean")
      */
@@ -944,6 +949,16 @@ public function setThreshold(?float $threshold): void
         $this->threshold = $threshold;
     }
 
+    public function getPointsLimit(): ?int
+    {
+        return $this->pointsLimit;
+    }
+
+    public function setPointsLimit(?int $pointsLimit): void
+    {
+        $this->pointsLimit = $pointsLimit;
+    }
+
     public function getPublicStats(): bool
     {
         return $this->publicStats;

diff --git a/app/model/view/GroupViewFactory.php b/app/model/view/GroupViewFactory.php
@@ -158,16 +158,21 @@ private function getStudentStatsInternal(
             ];
         }
 
+        $passesLimit = null;  // null = no limit
+        if ($group->getPointsLimit() !== null && $group->getPointsLimit() > 0) {
+            $passesLimit = $gainedPoints >= $group->getPointsLimit();
+        } elseif ($group->getThreshold() !== null && $group->getThreshold() > 0) {
+            $passesLimit = $gainedPoints >= $maxPoints * $group->getThreshold();
+        }
         return [
             "userId" => $student->getId(),
             "groupId" => $group->getId(),
             "points" => [
                 "total" => $maxPoints,
                 "gained" => $gainedPoints
             ],
-            "hasLimit" => $group->getThreshold() !== null && $group->getThreshold() > 0,
-            "passesLimit" => $group->getThreshold(
-            ) === null ? true : $gainedPoints >= $maxPoints * $group->getThreshold(),
+            "hasLimit" => $passesLimit !== null,
+            "passesLimit" => $passesLimit ?? true,
             "assignments" => $assignments,
             "shadowAssignments" => $shadowAssignments
         ];
@@ -251,6 +256,7 @@ function (ShadowAssignment $assignment) {
                 "publicStats" => $group->getPublicStats(),
                 "detaining" => $group->isDetaining(),
                 "threshold" => $group->getThreshold(),
+                "pointsLimit" => $group->getPointsLimit(),
                 "bindings" => $this->bindings->getBindingsForGroup($group),
                 "examBegin" => $group->hasExamPeriodSet() ? $group->getExamBegin()?->getTimestamp() : null,
                 "examEnd" => $group->hasExamPeriodSet() ? $group->getExamEnd()?->getTimestamp() : null,

diff --git a/migrations/Version20241010152436.php b/migrations/Version20241010152436.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20241010152436 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE `group` ADD points_limit INT DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE `group` DROP points_limit');
+    }
+}