Skip to content

Commit 6c06e36

Browse files
authored
Merge pull request #9 from atfromhome/controller
Fixing some bugs
2 parents 320e584 + 29cc6ac commit 6c06e36

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/ModelRecordImport.php

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace FromHome\ModelUpload;
66

7+
use Illuminate\Support\Str;
78
use Webmozart\Assert\Assert;
89
use Maatwebsite\Excel\Concerns\ToModel;
910
use Maatwebsite\Excel\Events\AfterImport;
@@ -62,6 +63,7 @@ public function model(array $row): ModelUploadRecord
6263
Assert::notNull($this->uploadFile);
6364

6465
return new ModelUploadRecord([
66+
'id' => \strtolower((string) Str::ulid()),
6567
'model_upload_file_id' => $this->uploadFile->getKey(),
6668
'payload' => $row,
6769
'meta' => $this->meta,

src/Processor/RecordProcessorManager.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ public function registerRecordProcessors(array $processors): void
1717

1818
public function getRecordProcessor(string $modelType): ?ModelUploadRecordProcessor
1919
{
20-
$actionClass = $this->actions[$modelType] ?? null;
20+
$processorClass = $this->processors[$modelType] ?? null;
2121

22-
if ($actionClass === null) {
22+
if ($processorClass === null) {
2323
return null;
2424
}
2525

26-
$action = app($actionClass);
26+
$processor = app($processorClass);
2727

28-
Assert::isInstanceOf($action, ModelUploadRecordProcessor::class);
28+
Assert::isInstanceOf($processor, ModelUploadRecordProcessor::class);
2929

30-
return $action;
30+
return $processor;
3131
}
3232
}

0 commit comments

Comments
 (0)