Wabel / zoho-crm-copy-db

src/Log/ZohoSyncSQLLogger.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Logging\SQLLogger;
-use Doctrine\DBAL\SQLParserUtils;
 use function PHPSTORM_META\type;
 use Psr\Log\LoggerInterface;
 

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
         $query = null;
         if ($params && $this->authorizedSQLWithParams) {
             $this->logger->debug($sql.' -- Params : {params} - Types : {types}', ['params' => json_encode($params), 'types' => json_encode($types)]);
-        } elseif($this->authorizedSQLWithoutParams) {
+        } elseif ($this->authorizedSQLWithoutParams) {
             $this->logger->debug($sql);
         }
     }

src/ZohoDatabasePusher.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use Wabel\Zoho\CRM\AbstractZohoDao;
 use Wabel\Zoho\CRM\Service\EntitiesGeneratorService;
 use Wabel\Zoho\CRM\ZohoBeanInterface;
-use zcrmsdk\crm\api\response\EntityResponse;
 
 /**
  * Description of ZohoDatabasePusher.

Spacing +7 added lines, -7 removed lines

@@ -67,9 +67,9 @@ 
     {
         $tableName = ZohoDatabaseHelper::getTableName($zohoDao, $this->prefix);
         if ($update) {
-            return (int)$this->connection->executeQuery('SELECT COUNT(DISTINCT uid) AS nb FROM `local_update` WHERE table_name LIKE :tableName AND error IS NULL', ['tableName' => $tableName])->fetchColumn();
+            return (int) $this->connection->executeQuery('SELECT COUNT(DISTINCT uid) AS nb FROM `local_update` WHERE table_name LIKE :tableName AND error IS NULL', ['tableName' => $tableName])->fetchColumn();
         }
-        return (int)$this->connection->executeQuery('SELECT COUNT(uid) AS nb FROM `local_insert` WHERE table_name LIKE :tableName AND error IS NULL', ['tableName' => $tableName])->fetchColumn();
+        return (int) $this->connection->executeQuery('SELECT COUNT(uid) AS nb FROM `local_insert` WHERE table_name LIKE :tableName AND error IS NULL', ['tableName' => $tableName])->fetchColumn();
     }
 
     /**
@@ -82,7 +82,7 @@ 
         $localTable = $update ? 'local_update' : 'local_insert';
         $tableName = ZohoDatabaseHelper::getTableName($zohoDao, $this->prefix);
         $countToPush = $this->countElementInTable($zohoDao, $update);
-        $this->logger->notice($countToPush . ' records to ' . ($update ? 'update' : 'insert') . ' into Zoho for module ' . $zohoDao->getPluralModuleName());
+        $this->logger->notice($countToPush.' records to '.($update ? 'update' : 'insert').' into Zoho for module '.$zohoDao->getPluralModuleName());
         if ($countToPush) {
             do {
                 $rowsDeleted = [];
@@ -255,7 +255,7 @@ 
                         ]
                     );
                 } else {
-                    $countResult = (int)$this->connection->fetchColumn('select count(id) from ' . $tableName . ' where id = :id', ['id' => $zohoBean->getZohoId()]);
+                    $countResult = (int) $this->connection->fetchColumn('select count(id) from '.$tableName.' where id = :id', ['id' => $zohoBean->getZohoId()]);
                     //If the sent data were duplicates Zoho can merged so we need to check if the Zoho ID already exist.
                     if ($countResult === 0) {
                         // ID not exist we can update the new row with the Zoho ID
@@ -361,13 +361,13 @@ 
                 $value = \DateTime::createFromFormat('Y-m-d H:i:s', $value) ?: null;
                 break;
             case 'boolean' :
-                $value = (bool)$value;
+                $value = (bool) $value;
                 break;
             case 'percent' :
-                $value = (int)$value;
+                $value = (int) $value;
                 break;
             case 'double' :
-                $value = (float)$value;
+                $value = (float) $value;
                 break;
             case 'multiselectlookup':
             case 'multiuserlookup':

Doc Comments +3 added lines, -1 removed lines

@@ -305,6 +305,9 @@ 
         }
     }
 
+    /**
+     * @param string $needle
+     */
     private function endsWith($haystack, $needle)
     {
         return substr_compare($haystack, $needle, -strlen($needle)) === 0;
@@ -340,7 +343,6 @@ 
      * Insert data to bean in order to update zoho records.
      *
      * @param ZohoBeanInterface $zohoBean
-     * @param array $fieldsMatching
      * @param type $columnName
      * @param type $valueDb
      */

src/LocalChangesTracker.php

Spacing +4 added lines, -4 removed lines

@@ -95,7 +95,7 @@ 
     public function createUuidInsertTrigger(Table $table)
     {
         $triggerName = sprintf('TRG_%s_SETUUIDBEFOREINSERT', $table->getName());
-        $this->logger->info('Creating ' . $triggerName . ' trigger for table ' . $table->getName() . '...');
+        $this->logger->info('Creating '.$triggerName.' trigger for table '.$table->getName().'...');
 
         //Fix - temporary MySQL 5.7 strict mode
         $sql = sprintf(
@@ -124,7 +124,7 @@ 
     public function createInsertTrigger(Table $table)
     {
         $triggerName = sprintf('TRG_%s_ONINSERT', $table->getName());
-        $this->logger->info('Creating ' . $triggerName . ' trigger for table ' . $table->getName() . '...');
+        $this->logger->info('Creating '.$triggerName.' trigger for table '.$table->getName().'...');
 
         $tableNameQuoted = $this->connection->quote($table->getName());
 
@@ -151,7 +151,7 @@ 
     public function createDeleteTrigger(Table $table)
     {
         $triggerName = sprintf('TRG_%s_ONDELETE', $table->getName());
-        $this->logger->info('Creating ' . $triggerName . ' trigger for table ' . $table->getName() . '...');
+        $this->logger->info('Creating '.$triggerName.' trigger for table '.$table->getName().'...');
 
         $tableNameQuoted = $this->connection->quote($table->getName());
 
@@ -178,7 +178,7 @@ 
     public function createUpdateTrigger(Table $table)
     {
         $triggerName = sprintf('TRG_%s_ONUPDATE', $table->getName());
-        $this->logger->info('Creating ' . $triggerName . ' trigger for table ' . $table->getName() . '...');
+        $this->logger->info('Creating '.$triggerName.' trigger for table '.$table->getName().'...');
 
         $innerCode = '';
 

src/ZohoDatabaseModelSync.php

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
         }
 
         $tableName = ZohoDatabaseHelper::getTableName($dao, $this->prefix);
-        $this->logger->notice('Synchronizing DB Model for ' . $tableName . '...');
+        $this->logger->notice('Synchronizing DB Model for '.$tableName.'...');
 
         $schema = new Schema();
         $table = $schema->createTable($tableName);
@@ -177,7 +177,7 @@ 
                     continue 2;
                     break;
                 default:
-                    throw new \RuntimeException('Unknown type "' . $field->getType() . '"');
+                    throw new \RuntimeException('Unknown type "'.$field->getType().'"');
             }
 
             // For MySQL, the maximum row size is 65535 bytes.

src/ZohoSyncDatabaseCommand.php

Spacing +2 added lines, -2 removed lines

@@ -141,7 +141,7 @@ 
             if ($input->getOption('log-path') && $input->getOption('clear-logs')) {
                 $this->logger->notice('Clearing logs...');
                 $path = $input->getOption('log-path');
-                $logFile = $path . '/ZCRMClientLibrary.log';
+                $logFile = $path.'/ZCRMClientLibrary.log';
                 if (file_exists($logFile)) {
                     if (is_writable($logFile)) {
                         if (file_put_contents($logFile, '') === false) {
@@ -185,7 +185,7 @@ 
             if ($input->getOption('log-path') && $input->getOption('dump-logs')) {
                 $this->logger->info('Dumping logs...');
                 $path = $input->getOption('log-path');
-                $logFile = $path . '/ZCRMClientLibrary.log';
+                $logFile = $path.'/ZCRMClientLibrary.log';
                 if (file_exists($logFile)) {
                     if (is_readable($logFile)) {
                         $this->logger->info(file_get_contents($logFile));

src/ZohoDatabaseCopier.php

Spacing +48 added lines, -48 removed lines

@@ -72,11 +72,11 @@ 
     {
         $users = $this->zohoUserService->getUsers();
         $tableName = 'users';
-        $this->logger->info('Fetched ' . count($users) . ' records for table ' . $tableName);
+        $this->logger->info('Fetched '.count($users).' records for table '.$tableName);
 
         $table = $this->connection->getSchemaManager()->createSchema()->getTable($tableName);
 
-        $select = $this->connection->prepare('SELECT * FROM ' . $tableName . ' WHERE id = :id');
+        $select = $this->connection->prepare('SELECT * FROM '.$tableName.' WHERE id = :id');
 
         $this->connection->beginTransaction();
         foreach ($users as $user) {
@@ -197,7 +197,7 @@ 
                                     $lastPageInConfig = '1';
                                 }
                                 $lastActivityTime = new \DateTime($lastDateInConfig, new \DateTimeZone($dao->getZohoClient()->getTimezone()));
-                                $recordsPage = (int)$lastPageInConfig;
+                                $recordsPage = (int) $lastPageInConfig;
                             } else {
                                 $findDateByModifiedTime = true;
                             }
@@ -210,10 +210,10 @@ 
                                 $lastActivityTime = new \DateTime($modifiedSince);
                             } else {
                                 if ($tableHasColumnModifiedTime) {
-                                    $lastActivityTime = $this->connection->fetchColumn('SELECT MAX(modifiedTime) FROM ' . $tableName);
+                                    $lastActivityTime = $this->connection->fetchColumn('SELECT MAX(modifiedTime) FROM '.$tableName);
                                 }
                                 if (!$lastActivityTime && $tableHasColumnCreatedTime) {
-                                    $lastActivityTime = $this->connection->fetchColumn('SELECT MAX(createdTime) FROM ' . $tableName);
+                                    $lastActivityTime = $this->connection->fetchColumn('SELECT MAX(createdTime) FROM '.$tableName);
                                 }
 
                                 if ($lastActivityTime !== null) {
@@ -253,7 +253,7 @@ 
                         if ($zohoSyncConfigTableExists) {
                             $lastDate = $lastActivityTime ? $lastActivityTime->format('Y-m-d H:i:s') : date('Y-m-d H:i:s', 0);
                             $this->upsertZohoConfig('FETCH_RECORDS_MODIFIED_SINCE__DATE', $tableName, $lastDate);
-                            $this->upsertZohoConfig('FETCH_RECORDS_MODIFIED_SINCE__PAGE', $tableName, (string)$recordsPage);
+                            $this->upsertZohoConfig('FETCH_RECORDS_MODIFIED_SINCE__PAGE', $tableName, (string) $recordsPage);
                         }
 
                         $recordsPaginationLastTime = $lastActivityTime;
@@ -262,10 +262,10 @@ 
                         if ($zohoSyncConfigTableExists) {
                             $latestDateToSave = $currentDateTime->format('Y-m-d H:i:s');
                             if ($tableHasColumnModifiedTime) {
-                                $latestDateToSave = $this->connection->fetchColumn('SELECT MAX(modifiedTime) FROM ' . $tableName);
+                                $latestDateToSave = $this->connection->fetchColumn('SELECT MAX(modifiedTime) FROM '.$tableName);
                             }
                             if (!$latestDateToSave && $tableHasColumnCreatedTime) {
-                                $latestDateToSave = $this->connection->fetchColumn('SELECT MAX(createdTime) FROM ' . $tableName);
+                                $latestDateToSave = $this->connection->fetchColumn('SELECT MAX(createdTime) FROM '.$tableName);
                             }
                             if (!$latestDateToSave) {
                                 $latestDateToSave = $currentDateTime->format('Y-m-d H:i:s');
@@ -275,26 +275,26 @@ 
                         }
                     }
                     $totalRecords = count($records);
-                    $this->logger->debug($totalRecords . ' records fetched.');
+                    $this->logger->debug($totalRecords.' records fetched.');
                     $deletedRecords = [];
                     $totalRecordsDeleted = 0;
                     if (($recordsPage - 1) === 1) {
                         $this->logger->notice(sprintf('Fetching the records to delete for module %s...', $dao->getPluralModuleName()));
                         $deletedRecords = $dao->getDeletedRecordIds($lastActivityTime);
                         $totalRecordsDeleted = count($deletedRecords);
-                        $this->logger->debug($totalRecordsDeleted . ' records fetched.');
+                        $this->logger->debug($totalRecordsDeleted.' records fetched.');
                     }
                 } else {
                     $this->logger->info(sprintf('Full copy started for module %s', $dao->getPluralModuleName()));
                     $this->logger->notice(sprintf('Fetching the records to insert/update for module ...%s', $dao->getPluralModuleName()));
                     $records = $dao->getRecords();
                     $totalRecords = count($records);
-                    $this->logger->debug($totalRecords . ' records fetched.');
+                    $this->logger->debug($totalRecords.' records fetched.');
                     $deletedRecords = [];
                     $stopAndhasMoreResults = false;
                 }
             } catch (ZCRMException $exception) {
-                $this->logger->error('Error when getting records for module ' . $dao->getPluralModuleName() . ': ' . $exception->getMessage(), [
+                $this->logger->error('Error when getting records for module '.$dao->getPluralModuleName().': '.$exception->getMessage(), [
                     'exception' => $exception
                 ]);
                 if ($throwErrors) {
@@ -304,7 +304,7 @@ 
             }
             $this->logger->info(sprintf('Inserting/updating %s records into table %s...', $totalRecords, $tableName));
 
-            $select = $this->connection->prepare('SELECT * FROM ' . $tableName . ' WHERE id = :id');
+            $select = $this->connection->prepare('SELECT * FROM '.$tableName.' WHERE id = :id');
 
             $this->connection->beginTransaction();
 
@@ -376,7 +376,7 @@ 
 
                     // If there is some columns updated in local_update, we skip them to avoid Zoho values to overide them
                     if ($localUpdateTableExists && $result['uid']) {
-                        $selectRecordInLocalUpdate = $this->connection->prepare('SELECT field_name FROM local_update WHERE table_name = "' . $tableName . '" AND uid = :uid');
+                        $selectRecordInLocalUpdate = $this->connection->prepare('SELECT field_name FROM local_update WHERE table_name = "'.$tableName.'" AND uid = :uid');
                         $selectRecordInLocalUpdate->execute(['uid' => $result['uid']]);
                         $resultsInLocalUpdate = $selectRecordInLocalUpdate->fetchAll(\PDO::FETCH_ASSOC);
                         $fieldsUpdated = [];
@@ -407,7 +407,7 @@ 
             }
 
             $this->logger->info(sprintf('Deleting %d records from table %s...', $totalRecordsDeleted, $tableName));
-            $sqlStatementUid = 'select uid from ' . $this->connection->quoteIdentifier($tableName) . ' where id = :id';
+            $sqlStatementUid = 'select uid from '.$this->connection->quoteIdentifier($tableName).' where id = :id';
             $processedRecords = 0;
             $logOffset = $totalRecordsDeleted >= 500 ? 100 : 50;
             foreach ($deletedRecords as $deletedRecord) {
@@ -439,10 +439,10 @@ 
                 if ($zohoSyncConfigTableExists) {
                     $latestDateToSave = $currentDateTime->format('Y-m-d H:i:s');
                     if ($tableHasColumnModifiedTime) {
-                        $latestDateToSave = $this->connection->fetchColumn('SELECT MAX(modifiedTime) FROM ' . $tableName);
+                        $latestDateToSave = $this->connection->fetchColumn('SELECT MAX(modifiedTime) FROM '.$tableName);
                     }
                     if (!$latestDateToSave && $tableHasColumnCreatedTime) {
-                        $latestDateToSave = $this->connection->fetchColumn('SELECT MAX(createdTime) FROM ' . $tableName);
+                        $latestDateToSave = $this->connection->fetchColumn('SELECT MAX(createdTime) FROM '.$tableName);
                     }
                     if (!$latestDateToSave) {
                         $latestDateToSave = $currentDateTime->format('Y-m-d H:i:s');
@@ -466,7 +466,7 @@ 
         $table = $this->connection->getSchemaManager()->createSchema()->getTable($tableName);
         $apiModuleName = $dao->getPluralModuleName();
 
-        $this->logger->notice('Starting bulk fetch for module ' . $apiModuleName . '...');
+        $this->logger->notice('Starting bulk fetch for module '.$apiModuleName.'...');
 
         $zohoClient = new ZohoClient([
             'client_id' => ZOHO_CRM_CLIENT_ID,
@@ -485,11 +485,11 @@ 
             $oauthToken = $zohoClient->getZohoOAuthClient()->getAccessToken(ZOHO_CRM_CLIENT_CURRENT_USER_EMAIL);
 
             // Step 1: Create a bulk read job
-            $this->logger->info('Creating read job for module ' . $apiModuleName . ' and page ' . $page . '...');
-            $response = $client->request('POST', 'https://' . (ZOHO_CRM_SANDBOX === 'true' ? 'sandbox' : 'www') . '.zohoapis.com/crm/bulk/v2/read', [
+            $this->logger->info('Creating read job for module '.$apiModuleName.' and page '.$page.'...');
+            $response = $client->request('POST', 'https://'.(ZOHO_CRM_SANDBOX === 'true' ? 'sandbox' : 'www').'.zohoapis.com/crm/bulk/v2/read', [
                 'http_errors' => false,
                 'headers' => [
-                    'Authorization' => 'Zoho-oauthtoken ' . $oauthToken
+                    'Authorization' => 'Zoho-oauthtoken '.$oauthToken
                 ],
                 'json' => [
                     'query' => [
@@ -507,23 +507,23 @@ 
 
                 // We don't care about the job status right now, it will be checked later
             } else {
-                $this->logger->error('Cannot create bulk read query for module ' . $apiModuleName . ': status: ' . $response->getStatusCode() . '. Status: ' . $response->getBody()->getContents());
+                $this->logger->error('Cannot create bulk read query for module '.$apiModuleName.': status: '.$response->getStatusCode().'. Status: '.$response->getBody()->getContents());
                 break;
             }
 
             if ($jobId === null) {
-                $this->logger->error('JobID cannot be null. json:' . $resultStr);
+                $this->logger->error('JobID cannot be null. json:'.$resultStr);
                 break;
             }
 
             // Step 2: Check job status
             $jobDetails = null;
             while (true) {
-                $this->logger->info('Checking job ' . $jobId . ' status for module ' . $apiModuleName . ' and page ' . $page . '...');
-                $response = $client->request('GET', 'https://' . (ZOHO_CRM_SANDBOX === 'true' ? 'sandbox' : 'www') . '.zohoapis.com/crm/bulk/v2/read/' . $jobId, [
+                $this->logger->info('Checking job '.$jobId.' status for module '.$apiModuleName.' and page '.$page.'...');
+                $response = $client->request('GET', 'https://'.(ZOHO_CRM_SANDBOX === 'true' ? 'sandbox' : 'www').'.zohoapis.com/crm/bulk/v2/read/'.$jobId, [
                     'http_errors' => false,
                     'headers' => [
-                        'Authorization' => 'Zoho-oauthtoken ' . $oauthToken
+                        'Authorization' => 'Zoho-oauthtoken '.$oauthToken
                     ]
                 ]);
                 if ($response->getStatusCode() >= 200 && $response->getStatusCode() < 300) {
@@ -541,15 +541,15 @@ 
                             $jobDetails = $json;
                             break;
                         } else {
-                            $this->logger->info('Unsupported job status: ' . $resultStr);
+                            $this->logger->info('Unsupported job status: '.$resultStr);
                             break;
                         }
                     } else {
-                        $this->logger->error('Unsupported response: ' . $resultStr);
+                        $this->logger->error('Unsupported response: '.$resultStr);
                         break;
                     }
                 } else {
-                    $this->logger->error('Cannot get bulk job status query for module ' . $apiModuleName . ': status: ' . $response->getStatusCode() . '. Status: ' . $response->getBody()->getContents());
+                    $this->logger->error('Cannot get bulk job status query for module '.$apiModuleName.': status: '.$response->getStatusCode().'. Status: '.$response->getBody()->getContents());
                     break;
                 }
                 sleep(15);
@@ -557,31 +557,31 @@ 
 
             // Step 3: Download the result
             if ($jobDetails === null) {
-                $this->logger->error('JobDetails cannot be empty. json:' . $resultStr);
+                $this->logger->error('JobDetails cannot be empty. json:'.$resultStr);
                 break;
             }
             $this->logger->debug(json_encode($jobDetails));
-            $this->logger->info('Downloading zip file for module ' . $apiModuleName . ' and page ' . $page . '...');
-            $jobZipFile = '/tmp/job_' . $dao->getZCRMModule()->getAPIName() . '_' . $jobDetails['data'][0]['id'] . '.zip';
+            $this->logger->info('Downloading zip file for module '.$apiModuleName.' and page '.$page.'...');
+            $jobZipFile = '/tmp/job_'.$dao->getZCRMModule()->getAPIName().'_'.$jobDetails['data'][0]['id'].'.zip';
             $jobCsvPath = '/tmp/job_extract';
-            $jobCsvFile = '/tmp/job_extract/' . $jobDetails['data'][0]['id'] . '.csv';
+            $jobCsvFile = '/tmp/job_extract/'.$jobDetails['data'][0]['id'].'.csv';
             $canProcessCsv = false;
 
-            $response = $client->request('GET', 'https://' . (ZOHO_CRM_SANDBOX === 'true' ? 'sandbox' : 'www') . '.zohoapis.com/crm/bulk/v2/read/' . $jobId . '/result', [
+            $response = $client->request('GET', 'https://'.(ZOHO_CRM_SANDBOX === 'true' ? 'sandbox' : 'www').'.zohoapis.com/crm/bulk/v2/read/'.$jobId.'/result', [
                 'http_errors' => false,
                 'headers' => [
-                    'Authorization' => 'Zoho-oauthtoken ' . $oauthToken
+                    'Authorization' => 'Zoho-oauthtoken '.$oauthToken
                 ],
                 'sink' => $jobZipFile
             ]);
             if ($response->getStatusCode() >= 200 && $response->getStatusCode() < 300) {
-                $this->logger->info('Extracting ' . $jobZipFile . ' file for module ' . $apiModuleName . ' and page ' . $page . '...');
+                $this->logger->info('Extracting '.$jobZipFile.' file for module '.$apiModuleName.' and page '.$page.'...');
                 $zip = new ZipArchive();
                 $res = $zip->open($jobZipFile);
                 if ($res === TRUE) {
                     $zip->extractTo($jobCsvPath);
                     $zip->close();
-                    $this->logger->info('File extracted in ' . $jobCsvFile);
+                    $this->logger->info('File extracted in '.$jobCsvFile);
                     $canProcessCsv = true;
                 } else {
                     switch ($res) {
@@ -613,11 +613,11 @@ 
                             $zipErrorMessage = "Unknow (Code $res)";
                             break;
                     }
-                    $this->logger->error('Error when extracting zip file: ' . $zipErrorMessage);
+                    $this->logger->error('Error when extracting zip file: '.$zipErrorMessage);
                     break;
                 }
             } else {
-                $this->logger->error('Cannot download results for module ' . $apiModuleName . ': status: ' . $response->getStatusCode() . '. Status: ' . $response->getBody()->getContents());
+                $this->logger->error('Cannot download results for module '.$apiModuleName.': status: '.$response->getStatusCode().'. Status: '.$response->getBody()->getContents());
                 break;
             }
 
@@ -638,7 +638,7 @@ 
             $this->logger->info('Saving records to db...');
             $nbRecords = $jobDetails['data'][0]['result']['count'];
             $whenToLog = ceil($nbRecords / 100);
-            $this->logger->info($nbRecords . ' records to save');
+            $this->logger->info($nbRecords.' records to save');
             $nbSaved = 0;
             $handle = fopen($jobCsvFile, 'r');
             $fields = [];
@@ -656,30 +656,30 @@ 
                             $recordDataToInsert[$decodedColumnName] = $value === '' ? null : $value;
                         } else {
                             if ($columnName === 'Owner' || $columnName === 'Created_By' || $columnName === 'Modified_By') {
-                                $recordDataToInsert[$decodedColumnName . '_OwnerID'] = $value === '' ? null : $value;
-                                $recordDataToInsert[$decodedColumnName . '_OwnerName'] = $users[$value] ?? null;
-                            } else if ($table->hasColumn($decodedColumnName . '_ID')) {
-                                $recordDataToInsert[$decodedColumnName . '_ID'] = $value === '' ? null : $value;
+                                $recordDataToInsert[$decodedColumnName.'_OwnerID'] = $value === '' ? null : $value;
+                                $recordDataToInsert[$decodedColumnName.'_OwnerName'] = $users[$value] ?? null;
+                            } else if ($table->hasColumn($decodedColumnName.'_ID')) {
+                                $recordDataToInsert[$decodedColumnName.'_ID'] = $value === '' ? null : $value;
                             }
                         }
                     }
                     $this->connection->insert($tableName, $recordDataToInsert);
                     ++$nbSaved;
                     if (($nbSaved % $whenToLog) === 0) {
-                        $this->logger->info($nbSaved . '/' . $nbRecords . ' records processed');
+                        $this->logger->info($nbSaved.'/'.$nbRecords.' records processed');
                     }
                 }
-                $this->logger->info($nbSaved . ' records saved for module ' . $apiModuleName . ' and page ' . $page);
+                $this->logger->info($nbSaved.' records saved for module '.$apiModuleName.' and page '.$page);
                 fclose($handle);
             }
 
             // Step 5: Check if there is more results
             $hasMoreRecords = $jobDetails['data'][0]['result']['more_records'];
             if (!$hasMoreRecords) {
-                $this->logger->info('No more records for the module ' . $apiModuleName);
+                $this->logger->info('No more records for the module '.$apiModuleName);
                 break;
             }
-            $this->logger->info('More records to fetch for the module ' . $apiModuleName);
+            $this->logger->info('More records to fetch for the module '.$apiModuleName);
             ++$page;
         }
     }