mirror of
https://github.com/werkraum-media/thuecat.git
synced 2024-12-04 19:16:13 +01:00
Skip import of entities without content responsible
We always expect someone to be responsible for content. If there is no one, skip the import of the entity.
This commit is contained in:
parent
6a89461972
commit
c97b9bd24d
3 changed files with 126 additions and 4 deletions
|
|
@ -119,12 +119,12 @@ class GeneralConverter implements Converter, LoggerAwareInterface
|
|||
ImportConfiguration $importConfiguration,
|
||||
string $language
|
||||
): ?Entity {
|
||||
$this->importConfiguration = $importConfiguration;
|
||||
|
||||
if ($this->shouldConvert($entity, $importConfiguration, $language) === false) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$this->importConfiguration = $importConfiguration;
|
||||
|
||||
$converted = new GenericEntity(
|
||||
$importConfiguration->getStoragePid(),
|
||||
$this->getTableNameByEntityClass(get_class($entity)),
|
||||
|
|
@ -152,6 +152,8 @@ class GeneralConverter implements Converter, LoggerAwareInterface
|
|||
ImportConfiguration $importConfiguration,
|
||||
string $language
|
||||
): bool {
|
||||
$tableName = $this->getTableNameByEntityClass(get_class($entity));
|
||||
|
||||
if (!$entity instanceof Minimum) {
|
||||
$this->logger->debug('Skipped conversion of entity, got unexpected type', [
|
||||
'expectedType' => Minimum::class,
|
||||
|
|
@ -170,7 +172,6 @@ class GeneralConverter implements Converter, LoggerAwareInterface
|
|||
$importConfiguration->getStoragePid(),
|
||||
$language
|
||||
);
|
||||
$tableName = $this->getTableNameByEntityClass(get_class($entity));
|
||||
if (
|
||||
$languageUid > 0
|
||||
&& isset($GLOBALS['TCA'][$tableName]['ctrl']['languageField']) === false
|
||||
|
|
@ -184,6 +185,13 @@ class GeneralConverter implements Converter, LoggerAwareInterface
|
|||
return false;
|
||||
}
|
||||
|
||||
if ($tableName !== 'tx_thuecat_organisation' && $this->getManagerUid($entity) === '') {
|
||||
$this->logger->debug('Skipped conversion of entity, is not an organisation and no manager was available', [
|
||||
'remoteId' => $entity->getId(),
|
||||
]);
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
114
Tests/Unit/Domain/Import/Typo3Converter/GeneralConverterTest.php
Normal file
114
Tests/Unit/Domain/Import/Typo3Converter/GeneralConverterTest.php
Normal file
|
|
@ -0,0 +1,114 @@
|
|||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
/*
|
||||
* Copyright (C) 2021 Daniel Siepmann <coding@daniel-siepmann.de>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
* 02110-1301, USA.
|
||||
*/
|
||||
|
||||
namespace WerkraumMedia\ThueCat\Tests\Unit\Domain\Import\Typo3Converter;
|
||||
|
||||
use Prophecy\Argument;
|
||||
use Prophecy\PhpUnit\ProphecyTrait;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use WerkraumMedia\ThueCat\Domain\Import\Entity\Properties\ForeignReference;
|
||||
use WerkraumMedia\ThueCat\Domain\Import\Entity\Town;
|
||||
use WerkraumMedia\ThueCat\Domain\Import\Importer;
|
||||
use WerkraumMedia\ThueCat\Domain\Import\Typo3Converter\GeneralConverter;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use WerkraumMedia\ThueCat\Domain\Import\ResolveForeignReference;
|
||||
use WerkraumMedia\ThueCat\Domain\Import\Typo3Converter\LanguageHandling;
|
||||
use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportConfiguration;
|
||||
use WerkraumMedia\ThueCat\Domain\Model\Backend\ImportLog;
|
||||
use WerkraumMedia\ThueCat\Domain\Repository\Backend\OrganisationRepository;
|
||||
use WerkraumMedia\ThueCat\Domain\Repository\Backend\ParkingFacilityRepository;
|
||||
use WerkraumMedia\ThueCat\Domain\Repository\Backend\TownRepository;
|
||||
|
||||
/**
|
||||
* @covers \WerkraumMedia\ThueCat\Domain\Import\Typo3Converter\GeneralConverter
|
||||
*/
|
||||
class GeneralConverterTest extends TestCase
|
||||
{
|
||||
use ProphecyTrait;
|
||||
|
||||
/**
|
||||
* @test
|
||||
*/
|
||||
public function canBeCreated(): void
|
||||
{
|
||||
$resolveForeignReference = $this->prophesize(ResolveForeignReference::class);
|
||||
$importer = $this->prophesize(Importer::class);
|
||||
$languageHandling = $this->prophesize(LanguageHandling::class);
|
||||
$organisationRepository = $this->prophesize(OrganisationRepository::class);
|
||||
$townRepository = $this->prophesize(TownRepository::class);
|
||||
$parkingFacilityRepository = $this->prophesize(ParkingFacilityRepository::class);
|
||||
|
||||
$subject = new GeneralConverter(
|
||||
$resolveForeignReference->reveal(),
|
||||
$importer->reveal(),
|
||||
$languageHandling->reveal(),
|
||||
$organisationRepository->reveal(),
|
||||
$townRepository->reveal(),
|
||||
$parkingFacilityRepository->reveal()
|
||||
);
|
||||
|
||||
self::assertInstanceOf(
|
||||
GeneralConverter::class,
|
||||
$subject
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @test
|
||||
*/
|
||||
public function skipsWithoutManager(): void
|
||||
{
|
||||
$resolveForeignReference = $this->prophesize(ResolveForeignReference::class);
|
||||
$importer = $this->prophesize(Importer::class);
|
||||
$importer->importConfiguration(Argument::any())->willReturn(new ImportLog());
|
||||
$languageHandling = $this->prophesize(LanguageHandling::class);
|
||||
$languageHandling->getLanguageUidForString(10, 'de')->willReturn(0);
|
||||
$organisationRepository = $this->prophesize(OrganisationRepository::class);
|
||||
$townRepository = $this->prophesize(TownRepository::class);
|
||||
$parkingFacilityRepository = $this->prophesize(ParkingFacilityRepository::class);
|
||||
$logger = $this->prophesize(LoggerInterface::class);
|
||||
|
||||
$subject = new GeneralConverter(
|
||||
$resolveForeignReference->reveal(),
|
||||
$importer->reveal(),
|
||||
$languageHandling->reveal(),
|
||||
$organisationRepository->reveal(),
|
||||
$townRepository->reveal(),
|
||||
$parkingFacilityRepository->reveal()
|
||||
);
|
||||
$subject->setLogger($logger->reveal());
|
||||
|
||||
$contentResponsible = new ForeignReference();
|
||||
$contentResponsible->setId('https://example.com/content-responsible');
|
||||
$entity = new Town();
|
||||
$entity->setName('Test Name');
|
||||
$entity->setContentResponsible($contentResponsible);
|
||||
|
||||
$configuration = $this->prophesize(ImportConfiguration::class);
|
||||
$configuration->getStoragePid()->willReturn(10);
|
||||
|
||||
self::assertNull(
|
||||
$subject->convert($entity, $configuration->reveal(), 'de')
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -22,7 +22,7 @@ parameters:
|
|||
|
||||
-
|
||||
message: "#^Cannot call method debug\\(\\) on Psr\\\\Log\\\\LoggerInterface\\|null\\.$#"
|
||||
count: 4
|
||||
count: 5
|
||||
path: Classes/Domain/Import/Typo3Converter/GeneralConverter.php
|
||||
|
||||
-
|
||||
|
|
|
|||
Loading…
Reference in a new issue