shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Validation issues for import fixed

Browse Source
This commit is contained in:
EnesSacid-Buker
2023-03-07 15:18:14 +03:00
parent f2b73d83d8
commit d2e96fbe23
27 changed files with 174 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
app/Utilities/Import.php
View File

@ -2,8 +2,11 @@
namespace App\Utilities;
use App\Abstracts\Import as AbstractsImport;
use App\Abstracts\ImportMultipleSheets;
use App\Jobs\Auth\NotifyUser;
use App\Notifications\Common\ImportCompleted;
use Illuminate\Http\Request;
use Maatwebsite\Excel\Validators\ValidationException;
use Throwable;
@ -12,69 +15,81 @@ class Import
/**
* Import the excel file or catch errors
*
* @param $class
* @param $request
* @param $translation
* @param AbstractsImport|ImportMultipleSheets $class
*
* @return array
*/
public static function fromExcel($class, $request, $translation)
public static function fromExcel($class, Request $request, string $translation): array
{
$success = true;
try {
$should_queue = should_queue();
$file = $request->file('import');
if (should_queue()) {
$rows = $class->toArray($file);
$total_rows = 0;
if (!empty($rows[0])) {
$total_rows = count($rows[0]);
} else if (!empty($sheets = $class->sheets())) {
$total_rows = count($rows[array_keys($sheets)[0]]);
}
$class->queue($file)->onQueue('imports')->chain([
new NotifyUser(user(), new ImportCompleted($translation, $total_rows)),
]);
$message = trans('messages.success.import_queued', ['type' => $translation]);
if ($should_queue) {
self::importQueue($class, $file, $translation);
} else {
$class->import($file);
$message = trans('messages.success.imported', ['type' => $translation]);
}
$response = [
'success' => true,
'error' => false,
'data' => null,
'message' => $message,
];
$message = trans(
'messages.success.' . ($should_queue ? 'import_queued' : 'imported'),
['type' => $translation]
);
} catch (Throwable $e) {
if ($e instanceof ValidationException) {
foreach ($e->failures() as $failure) {
$message = trans('messages.error.import_column', [
'message' => collect($failure->errors())->first(),
'column' => $failure->attribute(),
'line' => $failure->row(),
]);
$message = self::flashFailures($e);
flash($message)->error()->important();
}
$message = '';
} else {
$message = $e->getMessage();
}
$response = [
'success' => false,
'error' => true,
'data' => null,
'message' => $message,
];
$success = false;
}
return $response;
return [
'success' => $success,
'error' => ! $success,
'data' => null,
'message' => $message,
];
}
/**
* Import the excel file
*
* @param AbstractsImport|ImportMultipleSheets $class
*/
protected static function importQueue($class, $file, string $translation): void
{
$rows = $class->toArray($file);
$total_rows = 0;
if (! empty($rows[0])) {
$total_rows = count($rows[0]);
} else if (! empty($sheets = $class->sheets())) {
$total_rows = count($rows[array_keys($sheets)[0]]);
}
$class->queue($file)->onQueue('imports')->chain([
new NotifyUser(user(), new ImportCompleted($translation, $total_rows))
]);
}
protected static function flashFailures(Throwable $e): string
{
if (! $e instanceof ValidationException) {
return $e->getMessage();
}
foreach ($e->failures() as $failure) {
$message = trans('messages.error.import_column', [
'message' => collect($failure->errors())->first(),
'column' => $failure->attribute(),
'line' => $failure->row(),
]);
flash($message)->error()->important();
}
return '';
}
}