Merge branch 'staging'

jringeisen · Feb 11, 2024 · b73a0ca · b73a0ca
2 parents 71da062 + 946674d
commit b73a0ca
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 12 deletions.
diff --git a/app/Http/Controllers/Student/Prompts/GetQuestionsController.php b/app/Http/Controllers/Student/Prompts/GetQuestionsController.php
@@ -4,6 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Models\Prompt;
+use App\Services\Dto\AIContentDto;
 use App\Services\Interfaces\AIServiceInterface;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Http\Request;
@@ -19,17 +20,21 @@ public function __invoke(Request $request)
 
         $question = $request->user()->promptQuestions()->latest()->first();
 
-        $response = $service
-            ->addMessage('system', Prompt::where('category', 'questions')->first()->prompt)
-            ->addMessage('user', $request->question)
-            ->updateQuestionTokens($question)
-            ->createChat();
+        if ($question) {
+            $response = $service
+                ->addMessage('system', Prompt::where('category', 'questions')->first()->prompt)
+                ->addMessage('user', $request->question)
+                ->updateQuestionTokens($question)
+                ->createChat();
 
-        $question->promptAnswer()
-            ->updateOrCreate(
-                ['prompt_question_id' => $question->id],
-                ['questions' => $response->questions ?? null]
-            );
+            $question->promptAnswer()
+                ->updateOrCreate(
+                    ['prompt_question_id' => $question->id],
+                    ['questions' => $response->questions ?? null]
+                );
+        } else {
+            $response = new AIContentDto();
+        }
 
         return response()->json($response);
     }

diff --git a/app/Policies/FeedbackPolicy.php b/app/Policies/FeedbackPolicy.php
@@ -7,13 +7,21 @@
 
 class FeedbackPolicy
 {
+    public function view(User $user, Feedback $feedback): bool
+    {
+        return $user->id === $feedback->user_id
+            || in_array($user->email, config('app.nova_admin_emails'));
+    }
+
     public function update(User $user, Feedback $feedback): bool
     {
-        return $user->id === $feedback->user_id;
+        return $user->id === $feedback->user_id
+            || in_array($user->email, config('app.nova_admin_emails'));
     }
 
     public function delete(User $user, Feedback $feedback): bool
     {
-        return $user->id === $feedback->user_id;
+        return $user->id === $feedback->user_id
+            || in_array($user->email, config('app.nova_admin_emails'));
     }
 }