fix tests

2026-06-11 11:46:12 -04:00
parent c91fa2ce4d
commit 5ead80fdc7
1489 changed files with 11349 additions and 10305 deletions
@@ -3,9 +3,8 @@
 namespace App\Models;

 use Illuminate\Database\Eloquent\Builder;
-use App\Models\BaseModel;
-use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\DB;

 class UserRole extends BaseModel
@@ -28,12 +27,12 @@ class UserRole extends BaseModel
    ];

    protected $casts = [
-        'user_id'     => 'integer',
-        'role_id'     => 'integer',
-        'updated_by'  => 'integer',
-        'created_at'  => 'datetime',
-        'updated_at'  => 'datetime',
-        'deleted_at'  => 'datetime',
+        'user_id' => 'integer',
+        'role_id' => 'integer',
+        'updated_by' => 'integer',
+        'created_at' => 'datetime',
+        'updated_at' => 'datetime',
+        'deleted_at' => 'datetime',
    ];

    /* ============================================================
@@ -68,7 +67,10 @@ class UserRole extends BaseModel

    public function scopeForSchoolYear(Builder $q, ?string $schoolYear): Builder
    {
-        if ($schoolYear === null || trim($schoolYear) === '') return $q;
+        if ($schoolYear === null || trim($schoolYear) === '') {
+            return $q;
+        }
+
        return $q->where('school_year', $schoolYear);
    }

@@ -118,12 +120,13 @@ class UserRole extends BaseModel
                $existing->updated_by = $editorId;
                $existing->save();
            }
+
            return true;
        }

        static::query()->create([
-            'user_id'    => $userId,
-            'role_id'    => $roleId,
+            'user_id' => $userId,
+            'role_id' => $roleId,
            'updated_by' => $editorId,
        ]);

@@ -170,11 +173,11 @@ class UserRole extends BaseModel
        $req = $updating ? 'sometimes' : 'required';

        return [
-            'user_id'    => [$req, 'integer', 'min:1', 'exists:users,id'],
-            'role_id'    => [$req, 'integer', 'min:1', 'exists:roles,id'],
-            'semester'   => ['nullable', 'string', 'max:20'],
-            'school_year'=> ['nullable', 'string', 'max:20'],
+            'user_id' => [$req, 'integer', 'min:1', 'exists:users,id'],
+            'role_id' => [$req, 'integer', 'min:1', 'exists:roles,id'],
+            'semester' => ['nullable', 'string', 'max:20'],
+            'school_year' => ['nullable', 'string', 'max:20'],
            'updated_by' => ['nullable', 'integer'],
        ];
    }
-}
+}