Merge branch 'feature/fixdamage' into 'develop'

fix controller,request and route

See merge request witelgroup/rms_v2!71

app/Http/Controllers/V3/DamageManagementController.php

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\V3;
 
 use App\Facades\DataTable\DataTableFacade;
 use App\Http\Controllers\Controller;
-use App\Http\Requests\V3\Damage\DeleteRequest;
 use App\Http\Requests\V3\Damage\StoreRequest;
 use App\Http\Requests\V3\Damage\UpdateRequest;
 use App\Http\Traits\ApiResponse;
@@ -51,7 +50,7 @@ class DamageManagementController extends Controller
             'title' => $request->title,
             'unit' => $request->unit,
             'base_price' => $request->base_price,
-            'status' => $request->status,
+            'status' => 1,
         ]);
 
         return $this->successResponse();
@@ -77,7 +76,6 @@ class DamageManagementController extends Controller
             'title' => $request->title,
             'unit' => $request->unit,
             'base_price' => $request->base_price,
-            'status' => $request->status,
         ]);
 
         return $this->successResponse();
@@ -86,11 +84,9 @@ class DamageManagementController extends Controller
     /**
      * Remove the specified resource from storage.
      */
-    public function destroy(DeleteRequest $request, Damage $damage): JsonResponse
+    public function activate(Damage $damage): JsonResponse
     {
-        $damage->update([
+        $damage->status == 1 ? $damage->update(['status' => 0]) : $damage->update(['status' => 1]);
-            'status' => $request->status,
-        ]);
 
         return $this->successResponse();
     }

app/Http/Requests/V3/Damage/DeleteRequest.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Http\Requests\V3\Damage;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class DeleteRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     */
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
-     */
-    public function rules(): array
-    {
-        return [
-            'status' => 'required|in:0,1',
-        ];
-    }
-}

app/Http/Requests/V3/Damage/StoreRequest.php

@@ -25,7 +25,6 @@ class StoreRequest extends FormRequest
             'title' =>'required|string|max:255|unique:damages,title',
             'unit' =>'required|string|max:255',
             'base_price' =>'required|integer',
-            'status' =>'required|in:0,1',
         ];
     }
 }

app/Http/Requests/V3/Damage/UpdateRequest.php

@@ -3,6 +3,7 @@
 namespace App\Http\Requests\V3\Damage;
 
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
 
 class UpdateRequest extends FormRequest
 {
@@ -22,10 +23,9 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'title' =>'required|string|unique:damages,title',
+            'title' =>['required', 'string', 'max:255',Rule::unique('damages','title')->ignore($this->damage->id)],
             'unit' =>'required|string',
             'base_price' =>'required|numeric',
-            'status' =>'required|integer',
         ];
     }
 }

routes/v3.php

@@ -226,5 +226,5 @@ Route::prefix('damages')
        Route::post('/', 'store')->name('store');
        Route::get('/{damage}', 'show')->name('show');
        Route::post('/{damage}', 'update')->name('update');
-       Route::post('/delete/{damage}', 'destroy')->name('destroy');
+       Route::post('/activate/{damage}', 'activate')->name('activate');
     });