Merge branch 'main' into development

Author: rbruhn

.github/workflows/deploy.yml

@@ -33,6 +33,8 @@ jobs:
   # Create release when pushing to main
   create-release:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     if: "github.ref == 'refs/heads/main' && !contains(github.event.head_commit.message, '[skip deploy]') && !contains(github.event.head_commit.message, '[no deploy]')"
     outputs:
       release-tag: ${{ steps.create_release.outputs.tag_name }}
@@ -159,8 +161,6 @@ jobs:
         with:
           php-version: '8.3'
           extensions: mbstring, xml, bcmath, ctype, json, tokenizer, pdo, pdo_mysql
-      - name: Setup Composer authentication for Laravel Nova
-        run: composer config http-basic.nova.laravel.com ${{ secrets.NOVA_USERNAME }} ${{ secrets.NOVA_PASSWORD }}
       - name: Cache Composer packages
         id: composer-cache
         uses: actions/cache@v3
@@ -260,8 +260,6 @@ jobs:
         with:
           php-version: '8.3'
           extensions: mbstring, xml, bcmath, ctype, json, tokenizer, pdo, pdo_mysql
-      - name: Setup Composer authentication for Laravel Nova
-        run: composer config http-basic.nova.laravel.com ${{ secrets.NOVA_USERNAME }} ${{ secrets.NOVA_PASSWORD }}
       - name: Cache Composer packages
         id: composer-cache
         uses: actions/cache@v3

COMMIT_CONVENTIONS.md

@@ -10,9 +10,11 @@ Version numbers follow the format `MAJOR.MINOR.PATCH` (e.g., `1.2.3`).
 
 ## How It Works
 
-1. **Development Branch**: Push to `development` → Automatically deploys to development environment
+1. **Development Branch**: Push to `development` → Automatically deploys to development environment (Host: `3.138.217.206`)
+   - Operates using `dev-` prefixed SQS queues.
 2. **Main Branch**: Push to `main` → Creates GitHub release with auto-incremented version → Automatically deploys to
-   production
+   production (Host: `3.142.169.134`)
+   - Operates using `prod-` prefixed SQS queues.
 3. **Version Control**: Commit messages determine which part of the version number gets incremented
 
 ## Version Bump Rules

DEPLOYMENT_SETUP.md

@@ -34,10 +34,12 @@ If you need to test deployments locally:
 4. **Deploys using deployphp** with environment variables for token access
 
 ### Deployment Process (`deploy.php` + `deploy/custom.php`)
-1. **Downloads CI artifacts** using GitHub API
-2. **Extracts and deploys** built assets without server-side building
-3. **Checks queue status** before restarting to prevent job interruption
-4. **Cleans up** temporary files and node_modules automatically
+1. **PHP 8.3 Environment**: The deployment now runs on PHP 8.3.
+2. **Downloads CI artifacts** using GitHub API: This replaces server-side building, so `npm` or `yarn` are no longer required on the server.
+3. **Dynamic SQS Queues**: Queue names are now environment-prefixed (`prod-`, `dev-`, or `loc-`) as defined in `config/services.php`.
+4. **Filament & OpCache**: Automated tasks now handle Filament asset optimization and OpCache resets during deployment.
+5. **Checks queue status** before restarting to prevent job interruption
+6. **Cleans up** temporary files and node_modules automatically
 
 ## Key Features
 
@@ -47,20 +49,14 @@ If you need to test deployments locally:
 - Faster deployments with reduced server resource usage
 
 ### ✅ Queue-Safe Deployments
-- `queue:count` command checks Beanstalkd queue status
-- Deployment pauses queue restart if jobs are running
-- Prevents interruption of long-running tasks (e.g., CSV processing)
-
-### ✅ Automatic Cleanup
-- `node_modules` removed automatically via `clear_paths`
-- Temporary artifact files cleaned up after deployment
-- No manual intervention required
+- `queue:count` command checks status before restarting.
+- **Dynamic Prefixing**: SQS queues are dynamically named based on the environment (e.g., `prod-batch-trigger`).
 
 ## Queue Names Configuration
-The deployment checks these queues by default:
-- `export`
-- `geolocate`
-- `pusher_classification`
+The deployment checks these queues by default. Note that names are now derived from the `APP_ENV` prefix:
+- `{{prefix}}-export`
+- `{{prefix}}-geolocate`
+- `{{prefix}}-pusher_classification`
 
 To modify queue names, edit the `$queues` array in `deploy/custom.php`:
 ```php

app/Console/Commands/AppUpdateQueriesCommand.php

@@ -20,10 +20,7 @@
 
 namespace App\Console\Commands;
 
-use App\Jobs\PusherTranscriptionJob;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Storage;
 
 /**
  * Class UpdateQueries
@@ -51,209 +48,5 @@ public function __construct()
     /**
      * Fire command
      */
-    public function handle()
-    {
-        $operation = $this->argument('operation');
-
-        switch ($operation) {
-            case 'create-directories':
-                $this->createS3Directories();
-                break;
-
-            case 'move-files':
-                $this->moveS3DirectoryFiles();
-                break;
-
-            case 'update-paths':
-                $this->updateDatabasePaths();
-                break;
-            case 'process-classifications':
-                $this->processClassifications();
-                break;
-
-            default:
-                $this->createS3Directories();
-                $this->moveS3DirectoryFiles();
-                $this->updateDatabasePaths();
-                $this->processClassifications();
-        }
-    }
-
-    /**
-     * Create required directories in S3 bucket
-     */
-    protected function createS3Directories(): void
-    {
-        $directories = [
-            config('config.uploads.site-assets'),
-            config('config.uploads.project-assets'),
-        ];
-
-        foreach ($directories as $directory) {
-            try {
-                if (! Storage::disk('s3')->exists($directory)) {
-                    Storage::disk('s3')->makeDirectory($directory);
-                }
-            } catch (\Exception $e) {
-                $this->error("Failed to create directory {$directory}: ".$e->getMessage());
-            }
-        }
-    }
-
-    /**
-     * Move files between S3 directories using AWS CLI for optimal performance
-     */
-    protected function moveS3DirectoryFiles(): void
-    {
-        $bucket = config('filesystems.disks.s3.bucket');
-        $region = config('filesystems.disks.s3.region');
-
-        $migrations = [
-            [
-                'from' => config('config.uploads.project_resources_downloads'),
-                'to' => config('config.uploads.project-assets'),
-                'name' => 'project resources to project assets',
-            ],
-            [
-                'from' => config('config.uploads.resources'),
-                'to' => config('config.uploads.site-assets'),
-                'name' => 'resources to site assets',
-            ],
-        ];
-
-        foreach ($migrations as $migration) {
-            $this->migrateS3Directory($bucket, $region, $migration['from'], $migration['to'], $migration['name']);
-        }
-    }
-
-    /**
-     * Migrate files from one S3 directory to another using AWS CLI
-     */
-    protected function migrateS3Directory(string $bucket, string $region, string $fromDir, string $toDir, string $description): void
-    {
-        // Check if source directory has files
-        $listCommand = sprintf(
-            'aws s3 ls s3://%s/%s/ --region %s --recursive',
-            escapeshellarg($bucket),
-            escapeshellarg($fromDir),
-            escapeshellarg($region)
-        );
-
-        $output = [];
-        $returnCode = 0;
-        exec($listCommand.' 2>/dev/null', $output, $returnCode);
-
-        if (empty($output)) {
-            return;
-        }
-
-        $fileCount = count($output);
-
-        // Get initial count of destination directory
-        $destListCommand = sprintf(
-            'aws s3 ls s3://%s/%s/ --region %s --recursive',
-            escapeshellarg($bucket),
-            escapeshellarg($toDir),
-            escapeshellarg($region)
-        );
-
-        $destInitialOutput = [];
-        $destInitialReturnCode = 0;
-        exec($destListCommand.' 2>/dev/null', $destInitialOutput, $destInitialReturnCode);
-
-        $initialDestFileCount = count($destInitialOutput);
-        $expectedFinalCount = $initialDestFileCount + $fileCount;
-
-        // Copy files to new directory
-        $copyCommand = sprintf(
-            'aws s3 cp s3://%s/%s/ s3://%s/%s/ --region %s --recursive',
-            escapeshellarg($bucket),
-            escapeshellarg($fromDir),
-            escapeshellarg($bucket),
-            escapeshellarg($toDir),
-            escapeshellarg($region)
-        );
-
-        $copyOutput = [];
-        $copyReturnCode = 0;
-        exec($copyCommand.' 2>&1', $copyOutput, $copyReturnCode);
-
-        if ($copyReturnCode !== 0) {
-            $this->error('   Failed to copy files: '.implode("\n", $copyOutput));
-
-            return;
-        }
-
-        // Verify copy operation by listing destination directory
-        $verifyOutput = [];
-        $verifyReturnCode = 0;
-        exec($destListCommand.' 2>/dev/null', $verifyOutput, $verifyReturnCode);
-
-        $actualFinalCount = count($verifyOutput);
-
-        if ($actualFinalCount !== $expectedFinalCount) {
-            $this->error("   Verification failed: Expected {$expectedFinalCount} files, found {$actualFinalCount}");
-
-            return;
-        }
-    }
-
-    /**
-     * Update database paths for moved files
-     */
-    protected function updateDatabasePaths(): void
-    {
-        // Update ProjectAsset paths from project-resources/downloads to project-assets
-        $oldProjectPath = config('config.uploads.project_resources_downloads');
-        $newProjectPath = config('config.uploads.project-assets');
-
-        $projectAssetUpdates = DB::table('project_assets')
-            ->where('download_path', 'LIKE', $oldProjectPath.'/%')
-            ->get();
-
-        if ($projectAssetUpdates->isNotEmpty()) {
-            foreach ($projectAssetUpdates as $asset) {
-                $newPath = str_replace($oldProjectPath, $newProjectPath, $asset->download_path);
-
-                DB::table('project_assets')
-                    ->where('id', $asset->id)
-                    ->update(['download_path' => $newPath]);
-            }
-        }
-
-        // Update SiteAsset paths from resources to site-assets
-        $oldSitePath = config('config.uploads.resources');
-        $newSitePath = config('config.uploads.site-assets');
-
-        $siteAssetUpdates = DB::table('site_assets')
-            ->where('download_path', 'LIKE', $oldSitePath.'/%')
-            ->get();
-
-        if ($siteAssetUpdates->isNotEmpty()) {
-            foreach ($siteAssetUpdates as $asset) {
-                $newPath = str_replace($oldSitePath, $newSitePath, $asset->download_path);
-
-                DB::table('site_assets')
-                    ->where('id', $asset->id)
-                    ->update(['download_path' => $newPath]);
-            }
-        }
-    }
-
-    public function processClassifications(): void
-    {
-        DB::table('pusher_classifications')->orderBy('id')->chunkById(100, function ($chunk) {
-            $ids = [];
-            foreach ($chunk as $row) {
-                $data = json_decode($row->data, true);
-                if ($data && is_array($data)) {
-                    PusherTranscriptionJob::dispatch($data);
-                    $ids[] = $row->id;
-                }
-            }
-            if ($ids) {
-                DB::table('pusher_classifications')->whereIn('id', $ids)->delete();
-            }
-        }, 'id');
-    }
+    public function handle() {}
 }

app/Http/Controllers/Front/SiteAssetController.php

@@ -48,12 +48,12 @@ public function index(SiteAsset $siteAsset): \Illuminate\Contracts\View\View
      */
     public function show(SiteAsset $siteAsset): RedirectResponse|StreamedResponse
     {
-        if (! $siteAsset->document->exists() || ! file_exists(public_path('storage'.$siteAsset->document->path()))) {
+        if (empty($siteAsset->download_path) || ! Storage::disk('s3')->exists($siteAsset->download_path)) {
 
             return Redirect::route('front.site-assets.index')
                 ->with('danger', t('File cannot be found.'));
         }
 
-        return Storage::download('public/'.$siteAsset->document->path());
+        return Storage::disk('s3')->download($siteAsset->download_path);
     }
 }

app/Http/Middleware/EncryptCookies.php

@@ -30,6 +30,6 @@ class EncryptCookies extends Middleware
      * @var array
      */
     protected $except = [
-        //
+        'app_flash',
     ];
 }