kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-27 05:51:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix for #2980

Browse Source
This commit is contained in:
James Cole
2020-01-10 17:12:38 +01:00
parent 925f63c8e1
commit 8857e3553d
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
app/Console/Commands/Export/ExportData.php
View File

@@ -41,14 +41,6 @@ class ExportData extends Command
{ {
use VerifiesAccessToken; use VerifiesAccessToken;
/** @var JournalRepositoryInterface */
private $journalRepository;
/** @var AccountRepositoryInterface */
private $accountRepository;
/** @var User */
private $user;
/** /**
* The console command description. * The console command description.
* *
@@ -77,7 +69,12 @@ class ExportData extends Command
{--export-bills : Create a file with all your bills and some meta data.} {--export-bills : Create a file with all your bills and some meta data.}
{--export-piggies : Create a file with all your piggy banks and some meta data.} {--export-piggies : Create a file with all your piggy banks and some meta data.}
{--force : Force overwriting of previous exports if found.}'; {--force : Force overwriting of previous exports if found.}';
/** @var AccountRepositoryInterface */
private $accountRepository;
/** @var JournalRepositoryInterface */
private $journalRepository;
/** @var User */
private $user;
/** /**
* Create a new command instance. * Create a new command instance.
@@ -99,7 +96,7 @@ class ExportData extends Command
{ {
// verify access token // verify access token
if (!$this->verifyAccessToken()) { if (!$this->verifyAccessToken()) {
$this->error('Invalid access token.'); $this->error('Invalid access token. Check /profile.');
return 1; return 1;
} }
@@ -212,31 +209,34 @@ class ExportData extends Command
*/ */
private function getDateParameter(string $field): Carbon private function getDateParameter(string $field): Carbon
{ {
$date = null; $date = Carbon::now()->subYear();
if (null !== $this->option($field)) { if (null !== $this->option($field)) {
try { try {
$date = Carbon::createFromFormat('Y-m-d', $this->option($field)); $date = Carbon::createFromFormat('Y-m-d', $this->option($field));
} catch (InvalidArgumentException $e) { } catch (InvalidArgumentException $e) {
Log::error($e->getMessage()); Log::error($e->getMessage());
throw new FireflyException(sprintf('%s date "%s" must be formatted YYYY-MM-DD', $field, $this->option('start'))); $this->error(sprintf('%s date "%s" must be formatted YYYY-MM-DD. Field will be ignored.', $field, $this->option('start')));
}
}
if (null === $date && 'start' === $field) {
$journal = $this->journalRepository->firstNull();
$date = null === $journal ? Carbon::now()->subYear() : $date;
}
if (null === $date && 'end' === $field) {
$date = new Carbon;
}
if ('start' === $date) {
$date->startOfDay();
}
if ('end' === $date) {
$date->endOfDay();
} }
return $date; return $date;
} }
if ('start' === $field) {
$journal = $this->journalRepository->firstNull();
$date = null === $journal ? Carbon::now()->subYear() : $journal->date;
$date->startOfDay();
return $date;
}
if ('end' === $field) {
$date = new Carbon;
$date->endOfDay();
return $date;
}
// fallback
return $date;
}
/** /**
* @return string * @return string