Properly copying exercise file links when assignment is created or file is cloned.

Author: krulis-martin

app/model/entity/Assignment.php

@@ -76,9 +76,15 @@ private function __construct(
         $this->configurationType = $exercise->getConfigurationType();
         $this->exerciseFiles = $exercise->getExerciseFiles();
         $this->attachmentFiles = $exercise->getAttachmentFiles();
-        $this->fileLinks = new ArrayCollection(); // TODO properly copy from exercise
+        $this->fileLinks = new ArrayCollection();
         $this->solutionFilesLimit = $exercise->getSolutionFilesLimit();
         $this->solutionSizeLimit = $exercise->getSolutionSizeLimit();
+
+        // copy file links from exercise
+        foreach ($exercise->getFileLinks() as $link) {
+            $newLink = ExerciseFileLink::copyForAssignment($link, $this);
+            $this->fileLinks->add($newLink);
+        }
     }
 
     public static function assignToGroup(
@@ -454,16 +460,43 @@ function ($key, ExerciseTest $test) use ($exercise) {
     public function areExerciseFilesInSync(): bool
     {
         $exercise = $this->getExercise();
-        return $exercise
-            && $this->getExerciseFiles()->count()
-            === $exercise->getExerciseFiles()->count()
+        return $exercise && $this->getExerciseFiles()->count() === $exercise->getExerciseFiles()->count()
             && $this->getExerciseFiles()->forAll(
                 function ($key, ExerciseFile $file) use ($exercise) {
                     return $exercise->getExerciseFiles()->contains($file);
                 }
             );
     }
 
+    public function areExerciseFileLinksInSync(): bool
+    {
+        $exercise = $this->getExercise();
+        if (!$exercise || $this->getFileLinks()->count() !== $exercise->getFileLinks()->count()) {
+            return false;
+        }
+
+        // build index where keys are exercise file IDs
+        $fileIndex = [];
+        foreach ($this->getFileLinks() as $link) {
+            $fileIndex[$link->getExerciseFile()->getId()] = $link;
+        }
+
+        // verify that all exercise links are present and has the same data
+        foreach ($exercise->getFileLinks() as $link) {
+            $ourLink = $fileIndex[$link->getExerciseFile()->getId()] ?? null;
+            if (
+                $ourLink === null
+                || $ourLink->getKey() !== $link->getKey()
+                || $ourLink->getRequiredRole() !== $link->getRequiredRole()
+                || $ourLink->getSaveName() !== $link->getSaveName()
+            ) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     public function areAttachmentFilesInSync(): bool
     {
         $exercise = $this->getExercise();
@@ -537,6 +570,12 @@ public function syncWithExercise()
             $this->attachmentFiles->add($file);
         }
 
+        $this->fileLinks->clear();
+        foreach ($exercise->getFileLinks() as $link) {
+            $newLink = ExerciseFileLink::copyForAssignment($link, $this);
+            $this->fileLinks->add($newLink);
+        }
+
         $this->runtimeEnvironments->clear();
         foreach ($exercise->getRuntimeEnvironments() as $env) {
             $this->runtimeEnvironments->add($env);

app/model/entity/Exercise.php

@@ -219,7 +219,7 @@ public static function create(
 
     public static function forkFrom(Exercise $exercise, User $user, Group $group): Exercise
     {
-        return new self(
+        $newExercise = new self(
             1,
             $exercise->difficulty,
             $exercise->localizedTexts,
@@ -242,7 +242,19 @@ public static function forkFrom(Exercise $exercise, User $user, Group $group): E
             $exercise->solutionSizeLimit
         );
 
-        // TODO handle file link duplication
+        // handle file link duplication
+        foreach ($exercise->fileLinks as $link) {
+            $newLink = ExerciseFileLink::createForExercise(
+                $link->getKey(),
+                $link->getExerciseFile(),
+                $newExercise,
+                $link->getRequiredRole(),
+                $link->getSaveName()
+            );
+            $newExercise->fileLinks->add($newLink);
+        }
+
+        return $newExercise;
     }
 
     public function setRuntimeEnvironments(Collection $runtimeEnvironments): void

tests/helpers/FileStorage.phpt

@@ -866,7 +866,7 @@ class TestFileStorage extends Tester\TestCase
         PresenterTestHelper::loginDefaultAdmin($this->container);
         $user = $this->users->getByEmail(PresenterTestHelper::ADMIN_LOGIN);
         $partialFile = new UploadedPartialFile("foo", 9, $user);
-        $uploadedFile = new UploadedFile("foo", new DateTime(), 9, $user);
+        $uploadedFile = new UploadedFile("foo", new DateTime(), 9, $user, true);
         self::setPropertyOfObject($partialFile, 'id', '123');
         self::setPropertyOfObject($uploadedFile, 'id', '123');