Compare commits

..

No commits in common. "ab4ebe93a3713d218d25d75f4c4eb095e2ce107a" and "5e77ba32c18879dec4b7eda91843cbd0ee01829e" have entirely different histories.

View file

@ -83,9 +83,6 @@ final class GameImporter
$totalRows = 0; $totalRows = 0;
$addedAmount = 0; $addedAmount = 0;
$foundGames = [];
$rowValues = [];
foreach ($worksheet->getRowIterator(self::HEADER_ROW_INDEX + 1) as $row) { foreach ($worksheet->getRowIterator(self::HEADER_ROW_INDEX + 1) as $row) {
$totalRows++; $totalRows++;
@ -99,8 +96,7 @@ final class GameImporter
foreach ($columnDefinitions as $columnIndex => $attribute) { foreach ($columnDefinitions as $columnIndex => $attribute) {
$value = $worksheet->getCell(sprintf('%s%d', $columnIndex, $row->getRowIndex()))->getValueString(); $value = $worksheet->getCell(sprintf('%s%d', $columnIndex, $row->getRowIndex()))->getValueString();
$value = trim($value);
switch(KeyAttribute::from($attribute)) { switch(KeyAttribute::from($attribute)) {
case KeyAttribute::NONE: case KeyAttribute::NONE:
break; break;
@ -126,19 +122,11 @@ final class GameImporter
if (empty($values['key']) || empty($values['name']) || empty($values['store'])) { if (empty($values['key']) || empty($values['name']) || empty($values['store'])) {
continue; continue;
} }
$game = array_key_exists($values['name'], $foundGames) ? $foundGames[$values['name']] : null; $game = $this->entityManager->getRepository(Game::class)->findOneBy([ 'name' => $values['name'] ]);
if ($game === null) {
$game = $this->entityManager->getRepository(Game::class)->findOneBy([ 'name' => $values['name'] ]);
}
if ($game === null) { if ($game === null) {
$game = new Game($values['name']); $game = new Game($values['name']);
$this->entityManager->persist($game);
} }
$foundGames[$values['name']] = $game;
$key = new Key( $key = new Key(
$game, $game,
@ -149,6 +137,7 @@ final class GameImporter
$values['from'], $values['from'],
); );
$this->entityManager->persist($game);
$this->entityManager->persist($key); $this->entityManager->persist($key);
$addedAmount++; $addedAmount++;
} }