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

Update providers and repositories for new import job fields

Browse Source
This commit is contained in:
James Cole
2018-04-29 18:07:14 +02:00
parent 7390e20218
commit f74a6dffca
4 changed files with 85 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
app/Models/ImportJob.php
View File

@@ -43,11 +43,6 @@ class ImportJob extends Model
public $validStatus
= [
'new',
'configuring',
'configured',
'running',
'error',
'finished',
];
/**
* The attributes that should be casted to native types.
@@ -56,9 +51,14 @@ class ImportJob extends Model
*/
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'created_at' => 'datetime',
'updated_at' => 'datetime',
'configuration' => 'array',
'extended_status' => 'array',
'transactions' => 'array',
];
/** @var array */
protected $fillable = ['key', 'user_id', 'file_type', 'source', 'status', 'stage', 'configuration', 'extended_status', 'transactions'];
/**
* @param $value
@@ -86,9 +86,11 @@ class ImportJob extends Model
}
/**
* @deprecated
*
* @param int $count
*/
public function addTotalSteps(int $count)
public function addTotalSteps(int $count): void
{
$status = $this->extended_status;
$status['steps'] += $count;
@@ -97,88 +99,9 @@ class ImportJob extends Model
Log::debug(sprintf('Add %d to total steps for job "%s" making total steps %d', $count, $this->key, $status['steps']));
}
/**
* @param string $status
*
* @throws FireflyException
*/
public function change(string $status): void
{
if (\in_array($status, $this->validStatus)) {
Log::debug(sprintf('Job status set (in model) to "%s"', $status));
$this->status = $status;
$this->save();
return;
}
throw new FireflyException(sprintf('Status "%s" is invalid for job "%s".', $status, $this->key));
}
/**
* @param $value
*
* @return mixed
*/
public function getConfigurationAttribute($value)
{
if (null === $value) {
return [];
}
if (0 === \strlen($value)) {
return [];
}
return json_decode($value, true);
}
/**
* @param $value
*
* @return mixed
*/
public function getExtendedStatusAttribute($value)
{
if (0 === \strlen((string)$value)) {
return [];
}
return json_decode($value, true);
}
/**
* @codeCoverageIgnore
*
* @param $value
*/
public function setConfigurationAttribute($value)
{
$this->attributes['configuration'] = json_encode($value);
}
/**
* @codeCoverageIgnore
*
* @param $value
*/
public function setExtendedStatusAttribute($value)
{
$this->attributes['extended_status'] = json_encode($value);
}
/**
* @param $value
*/
public function setStatusAttribute(string $value)
{
if (\in_array($value, $this->validStatus)) {
$this->attributes['status'] = $value;
}
}
/**
* @return string
*
* @deprecated
* @throws \Illuminate\Contracts\Encryption\DecryptException
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
*/