update 02-08

Artemis23710 · Feb 8, 2025 · a036920 · a036920
1 parent 9d4b787
commit a036920
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 44 deletions.
diff --git a/app/Http/Controllers/Api/Auth/OperationController.php b/app/Http/Controllers/Api/Auth/OperationController.php
@@ -7,33 +7,17 @@
 use App\Models\Operation_targets;
 use App\Models\Operations;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 
 class OperationController extends Controller
 {
     public function store(Request $request)
     {
-        $request->validate([
-            'name_operation' => 'required|string',
-            'title_operation' => 'required|string',
-            'type_operation' => 'required|string',
-            'start_operation' => 'required|date',
-            'end_operation' => 'required|date',
-            'budget_operation' => 'required|numeric',
-            'officer_incharge' => 'required|string',
-            'description' => 'nullable|string',
-            'targetsofopp' => 'array',
-            'targetsofopp.*.name' => 'required|string',
-            'targetsofopp.*.description' => 'nullable|string',
-            'officerinopp' => 'array',
-            'officerinopp.*.officer_id' => 'required|integer',
-            'officerinopp.*.officer_badge' => 'required|string',
-            'officerinopp.*.officer_role' => 'required|string',
-        ]);
-
         DB::beginTransaction();
-
         try {
+
             $operation = Operations::create([
                 'Name' => $request->name_operation,
                 'title' => $request->title_operation,
@@ -46,39 +30,66 @@ public function store(Request $request)
                 'status' => 1, 
                 'Complete_status' => 0,
                 'approve_status' => 0,
-                'created_by' => auth()->id(),
-                'updated_by' => auth()->id(),
+                'created_by' => Auth::id(),
+                'updated_by' => 0,
             ]);
 
+            $operationId = $operation->id;
+
+            $targetsofopp = $request->input('targetsofopp'); 
+            $targetArray = json_decode($targetsofopp, true);  
 
-            foreach ($request->targetsofopp as $target) {
-                Operation_targets::create([
-                    'target_name' => $target['name'],
-                    'target_description' => $target['description'],
-                    'status' => 'Active',
-                    'created_by' => auth()->id(),
-                    'updated_by' => auth()->id(),
-                ]);
-            }
 
-            foreach ($request->officerinopp as $officer) {
-                Operation_officers::create([
-                    'Officer_id' => $officer['officer_id'],
-                    'officer_badge' => $officer['officer_badge'],
-                    'officer_role' => $officer['officer_role'],
-                    'status' => 'Active',
-                    'created_by' => auth()->id(),
-                    'updated_by' => auth()->id(),
-                ]);
+            if(is_array($targetArray)){
+
+                foreach ($targetArray  as $rowtarget) {
+                    $name = $rowtarget['name'];
+                    $description = $rowtarget['description'];
+                    Operation_targets::create([
+                        'operation_id' => $operationId,
+                        'target_name' => $name,
+                        'target_description' => $description,
+                        'status' => 1,
+                        'created_by' => Auth::id(),
+                        'updated_by' => 0,
+                    ]);
+                }
             }
+
+
+            $officerinopp = $request->input('officerinopp'); 
+            $officersArray = json_decode($officerinopp, true); 
 
+            if(is_array($officersArray)){
+            foreach ($officersArray as $rowofficer) {
+
+                $officer_id = $rowofficer['officer_id'];
+                $officer_badge = $rowofficer['officer_badge'];
+                $officer_role = $rowofficer['officer_role'];
+
+                    Operation_officers::create([
+                        'operation_id' => $operationId,
+                        'Officer_id' => $officer_id,
+                        'officer_badge' => $officer_badge,
+                        'officer_role' => $officer_role,
+                        'status' => 1,
+                        'created_by' =>Auth::id(),
+                        'updated_by' => 0,
+                    ]);
+                }
+            }
+
             DB ::commit();
 
             return response()->json(['message' => 'Operation created successfully'], 201);
-
-        } catch (\Exception $e) {
-            DB::rollBack();
-            return response()->json(['error' => 'Failed to create operation', 'details' => $e->getMessage()], 500);
-        }
+    } catch (\Exception $e) {
+        DB::rollBack();
+
+        return response()->json([
+            'error' => $e->getMessage()
+        ], 400);
     }
+    }
+
+
 }
diff --git a/app/Models/Operation_officers.php b/app/Models/Operation_officers.php
@@ -10,6 +10,7 @@ class Operation_officers extends Model
     use HasFactory;
 
     protected $fillable = [
+        'operation_id',
         'Officer_id',
         'officer_badge',
         'officer_role',

diff --git a/app/Models/Operation_targets.php b/app/Models/Operation_targets.php
@@ -10,6 +10,7 @@ class Operation_targets extends Model
     use HasFactory;
 
     protected $fillable = [
+        'operation_id',
         'target_name',
         'target_description',
         'status',

diff --git a/database/migrations/2025_02_03_084632_create_operation_targets_table.php b/database/migrations/2025_02_03_084632_create_operation_targets_table.php
@@ -13,6 +13,7 @@ public function up(): void
     {
         Schema::create('operation_targets', function (Blueprint $table) {
             $table->id();
+            $table->integer('operation_id'); 
             $table->string('target_name');
             $table->string('target_description');
             $table->integer('status'); 

diff --git a/database/migrations/2025_02_03_084646_create_operation_officers_table.php b/database/migrations/2025_02_03_084646_create_operation_officers_table.php
@@ -13,6 +13,7 @@ public function up(): void
     {
         Schema::create('operation_officers', function (Blueprint $table) {
             $table->id();
+            $table->integer('operation_id'); 
             $table->integer('Officer_id');
             $table->string('officer_badge');
             $table->string('officer_role');