Changed separate mehod approved to approved and approvedOrOwner

laravelsu · Jul 28, 2024 · 01327bc · 01327bc
1 parent 67a4bf2
commit 01327bc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/app/Http/Controllers/PositionsController.php b/app/Http/Controllers/PositionsController.php
@@ -17,7 +17,7 @@ class PositionsController extends Controller
      */
     public function jobs()
     {
-        $positions = Position::approved()
+        $positions = Position::approvedOrOwner()
             ->with(['author'])
             ->whereDate('created_at', '>=', now()->subMonths(2))
             ->orderBy('id', 'desc')

diff --git a/app/Models/Concerns/Approvable.php b/app/Models/Concerns/Approvable.php
@@ -16,8 +16,21 @@ trait Approvable
      */
     public function scopeApproved(Builder $query, bool $approved = true): Builder
     {
-        return $query->where('approved', $approved)
-            ->orWhere('user_id', auth()->id());
+        return $query->where('approved', $approved);
+    }
+
+
+    /**
+     * Scope a query to only include approved or owner items.
+     *
+     * @param Builder $query
+     * @param bool    $approved
+     *
+     * @return Builder
+     */
+    public function scopeApprovedOrOwner(Builder $query, bool $approved = true): Builder
+    {
+        return $query->approved($approved)->orWhere('user_id', auth()->id());
     }
 
     /**