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

cleanup: Commands are a lot less verbal and report better on success / failue

Browse Source
This commit is contained in:
James Cole
2023-06-02 07:36:17 +02:00
parent 1e1497ff4e
commit dcf71c6fdf
60 changed files with 1108 additions and 1698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Console/Commands/Integrity/CreateGroupMemberships.php
View File

@@ -38,18 +38,8 @@ use Illuminate\Support\Facades\Log;
class CreateGroupMemberships extends Command
{
public const CONFIG_NAME = '560_create_group_memberships';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Update group memberships';
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'firefly-iii:create-group-memberships';
protected $signature = 'firefly-iii:create-group-memberships';
/**
* TODO move to helper.
@@ -64,7 +54,6 @@ class CreateGroupMemberships extends Command
$userGroup = UserGroup::where('title', $user->email)->first();
if (null === $userGroup) {
$userGroup = UserGroup::create(['title' => $user->email]);
Log::debug(sprintf('Created new user group #%d ("%s")', $userGroup->id, $userGroup->title));
}
$userRole = UserRole::where('title', UserRole::OWNER)->first();
@@ -83,15 +72,11 @@ class CreateGroupMemberships extends Command
'user_group_id' => $userGroup->id,
]
);
Log::debug('Created new membership.');
}
if (null === $user->user_group_id) {
$user->user_group_id = $userGroup->id;
$user->save();
Log::debug('Put user in default group.');
}
Log::debug(sprintf('User #%d now has main group.', $user->id));
}
/**
@@ -102,12 +87,8 @@ class CreateGroupMemberships extends Command
*/
public function handle(): int
{
$start = microtime(true);
$this->createGroupMemberships();
$end = round(microtime(true) - $start, 2);
$this->info(sprintf('Validated group memberships in %s seconds.', $end));
$this->info('Correct: validated group memberships');
return 0;
}
@@ -121,9 +102,7 @@ class CreateGroupMemberships extends Command
$users = User::get();
/** @var User $user */
foreach ($users as $user) {
Log::debug(sprintf('Manage group memberships for user #%d', $user->id));
self::createGroupMembership($user);
Log::debug(sprintf('Done with user #%d', $user->id));
}
}
}