From c6ad36b294d166762dbf58320c8134f4c42ee0e9 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Wed, 11 Jan 2023 12:56:27 +0100
Subject: [PATCH] Use proper column names

Normal updates are executed:

    ./vendor/bin/typo3cms upgrade:prepare

    ./vendor/bin/typo3cms upgrade:run all --no-interaction

    ./vendor/bin/typo3cms database:updateschema '*'

    ./vendor/bin/typo3cms database:updateschema '*'

The first one will execute an database:updateschema which will run safe
which only adds and doesn't rename or remove columns.
Then our update wizard can use the existing columns and new columns and
tables.
The last step will actually rename and remove.
---
 Classes/Updates/MigrateOldLocations.php | 79 +++++++++++++------------
 1 file changed, 42 insertions(+), 37 deletions(-)

diff --git a/Classes/Updates/MigrateOldLocations.php b/Classes/Updates/MigrateOldLocations.php
index 6fe072c..abbe0b9 100644
--- a/Classes/Updates/MigrateOldLocations.php
+++ b/Classes/Updates/MigrateOldLocations.php
@@ -107,23 +107,23 @@ class MigrateOldLocations implements UpgradeWizardInterface
 
     private function getExitingLocationUid(array $event): int
     {
-        $oldColumns = [
-            'sys_language_uid' => 'sys_language_uid',
-            'zzz_deleted_name' => 'name',
-            'zzz_deleted_street' => 'street',
-            'zzz_deleted_district' => 'district',
-            'zzz_deleted_city' => 'city',
-            'zzz_deleted_zip' => 'zip',
-            'zzz_deleted_country' => 'country',
-            'zzz_deleted_phone' => 'phone',
-            'zzz_deleted_latitude' => 'latitude',
-            'zzz_deleted_longitude' => 'longitude',
+        $columns = [
+            'sys_language_uid',
+            'name',
+            'street',
+            'district',
+            'city',
+            'zip',
+            'country',
+            'phone',
+            'latitude',
+            'longitude',
         ];
         $qb = $this->connectionPool->getQueryBuilderForTable('tx_events_domain_model_location');
         $qb->select('uid', 'l10n_parent');
         $qb->from('tx_events_domain_model_location');
-        foreach ($oldColumns as $oldName => $newName) {
-            $qb->andWhere($qb->expr()->eq($newName, $qb->createNamedParameter($event[$oldName])));
+        foreach ($columns as $column) {
+            $qb->andWhere($qb->expr()->eq($column, $qb->createNamedParameter($event[$column])));
         }
 
         $uids = $qb->execute()->fetchAssociative();
@@ -138,19 +138,24 @@ class MigrateOldLocations implements UpgradeWizardInterface
     {
         $this->logger->info('Location will be created.', ['event' => $event]);
 
-        $record = [
-            'pid' => $event['pid'],
-            'sys_language_uid' => $event['sys_language_uid'],
-            'name' => $event['zzz_deleted_name'],
-            'street' => $event['zzz_deleted_street'],
-            'district' => $event['zzz_deleted_district'],
-            'city' => $event['zzz_deleted_city'],
-            'zip' => $event['zzz_deleted_zip'],
-            'country' => $event['zzz_deleted_country'],
-            'phone' => $event['zzz_deleted_phone'],
-            'latitude' => $event['zzz_deleted_latitude'],
-            'longitude' => $event['zzz_deleted_longitude'],
+        $columnsToMap = [
+            'pid',
+            'sys_language_uid',
+            'name',
+            'street',
+            'district',
+            'city',
+            'zip',
+            'country',
+            'phone',
+            'latitude',
+            'longitude',
         ];
+        $record = [];
+
+        foreach ($columnsToMap as $columnName) {
+            $record[$columnName] = $event[$columnName];
+        }
         $recordUid = 'NEW12121';
         $l10nParentUid = $this->uidsForTranslation[$event['l10n_parent'] . '-0'] ?? 0;
         $dataHandler = clone $this->dataHandler;
@@ -214,23 +219,23 @@ class MigrateOldLocations implements UpgradeWizardInterface
 
     private function getQueryBuilder(): QueryBuilder
     {
-        $oldColumns = [
-            'zzz_deleted_name',
-            'zzz_deleted_street',
-            'zzz_deleted_district',
-            'zzz_deleted_city',
-            'zzz_deleted_zip',
-            'zzz_deleted_country',
-            'zzz_deleted_phone',
-            'zzz_deleted_latitude',
-            'zzz_deleted_longitude',
+        $columns = [
+            'name',
+            'street',
+            'district',
+            'city',
+            'zip',
+            'country',
+            'phone',
+            'latitude',
+            'longitude',
         ];
         $qb = $this->connectionPool->getQueryBuilderForTable('tx_events_domain_model_event');
         $qb->getRestrictions()->removeAll();
-        $qb->select(...$oldColumns);
+        $qb->select(...$columns);
         $qb->addSelect('uid', 'pid', 'sys_language_uid', 'l10n_parent');
         $qb->from('tx_events_domain_model_event');
-        foreach ($oldColumns as $columnName) {
+        foreach ($columns as $columnName) {
             $qb->orWhere($qb->expr()->neq($columnName, $qb->createNamedParameter('')));
         }
         $qb->orderBy('sys_language_uid', 'ASC');