Catch errors when adding problems YAML.

Fixes #2482.

Author: nickygerritsen

webapp/src/Controller/API/ProblemController.php

@@ -102,9 +102,12 @@ public function addProblemsAction(Request $request): array
         // Note: we read the JSON as YAML, since any JSON is also YAML and this allows us
         // to import files with YAML inside them that match the JSON format
         $data = Yaml::parseFile($file->getRealPath(), Yaml::PARSE_DATETIME);
-        if ($this->importExportService->importProblemsData($contest, $data, $ids)) {
+        if ($this->importExportService->importProblemsData($contest, $data, $ids, $messages)) {
             return $ids;
         }
+        if (!empty($messages)) {
+            throw new BadRequestHttpException($this->dj->jsonEncode($messages));
+        }
         throw new BadRequestHttpException("Error while adding problems");
     }
 

webapp/src/Controller/Jury/ImportExportController.php

@@ -238,11 +238,15 @@ public function indexAction(Request $request): Response
                 $this->addFlash('danger', "Parse error in YAML/JSON file (" . $file->getClientOriginalName() . "): " . $e->getMessage());
                 return $this->redirectToRoute('jury_import_export');
             }
-            if ($this->importExportService->importProblemsData($problemsImportForm->get('contest')->getData(), $data)) {
+            if ($this->importExportService->importProblemsData($problemsImportForm->get('contest')->getData(), $data, $ids, $messages)) {
                 $this->addFlash('success',
                     sprintf('The file %s is successfully imported.', $file->getClientOriginalName()));
             } else {
-                $this->addFlash('danger', 'Failed importing problems');
+                if (!empty($messages)) {
+                    $this->postMessages($messages);
+                } else {
+                    $this->addFlash('danger', 'Failed importing problems');
+                }
             }
             return $this->redirectToRoute('jury_import_export');
         }

webapp/src/Service/ImportExportService.php

@@ -309,8 +309,9 @@ public function importContestData(mixed $data, ?string &$errorMessage = null, st
      *              problems?: array{name?: string, short-name?: string, id?: string, label?: string,
      *                              letter?: string, label?: string, letter?: string}} $problems
      * @param string[]|null $ids
+     * @param array<string, string[]> $messages
      */
-    public function importProblemsData(Contest $contest, array $problems, array &$ids = null): bool
+    public function importProblemsData(Contest $contest, array $problems, array &$ids = null, ?array &$messages = []): bool
     {
         // For problemset.yaml the root key is called `problems`, so handle that case
         // TODO: Move this check away to make the $problems array shape easier
@@ -329,8 +330,20 @@ public function importProblemsData(Contest $contest, array $problems, array &$id
                 ->setTimelimit($problemData['time_limit'] ?? 10)
                 ->setExternalid($problemData['id'] ?? $problemData['short-name'] ?? $problemLabel ?? null);
 
-            $this->em->persist($problem);
-            $this->em->flush();
+            $hasErrors = false;
+            $errors    = $this->validator->validate($problem);
+            if ($errors->count()) {
+                $hasErrors = true;
+                /** @var ConstraintViolationInterface $error */
+                foreach ($errors as $error) {
+                    $messages['danger'][] = sprintf(
+                        'Error: problems.%s.%s: %s',
+                        $problem->getExternalid(),
+                        $error->getPropertyPath(),
+                        $error->getMessage()
+                    );
+                }
+            }
 
             $contestProblem = new ContestProblem();
             $contestProblem
@@ -339,14 +352,35 @@ public function importProblemsData(Contest $contest, array $problems, array &$id
                 // We need to set both the entities and the IDs because of the composite primary key.
                 ->setProblem($problem)
                 ->setContest($contest);
+
+            $errors    = $this->validator->validate($contestProblem);
+            if ($errors->count()) {
+                $hasErrors = true;
+                /** @var ConstraintViolationInterface $error */
+                foreach ($errors as $error) {
+                    $messages['danger'][] = sprintf(
+                        'Error: problems.%s.contestproblem.%s: %s',
+                        $problem->getExternalid(),
+                        $error->getPropertyPath(),
+                        $error->getMessage()
+                    );
+                }
+            }
+
+            if ($hasErrors) {
+                return false;
+
+            }
+
+            $this->em->persist($problem);
             $this->em->persist($contestProblem);
+            $this->em->flush();
 
             $ids[] = $problem->getApiId($this->eventLogService);
         }
 
         $this->em->flush();
 
-        // For now this method will never fail so always return true.
         return true;
     }