Эх сурвалжийг харах

Merge branch 'dev' into assetgroup-serch

kely 1 жил өмнө
parent
commit
0a0a10ee3c

+ 5 - 0
app/Http/Controllers/API/UserController.php

@@ -35,4 +35,9 @@ class UserController extends Controller
 
         return $this->noContent();
     }
+
+    public function index(){
+        $user = User::all();
+        return $user;
+    }
 }

+ 1 - 1
app/Http/Resources/API/AssetResource.php

@@ -19,7 +19,7 @@ class AssetResource extends JsonResource
             'name' => $this->name,
             'code' => $this->code,
             'description' => $this->description,
-            'status' => 'doing',
+            'status' => $this->status,
             'created_by' => $this->created_by,
             'owner' => $this->owner,
             'address' => $this->address,

+ 10 - 3
app/Models/Enums/AssetStatus.php

@@ -4,9 +4,16 @@ namespace App\Models\Enums;
 
 enum AssetStatus: string
 {
-    case DOING = 'doing';
+    case CONCEPT = 'concept';
 
-    case DONE = 'done';
+    case DESIGN = 'design';
+
+    case CONSTRUCTION = 'construction';
+
+    case OPERATE = 'operate';
+
+    case DESTROY = 'destroy';
+
+    case SELLING = 'selling';
 
-    case CLOSED = 'closed';
 }

+ 29 - 0
database/migrations/2024_02_21_081908_change_asset_status_to_assets.php

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('assets', function (Blueprint $table) {
+            $table->enum('status', ['concept', 'design', 'construction','operate','closed','destroy','selling'])->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('assets', function (Blueprint $table) {
+            //
+            $table->dropColumn('status');
+        });
+    }
+};

+ 1 - 0
routes/api.php

@@ -20,6 +20,7 @@ Route::post("/login", [API\AuthController::class, "login"]);
 Route::middleware(['auth:sanctum'])->group(function () {
     Route::post("/logout", [API\AuthController::class, "logout"]);
     Route::get("user/info", [API\UserController::class, 'info'])->name("user.info");
+    Route::get("user/index",[API\UserController::class, 'index'])->name("user.index");
 
     Route::middleware(['permission'])->group(function() {
         Route::apiResources([