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

Refactor upgrade and verify commands.

Browse Source
This commit is contained in:
James Cole
2019-03-23 18:58:06 +01:00
parent 1b0be2a47e
commit ce30375341
31 changed files with 909 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
app/Console/Commands/Integrity/ReportEmptyObjects.php
View File

@@ -21,10 +21,10 @@
namespace FireflyIII\Console\Commands\Integrity;
use FireflyIII\Models\Account;
use FireflyIII\Models\Budget;
use FireflyIII\Models\Category;
use FireflyIII\Models\Tag;
use FireflyIII\Models\Account;
use Illuminate\Console\Command;
use stdClass;
@@ -53,15 +53,39 @@ class ReportEmptyObjects extends Command
*/
public function handle(): int
{
$start = microtime(true);
$this->reportEmptyBudgets();
$this->reportEmptyCategories();
$this->reportEmptyTags();
$this->reportAccounts();
$this->reportBudgetLimits();
$end = round(microtime(true) - $start, 2);
$this->info(sprintf('Report on empty objects finished in %s seconds', $end));
return 0;
}
/**
* Reports on accounts with no transactions.
*/
private function reportAccounts(): void
{
$set = Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
->leftJoin('users', 'accounts.user_id', '=', 'users.id')
->groupBy(['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email'])
->whereNull('transactions.account_id')
->get(
['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email']
);
/** @var stdClass $entry */
foreach ($set as $entry) {
$name = $entry->name;
$line = 'User #%d (%s) has account #%d ("%s") which has no transactions.';
$line = sprintf($line, $entry->user_id, $entry->email, $entry->id, $name);
$this->line($line);
}
}
/**
* Reports on budgets with no budget limits (which makes them pointless).
@@ -87,28 +111,6 @@ class ReportEmptyObjects extends Command
}
}
/**
* Reports on accounts with no transactions.
*/
private function reportAccounts(): void
{
$set = Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
->leftJoin('users', 'accounts.user_id', '=', 'users.id')
->groupBy(['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email'])
->whereNull('transactions.account_id')
->get(
['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email']
);
/** @var stdClass $entry */
foreach ($set as $entry) {
$name = $entry->name;
$line = 'User #%d (%s) has account #%d ("%s") which has no transactions.';
$line = sprintf($line, $entry->user_id, $entry->email, $entry->id, $name);
$this->line($line);
}
}
/**
* Report on budgets with no transactions or journals.
*/
@@ -125,7 +127,7 @@ class ReportEmptyObjects extends Command
foreach ($set as $entry) {
$objName = $entry->name;
$line = sprintf(
'User #%d (%s) has budget #%d ("%s") which has no transactions.',
'User #%d (%s) has budget #%d ("%s") which has no transaction journals.',
$entry->user_id,
$entry->email,
$entry->id,
@@ -152,7 +154,7 @@ class ReportEmptyObjects extends Command
$objName = $entry->name;
$line = sprintf(
'User #%d (%s) has category #%d ("%s") which has no transactions.',
'User #%d (%s) has category #%d ("%s") which has no transaction journals.',
$entry->user_id,
$entry->email,
$entry->id,
@@ -167,19 +169,19 @@ class ReportEmptyObjects extends Command
*/
private function reportEmptyTags(): void
{
$set = Tag::leftJoin('tag_transaction_journal', 'tags.id', '=', 'tag_transaction_journal.tag_id')
->leftJoin('users', 'tags.user_id', '=', 'users.id')
->distinct()
->whereNull('tag_transaction_journal.tag_id')
->whereNull('tags.deleted_at')
->get(['tags.id', 'tags.tag', 'tags.user_id', 'users.email']);
$set = Tag::leftJoin('tag_transaction_journal', 'tags.id', '=', 'tag_transaction_journal.tag_id')
->leftJoin('users', 'tags.user_id', '=', 'users.id')
->distinct()
->whereNull('tag_transaction_journal.tag_id')
->whereNull('tags.deleted_at')
->get(['tags.id', 'tags.tag', 'tags.user_id', 'users.email']);
/** @var stdClass $entry */
foreach ($set as $entry) {
$objName = $entry->tag;
$line = sprintf(
'User #%d (%s) has tag #%d ("%s") which has no transactions.',
'User #%d (%s) has tag #%d ("%s") which has no transaction journals.',
$entry->user_id,
$entry->email,
$entry->id,

36
app/Console/Commands/Integrity/ReportIntegrity.php
View File

@@ -59,21 +59,6 @@ class ReportIntegrity extends Command
$commands = [
'firefly-iii:report-empty-objects',
'firefly-iii:report-sum',
// 'firefly-iii:',
// 'firefly-iii:',
// 'firefly-iii:',
// 'firefly-iii:',
// 'firefly-iii:',
// 'firefly-iii:',
// 'firefly-iii:',
// 'firefly-iii:',
// 'firefly-iii:',
// 'firefly-iii:',
// 'firefly-iii:',
// 'firefly-iii:',
// 'firefly-iii:',
// 'firefly-iii:',
// 'firefly-iii:',
];
foreach ($commands as $command) {
$this->line(sprintf('Now executing %s', $command));
@@ -82,27 +67,6 @@ class ReportIntegrity extends Command
echo $result;
}
// $this->reportEmptyBudgets();
// $this->reportEmptyCategories();
// $this->reportObject('tag');
// $this->reportAccounts();
// $this->reportBudgetLimits();
// $this->reportSum();
// $this->reportJournals();
// $this->reportTransactions();
// $this->reportDeletedAccounts();
// $this->reportNoTransactions();
// $this->reportTransfersBudgets();
// $this->reportIncorrectJournals();
// $this->repairPiggyBanks();
// $this->createLinkTypes();
// $this->createAccessTokens();
// $this->fixDoubleAmounts(); // is a report function!
// $this->fixBadMeta();
// $this->removeBills();
// $this->enableCurrencies();
// $this->reportZeroAmount();
return 0;
}
}

7
app/Console/Commands/Integrity/ReportSum.php
View File

@@ -61,6 +61,7 @@ class ReportSum extends Command
*/
private function reportSum(): void
{
$start = microtime(true);
/** @var UserRepositoryInterface $userRepository */
$userRepository = app(UserRepositoryInterface::class);
@@ -68,11 +69,15 @@ class ReportSum extends Command
foreach ($userRepository->all() as $user) {
$sum = (string)$user->transactions()->sum('amount');
if (0 !== bccomp($sum, '0')) {
$this->error('Error: Transactions for user #' . $user->id . ' (' . $user->email . ') are off by ' . $sum . '!');
$message = sprintf('Error: Transactions for user #%d (%s) are off by %s!', $user->id, $user->email, $sum);
$this->error($message);
}
if (0 === bccomp($sum, '0')) {
$this->info(sprintf('Amount integrity OK for user #%d', $user->id));
}
}
$end = round(microtime(true) - $start, 2);
$this->info(sprintf('Report on total sum finished in %s seconds', $end));
}
}