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

Final things.

Browse Source
This commit is contained in:
James Cole
2021-03-21 11:06:08 +01:00
parent 206845575c
commit 97a687e40a
17 changed files with 305 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
app/Support/Http/Controllers/CronRunner.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Support\Http\Controllers;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Support\Cronjobs\AutoBudgetCronjob;
use FireflyIII\Support\Cronjobs\RecurringCronjob;
@@ -34,60 +35,97 @@ use FireflyIII\Support\Cronjobs\TelemetryCronjob;
trait CronRunner
{
/**
* @return string
* @param bool $force
* @param Carbon $date
*
* @return array
*/
protected function runAutoBudget(): string
protected function runAutoBudget(bool $force, Carbon $date): array
{
/** @var AutoBudgetCronjob $autoBudget */
$autoBudget = app(AutoBudgetCronjob::class);
$autoBudget->setForce($force);
$autoBudget->setDate($date);
try {
$result = $autoBudget->fire();
$autoBudget->fire();
} catch (FireflyException $e) {
return $e->getMessage();
}
if (false === $result) {
return 'The auto budget cron job did not fire.';
return [
'job_fired' => false,
'job_succeeded' => false,
'job_errored' => true,
'message' => $e->getMessage(),
];
}
return 'The auto budget cron job fired successfully.';
return [
'job_fired' => $autoBudget->jobFired,
'job_succeeded' => $autoBudget->jobSucceeded,
'job_errored' => $autoBudget->jobErrored,
'message' => $autoBudget->message,
];
}
/**
* @return string
* @param bool $force
* @param Carbon $date
*
* @return array
*/
protected function runRecurring(): string
protected function runRecurring(bool $force, Carbon $date): array
{
/** @var RecurringCronjob $recurring */
$recurring = app(RecurringCronjob::class);
$recurring->setForce($force);
$recurring->setDate($date);
try {
$result = $recurring->fire();
$recurring->fire();
} catch (FireflyException $e) {
return $e->getMessage();
}
if (false === $result) {
return 'The recurring transaction cron job did not fire. It was fired less than half a day ago.';
return [
'job_fired' => false,
'job_succeeded' => false,
'job_errored' => true,
'message' => $e->getMessage(),
];
}
return 'The recurring transaction cron job fired successfully.';
return [
'job_fired' => $recurring->jobFired,
'job_succeeded' => $recurring->jobSucceeded,
'job_errored' => $recurring->jobErrored,
'message' => $recurring->message,
];
}
/**
* @return string
* @param bool $force
* @param Carbon $date
*
* @return array
*/
protected function runTelemetry(): string
protected function runTelemetry(bool $force, Carbon $date): array
{
/** @var TelemetryCronjob $telemetry */
$telemetry = app(TelemetryCronjob::class);
$telemetry->setForce($force);
$telemetry->setDate($date);
try {
$result = $telemetry->fire();
$telemetry->fire();
} catch (FireflyException $e) {
return $e->getMessage();
}
if (false === $result) {
return 'The telemetry cron job did not fire.';
return [
'job_fired' => false,
'job_succeeded' => false,
'job_errored' => true,
'message' => $e->getMessage(),
];
}
return 'The telemetry cron job fired successfully.';
return [
'job_fired' => $telemetry->jobFired,
'job_succeeded' => $telemetry->jobSucceeded,
'job_errored' => $telemetry->jobErrored,
'message' => $telemetry->message,
];
}
}