Merge branch 'feature/AzmayeshSort' into 'develop'

Feature/azmayesh sort

See merge request witelgroup/rms_v2!36

app/Http/Controllers/V3/Auth/LogoutController.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Controllers\V3\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class LogoutController extends Controller
+{
+    use AuthenticatesUsers;
+    /**
+     * Handle the incoming request.
+     */
+    public function __invoke(Request $request): JsonResponse
+    {
+        if($request->session()->exists('last_login')){
+            $user = auth()->user();
+            $user->last_login = $request->session()->get('last_login');
+            $user->save();
+            $request->session()->forget('last_login');
+        }
+
+        $this->guard()->logout();
+
+        $request->session()->invalidate();
+
+        $request->session()->regenerateToken();
+
+        return response()->json([
+            'message' => 'logged out'
+        ]);
+    }
+}

app/Http/Controllers/V3/Azmayesh/AzmayeshController.php

@@ -31,6 +31,10 @@ class AzmayeshController extends Controller
             'work_number',
             'consultant',
             'applicant',
+            'azmayesh_type_name',
+            'project_name',
+            'updated_at',
+            'created_at'
         );
 
         $allowedFilters = $columns;

app/Http/Controllers/V3/Azmayesh/AzmayeshSampleController.php

@@ -23,7 +23,7 @@ class AzmayeshSampleController extends Controller
     public function index(Request $request, string $azmayesh_id): JsonResponse
     {
         $columns = array(
-            'id',
+            'id', 'updated_at', 'created_at'
         );
 
         $allowedFilters = $columns;

app/Http/Controllers/V3/Azmayesh/AzmayeshTypeController.php

@@ -20,7 +20,7 @@ class AzmayeshTypeController extends Controller
     public function index(Request $request): JsonResponse
     {
         $columns = array(
-            'id', 'name'
+            'id', 'name', 'updated_at', 'created_at'
         );
 
         $allowedFilters = $columns;

routes/v3.php

@@ -1,5 +1,6 @@
 <?php
 
+use App\Http\Controllers\V3\Auth\LogoutController;
 use App\Http\Controllers\V3\Azmayesh\AzmayeshController;
 use App\Http\Controllers\V3\Azmayesh\AzmayeshSampleController;
 use App\Http\Controllers\V3\Azmayesh\AzmayeshTypeController;
@@ -73,3 +74,5 @@ Route::prefix('azmayesh_samples')
         Route::post('/update/{azmayesh}', 'update')->name('update');
         Route::post('/delete/{azmayesh}', 'destroy')->name('delete');
     });
+
+Route::post('logout', LogoutController::class)->name('logout');