From 6162b47a655fc906138f77430ee3a24bc1bafcf7 Mon Sep 17 00:00:00 2001
From: Masroor Ehsan <masroore@gmail.com>
Date: Tue, 7 Jan 2025 16:52:40 +0600
Subject: [PATCH] refator

---
 app/DAL/Studies/WorklistFactory.php            |  2 +-
 .../Enums => Domain/ACL}/Permission.php        |  2 +-
 app/{Models/Enums => Domain/ACL}/Role.php      |  2 +-
 .../Controllers/Staff/AttachmentController.php |  2 +-
 .../Controllers/Staff/StudiesController.php    |  2 +-
 .../Staff/StudyAssignmentController.php        |  4 ++--
 .../Staff/StudyHistoryController.php           |  2 +-
 .../Controllers/StudyMetadataController.php    |  2 +-
 app/Models/Study.php                           |  2 +-
 app/Models/User.php                            |  4 ++--
 app/Services/Workflow/Manager.php              |  2 +-
 database/seeders/RoleSeeder.php                |  4 ++--
 database/seeders/UserSeeder.php                |  2 +-
 resources/views/staff/meta/edit.blade.php      |  2 +-
 resources/views/staff/meta/view.blade.php      |  2 +-
 resources/views/staff/studies/index.blade.php  | 18 +++++++++---------
 16 files changed, 27 insertions(+), 27 deletions(-)
 rename app/{Models/Enums => Domain/ACL}/Permission.php (96%)
 rename app/{Models/Enums => Domain/ACL}/Role.php (93%)

diff --git a/app/DAL/Studies/WorklistFactory.php b/app/DAL/Studies/WorklistFactory.php
index 50fbccb..770972c 100644
--- a/app/DAL/Studies/WorklistFactory.php
+++ b/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;
 
diff --git a/app/Models/Enums/Permission.php b/app/Domain/ACL/Permission.php
similarity index 96%
rename from app/Models/Enums/Permission.php
rename to app/Domain/ACL/Permission.php
index 096f183..2131a0d 100644
--- a/app/Models/Enums/Permission.php
+++ b/app/Domain/ACL/Permission.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Enums;
+namespace App\Domain\ACL;
 
 enum Permission: string
 {
diff --git a/app/Models/Enums/Role.php b/app/Domain/ACL/Role.php
similarity index 93%
rename from app/Models/Enums/Role.php
rename to app/Domain/ACL/Role.php
index 1f9eebb..1db25f4 100644
--- a/app/Models/Enums/Role.php
+++ b/app/Domain/ACL/Role.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Enums;
+namespace App\Domain\ACL;
 
 enum Role: string
 {
diff --git a/app/Http/Controllers/Staff/AttachmentController.php b/app/Http/Controllers/Staff/AttachmentController.php
index 4292a43..6a8a5b6 100644
--- a/app/Http/Controllers/Staff/AttachmentController.php
+++ b/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;
diff --git a/app/Http/Controllers/Staff/StudiesController.php b/app/Http/Controllers/Staff/StudiesController.php
index 50ca332..db6da22 100644
--- a/app/Http/Controllers/Staff/StudiesController.php
+++ b/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;
 
diff --git a/app/Http/Controllers/Staff/StudyAssignmentController.php b/app/Http/Controllers/Staff/StudyAssignmentController.php
index b4a8f7b..b0f1fcc 100644
--- a/app/Http/Controllers/Staff/StudyAssignmentController.php
+++ b/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;
diff --git a/app/Http/Controllers/Staff/StudyHistoryController.php b/app/Http/Controllers/Staff/StudyHistoryController.php
index 3167033..2561e17 100644
--- a/app/Http/Controllers/Staff/StudyHistoryController.php
+++ b/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;
diff --git a/app/Http/Controllers/StudyMetadataController.php b/app/Http/Controllers/StudyMetadataController.php
index 0d760f7..32f8c61 100644
--- a/app/Http/Controllers/StudyMetadataController.php
+++ b/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
diff --git a/app/Models/Study.php b/app/Models/Study.php
index 76e58c9..3113402 100644
--- a/app/Models/Study.php
+++ b/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;
diff --git a/app/Models/User.php b/app/Models/User.php
index d2ea355..e655f8b 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -2,8 +2,8 @@
 
 namespace App\Models;
 
-use App\Models\Enums\Permission;
-use App\Models\Enums\Role;
+use App\Domain\ACL\Permission;
+use App\Domain\ACL\Role;
 use App\Models\Traits\HashableId;
 use App\Services\UserService;
 use Carbon\Carbon;
diff --git a/app/Services/Workflow/Manager.php b/app/Services/Workflow/Manager.php
index 3a40659..f23e3ac 100644
--- a/app/Services/Workflow/Manager.php
+++ b/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;
diff --git a/database/seeders/RoleSeeder.php b/database/seeders/RoleSeeder.php
index edcc5b6..dbb4cc2 100644
--- a/database/seeders/RoleSeeder.php
+++ b/database/seeders/RoleSeeder.php
@@ -2,8 +2,8 @@
 
 namespace Database\Seeders;
 
-use App\Models\Enums\Permission;
-use App\Models\Enums\Role;
+use App\Domain\ACL\Permission;
+use App\Domain\ACL\Role;
 use Illuminate\Database\Seeder;
 use Spatie\Permission\Models\Permission as SpatiePermission;
 use Spatie\Permission\Models\Role as SpatieRole;
diff --git a/database/seeders/UserSeeder.php b/database/seeders/UserSeeder.php
index 480c50c..5b8f82f 100644
--- a/database/seeders/UserSeeder.php
+++ b/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;
diff --git a/resources/views/staff/meta/edit.blade.php b/resources/views/staff/meta/edit.blade.php
index f007e31..c60bf44 100644
--- a/resources/views/staff/meta/edit.blade.php
+++ b/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
 
diff --git a/resources/views/staff/meta/view.blade.php b/resources/views/staff/meta/view.blade.php
index f007e31..c60bf44 100644
--- a/resources/views/staff/meta/view.blade.php
+++ b/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
 
diff --git a/resources/views/staff/studies/index.blade.php b/resources/views/staff/studies/index.blade.php
index 87bcd8f..2049f64 100644
--- a/resources/views/staff/studies/index.blade.php
+++ b/resources/views/staff/studies/index.blade.php
@@ -27,7 +27,7 @@
                 <div class="row gy-4 gy-sm-1">
                     <div class="col-sm-6 col-lg-3">
                         <div
-                            class="d-flex justify-content-between align-items-start card-widget-1 border-end pb-4 pb-sm-0">
+                                class="d-flex justify-content-between align-items-start card-widget-1 border-end pb-4 pb-sm-0">
                             <div>
                                 <h4 class="mb-0">24</h4>
                                 <p class="mb-0">Clients</p>
@@ -42,7 +42,7 @@ class="d-flex justify-content-between align-items-start card-widget-1 border-end
                     </div>
                     <div class="col-sm-6 col-lg-3">
                         <div
-                            class="d-flex justify-content-between align-items-start card-widget-2 border-end pb-4 pb-sm-0">
+                                class="d-flex justify-content-between align-items-start card-widget-2 border-end pb-4 pb-sm-0">
                             <div>
                                 <h4 class="mb-0">165</h4>
                                 <p class="mb-0">Invoices</p>
@@ -57,7 +57,7 @@ class="d-flex justify-content-between align-items-start card-widget-2 border-end
                     </div>
                     <div class="col-sm-6 col-lg-3">
                         <div
-                            class="d-flex justify-content-between align-items-start border-end pb-4 pb-sm-0 card-widget-3">
+                                class="d-flex justify-content-between align-items-start border-end pb-4 pb-sm-0 card-widget-3">
                             <div>
                                 <h4 class="mb-0">$2.46k</h4>
                                 <p class="mb-0">Paid</p>
@@ -130,21 +130,21 @@ class="d-flex justify-content-between align-items-start border-end pb-4 pb-sm-0
                                 <a target="_blank" href="{{ $study->links()['stone'] }}">St</a> |
                             @endif
                             @if ($study->allowed()['ohif'])
-                                    <a target="_blank" href="{{ $study->links()['ohif'] }}">O</a> |
+                                <a target="_blank" href="{{ $study->links()['ohif'] }}">O</a> |
                             @endif
                             @if ($study->allowed()['ohif.mpr'])
-                                    <a target="_blank" href="{{ $study->links()['ohif.mpr'] }}">OM</a> |
+                                <a target="_blank" href="{{ $study->links()['ohif.mpr'] }}">OM</a> |
                             @endif
                             @if ($study->allowed()['ohif.seg'])
-                                    <a target="_blank" href="{{ $study->links()['ohif.seg'] }}">OS</a> |
+                                <a target="_blank" href="{{ $study->links()['ohif.seg'] }}">OS</a> |
                             @endif
                             @if ($study->allowed()['zip'])
-                                    <a target="_blank" href="{{ $study->links()['zip'] }}">Z</a> |
+                                <a target="_blank" href="{{ $study->links()['zip'] }}">Z</a> |
                             @endif
 
-                                <span class="badge bg-success">Reported</span>
+                            <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