From 5d7f757b93aa98f828d527d2e97b74ac7fbab570 Mon Sep 17 00:00:00 2001
From: Masroor Ehsan <masroore@gmail.com>
Date: Tue, 7 Jan 2025 16:54:38 +0600
Subject: [PATCH] refx

---
 app/DAL/Studies/IUserStudyLister.php                          | 2 +-
 app/DAL/Studies/WorklistBase.php                              | 2 +-
 app/{Models/Enums => Domain/Person}/PatientSex.php            | 2 +-
 app/{Models/Enums => Domain/Study}/Priority.php               | 2 +-
 app/{Models/Enums => Domain/Study}/StudyAccessFlags.php       | 2 +-
 app/{Models/Enums => Domain/Study}/StudyLevelStatus.php       | 2 +-
 app/{Models/Enums => Domain/Study}/StudyModality.php          | 2 +-
 app/{Models/Enums => Domain/Study}/StudyRequestStatus.php     | 2 +-
 app/Models/SharedStudy.php                                    | 2 +-
 app/Models/Study.php                                          | 4 ++--
 app/Services/Pacs/Sync/Pipes/FilterStudies.php                | 2 +-
 app/Services/Pacs/Sync/StudiesSync.php                        | 2 +-
 .../migrations/2024_12_27_060234_create_studies_table.php     | 4 ++--
 .../2024_12_28_181346_create_study_delete_requests_table.php  | 2 +-
 .../2024_12_30_144956_create_shared_studies_table.php         | 2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)
 rename app/{Models/Enums => Domain/Person}/PatientSex.php (77%)
 rename app/{Models/Enums => Domain/Study}/Priority.php (80%)
 rename app/{Models/Enums => Domain/Study}/StudyAccessFlags.php (89%)
 rename app/{Models/Enums => Domain/Study}/StudyLevelStatus.php (84%)
 rename app/{Models/Enums => Domain/Study}/StudyModality.php (94%)
 rename app/{Models/Enums => Domain/Study}/StudyRequestStatus.php (82%)

diff --git a/app/DAL/Studies/IUserStudyLister.php b/app/DAL/Studies/IUserStudyLister.php
index 0955549..0b6bf55 100644
--- a/app/DAL/Studies/IUserStudyLister.php
+++ b/app/DAL/Studies/IUserStudyLister.php
@@ -2,8 +2,8 @@
 
 namespace App\DAL\Studies;
 
+use App\Domain\Study\StudyLevelStatus;
 use App\Models\Enums\ReportStatus;
-use App\Models\Enums\StudyLevelStatus;
 use Illuminate\Contracts\Database\Eloquent\Builder;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 
diff --git a/app/DAL/Studies/WorklistBase.php b/app/DAL/Studies/WorklistBase.php
index 1c54ad0..290cf45 100644
--- a/app/DAL/Studies/WorklistBase.php
+++ b/app/DAL/Studies/WorklistBase.php
@@ -2,8 +2,8 @@
 
 namespace App\DAL\Studies;
 
+use App\Domain\Study\StudyLevelStatus;
 use App\Models\Enums\ReportStatus;
-use App\Models\Enums\StudyLevelStatus;
 use App\Models\Study;
 use Carbon\Carbon;
 use Illuminate\Contracts\Database\Eloquent\Builder;
diff --git a/app/Models/Enums/PatientSex.php b/app/Domain/Person/PatientSex.php
similarity index 77%
rename from app/Models/Enums/PatientSex.php
rename to app/Domain/Person/PatientSex.php
index 08aedea..bec84fd 100644
--- a/app/Models/Enums/PatientSex.php
+++ b/app/Domain/Person/PatientSex.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Enums;
+namespace App\Domain\Person;
 
 enum PatientSex: string
 {
diff --git a/app/Models/Enums/Priority.php b/app/Domain/Study/Priority.php
similarity index 80%
rename from app/Models/Enums/Priority.php
rename to app/Domain/Study/Priority.php
index fac6c0a..9f3078c 100644
--- a/app/Models/Enums/Priority.php
+++ b/app/Domain/Study/Priority.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Enums;
+namespace App\Domain\Study;
 
 enum Priority: int
 {
diff --git a/app/Models/Enums/StudyAccessFlags.php b/app/Domain/Study/StudyAccessFlags.php
similarity index 89%
rename from app/Models/Enums/StudyAccessFlags.php
rename to app/Domain/Study/StudyAccessFlags.php
index ffc4b74..f8c271d 100644
--- a/app/Models/Enums/StudyAccessFlags.php
+++ b/app/Domain/Study/StudyAccessFlags.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Enums;
+namespace App\Domain\Study;
 
 use App\Models\Traits\BitmaskFunctionality;
 
diff --git a/app/Models/Enums/StudyLevelStatus.php b/app/Domain/Study/StudyLevelStatus.php
similarity index 84%
rename from app/Models/Enums/StudyLevelStatus.php
rename to app/Domain/Study/StudyLevelStatus.php
index 61aabe6..1c446e2 100644
--- a/app/Models/Enums/StudyLevelStatus.php
+++ b/app/Domain/Study/StudyLevelStatus.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Enums;
+namespace App\Domain\Study;
 
 enum StudyLevelStatus: int
 {
diff --git a/app/Models/Enums/StudyModality.php b/app/Domain/Study/StudyModality.php
similarity index 94%
rename from app/Models/Enums/StudyModality.php
rename to app/Domain/Study/StudyModality.php
index dfbea40..c4ca71e 100644
--- a/app/Models/Enums/StudyModality.php
+++ b/app/Domain/Study/StudyModality.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Enums;
+namespace App\Domain\Study;
 
 enum StudyModality: string
 {
diff --git a/app/Models/Enums/StudyRequestStatus.php b/app/Domain/Study/StudyRequestStatus.php
similarity index 82%
rename from app/Models/Enums/StudyRequestStatus.php
rename to app/Domain/Study/StudyRequestStatus.php
index 11feda3..cdeff76 100644
--- a/app/Models/Enums/StudyRequestStatus.php
+++ b/app/Domain/Study/StudyRequestStatus.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Enums;
+namespace App\Domain\Study;
 
 enum StudyRequestStatus: int
 {
diff --git a/app/Models/SharedStudy.php b/app/Models/SharedStudy.php
index 2e788aa..3d54b90 100644
--- a/app/Models/SharedStudy.php
+++ b/app/Models/SharedStudy.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use App\Models\Enums\StudyAccessFlags;
+use App\Domain\Study\StudyAccessFlags;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class SharedStudy extends BaseModel
diff --git a/app/Models/Study.php b/app/Models/Study.php
index 3113402..ecae57a 100644
--- a/app/Models/Study.php
+++ b/app/Models/Study.php
@@ -3,9 +3,9 @@
 namespace App\Models;
 
 use App\Domain\ACL\Permission;
-use App\Models\Enums\Priority;
+use App\Domain\Study\Priority;
+use App\Domain\Study\StudyLevelStatus;
 use App\Models\Enums\ReportStatus;
-use App\Models\Enums\StudyLevelStatus;
 use App\Models\Traits\HashableId;
 use App\Services\Pacs\PacsUrlGen;
 use Carbon\Carbon;
diff --git a/app/Services/Pacs/Sync/Pipes/FilterStudies.php b/app/Services/Pacs/Sync/Pipes/FilterStudies.php
index d4c79ed..f631b93 100644
--- a/app/Services/Pacs/Sync/Pipes/FilterStudies.php
+++ b/app/Services/Pacs/Sync/Pipes/FilterStudies.php
@@ -2,7 +2,7 @@
 
 namespace App\Services\Pacs\Sync\Pipes;
 
-use App\Models\Enums\StudyLevelStatus;
+use App\Domain\Study\StudyLevelStatus;
 use App\Services\Pacs\Sync\StudiesSync;
 use Closure;
 use Illuminate\Support\Collection;
diff --git a/app/Services/Pacs/Sync/StudiesSync.php b/app/Services/Pacs/Sync/StudiesSync.php
index 1fe6d05..3505fd2 100644
--- a/app/Services/Pacs/Sync/StudiesSync.php
+++ b/app/Services/Pacs/Sync/StudiesSync.php
@@ -2,7 +2,7 @@
 
 namespace App\Services\Pacs\Sync;
 
-use App\Models\Enums\StudyLevelStatus;
+use App\Domain\Study\StudyLevelStatus;
 use App\Services\Pacs\DicomUtils;
 use App\Services\Pacs\InstituteMapper;
 use App\Services\Pacs\OrthancRestClient;
diff --git a/database/migrations/2024_12_27_060234_create_studies_table.php b/database/migrations/2024_12_27_060234_create_studies_table.php
index b69a515..92e64bb 100644
--- a/database/migrations/2024_12_27_060234_create_studies_table.php
+++ b/database/migrations/2024_12_27_060234_create_studies_table.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Models\Enums\Priority;
+use App\Domain\Study\Priority;
+use App\Domain\Study\StudyLevelStatus;
 use App\Models\Enums\ReportStatus;
-use App\Models\Enums\StudyLevelStatus;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2024_12_28_181346_create_study_delete_requests_table.php b/database/migrations/2024_12_28_181346_create_study_delete_requests_table.php
index bf06d90..294a31b 100644
--- a/database/migrations/2024_12_28_181346_create_study_delete_requests_table.php
+++ b/database/migrations/2024_12_28_181346_create_study_delete_requests_table.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Enums\StudyRequestStatus;
+use App\Domain\Study\StudyRequestStatus;
 use App\Models\Study;
 use App\Models\User;
 use Illuminate\Database\Migrations\Migration;
diff --git a/database/migrations/2024_12_30_144956_create_shared_studies_table.php b/database/migrations/2024_12_30_144956_create_shared_studies_table.php
index bd5fb77..c45e00c 100644
--- a/database/migrations/2024_12_30_144956_create_shared_studies_table.php
+++ b/database/migrations/2024_12_30_144956_create_shared_studies_table.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Enums\StudyAccessFlags;
+use App\Domain\Study\StudyAccessFlags;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;