From 1227814dea34324226b6d8490785dcfc9c3b35dd Mon Sep 17 00:00:00 2001 From: amirghasempoor Date: Wed, 23 Apr 2025 09:53:09 +0330 Subject: [PATCH] change query columns --- app/Enums/SafetyAndPrivacyStatus.php | 4 ++-- .../V3/Dashboard/SafetyAndPrivacyController.php | 13 +++++++++++-- ...00327_add_column_to_safety_and_privacy_table.php | 3 ++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/Enums/SafetyAndPrivacyStatus.php b/app/Enums/SafetyAndPrivacyStatus.php index 34358e24..78168c2a 100644 --- a/app/Enums/SafetyAndPrivacyStatus.php +++ b/app/Enums/SafetyAndPrivacyStatus.php @@ -4,16 +4,16 @@ namespace App\Enums; enum SafetyAndPrivacyStatus: int { + case PENDING = 0; case CONFIRM = 1; case REJECT = 2; - case PENDING = 3; public static function name(int $state): string { $mapArray = [ + 0 => 'در حال بررسی', 1 => 'تایید', 2 => 'عدم تایید', - 3 => 'در حال بررسی' ]; return $mapArray[$state]; diff --git a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacyController.php b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacyController.php index 3124cce8..afb45a7d 100644 --- a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacyController.php +++ b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacyController.php @@ -202,8 +202,11 @@ class SafetyAndPrivacyController extends Controller public function confirm(Request $request, SafetyAndPrivacy $safetyAndPrivacy): JsonResponse { + $status_id = SafetyAndPrivacyStatus::CONFIRM->value; + $safetyAndPrivacy->update([ 'status' => SafetyAndPrivacyStatus::CONFIRM->value, + 'status_fa' => SafetyAndPrivacyStatus::name($status_id), 'supervisor_description' => $request->supervisor_description ]); @@ -212,8 +215,11 @@ class SafetyAndPrivacyController extends Controller public function reject(Request $request, SafetyAndPrivacy $safetyAndPrivacy): JsonResponse { + $status_id = SafetyAndPrivacyStatus::REJECT->value; + $safetyAndPrivacy->update([ - 'status' => SafetyAndPrivacyStatus::REJECT->value, + 'status' => $status_id, + 'status_fa' => SafetyAndPrivacyStatus::name($status_id), 'supervisor_description' => $request->supervisor_description ]); @@ -222,10 +228,13 @@ class SafetyAndPrivacyController extends Controller public function finish(Request $request, SafetyAndPrivacy $safetyAndPrivacy): JsonResponse { + $status_id = SafetyAndPrivacyStatus::PENDING->value; + $safetyAndPrivacy->update([ - 'is_finished' => $request->is_finished, + 'is_finished' => 1, 'final_description' => $request->final_description, 'status' => SafetyAndPrivacyStatus::PENDING->value, + 'status_fa' => SafetyAndPrivacyStatus::name($status_id), ]); return $this->successResponse(); diff --git a/database/migrations/2025_04_22_100327_add_column_to_safety_and_privacy_table.php b/database/migrations/2025_04_22_100327_add_column_to_safety_and_privacy_table.php index 49d997a7..d63218ce 100644 --- a/database/migrations/2025_04_22_100327_add_column_to_safety_and_privacy_table.php +++ b/database/migrations/2025_04_22_100327_add_column_to_safety_and_privacy_table.php @@ -14,6 +14,7 @@ return new class extends Migration Schema::table('safety_and_privacy', function (Blueprint $table) { $table->boolean('is_finished')->nullable(); $table->integer('status')->nullable(); + $table->string('status_fa')->nullable(); $table->string('supervisor_description')->nullable(); $table->string('final_description')->nullable(); }); @@ -25,7 +26,7 @@ return new class extends Migration public function down(): void { Schema::table('safety_and_privacy', function (Blueprint $table) { - $table->dropColumn(['status', 'final_description', 'is_finished', 'supervisor_description']); + $table->dropColumn(['status', 'final_description', 'is_finished', 'supervisor_description', 'status_fa']); }); } };