kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2016-05-02 20:49:19 +02:00
parent 5e1167b8ae
commit 3344bb7263
21 changed files with 105 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/Repositories/ExportJob/ExportJobRepository.php
View File

@@ -68,16 +68,26 @@ class ExportJobRepository implements ExportJobRepositoryInterface
*/
public function create(): ExportJob
{
$exportJob = new ExportJob;
$exportJob->user()->associate($this->user);
/*
* In theory this random string could give db error.
*/
$exportJob->key = Str::random(12);
$exportJob->status = 'export_status_never_started';
$exportJob->save();
$count = 0;
while ($count < 30) {
$key = Str::random(12);
$existing = $this->findByKey($key);
if (is_null($existing->id)) {
$exportJob = new ExportJob;
$exportJob->user()->associate($this->user);
$exportJob->key = Str::random(12);
$exportJob->status = 'export_status_never_started';
$exportJob->save();
// breaks the loop:
return $exportJob;
}
$count++;
}
return new ExportJob;
return $exportJob;
}
/**
@@ -90,7 +100,12 @@ class ExportJobRepository implements ExportJobRepositoryInterface
*/
public function findByKey(string $key): ExportJob
{
return $this->user->exportJobs()->where('key', $key)->first();
$result = $this->user->exportJobs()->where('key', $key)->first();
if (is_null($result)) {
return new ExportJob;
}
return $result;
}
}