Enabling partial assignment sync from the exercise.

Author: krulis-martin

app/V1Module/presenters/AssignmentsPresenter.php

@@ -645,10 +645,17 @@ public function checkSyncWithExercise(string $id)
      * @throws NotFoundException
      */
     #[Path("id", new VUuid(), "Identifier of the assignment that should be synchronized", required: true)]
+    #[Post("syncOptions", new VArray(new VString(
+        1,
+        32,
+        '/^(configurationType|exerciseConfig|exerciseEnvironmentConfigs|exerciseTests|files|fileLinks|hardwareGroups'
+            . '|limits|localizedTexts|mergeJudgeLogs|runtimeEnvironments|scoreConfig)$/'
+    )), "List of options what to synchronize (if missing, everything is synchronized)", required: false)]
     public function actionSyncWithExercise($id)
     {
         $assignment = $this->assignments->findOrThrow($id);
         $exercise = $assignment->getExercise();
+        $syncOptions = $this->getRequest()->getPost("syncOptions") ?? [];
 
         if ($exercise === null) {
             throw new NotFoundException("Exercise for assignment '{$id}' was deleted");
@@ -661,7 +668,7 @@ public function actionSyncWithExercise($id)
         }
 
         $assignment->updatedNow();
-        $assignment->syncWithExercise();
+        $assignment->syncWithExercise($syncOptions);
         $this->assignments->flush();
         $this->sendSuccessResponse($this->assignmentViewFactory->getAssignment($assignment));
     }

app/model/entity/Assignment.php

@@ -12,6 +12,7 @@
 use Doctrine\Common\Collections\Criteria;
 use Gedmo\Mapping\Annotation as Gedmo;
 use DateTime;
+use InvalidArgumentException;
 
 /**
  * @ORM\Entity
@@ -535,64 +536,110 @@ function ($key, RuntimeEnvironment $env) use ($exercise) {
             );
     }
 
-    public function syncWithExercise()
+    public function syncWithExercise(array $options = []): void
     {
         $exercise = $this->getExercise();
         if ($exercise === null) {
             // cannot sync exercise was deleted
             return;
         }
 
-        $this->mergeJudgeLogs = $exercise->getMergeJudgeLogs();
+        // figure out which parts to sync (all are synced if no options are given)
+        $syncOptions = [
+            "configurationType" => !$options,
+            "exerciseConfig" => !$options,
+            "exerciseEnvironmentConfigs" => !$options,
+            "exerciseTests" => !$options,
+            "files" => !$options,
+            "fileLinks" => !$options,
+            "hardwareGroups" => !$options,
+            "limits" => !$options,
+            "localizedTexts" => !$options,
+            "mergeJudgeLogs" => !$options,
+            "runtimeEnvironments" => !$options,
+            "scoreConfig" => !$options,
+        ];
+
+        foreach ($options as $option) {
+            if (!array_key_exists($option, $syncOptions)) {
+                throw new InvalidArgumentException("Unknown sync option: $option");
+            }
+            $syncOptions[$option] = true;
+        }
 
-        $this->hardwareGroups->clear();
-        foreach ($exercise->getHardwareGroups() as $group) {
-            $this->hardwareGroups->add($group);
+        $syncOptions = (object)$syncOptions;
+
+        if ($syncOptions->configurationType) {
+            $this->configurationType = $exercise->getConfigurationType();
         }
 
-        $this->localizedTexts->clear();
-        foreach ($exercise->getLocalizedTexts() as $text) {
-            $this->localizedTexts->add($text);
+        if ($syncOptions->exerciseConfig) {
+            $this->exerciseConfig = $exercise->getExerciseConfig();
         }
 
-        $this->exerciseConfig = $exercise->getExerciseConfig();
-        $this->configurationType = $exercise->getConfigurationType();
-        $this->scoreConfig = $exercise->getScoreConfig();
+        if ($syncOptions->exerciseEnvironmentConfigs) {
+            $this->exerciseEnvironmentConfigs->clear();
+            foreach ($exercise->getExerciseEnvironmentConfigs() as $config) {
+                $this->exerciseEnvironmentConfigs->add($config);
+            }
+        }
 
-        $this->exerciseEnvironmentConfigs->clear();
-        foreach ($exercise->getExerciseEnvironmentConfigs() as $config) {
-            $this->exerciseEnvironmentConfigs->add($config);
+        if ($syncOptions->exerciseTests) {
+            $this->exerciseTests->clear();
+            foreach ($exercise->getExerciseTests() as $test) {
+                $this->exerciseTests->add($test);
+            }
         }
 
-        $this->exerciseLimits->clear();
-        foreach ($exercise->getExerciseLimits() as $limits) {
-            $this->exerciseLimits->add($limits);
+        if ($syncOptions->files) {
+            $this->exerciseFiles->clear();
+            foreach ($exercise->getExerciseFiles() as $file) {
+                $this->exerciseFiles->add($file);
+            }
         }
 
-        $this->exerciseTests->clear();
-        foreach ($exercise->getExerciseTests() as $test) {
-            $this->exerciseTests->add($test);
+        if ($syncOptions->fileLinks) {
+            $this->fileLinks->clear();
+            foreach ($exercise->getFileLinks() as $link) {
+                $newLink = ExerciseFileLink::copyForAssignment($link, $this);
+                $this->fileLinks->add($newLink);
+            }
         }
 
-        $this->exerciseFiles->clear();
-        foreach ($exercise->getExerciseFiles() as $file) {
-            $this->exerciseFiles->add($file);
+        if ($syncOptions->hardwareGroups) {
+            $this->hardwareGroups->clear();
+            foreach ($exercise->getHardwareGroups() as $group) {
+                $this->hardwareGroups->add($group);
+            }
         }
 
-        $this->attachmentFiles->clear();
-        foreach ($exercise->getAttachmentFiles() as $file) {
-            $this->attachmentFiles->add($file);
+        if ($syncOptions->limits) {
+            $this->exerciseLimits->clear();
+            foreach ($exercise->getExerciseLimits() as $limits) {
+                $this->exerciseLimits->add($limits);
+            }
         }
 
-        $this->fileLinks->clear();
-        foreach ($exercise->getFileLinks() as $link) {
-            $newLink = ExerciseFileLink::copyForAssignment($link, $this);
-            $this->fileLinks->add($newLink);
+        if ($syncOptions->localizedTexts) {
+            $this->localizedTexts->clear();
+            foreach ($exercise->getLocalizedTexts() as $text) {
+                $this->localizedTexts->add($text);
+            }
+        }
+
+        if ($syncOptions->mergeJudgeLogs) {
+            $this->mergeJudgeLogs = $exercise->getMergeJudgeLogs();
+        }
+
+        if ($syncOptions->runtimeEnvironments) {
+            $this->runtimeEnvironments->clear();
+            foreach ($exercise->getRuntimeEnvironments() as $env) {
+                $this->runtimeEnvironments->add($env);
+            }
         }
 
-        $this->runtimeEnvironments->clear();
-        foreach ($exercise->getRuntimeEnvironments() as $env) {
-            $this->runtimeEnvironments->add($env);
+        if ($syncOptions->scoreConfig) {
+            $this->scoreConfig = $exercise->getScoreConfig();
         }
 
         $this->syncedAt = new DateTime();

app/model/view/AssignmentViewFactory.php

@@ -117,14 +117,6 @@ function (LocalizedExercise $text) use ($assignment) {
                 "mergeJudgeLogs" => [
                     "upToDate" => $exercise && $assignment->getMergeJudgeLogs() === $exercise->getMergeJudgeLogs(),
                 ],
-
-                // DEPRECATED fields (will be removed in future)
-                "supplementaryFiles" => [
-                    "upToDate" => $assignment->areExerciseFilesInSync()
-                ],
-                "attachmentFiles" => [
-                    "upToDate" => $assignment->areAttachmentFilesInSync()
-                ],
             ],
             "solutionFilesLimit" => $assignment->getSolutionFilesLimit(),
             "solutionSizeLimit" => $assignment->getSolutionSizeLimit(),