From 03862c5460472c909d0f7f3d74b8119f9154fb33 Mon Sep 17 00:00:00 2001 From: Dr Masroor Ehsan Date: Fri, 3 Jan 2025 20:04:47 +0600 Subject: [PATCH] wip --- .../{AdminStudyLister.php => AdminWorklist.php} | 2 +- ...iologistStudyLister.php => RadiologistWorklist.php} | 2 +- .../{ReferrerStudyLister.php => ReferrerWorklist.php} | 2 +- ...echnicianStudyLister.php => TechnicianWorklist.php} | 2 +- .../{UserStudyListerBase.php => WorklistBase.php} | 2 +- ...{UserStudyListerFactory.php => WorklistFactory.php} | 10 +++++----- app/Http/Controllers/Staff/StudiesController.php | 4 ++-- app/Http/Controllers/Staff/WorklistController.php | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) rename app/DAL/Studies/{AdminStudyLister.php => AdminWorklist.php} (81%) rename app/DAL/Studies/{RadiologistStudyLister.php => RadiologistWorklist.php} (85%) rename app/DAL/Studies/{ReferrerStudyLister.php => ReferrerWorklist.php} (85%) rename app/DAL/Studies/{TechnicianStudyLister.php => TechnicianWorklist.php} (90%) rename app/DAL/Studies/{UserStudyListerBase.php => WorklistBase.php} (97%) rename app/DAL/Studies/{UserStudyListerFactory.php => WorklistFactory.php} (56%) diff --git a/app/DAL/Studies/AdminStudyLister.php b/app/DAL/Studies/AdminWorklist.php similarity index 81% rename from app/DAL/Studies/AdminStudyLister.php rename to app/DAL/Studies/AdminWorklist.php index 7a66df3..3f9a9ec 100644 --- a/app/DAL/Studies/AdminStudyLister.php +++ b/app/DAL/Studies/AdminWorklist.php @@ -5,7 +5,7 @@ use App\Models\Study; use Illuminate\Contracts\Database\Eloquent\Builder; -final class AdminStudyLister extends UserStudyListerBase +final class AdminWorklist extends WorklistBase { protected function buildQuery(?int $user_id = null): Builder { diff --git a/app/DAL/Studies/RadiologistStudyLister.php b/app/DAL/Studies/RadiologistWorklist.php similarity index 85% rename from app/DAL/Studies/RadiologistStudyLister.php rename to app/DAL/Studies/RadiologistWorklist.php index f4d8cfc..adb350e 100644 --- a/app/DAL/Studies/RadiologistStudyLister.php +++ b/app/DAL/Studies/RadiologistWorklist.php @@ -5,7 +5,7 @@ use App\Models\Study; use Illuminate\Contracts\Database\Eloquent\Builder; -final class RadiologistStudyLister extends UserStudyListerBase +final class RadiologistWorklist extends WorklistBase { protected function buildQuery(?int $user_id = null): Builder { diff --git a/app/DAL/Studies/ReferrerStudyLister.php b/app/DAL/Studies/ReferrerWorklist.php similarity index 85% rename from app/DAL/Studies/ReferrerStudyLister.php rename to app/DAL/Studies/ReferrerWorklist.php index 7b9cf1d..6ee1c1f 100644 --- a/app/DAL/Studies/ReferrerStudyLister.php +++ b/app/DAL/Studies/ReferrerWorklist.php @@ -5,7 +5,7 @@ use App\Models\Study; use Illuminate\Contracts\Database\Eloquent\Builder; -final class ReferrerStudyLister extends UserStudyListerBase +final class ReferrerWorklist extends WorklistBase { protected function buildQuery(?int $user_id = null): Builder { diff --git a/app/DAL/Studies/TechnicianStudyLister.php b/app/DAL/Studies/TechnicianWorklist.php similarity index 90% rename from app/DAL/Studies/TechnicianStudyLister.php rename to app/DAL/Studies/TechnicianWorklist.php index 66d9419..b98c81d 100644 --- a/app/DAL/Studies/TechnicianStudyLister.php +++ b/app/DAL/Studies/TechnicianWorklist.php @@ -5,7 +5,7 @@ use App\Models\Study; use Illuminate\Contracts\Database\Eloquent\Builder; -final class TechnicianStudyLister extends UserStudyListerBase +final class TechnicianWorklist extends WorklistBase { protected function buildQuery(?int $user_id = null): Builder { diff --git a/app/DAL/Studies/UserStudyListerBase.php b/app/DAL/Studies/WorklistBase.php similarity index 97% rename from app/DAL/Studies/UserStudyListerBase.php rename to app/DAL/Studies/WorklistBase.php index 0b6f47c..daa1495 100644 --- a/app/DAL/Studies/UserStudyListerBase.php +++ b/app/DAL/Studies/WorklistBase.php @@ -6,7 +6,7 @@ use Illuminate\Contracts\Database\Eloquent\Builder; use Illuminate\Contracts\Pagination\LengthAwarePaginator; -abstract class UserStudyListerBase implements IUserStudyLister +abstract class WorklistBase implements IUserStudyLister { private ?int $pageSize = null; diff --git a/app/DAL/Studies/UserStudyListerFactory.php b/app/DAL/Studies/WorklistFactory.php similarity index 56% rename from app/DAL/Studies/UserStudyListerFactory.php rename to app/DAL/Studies/WorklistFactory.php index 9c4d7e6..c58de3e 100644 --- a/app/DAL/Studies/UserStudyListerFactory.php +++ b/app/DAL/Studies/WorklistFactory.php @@ -5,7 +5,7 @@ use App\Models\Enums\UserRole; use Exception; -final readonly class UserStudyListerFactory +final readonly class WorklistFactory { /** * @throws Exception @@ -15,10 +15,10 @@ public static function getLister(): IUserStudyLister $role = auth()->user()->roles()->first()->name; return match (UserRole::from($role)) { - UserRole::Admin => new AdminStudyLister, - UserRole::Technician => new TechnicianStudyLister, - UserRole::Radiologist => new RadiologistStudyLister, - UserRole::ReferringDoctor => new ReferrerStudyLister, + UserRole::Admin => new AdminWorklist, + UserRole::Technician => new TechnicianWorklist, + UserRole::Radiologist => new RadiologistWorklist, + UserRole::ReferringDoctor => new ReferrerWorklist, default => throw new Exception("Unknown user role: $role"), }; } diff --git a/app/Http/Controllers/Staff/StudiesController.php b/app/Http/Controllers/Staff/StudiesController.php index 0f960ca..4b91e8f 100644 --- a/app/Http/Controllers/Staff/StudiesController.php +++ b/app/Http/Controllers/Staff/StudiesController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers\Staff; -use App\DAL\Studies\UserStudyListerFactory; +use App\DAL\Studies\WorklistFactory; use App\Http\Controllers\HashidControllerBase; use App\Models\Study; use App\Services\AuditTrail\Activity; @@ -11,7 +11,7 @@ class StudiesController extends HashidControllerBase { public function index() { - $studies = UserStudyListerFactory::getLister()->all(); + $studies = WorklistFactory::getLister()->all(); return view('staff.studies.index', compact('studies')); } diff --git a/app/Http/Controllers/Staff/WorklistController.php b/app/Http/Controllers/Staff/WorklistController.php index da97b5c..21a7026 100644 --- a/app/Http/Controllers/Staff/WorklistController.php +++ b/app/Http/Controllers/Staff/WorklistController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers\Staff; -use App\DAL\Studies\UserStudyListerFactory; +use App\DAL\Studies\WorklistFactory; use App\Http\Controllers\HashidControllerBase; use App\Presenters\StudyPresenter; @@ -10,7 +10,7 @@ class WorklistController extends HashidControllerBase { public function index() { - $studies = StudyPresenter::pagination(UserStudyListerFactory::getLister()->all()); + $studies = StudyPresenter::pagination(WorklistFactory::getLister()->all()); return view('staff.worklist.index', compact('studies')); }