Merge branch 'dev' into 'features/typesense'

# Conflicts:
#   routes/events.php

app/Http/Controllers/EventsController.php

@@ -59,7 +59,9 @@ class EventsController extends Controller
 
         try {
 
-            return response()->json(['data' => Events::all()]);
+            $events = Events::with('tasks')->get();
+
+            return response()->json(['data' => $events]);
 
         } catch (\Exception $e) {
             Log::info($e->getMessage());
@@ -67,6 +69,7 @@ class EventsController extends Controller
         }
     }
 
+
     public function delete(Request $request, int $id): JsonResponse {
 
         if ($request->user()->role != 1) {
@@ -83,4 +86,23 @@ class EventsController extends Controller
             return response()->json(['message' => "Server error"], 500);
         }
     }
+
+    public function getEvent(Request $request, int $id): JsonResponse {
+
+        try {
+
+            $event = Events::find($id);
+            return response()->json([
+                "id" => $event->id,
+                "name" => $event->name,
+                "description" => $event->description,
+                "created_at" => $event->created_at,
+                "updated_at" => $event->updated_at,
+                "tasks" => $event->tasks,
+            ]);
+        } catch (\Exception $e) {
+            Log::info($e->getMessage());
+            return response()->json(['message' => "Server error"], 500);
+        }
+    }
 }

app/Http/Controllers/UserController.php

@@ -7,6 +7,8 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
+use App\Services\GetRole;
+use App\Services\UserService;
 
 class UserController extends Controller
 {
@@ -15,6 +17,15 @@ class UserController extends Controller
         return true;
     }
 
+    public function me(Request $request): JsonResponse {
+        try {
+            return response()->json(UserService::getData($request->user()->id));
+        } catch(\Exception $e) {
+            Log::info($e->getMessage());
+            return response()->json(['message' => "Server error"], 500);
+        }
+    }
+
     public function create(Request $request): JsonResponse {
         User::create([
             "name" => $request["name"],
@@ -61,16 +72,7 @@ class UserController extends Controller
     public function getUser(Request $request, int $id): JsonResponse {
 
         try {
-            $user = User::find($id);
-            return response()->json([
-                'id' => $user->id,
-                'name' => $user->name,
-                'lastname' => $user->lastname,
-                'email' => $user->email,
-                'phone' => $user->phone ? $user->phone : "null",
-                'validate' => $user->validate,
-                'role' => $user->role,
-            ]);
+            return response()->json(UserService::getData($id));
         } catch(\Exception $e) {
             Log::info($e->getMessage());
             return response()->json(['message' => "Server error"], 500);