groove/Part-DB-server
1
0
Fork 0
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2026-01-13 21:59:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Encapsulate the fieldmapping data in the importjob further

Browse source
This commit is contained in:
Jan Böhmer 2025-09-21 17:41:56 +02:00
parent eda6deff47
commit 16126c4000
3 changed files with 39 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/Entity/BulkInfoProviderImportJob.php
View file

@ -26,7 +26,7 @@ use App\Entity\Base\AbstractDBElement;
use App\Entity\Parts\Part;
use App\Entity\UserSystem\User;
use App\Services\InfoProviderSystem\DTOs\BulkSearchResponseDTO;
use App\Services\InfoProviderSystem\DTOs\SearchResultDTO;
use App\Services\InfoProviderSystem\DTOs\FieldMappingDTO;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\DBAL\Types\Types;
@ -43,6 +43,11 @@ class BulkInfoProviderImportJob extends AbstractDBElement
#[ORM\Column(type: Types::JSON)]
private array $fieldMappings = [];
/**
* @var FieldMappingDTO[] The deserialized field mappings DTOs, cached for performance
*/
private ?array $fieldMappingsDTO = null;
#[ORM\Column(type: Types::JSON)]
private array $searchResults = [];
@ -150,14 +155,39 @@ class BulkInfoProviderImportJob extends AbstractDBElement
return $this;
}
/**
* @return FieldMappingDTO[] The deserialized field mappings
*/
public function getFieldMappings(): array
{
return $this->fieldMappings;
if ($this->fieldMappingsDTO === null) {
// Lazy load the DTOs from the raw JSON data
$this->fieldMappingsDTO = array_map(
static fn($data) => FieldMappingDTO::fromSerializableArray($data),
$this->fieldMappings
);
}
return $this->fieldMappingsDTO;
}
/**
* @param FieldMappingDTO[] $fieldMappings
* @return $this
*/
public function setFieldMappings(array $fieldMappings): self
{
$this->fieldMappings = $fieldMappings;
//Ensure that we are dealing with the objects here
if (count($fieldMappings) > 0 && !$fieldMappings[0] instanceof FieldMappingDTO) {
throw new \InvalidArgumentException('Expected an array of FieldMappingDTO objects');
}
$this->fieldMappingsDTO = $fieldMappings;
$this->fieldMappings = array_map(
static fn(FieldMappingDTO $dto) => $dto->toSerializableArray(),
$fieldMappings
);
return $this;
}
@ -260,13 +290,6 @@ class BulkInfoProviderImportJob extends AbstractDBElement
return $progress;
}
public function setProgress(array $progress): self
{
// This method is kept for backward compatibility
// The progress is now managed through the jobParts relationship
return $this;
}
public function markAsCompleted(): self
{
$this->status = BulkImportJobStatus::COMPLETED;