Fixing problem with exercise file links removal during exercise-assignment sync.

Author: krulis-martin

app/model/entity/Assignment.php

@@ -25,17 +25,18 @@ class Assignment extends AssignmentBase implements IExercise
     use ExerciseData;
 
     /**
-     * @ORM\OneToMany(targetEntity="ExerciseFileLink", mappedBy="assignment", cascade={"persist"})
+     * @ORM\OneToMany(targetEntity="ExerciseFileLink", mappedBy="assignment", cascade={"persist", "remove"},
+     *                orphanRemoval=true)
      * @var Collection<ExerciseFileLink>
      */
-    protected $fileLinks;
+    protected $exerciseFileLinks;
 
     /**
      * @return Collection<ExerciseFileLink>
      */
     public function getFileLinks(): Collection
     {
-        return $this->fileLinks;
+        return $this->exerciseFileLinks;
     }
 
     private function __construct(
@@ -91,7 +92,7 @@ private function __construct(
         $this->configurationType = $exercise->getConfigurationType();
         $this->exerciseFiles = $exercise->getExerciseFiles();
         $this->attachmentFiles = $exercise->getAttachmentFiles();
-        $this->fileLinks = new ArrayCollection();
+        $this->exerciseFileLinks = new ArrayCollection();
         $this->solutionFilesLimit = $exercise->getSolutionFilesLimit();
         $this->solutionSizeLimit = $exercise->getSolutionSizeLimit();
     }
@@ -125,7 +126,7 @@ public static function assignToGroup(
         // copy file links from exercise
         foreach ($exercise->getFileLinks() as $link) {
             $newLink = ExerciseFileLink::copyForAssignment($link, $assignment);
-            $assignment->fileLinks->add($newLink);
+            $assignment->exerciseFileLinks->add($newLink);
         }
 
         return $assignment;
@@ -599,10 +600,10 @@ public function syncWithExercise(array $options = []): void
         }
 
         if ($syncOptions->fileLinks) {
-            $this->fileLinks->clear();
+            $this->exerciseFileLinks->clear();
             foreach ($exercise->getFileLinks() as $link) {
                 $newLink = ExerciseFileLink::copyForAssignment($link, $this);
-                $this->fileLinks->add($newLink);
+                $this->exerciseFileLinks->add($newLink);
             }
         }
 

app/model/entity/Exercise.php

@@ -112,7 +112,8 @@ class Exercise implements IExercise
     protected $archivedAt = null;
 
     /**
-     * @ORM\OneToMany(targetEntity="ExerciseFileLink", mappedBy="exercise", cascade={"persist"})
+     * @ORM\OneToMany(targetEntity="ExerciseFileLink", mappedBy="exercise", cascade={"persist", "remove"},
+     *                orphanRemoval=true)
      * @var Collection<ExerciseFileLink>
      */
     protected $fileLinks;

app/model/entity/ExerciseFileLink.php

@@ -59,7 +59,7 @@ class ExerciseFileLink implements JsonSerializable
     protected $exercise;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Assignment")
+     * @ORM\ManyToOne(targetEntity="Assignment", inversedBy="exerciseFileLinks")
      * @ORM\JoinColumn(onDelete="CASCADE")
      */
     protected $assignment;

tests/Presenters/AssignmentsPresenter.phpt

@@ -841,6 +841,7 @@ class TestAssignmentsPresenter extends Tester\TestCase
 
         Assert::same($assignment->getId(), $data["id"]);
         Assert::same($newExerciseLimits, $assignment->getLimitsByEnvironmentAndHwGroup($environment, $hwGroup));
+        $this->presenter->assignments->refresh($assignment);
         Assert::count(1, $assignment->getFileLinks());
         $newLink = $assignment->getFileLinks()->first();
         Assert::equal("NEW", $newLink->getKey());