DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #16361 from Godmartinz/acceptancer_reminder_unlisted_email_info

Browse source 
Fixed acceptance reminder command lag on users with no associated email
This commit is contained in:
snipe 2025-02-26 20:33:02 +00:00 committed by GitHub
parent d923d29bad 899119ae2d
commit 2ff47edb94
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/Console/Commands/SendAcceptanceReminder.php
View file

@ -64,6 +64,7 @@ class SendAcceptanceReminder extends Command
->groupBy(function($item) { ->groupBy(function($item) {
return $item['acceptance']->assignedTo ? $item['acceptance']->assignedTo->id : ''; return $item['acceptance']->assignedTo ? $item['acceptance']->assignedTo->id : '';
}); });
$no_email_list= [];
foreach($unacceptedAssetGroups as $unacceptedAssetGroup) { foreach($unacceptedAssetGroups as $unacceptedAssetGroup) {
// The [0] is weird, but it allows for the item_count to work and grabs the appropriate info for each user. // The [0] is weird, but it allows for the item_count to work and grabs the appropriate info for each user.
@ -72,7 +73,10 @@ class SendAcceptanceReminder extends Command
$locale = $acceptance->assignedTo?->locale; $locale = $acceptance->assignedTo?->locale;
$email = $acceptance->assignedTo?->email; $email = $acceptance->assignedTo?->email;
if(!$email){ if(!$email){
$this->info($acceptance->assignedTo?->present()->fullName().' has no email address.'); $no_email_list[] = [
'id' => $acceptance->assignedTo->id,
'name' => $acceptance->assignedTo->present()->fullName(),
];
} }
$item_count = $unacceptedAssetGroup->count(); $item_count = $unacceptedAssetGroup->count();
@ -86,6 +90,14 @@ class SendAcceptanceReminder extends Command
} }
$this->info($count.' users notified.'); $this->info($count.' users notified.');
$headers = ['ID', 'Name'];
$rows = [];
foreach ($no_email_list as $user) {
$rows[] = [$user['id'], $user['name']];
}
$this->info("The following users do not have an email address:");
$this->table($headers, $rows);
return 0; return 0;
} }

8
tests/Feature/Console/SendAcceptanceReminderTest.php
View file

@ -43,9 +43,13 @@ class SendAcceptanceReminderTest extends TestCase
CheckoutAcceptance::factory()->pending()->create([ CheckoutAcceptance::factory()->pending()->create([
'assigned_to_id' => $userA->id, 'assigned_to_id' => $userA->id,
]); ]);
$headers = ['ID', 'Name'];
$rows = [
[$userA->id, $userA->present()->fullName()],
];
$this->artisan('snipeit:acceptance-reminder') $this->artisan('snipeit:acceptance-reminder')
->expectsOutput($userA->present()->fullName().' has no email address.') ->expectsOutput("The following users do not have an email address:")
->expectsTable($headers, $rows)
->assertExitCode(0); ->assertExitCode(0);
Mail::assertNotSent(UnacceptedAssetReminderMail::class); Mail::assertNotSent(UnacceptedAssetReminderMail::class);