Compare commits

..

No commits in common. "ff05142acc7fe2ed6cbef3ddd12458ba95e4f1cf" and "56fee01322e651832e31e3ba042d20c549612835" have entirely different histories.

2 changed files with 7 additions and 47 deletions

View file

@ -15,8 +15,6 @@ class Game
private int|null $id; private int|null $id;
#[ORM\Column] #[ORM\Column]
private string $name; private string $name;
#[ORM\Column(nullable: true)]
private string|null $internalName;
public function getName(): string public function getName(): string
{ {
@ -28,22 +26,11 @@ class Game
return $this->id; return $this->id;
} }
public function getInternalName(): string
{
return $this->internalName ?? $this->name;
}
public function setInternalName(string $internalName): void
{
$this->internalName = $internalName;
}
/** /**
* @param string $name * @param string $name
*/ */
public function __construct(string $internalName, string $name) public function __construct(string $name)
{ {
$this->internalName = $internalName;
$this->name = $name; $this->name = $name;
} }
} }

View file

@ -3,17 +3,14 @@ declare(strict_types=1);
namespace GamesShop\Importer; namespace GamesShop\Importer;
use Doctrine\Common\Collections\Criteria;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Exception; use Exception;
use GamesShop\ContainerHandler;
use GamesShop\Entities\Account\User; use GamesShop\Entities\Account\User;
use GamesShop\Entities\Games\Game; use GamesShop\Entities\Games\Game;
use GamesShop\Entities\Games\Key; use GamesShop\Entities\Games\Key;
use GamesShop\Entities\Games\KeyAttribute; use GamesShop\Entities\Games\KeyAttribute;
use GamesShop\Entities\Games\Store; use GamesShop\Entities\Games\Store;
use GamesShop\Entities\GamesList; use GamesShop\Entities\GamesList;
use Monolog\Logger;
use PhpOffice\PhpSpreadsheet\IOFactory; use PhpOffice\PhpSpreadsheet\IOFactory;
final class GameImporter final class GameImporter
@ -130,26 +127,18 @@ final class GameImporter
continue; continue;
} }
$internalName = $this->prepareGameName($values['name']); $game = array_key_exists($values['name'], $foundGames) ? $foundGames[$values['name']] : null;
$game = array_key_exists($internalName, $foundGames) ? $foundGames[$internalName] : null;
ContainerHandler::get(Logger::class)->debug('importing game ' . $internalName);
if ($game === null) { if ($game === null) {
$game = $this->entityManager->getRepository(Game::class)->matching( $game = $this->entityManager->getRepository(Game::class)->findOneBy([ 'name' => $values['name'] ]);
Criteria::create()
->where(Criteria::expr()->eq('name', $values['name']))
->orWhere(Criteria::expr()->eq('internalName', $internalName))
)->first();
} }
if ($game === false) { if ($game === null) {
$game = new Game($internalName, $values['name']); $game = new Game($values['name']);
$this->entityManager->persist($game); $this->entityManager->persist($game);
} }
$foundGames[$internalName] = $game; $foundGames[$values['name']] = $game;
$game->setInternalName($internalName);
$key = new Key( $key = new Key(
$game, $game,
@ -185,20 +174,4 @@ final class GameImporter
return Store::EXTERNAL; return Store::EXTERNAL;
} }
private function prepareGameName(string $name): string
{
$replacements = [
':' => '',
'-' => '',
',' => '',
'!' => '',
'?' => '',
' ' => ' ',
' ' => '_',
];
$name = strtoupper($name);
return str_replace(array_keys($replacements), array_values($replacements), $name);
}
} }