mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-07-12 03:14:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed error handling of structural data import

Browse source 
This was the reason for the exception in #632
This commit is contained in:
Jan Böhmer 2024-06-22 22:55:15 +02:00
parent 64414fe105
commit b7b941e3a1
4 changed files with 98 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Services/ImportExportSystem/EntityImporter.php
View file

@ -29,6 +29,7 @@ use App\Entity\Parts\Part;
use App\Repository\StructuralDBElementRepository;
use App\Serializer\APIPlatform\SkippableItemNormalizer;
use Symfony\Component\Validator\ConstraintViolationList;
use Symfony\Component\Validator\ConstraintViolationListInterface;
use function count;
use Doctrine\ORM\EntityManagerInterface;
use InvalidArgumentException;
@ -57,6 +58,7 @@ class EntityImporter
* @phpstan-param class-string<T> $class_name
* @param AbstractStructuralDBElement|null $parent the element which will be used as parent element for new elements
* @param array $errors an associative array containing all validation errors
* @param-out array<string, array{'entity': object, 'violations': ConstraintViolationListInterface}> $errors
*
* @return AbstractNamedDBElement[] An array containing all valid imported entities (with the type $class_name)
* @return T[]
@ -152,6 +154,7 @@ class EntityImporter
* @param string $data The serialized data which should be imported
* @param array $options The options for the import process
* @param array $errors An array which will be filled with the validation errors, if any occurs during import
* @param-out array<string, array{'entity': object, 'violations': ConstraintViolationListInterface}> $errors
* @return array An array containing all valid imported entities
*/
public function importString(string $data, array $options = [], array &$errors = []): array
@ -218,6 +221,10 @@ class EntityImporter
if (count($tmp) > 0) { //Log validation errors to global log.
$name = $entity instanceof AbstractStructuralDBElement ? $entity->getFullPath() : $entity->getName();
if (trim($name) === '') {
$name = 'Row ' . (string) $key;
}
$errors[$name] = [
'violations' => $tmp,
'entity' => $entity,
@ -264,7 +271,7 @@ class EntityImporter
* @param array $options options for the import process
* @param AbstractNamedDBElement[] $entities The imported entities are returned in this array
*
* @return array<string, ConstraintViolationList> An associative array containing an ConstraintViolationList and the entity name as key are returned,
* @return array<string, array{'entity': object, 'violations': ConstraintViolationListInterface}> An associative array containing an ConstraintViolationList and the entity name as key are returned,
* if an error happened during validation. When everything was successfully, the array should be empty.
*/
public function importFileAndPersistToDB(File $file, array $options = [], array &$entities = []): array
@ -296,6 +303,7 @@ class EntityImporter
*
* @param File $file the file that should be used for importing
* @param array $options options for the import process
* @param-out array<string, array{'entity': object, 'violations': ConstraintViolationListInterface}> $errors
*
* @return array an array containing the deserialized elements
*/