Merge branch 'refs/heads/development'

Author: rbruhn

app/Console/Commands/AppClearSubjectsCommand.php

@@ -0,0 +1,102 @@
+<?php
+
+/*
+ * Copyright (C) 2014 - 2026, Biospex
+ * [email protected]
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace App\Console\Commands;
+
+use App\Models\Expedition;
+use App\Models\Subject;
+use App\Services\DarwinCore\DwcValidationService;
+use Illuminate\Console\Command;
+
+class AppClearSubjectsCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:clear-subjects {uuid : The UUID of the expedition} {--dry-run : Display the count without updating}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Clear the OCR data from every subject assigned to an expedition';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(DwcValidationService $validationService): int
+    {
+        $uuid = $this->argument('uuid');
+
+        if (! $validationService->isValidUuid($uuid)) {
+            $this->error('Invalid UUID format provided.');
+
+            return self::FAILURE;
+        }
+
+        $expedition = Expedition::where('uuid', $uuid)->first();
+
+        if (! $expedition) {
+            $this->error("Expedition with UUID {$uuid} not found.");
+
+            return self::FAILURE;
+        }
+
+        // MongoDB is type sensitive; expedition_ids contains integers in this app
+        $expeditionId = (int) $expedition->id;
+
+        $query = Subject::where('expedition_ids', $expeditionId);
+        $subjectCount = $query->count();
+
+        if ($subjectCount === 0) {
+            $this->info('No subjects found for this expedition.');
+
+            return self::SUCCESS;
+        }
+
+        if ($this->option('dry-run')) {
+            $this->info("Dry run: {$subjectCount} subjects would have their OCR cleared.");
+
+            return self::SUCCESS;
+        }
+
+        if (! $this->confirm("Are you sure you want to clear OCR for {$subjectCount} subjects in '{$expedition->title}'?")) {
+            $this->info('Operation cancelled.');
+
+            return self::SUCCESS;
+        }
+
+        $this->info("Clearing OCR for {$subjectCount} subjects...");
+
+        /**
+         * Using the Subject model (mongodb/laravel-mongodb) to perform a bulk update.
+         * The 'where' clause on an array field like 'expedition_ids' in MongoDB
+         * automatically checks for existence of the value.
+         */
+        $query->update(['ocr' => '']);
+
+        $this->info('OCR data cleared successfully.');
+
+        return self::SUCCESS;
+    }
+}

app/Console/Commands/AppFileDeploymentCommand.php

@@ -24,6 +24,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Symfony\Component\Console\Command\Command as CommandAlias;
@@ -94,8 +95,6 @@ private function getSourceFiles(): Collection
             throw new Exception("No supervisor template files found in: {$supervisorPath}");
         }
 
-        \Log::info('Found '.count($files).' supervisor template file(s)');
-
         return collect($files);
     }
 
@@ -201,6 +200,7 @@ private function getTargetPath($sourceFile): string
      */
     private function writeTargetFile(string $targetPath, string $content): void
     {
+
         $dir = dirname($targetPath);
 
         if (! File::isDirectory($dir)) {
@@ -232,10 +232,6 @@ private function showDryRunChanges(string $filename, string $original, string $p
                     $changes++;
                 }
             }
-
-            if ($changes === 0) {
-                \Log::info('  <fg=gray>No replacements needed</>');
-            }
         }
     }
 
@@ -281,7 +277,7 @@ private function getReplacementValue(string $field): ?string
             if (str_starts_with($field, 'AWS_SQS_')) {
                 $value = strtolower(str_replace('AWS_SQS_', '', $field));
 
-                return config('services.aws.queues.'.$value);
+                return config('services.aws.sqs.'.$value);
             }
 
             if ($field === 'REVERB_DEBUG') {

app/Console/Commands/CleanEfsDirsCommand.php

@@ -70,7 +70,6 @@ private function cleanDirectory(string $path): int
 
             if ($lastModified->lessThan($threshold)) {
                 File::delete($file); // Use the File facade to delete
-                \Log::info("Deleted file: $file");
                 $deletedFiles++;
             }
         }

app/Console/Commands/ExportQueueCommand.php

@@ -68,9 +68,15 @@ public function handle(): void
         $expeditionId = $this->argument('expeditionId');
 
         try {
-            is_null($expeditionId)
-                ? $this->queueService->processNextQueue()
-                : $this->cleanupService->resetExpeditionExport($expeditionId);
+            if (is_null($expeditionId)) {
+                // 1. Check for finished image processing
+                $this->queueService->checkActiveQueuesForCompletion();
+
+                // 2. Process the next waiting queue
+                $this->queueService->processNextQueue();
+            } else {
+                $this->cleanupService->resetExpeditionExport($expeditionId);
+            }
         } catch (\Throwable $e) {
             $this->fail($e);
         }

app/Console/Commands/ExportQueueStageCommand.php

@@ -87,8 +87,8 @@ public function handle()
         $queue->error = 0;
         $queue->save();
 
-        \Artisan::call('update:listen-controller start');
-
+        // Start both the specific update listener and the shared DLQ listener
+        \Artisan::call('sqs:control export_update image_trigger_dlq --action=start');
         try {
             match ($queue->stage) {
                 1 => ZooniverseExportProcessImagesJob::dispatch($queue),

app/Console/Commands/PurgeAwsQueues.php

@@ -61,7 +61,7 @@ public function handle()
             return 1;
         }
 
-        $queues = config('services.aws.queues');
+        $queues = config('services.aws.sqs');
 
         $this->info("Purging queues for environment: <comment>{$env}</comment>");
 

app/Console/Commands/SqsControllerBatchCommand.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (C) 2014 - 2025, Biospex
+ * Copyright (C) 2014 - 2026, Biospex
  * [email protected]
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,31 +22,21 @@
 
 use App\Services\SupervisorControlService;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Config;
 
 /**
- * Command to control OCR listeners via Supervisor
- *
- * @author Biospex <[email protected]>
+ * Unified command to control any SQS listener via Supervisor.
+ * Usage: php artisan sqs:control export_update start
  */
-class SqsControllerOcrCommand extends Command
+class SqsControllerCommand extends Command
 {
     /**
      * The console command signature.
-     *
-     * @var string
      */
-    protected $signature = 'ocr:listen-controller {action=start|stop|restart}';
+    protected $signature = 'sqs:control {queue_keys*} {--action=start : start|stop|restart}';
 
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Start/stop/restart OCR listeners via Supervisor (environment-neutral)';
+    protected $description = 'Control one or more SQS listeners via Supervisor by providing config queue keys';
 
-    /**
-     * Create a new command instance.
-     */
     public function __construct(protected SupervisorControlService $service)
     {
         parent::__construct();
@@ -57,14 +47,32 @@ public function __construct(protected SupervisorControlService $service)
      */
     public function handle(): int
     {
+        $keys = $this->argument('queue_keys');
+        $action = $this->option('action');
+
+        $queueNames = [];
+        foreach ($keys as $key) {
+            $name = Config::get("services.aws.sqs.{$key}");
+            if (empty($name)) {
+                $this->warn("Invalid queue key: '{$key}' - skipping.");
+
+                continue;
+            }
+            $queueNames[] = $name;
+        }
+
+        if (empty($queueNames)) {
+            $this->error('No valid queue names found to control.');
+
+            return self::FAILURE;
+        }
+
         try {
-            $this->service->control([
-                config('services.aws.queues.ocr_update'),
-            ], $this->argument('action'));
+            $this->service->control($queueNames, $action);
 
             return self::SUCCESS;
         } catch (\Throwable $e) {
-            $this->error('Failed to control OCR listeners: '.$e->getMessage());
+            $this->error('Supervisor Control Failed: '.$e->getMessage());
 
             return self::FAILURE;
         }