Merge pull request #303 from czqoocavatsim/JoshuaBranch

Joshua branch
czqoocavatsim · Aug 18, 2024 · f09e010 · f09e010
2 parents 14dee3b + 0b99675
commit f09e010
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -106,7 +106,7 @@ protected function schedule(Schedule $schedule)
         $schedule->job(new ProcessSessionReminders())->daily();
 
         // Check Training Threads Status (Once per week)
-        $schedule->job(new DiscordTrainingUpdates())->weeklyOn(7, '17:45');
+        $schedule->job(new DiscordTrainingUpdates())->weeklyOn(7, '18:00');
 
         // Discord role updating
         //$schedule->job(new UpdateDiscordUserRoles)->twiceDaily(6, 18);

diff --git a/app/Jobs/DiscordTrainingUpdates.php b/app/Jobs/DiscordTrainingUpdates.php
@@ -58,9 +58,12 @@ public function handle()
                     }
 
                     // See if CID is still a student
-                    $student = Student::where('user_id', $cid)->first();
+                    $student = Student::where('user_id', $cid)->where('current', true)->first();
+
                     if($student !== null){
 
+                        $counter++;
+
                         // Thread should be active, so lets activate it.
                         $discord = new DiscordClient();
                         $data = $discord->getClient()->patch('channels/'.$thread['id'], [
@@ -88,6 +91,8 @@ public function handle()
             $response = $discord->getClient()->get('guilds/'.env('DISCORD_GUILD_ID').'/threads/active');
             $results = json_decode($response->getBody(), true);
 
+            dd($results);
+
             foreach ($results['threads'] as $thread) {
 
                 // Get the ID of the Active Training Thread
@@ -97,7 +102,8 @@ public function handle()
                     $cid = null;
                 }
 
-                $student = Student::where('user_id', $cid)->first();
+                // See if user is still a student
+                $student = Student::where('user_id', $cid)->where('current', true)->first();
 
                 // Check Lable is 'In Progress' or 'Ready For Pick-Up'
                 if($student->hasLabel('In Progress') || $student->hasLabel('Ready For Pick-Up')){