refator

app/DAL/Studies/WorklistFactory.php

@@ -2,7 +2,7 @@
 
 namespace App\DAL\Studies;
 
-use App\Models\Enums\Role;
+use App\Domain\ACL\Role;
 use Exception;
 use Illuminate\Support\Facades\Cache;
 

app/Domain/ACL/Permission.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Enums;
+namespace App\Domain\ACL;
 
 enum Permission: string
 {

app/Domain/ACL/Role.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Enums;
+namespace App\Domain\ACL;
 
 enum Role: string
 {

app/Http/Controllers/Staff/AttachmentController.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Staff;
 
+use App\Domain\ACL\Permission;
 use App\Http\Controllers\HashidControllerBase;
-use App\Models\Enums\Permission;
 use App\Models\Study;
 use App\Services\AuditTrail\Activity;
 use Illuminate\Http\Request;

app/Http/Controllers/Staff/StudiesController.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Staff;
 
+use App\Domain\ACL\Permission;
 use App\Http\Controllers\HashidControllerBase;
-use App\Models\Enums\Permission;
 use App\Models\Study;
 use App\Services\AuditTrail\Activity;
 

app/Http/Controllers/Staff/StudyAssignmentController.php

@@ -3,11 +3,11 @@
 namespace App\Http\Controllers\Staff;
 
 use App\DAL\Radiologists;
+use App\Domain\ACL\Permission;
+use App\Domain\ACL\Role;
 use App\Http\Controllers\HashidControllerBase;
 use App\Http\Requests\AssignPhysicianRequest;
-use App\Models\Enums\Permission;
 use App\Models\Enums\ReportStatus;
-use App\Models\Enums\Role;
 use App\Models\Study;
 use App\Models\User;
 use App\Services\AuditTrail\Activity;

app/Http/Controllers/Staff/StudyHistoryController.php

@@ -2,9 +2,9 @@
 
 namespace App\Http\Controllers\Staff;
 
+use App\Domain\ACL\Permission;
 use App\Http\Controllers\HashidControllerBase;
 use App\Http\Requests\StudyHistoryRequest;
-use App\Models\Enums\Permission;
 use App\Models\Study;
 use App\Models\StudyDetails;
 use App\Services\AuditTrail\Activity;

app/Http/Controllers/StudyMetadataController.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
+use App\Domain\ACL\Permission;
 use App\Http\Requests\StudyMetadataUpdateRequest;
-use App\Models\Enums\Permission;
 use App\Models\Study;
 
 class StudyMetadataController extends HashidControllerBase

app/Models/Study.php

@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use App\Models\Enums\Permission;
+use App\Domain\ACL\Permission;
 use App\Models\Enums\Priority;
 use App\Models\Enums\ReportStatus;
 use App\Models\Enums\StudyLevelStatus;

app/Models/User.php

@@ -2,8 +2,8 @@
 
 namespace App\Models;
 
-use App\Models\Enums\Permission;
+use App\Domain\ACL\Permission;
-use App\Models\Enums\Role;
+use App\Domain\ACL\Role;
 use App\Models\Traits\HashableId;
 use App\Services\UserService;
 use Carbon\Carbon;

app/Services/Workflow/Manager.php

@@ -2,7 +2,7 @@
 
 namespace App\Services\Workflow;
 
-use App\Models\Enums\Permission;
+use App\Domain\ACL\Permission;
 use App\Models\Enums\ReportStatus;
 use App\Models\Study;
 use App\Models\User;

database/seeders/RoleSeeder.php

@@ -2,8 +2,8 @@
 
 namespace Database\Seeders;
 
-use App\Models\Enums\Permission;
+use App\Domain\ACL\Permission;
-use App\Models\Enums\Role;
+use App\Domain\ACL\Role;
 use Illuminate\Database\Seeder;
 use Spatie\Permission\Models\Permission as SpatiePermission;
 use Spatie\Permission\Models\Role as SpatieRole;

database/seeders/UserSeeder.php

@@ -2,7 +2,7 @@
 
 namespace Database\Seeders;
 
-use App\Models\Enums\Role;
+use App\Domain\ACL\Role;
 use App\Models\Institute;
 use App\Models\User;
 use Illuminate\Database\Seeder;

resources/views/staff/meta/edit.blade.php

@@ -17,7 +17,7 @@
                 </div>
                 <x-section-border/>
 
-                @if (may(\App\Models\Enums\Permission::StudyMetadataEdit))
+                @if (may(\App\Domain\ACL\Permission::StudyMetadataEdit))
                     <a class="btn btn-sm" href="{{ route('staff.meta.edit', $study->hash) }}">Edit</a>
                 @endif
 

resources/views/staff/meta/view.blade.php

@@ -17,7 +17,7 @@
                 </div>
                 <x-section-border/>
 
-                @if (may(\App\Models\Enums\Permission::StudyMetadataEdit))
+                @if (may(\App\Domain\ACL\Permission::StudyMetadataEdit))
                     <a class="btn btn-sm" href="{{ route('staff.meta.edit', $study->hash) }}">Edit</a>
                 @endif
 

resources/views/staff/studies/index.blade.php

@@ -144,7 +144,7 @@ class="d-flex justify-content-between align-items-start border-end pb-4 pb-sm-0
 
                             <span class="badge bg-success">Reported</span>
 
-                            @can(\App\Models\Enums\Permission::ReportCreate)
+                            @can(\App\Domain\ACL\Permission::ReportCreate)
                                 <a target="_blank" class="btn"
                                    href="{{ route('radiologist.report-write', $study->id) }}">TXT</a>
                             @endcan