Skip to content

Commit 7c10c2d

Browse files
committed
fixes created_by on rejected file
1 parent 970353d commit 7c10c2d

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

src/app/Jobs/RejectedExportJob.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace LaravelEnso\DataImport\app\Jobs;
44

55
use Illuminate\Bus\Queueable;
6+
use LaravelEnso\Core\app\Models\User;
67
use Illuminate\Queue\SerializesModels;
78
use Illuminate\Queue\InteractsWithQueue;
89
use Illuminate\Contracts\Queue\ShouldQueue;
@@ -16,21 +17,24 @@ class RejectedExportJob implements ShouldQueue
1617
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
1718

1819
private $dataImport;
20+
private $user;
1921

2022
public $queue;
2123
public $timeout;
2224

23-
public function __construct(DataImport $dataImport)
25+
public function __construct(DataImport $dataImport, User $user)
2426
{
2527
$this->dataImport = $dataImport;
28+
$this->user = $user;
2629

2730
$this->queue = config('enso.imports.queues.rejected');
2831
$this->timeout = (new Template($dataImport))->timeout();
2932
}
3033

3134
public function handle()
3235
{
33-
(new Rejected($this->dataImport))
34-
->run();
36+
(new Rejected(
37+
$this->dataImport, $this->user
38+
))->run();
3539
}
3640
}

src/app/Services/Exporters/Rejected.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Illuminate\Http\File;
66
use Illuminate\Support\Str;
77
use Illuminate\Support\Collection;
8+
use LaravelEnso\Core\app\Models\User;
89
use Illuminate\Support\Facades\Storage;
910
use LaravelEnso\DataImport\app\Enums\Statuses;
1011
use LaravelEnso\DataImport\app\Models\DataImport;
@@ -15,15 +16,17 @@
1516
class Rejected
1617
{
1718
private $dataImport;
19+
private $user;
1820
private $writer;
1921
private $path;
2022
private $filename;
2123
private $sheets;
2224
private $dumps;
2325

24-
public function __construct(DataImport $dataImport)
26+
public function __construct(DataImport $dataImport, User $user)
2527
{
2628
$this->dataImport = $dataImport;
29+
$this->user = $user;
2730
$this->sheets = collect();
2831
$this->dumps = $this->dumps();
2932
}
@@ -108,7 +111,7 @@ private function storeRejected()
108111
$this->dataImport->rejected()
109112
->create(['data_import_id' => $this->dataImport->id])
110113
->attach(
111-
new File(Storage::path($this->path())), $this->filename()
114+
new File(Storage::path($this->path())), $this->filename(), $this->user
112115
);
113116

114117
return $this;

src/app/Services/Importers/Chunk.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ private function finalize()
138138

139139
$this->dataImport->setStatus(Statuses::Processed);
140140

141-
RejectedExportJob::dispatch($this->dataImport);
141+
RejectedExportJob::dispatch($this->dataImport, $this->user);
142142
}
143143

144144
private function afterHook()

0 commit comments

Comments
 (0)