Merge pull request #6683 from bakaphp/release/1.64.0

Release 1.66.0

Author: kaioken

.github/workflows/docker-swarm-deploy copy.yaml renamed to .github/workflows/docker-swarm-deploy.yaml

@@ -33,7 +33,7 @@ jobs:
     environment: ${{ github.ref_name }}
     steps:
       - name: executing remote ssh commands using password
-        uses: appleboy/[email protected].2
+        uses: appleboy/[email protected].3
         with:
           host: ${{ secrets.AWS_EC2_HOST }}
           username: ${{ secrets.AWS_EC2_USERNAME }}
@@ -59,28 +59,18 @@ jobs:
             docker restart laravel-scheduler
             docker restart queue-sync-shopify-queue
             docker restart queue-sync-shopify-queue-worker-1
-            docker stop queue-sync-shopify-queue-worker-2
+            docker restart batch-logger-queue
+            docker restart queue-user-interactions
             docker restart queue-scout-worker-1
-            docker stop queue-scout-worker-2
             docker restart queue-workflow-1
+            docker stop queue-sync-shopify-queue-worker-2
             docker stop queue-workflow-2
             docker stop queue-workflow-3
-            docker restart batch-logger-queue
-            docker restart queue-user-interactions
-            docker stop queue-scrapper-worker-1
-            docker stop queue-scrapper-worker-2
-            docker stop queue-scrapper-worker-3
-            docker stop queue-scrapper-worker-4
-            docker stop queue-scout-worker-3
+            docker stop queue-scrapper-worker-{1..4}
+            docker stop queue-scout-worker-{2..3}
             if [ "docker-compose.${{ github.ref_name }}.yml" == "docker-compose.1.x.yml" ]; then
               docker stop queue-imports2
-              docker stop queue2
-              docker stop queue3
-              docker stop queue4
-              docker stop queue5
-              docker stop queue6
-              docker stop queue7
-              docker stop queue8
+              docker stop queue{2..8}
               docker stop queue-workflow-4
             fi
 

.github/workflows/ec2-deploy.yaml

@@ -31,7 +31,7 @@ jobs:
     environment: ${{ github.ref_name }}
     steps:
       - name: executing remote ssh commands using password
-        uses: appleboy/[email protected].2
+        uses: appleboy/[email protected].3
         with:
           host: ${{ secrets.AWS_QUEUE_EC2_HOST }}
           username: ${{ secrets.AWS_EC2_USERNAME }}

.github/workflows/ecs-deploy.yaml

@@ -1,4 +1,4 @@
-name: Deploy to Test EC2
+name: Deploy to Secondary EC2
 
 on:
   push:
@@ -7,7 +7,7 @@ on:
   workflow_dispatch: {}
 
 jobs:
-  deploy-to-test-ec2:
+  deploy-to-ec2:
     runs-on: ubuntu-latest
     environment: ${{ github.ref_name }}
     permissions:
@@ -27,11 +27,11 @@ jobs:
 
   docker-command:
     runs-on: ubuntu-latest
-    needs: deploy-to-test-ec2
+    needs: deploy-to-ec2
     environment: ${{ github.ref_name }}
     steps:
       - name: executing remote ssh commands using password
-        uses: appleboy/[email protected].2
+        uses: appleboy/[email protected].3
         with:
           host: ${{ secrets.AWS_TEST_EC2_HOST }}
           username: ${{ secrets.AWS_TEST_EC2_USERNAME }}
@@ -46,36 +46,25 @@ jobs:
             docker exec -i phpkanvas-ecosystem php artisan lighthouse:clear-cache all
             docker exec -i phpkanvas-ecosystem php artisan config:cache
             docker restart queue-scrapper
-            docker stop queue-scrapper-worker-1
-            docker stop queue-scrapper-worker-2
-            docker stop queue-scrapper-worker-3
-            docker stop queue-scrapper-worker-4
+            docker stop queue-scrapper-worker-{1..4}
             docker restart queue
             docker restart queue-imports
             docker stop queue-notifications
             docker stop queue-social
             docker restart laravel-scheduler
             docker stop queue-sync-shopify-queue
-            docker stop queue-sync-shopify-queue-worker-1
-            docker stop queue-sync-shopify-queue-worker-1
-            docker stop queue-sync-shopify-queue-worker-2
+            docker stop queue-sync-shopify-queue-worker-{1..2}
             docker restart queue-scout-worker-1
             docker stop queue-scout-worker-2
             docker stop queue-scout-worker-3
-            docker restart queue-workflow-1
-            docker restart queue-workflow-2
+            docker restart queue-workflow-{1..2}
             docker stop queue-workflow-3
             docker stop batch-logger-queue
             docker stop queue-user-interactions
             if [ "docker-compose.${{ github.ref_name }}.yml" == "docker-compose.1.x.yml" ]; then
               docker stop queue-imports2
               docker restart queue2
-              docker stop queue3
-              docker stop queue4
-              docker stop queue5
-              docker stop queue6
-              docker stop queue7
-              docker stop queue8
+              docker stop queue{3..8}
               docker stop queue-workflow-4
             fi
 

.github/workflows/queues-ec2-deploy.yaml

@@ -6,8 +6,10 @@
 
 use Baka\Enums\StateEnums;
 use Baka\Traits\KanvasJobsTrait;
+use Baka\Validations\Date;
 use Exception;
 use Illuminate\Console\Command;
+use Illuminate\Contracts\Database\Query\Builder;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Notification;
 use Kanvas\Apps\Models\Apps;
@@ -32,66 +34,100 @@ class MailAllAppUsersCommand extends Command
                             {subject : The subject of the email} 
                             {--test-email= : Email address to send a test email instead of sending to all users}
                             {--production : Flag to confirm sending to all users in production}
-                            {--delay=500 : Delay in milliseconds between each email}';
+                            {--delay=500 : Delay in milliseconds between each email}
+                            {--created-after= : Filter users created after this date (Y-m-d H:i:s format)}
+                            {--created-before= : Filter users created before this date (Y-m-d H:i:s format)}';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Send specific email to all users of an app or to a test email address';
+    protected $description = 'Send specific email to all users of an app or to a test email address with optional date filtering';
 
     /**
      * Execute the console command.
      */
-    public function handle()
+    public function handle(): void
     {
         $app = Apps::getById((int) $this->argument('apps_id'));
         $this->app = $app;
         $this->overwriteAppService($app);
-        $emailTemplateName = $this->argument('email_template_name');
-        $emailSubject = $this->argument('subject');
+        $emailTemplateName = (string) $this->argument('email_template_name');
+        $emailSubject = (string) $this->argument('subject');
         $testEmail = $this->option('test-email');
         $isProduction = $this->option('production');
         $delayMs = (int) $this->option('delay');
+        $createdAfter = $this->option('created-after') ?? '';
+        $createdBefore = $this->option('created-before') ?? '';
+
+        // Validate date format if provided
+        if ($createdAfter !== '' && ! Date::isValid($createdAfter, 'Y-m-d H:i:s')) {
+            $this->error('Invalid created-after date format. Use Y-m-d H:i:s format (e.g., 2024-01-01 00:00:00)');
+
+            return;
+        }
+
+        if ($createdBefore !== '' && ! Date::isValid($createdBefore, 'Y-m-d H:i:s')) {
+            $this->error('Invalid created-before date format. Use Y-m-d H:i:s format (e.g., 2024-12-31 23:59:59)');
+
+            return;
+        }
 
         // Check if we're just testing to a single email
-        if ($testEmail) {
+        if (is_string($testEmail) && ! empty($testEmail)) {
             try {
                 $userModelEntity = Users::getByEmail($testEmail);
                 $this->sendEmailToUser($userModelEntity, $emailTemplateName, $emailSubject);
                 $this->info('Test email successfully sent to: ' . $userModelEntity->getId() . ' on app: ' . $app->getId());
             } catch (Exception $e) {
                 $this->error('Failed to send test email: ' . $e->getMessage());
 
-                return 1;
+                return;
             }
 
-            return 0;
+            return;
         }
 
         // Check if we're in production mode and have the production flag
         if (! app()->isProduction() || ! $isProduction) {
             $this->error('This command can only send emails to all users in production with the --production flag.');
             $this->info('Use [email protected] to send a test email instead.');
 
-            return 1;
+            return;
         }
 
+        // Build the base query for counting and processing users
+        $baseQuery = $this->buildUserQuery($app->getId(), $createdAfter, $createdBefore);
+
         // Count total users to process for progress bar
-        $totalUsers = DB::table('users_associated_apps')
-            ->where('apps_id', $app->id)
-            ->where('is_deleted', StateEnums::NO->getValue())
-            ->where('companies_id', AppEnums::GLOBAL_COMPANY_ID->getValue())
-            ->count();
+        $totalUsers = $baseQuery->count();
 
         if ($totalUsers === 0) {
-            $this->warn('No users found for this app.');
+            $this->warn('No users found for this app with the given criteria.');
+            if ($createdAfter !== '' || $createdBefore !== '') {
+                $this->info('Date filters applied:');
+                if ($createdAfter !== '') {
+                    $this->info('  - Created after: ' . $createdAfter);
+                }
+                if ($createdBefore !== '') {
+                    $this->info('  - Created before: ' . $createdBefore);
+                }
+            }
 
-            return 0;
+            return;
         }
 
         $this->info("Found {$totalUsers} users to process.");
+        if ($createdAfter !== '' || $createdBefore !== '') {
+            $this->info('Date filters applied:');
+            if ($createdAfter !== '') {
+                $this->info('  - Created after: ' . $createdAfter);
+            }
+            if ($createdBefore !== '') {
+                $this->info('  - Created before: ' . $createdBefore);
+            }
+        }
 
         // Initialize counters
         $successCount = 0;
@@ -103,10 +139,7 @@ public function handle()
         $progressBar->start();
 
         // Only runs if we're in production and have the production flag
-        DB::table('users_associated_apps')
-            ->where('apps_id', $app->id)
-            ->where('is_deleted', StateEnums::NO->getValue())
-            ->where('companies_id', AppEnums::GLOBAL_COMPANY_ID->getValue())
+        $this->buildUserQuery($app->getId(), $createdAfter, $createdBefore)
             ->orderBy('users_id')
             ->chunk(100, function ($users) use (
                 $app,
@@ -154,12 +187,10 @@ public function handle()
         if ($failCount > 0) {
             $this->error("  - Failed: {$failCount}");
 
-            return 1;
+            return;
         }
 
         $this->info('All emails have been sent successfully.');
-
-        return 0;
     }
 
     /**
@@ -182,4 +213,32 @@ private function sendEmailToUser(Users $user, string $emailTemplateName, string
         $notification->setSubject($emailSubject);
         Notification::route('mail', $user->email)->notify($notification);
     }
+
+    /**
+     * Build the user query with optional date filters
+     */
+    private function buildUserQuery(
+        int $appId,
+        ?string $createdAfter = null,
+        ?string $createdBefore = null
+    ): Builder {
+        $query = DB::table('users_associated_apps')
+            ->join('users', 'users_associated_apps.users_id', '=', 'users.id')
+            ->selectRaw('users_associated_apps.*, users.email')
+            ->where('users_associated_apps.apps_id', $appId)
+            ->where('users_associated_apps.is_deleted', StateEnums::NO->getValue())
+            ->where('users_associated_apps.companies_id', AppEnums::GLOBAL_COMPANY_ID->getValue())
+            ->where('users.is_deleted', StateEnums::NO->getValue());
+
+        // Apply created_at filters if provided
+        if ($createdAfter !== null && ! empty($createdAfter)) {
+            $query->where('users.created_at', '>=', $createdAfter);
+        }
+
+        if ($createdBefore !== null && ! empty($createdBefore)) {
+            $query->where('users.created_at', '<=', $createdBefore);
+        }
+
+        return $query;
+    }
 }