Merge pull request 'corrected logic for mail triggering' (#59) from ranjith-dev into master

Reviewed-on: #59

.github/workflows/gemini-pr-review.yaml

@@ -36,8 +36,8 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-npm-global-
 
-      - name: Install Gemini CLI globally
+#      - name: Install Gemini CLI globally
-        run: npm install -g --loglevel=http @google/gemini-cli
+#        run: npm install -g --loglevel=http @google/gemini-cli
 
       - name: Generate git diff and review with Gemini
         id: review

app/Console/Commands/Scheduler.php

@@ -0,0 +1,162 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Console\Scheduling\Schedule;
+use App\Models\AlertMailRule;
+
+
+class Scheduler extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    // protected $signature = 'app:scheduler';
+
+    protected $signature = 'custom:scheduler';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    // protected $description = 'Command description';
+
+    protected $description = 'Manually trigger scheduler logic';
+
+    /**
+     * Execute the console command.
+     */
+    // public function handle()
+    // {
+    //     //
+    // }
+
+    public function handle()
+    {
+
+        // --- Production Rules ---
+        $productionRules = AlertMailRule::where('module', 'ProductionQuantities')
+            ->where('rule_name', 'ProductionMail')
+            ->select('plant', 'schedule_type')
+            ->distinct()
+            ->get();
+
+        foreach ($productionRules as $rule) {
+            switch ($rule->schedule_type) {
+                case 'Live':
+                    // Run every minute
+                    \Artisan::call('send:production-report', [
+                        'schedule_type' => $rule->schedule_type,
+                        'plant' => $rule->plant,
+                    ]);
+                    break;
+                case 'Hourly':
+                    if (now()->minute == 0) {
+                        \Artisan::call('send:production-report', [
+                            'schedule_type' => $rule->schedule_type,
+                            'plant' => $rule->plant,
+                        ]);
+                    }
+                    break;
+                case 'Daily':
+                    if (now()->format('H:i') == '07:59') {
+                        \Artisan::call('send:production-report', [
+                            'schedule_type' => $rule->schedule_type,
+                            'plant' => $rule->plant,
+                        ]);
+                    }
+                    break;
+            }
+        }
+
+
+        // --- Invoice Validation Rules ---
+        $invoiceRules = AlertMailRule::where('module', 'InvoiceValidation')
+            ->select('plant', 'schedule_type')
+            ->distinct()
+            ->get();
+
+        foreach ($invoiceRules as $rule) {
+
+            switch ($rule->schedule_type) {
+                case 'Live':
+                    // Run every minute
+                    \Artisan::call('send:invoice-report', [
+                        'schedule_type' => $rule->schedule_type,
+                        'plant' => $rule->plant,
+                    ]);
+                    break;
+                case 'Hourly':
+                    if (now()->minute == 0) {
+                        \Artisan::call('send:invoice-report', [
+                            'schedule_type' => $rule->schedule_type,
+                            'plant' => $rule->plant,
+                        ]);
+                    }
+                    break;
+                case 'Daily':
+                    if (now()->format('H:i') == '07:59') {
+                        \Artisan::call('send:invoice-report', [
+                            'schedule_type' => $rule->schedule_type,
+                            'plant' => $rule->plant,
+                        ]);
+                    }
+                    break;
+            }
+        }
+
+        // --- Invoice Data Report Rules ---
+        $invoiceDataRules = AlertMailRule::where('module', 'InvoiceDataReport')
+            ->select('plant', 'schedule_type')
+            ->distinct()
+            ->get();
+
+        foreach ($invoiceDataRules as $rule) {
+
+            switch ($rule->schedule_type) {
+                case 'Live':
+                    // Run every minute
+                    \Artisan::call('send:invoice-data-report', [
+                        'schedule_type' => $rule->schedule_type,
+                        'plant' => $rule->plant,
+                    ]);
+                    break;
+                case 'Hourly':
+                    if (now()->minute == 0) {
+                        \Artisan::call('send:invoice-data-report', [
+                            'schedule_type' => $rule->schedule_type,
+                            'plant' => $rule->plant,
+                        ]);
+                    }
+                    break;
+                case 'Daily':
+                    if (now()->format('H:i') == '10:00') {
+                        \Artisan::call('send:invoice-data-report', [
+                            'schedule_type' => $rule->schedule_type,
+                            'plant' => $rule->plant,
+                        ]);
+                    }
+                    break;
+            }
+        }
+    }
+
+
+    /**
+     * Helper to call Artisan commands with parameters.
+     */
+    protected function callArtisanCommand($commandName, $rule)
+    {
+        \Artisan::call($commandName, [
+            'schedule_type' => $rule->schedule_type,
+            'plant' => $rule->plant,
+        ]);
+
+        $this->info("Executed {$commandName} for plant: {$rule->plant}");
+        \Log::info("Executed {$commandName} for plant: {$rule->plant}");
+    }
+}

routes/console.php

@@ -2,8 +2,6 @@
 
 use Illuminate\Foundation\Inspiring;
 use Illuminate\Support\Facades\Artisan;
-use App\Models\AlertMailRule;
-use Illuminate\Console\Scheduling\Schedule;
 
 
 
@@ -11,87 +9,93 @@ Artisan::command('inspire', function () {
     $this->comment(Inspiring::quote());
 })->purpose('Display an inspiring quote');
 
+
+Artisan::command('auto:scheduler', function () {
+    $this->call('custom:scheduler');
+})->everyMinute();
+
+
 //     Schedule::command('send:invoice-report');
 //   Schedule::command('send:production-report');
 
-app()->booted(function () {
+// app()->booted(function () {
-    $schedule = app(Schedule::class);
+//     $schedule = app(Schedule::class);
 
-    // $schedule->command('report:send-daily-production')->dailyAt('07:59');
+//     // $schedule->command('report:send-daily-production')->dailyAt('07:59');
-        // Production report scheduling
+//         // Production report scheduling
-        $productionRules = AlertMailRule::where('module', 'ProductionQuantities')
+//         $productionRules = AlertMailRule::where('module', 'ProductionQuantities')
-            ->where('rule_name', 'ProductionMail')
+//             ->where('rule_name', 'ProductionMail')
-            ->select('plant', 'schedule_type')
+//             ->select('plant', 'schedule_type')
-            ->distinct()
+//             ->distinct()
-            ->get();
+//             ->get();
 
-        foreach ($productionRules as $rule) {
+//         foreach ($productionRules as $rule) {
-            $type = $rule->schedule_type;
+//             $type = $rule->schedule_type;
-            $plantId = $rule->plant;
+//             $plantId = $rule->plant;
 
-            $command = $schedule->command('send:production-report', [$type, $plantId]);
+//             $command = $schedule->command('send:production-report', [$type, $plantId]);
-            // ->appendOutputTo(storage_path('logs/scheduler.log'));
+//             // ->appendOutputTo(storage_path('logs/scheduler.log'));
 
-            switch ($type) {
+//             switch ($type) {
-                case 'Live':
+//                 case 'Live':
-                    $command->everyMinute();
+//                     $command->everyMinute();
-                    break;
+//                     break;
-                case 'Hourly':
+//                 case 'Hourly':
-                    $command->hourly();
+//                     $command->hourly();
-                    break;
+//                     break;
-                case 'Daily':
+//                 case 'Daily':
-                    $command->dailyAt('07:59');
+//                     $command->dailyAt('07:59');
-                    break;
+//                     break;
-            }
+//             }
-        }
+//         }
 
-        // Invoice report scheduling
+//         // Invoice report scheduling
-        $invoiceRules = AlertMailRule::where('module', 'InvoiceValidation')
+//         $invoiceRules = AlertMailRule::where('module', 'InvoiceValidation')
-            ->select('plant', 'schedule_type')
+//             ->select('plant', 'schedule_type')
-            ->distinct()
+//             ->distinct()
-            ->get();
+//             ->get();
 
-        foreach ($invoiceRules as $rule) {
+//         foreach ($invoiceRules as $rule) {
-            $type = $rule->schedule_type;
+//             $type = $rule->schedule_type;
-            $plantId = $rule->plant;
+//             $plantId = $rule->plant;
 
-            $command = $schedule->command('send:invoice-report', [$type, $plantId]);
+//             $command = $schedule->command('send:invoice-report', [$type, $plantId]);
 
-            switch ($type) {
+//             switch ($type) {
-                case 'Live':
+//                 case 'Live':
-                    $command->everyMinute();
+//                     $command->everyMinute();
-                    break;
+//                     break;
-                case 'Hourly':
+//                 case 'Hourly':
-                    $command->hourly();
+//                     $command->hourly();
-                    break;
+//                     break;
-                case 'Daily':
+//                 case 'Daily':
-                    $command->dailyAt('07:59');
+//                     $command->dailyAt('07:59');
-                    break;
+//                     break;
-            }
+//             }
-        }
+//         }
 
-        // Invoice Data Report Scheduling
+//         // Invoice Data Report Scheduling
-        $invoiceDataRules = AlertMailRule::where('module', 'InvoiceDataReport')
+//         $invoiceDataRules = AlertMailRule::where('module', 'InvoiceDataReport')
-            ->select('plant', 'schedule_type')
+//             ->select('plant', 'schedule_type')
-            ->distinct()
+//             ->distinct()
-            ->get();
+//             ->get();
 
-        foreach ($invoiceDataRules as $rule) {
+//         foreach ($invoiceDataRules as $rule) {
-            $type = $rule->schedule_type;
+//             $type = $rule->schedule_type;
-            $plantId = $rule->plant;
+//             $plantId = $rule->plant;
 
-            $command = $schedule->command('send:invoice-data-report', [$type, $plantId]);
+//             $command = $schedule->command('send:invoice-data-report', [$type, $plantId]);
 
-            switch ($type) {
+//             switch ($type) {
-                case 'Live':
+//                 case 'Live':
-                    $command->everyMinute();
+//                     $command->everyMinute();
-                    break;
+//                     break;
-                case 'Hourly':
+//                 case 'Hourly':
-                    $command->hourly();
+//                     $command->hourly();
-                    break;
+//                     break;
-                case 'Daily':
+//                 case 'Daily':
-                    $command->dailyAt('10:00');
+//                     $command->dailyAt('10:00');
-                    break;
+//                     break;
-            }
+//             }
-        }
+//         }
-});
+// });