Skip to content

highway to the danger zone - Adds wildcards to allow removing multiple emails at once #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dan2k3k4 merged 3 commits into from
Mar 17, 2026
Merged

highway to the danger zone - Adds wildcards to allow removing multiple emails at once #31

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ddacbe
Adds wildcards
Oct 9, 2025
04bd598
chore: update app/Console/Commands/RemoveAppInstancesByEmail.php
dan2k3k4 Feb 9, 2026
951f454
Merge branch 'main' into feature-remove-by-email
dan2k3k4 Feb 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions app/Console/Commands/RemoveAppInstancesByEmail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class RemoveAppInstancesByEmail extends Command
* @var string
*/
protected $signature = 'polydock:remove-instances-by-email
{email : The email address to search for}
{email : The email address or pattern to search for (supports % wildcards)}
{--dry-run : Show what would be removed without actually doing it}
{--force : Skip confirmation prompt}';

Expand All @@ -24,7 +24,7 @@ class RemoveAppInstancesByEmail extends Command
*
* @var string
*/
protected $description = 'Find all app instances with the given email address and set them to pending removal';
protected $description = 'Find all app instances with the given email address or pattern and set them to pending removal';

/**
* Execute the console command.
Expand All @@ -35,19 +35,28 @@ public function handle()
$isDryRun = $this->option('dry-run');
$force = $this->option('force');

if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
$this->error('Invalid email address provided.');
// Check if this is a pattern (contains %) or exact email
$isPattern = str_contains($email, '%');

if (!$isPattern && !filter_var($email, FILTER_VALIDATE_EMAIL)) {
$this->error('Invalid email address provided. Use % for wildcard patterns (e.g., %@example.com).');
return 1;
}

$this->info("Searching for app instances with email: {$email}");
$searchType = $isPattern ? 'pattern' : 'email';
$this->info("Searching for app instances with {$searchType}: {$email}");

// Find all app instances with the given email in their data
$instances = PolydockAppInstance::whereJsonContains('data->user-email', $email)->get();
// Find all app instances with the given email or pattern in their data
if ($isPattern) {
// Use raw SQL for pattern matching (compatible with MariaDB/MySQL)
$instances = PolydockAppInstance::whereRaw("JSON_UNQUOTE(JSON_EXTRACT(data, '$.\"user-email\"')) LIKE ?", [$email])->get();
Comment thread
dan2k3k4 marked this conversation as resolved.
Outdated
} else {
$instances = PolydockAppInstance::whereJsonContains('data->user-email', $email)->get();
}


if ($instances->isEmpty()) {
$this->info('No app instances found with the email address: ' . $email);
$this->info("No app instances found matching {$searchType}: {$email}");
return 0;
}

Expand All @@ -67,18 +76,19 @@ public function handle()
return 0;
}

$this->info("Found {$instances->count()} app instance(s) with email: {$email}");
$this->info("Found {$instances->count()} app instance(s) matching {$searchType}: {$email}");
$this->info("Removable instances: {$removableInstances->count()}");
$this->newLine();

// Display the removable instances
$headers = ['ID', 'Name', 'Status', 'Store App', 'Created At'];
$headers = ['ID', 'Name', 'Email', 'Status', 'Store App', 'Created At'];
$rows = [];

foreach ($removableInstances as $instance) {
$rows[] = [
$instance->id,
$instance->name ?: 'N/A',
$instance->getUserEmail() ?: 'N/A',
$instance->status->getLabel(),
$instance->storeApp->name ?? 'N/A',
$instance->created_at->format('Y-m-d H:i:s')
Expand Down Expand Up @@ -116,7 +126,7 @@ public function handle()

$instance->setStatus(
PolydockAppInstanceStatus::PENDING_PRE_REMOVE,
"Marked for removal by email: {$email}"
"Marked for removal by {$searchType}: {$email}"
);
$instance->save();

Expand Down