refactoring

This commit is contained in:
Yuri Kuznetsov
2021-09-05 12:14:39 +03:00
parent 447732bf9c
commit bbabe672d8
5 changed files with 536 additions and 155 deletions

View File

@@ -32,6 +32,8 @@ namespace Espo\Controllers;
use Espo\Core\Exceptions\Forbidden;
use Espo\Core\Exceptions\BadRequest;
use Espo\Tools\Import\Params as ImportParams;
use Espo\Core\{
Controllers\Record,
Api\Request,
@@ -131,7 +133,7 @@ class Import extends Record
$timezone = $data->timezone;
}
$importParams = [
$rawParams = [
'headerRow' => !empty($data->headerRow),
'delimiter' => $data->delimiter,
'textQualifier' => $data->textQualifier,
@@ -147,13 +149,14 @@ class Import extends Record
'idleMode' => !empty($data->idleMode),
'silentMode' => !empty($data->silentMode),
'manualMode' => !empty($data->manualMode),
'defaultFieldList' => $data->defaultFieldList ?? [],
];
if (property_exists($data, 'updateBy')) {
$importParams['updateBy'] = $data->updateBy;
$rawParams['updateBy'] = $data->updateBy;
}
$params = ImportParams::fromRaw($rawParams);
$attachmentId = $data->attachmentId;
if (!$this->acl->check($data->entityType, 'edit')) {
@@ -164,7 +167,7 @@ class Import extends Record
$data->entityType,
$data->attributeList,
$attachmentId,
$importParams
$params
);
}