Merge branch 'fix/new_chat_users' into 'main'

Arreglado problema al listar usuarios con select See merge request jjimenez/safekat!878
2025-07-25 22:52:08 +00:00 · 2025-07-09 11:22:03 +00:00
parent c79ae6245c 6c94858d8c
commit 7e7b39fc38
1 changed files with 98 additions and 61 deletions
--- a/ci4/app/Controllers/Chat/ChatController.php
+++ b/ci4/app/Controllers/Chat/ChatController.php
@ -61,11 +61,13 @@ class ChatController extends BaseController
        $this->chatService = service("chat");

    }
-    public function index() {}
-    public function get_chat_departments(string $model,int $modelId)
+    public function index()
+    {
+    }
+    public function get_chat_departments(string $model, int $modelId)
    {

-        $data = $this->chatService->getChatDepartments($model,$modelId);
+        $data = $this->chatService->getChatDepartments($model, $modelId);

        return $this->response->setJSON($data);
    }
@ -250,7 +252,7 @@ class ChatController extends BaseController
    public function store_message($model)
    {
        $data = $this->request->getPost();
-        $chatMessageEntity = $this->chatService->storeChatMessage($data["chat_department_id"],$model,$data["model_id"],$data);
+        $chatMessageEntity = $this->chatService->storeChatMessage($data["chat_department_id"], $model, $data["model_id"], $data);
        return $this->response->setJSON($chatMessageEntity);

    }
@ -341,22 +343,26 @@ class ChatController extends BaseController
    }
    public function get_chat_users_internal()
    {
-        $query = $this->userModel->builder()->select(
-            [
-                "id",
-                "CONCAT(first_name,' ',last_name,'(',username,')') as name"
-            ]
-        )->where("cliente_id", null)
-            ->where("deleted_at", null)
-            ->whereNotIn("id", [auth()->user()->id]);
-        if ($this->request->getGet("q")) {
-            $query->groupStart()
-                ->orLike("users.username", $this->request->getGet("q"))
-                ->orLike("CONCAT(first_name,' ',last_name)", $this->request->getGet("q"))
+        $builder = $this->userModel->builder();
+
+        $builder->select([
+            'users.id',
+            "CONCAT(first_name, ' ', last_name, ' (', auth_identities.secret, ')') AS name"
+        ])
+            ->join('auth_identities', 'auth_identities.user_id = users.id AND auth_identities.type = "email_password"')
+            ->where('cliente_id', null)
+            ->where('deleted_at', null)
+            ->whereNotIn('users.id', [auth()->user()->id]);
+
+        if ($this->request->getGet('q')) {
+            $q = $this->request->getGet('q');
+            $builder->groupStart()
+                ->orLike('auth_identities.secret', $q)
+                ->orLike("CONCAT(first_name, ' ', last_name)", $q)
                ->groupEnd();
        }

-        return $this->response->setJSON($query->get()->getResultObject());
+        return $this->response->setJSON($builder->get()->getResultObject());
    }
    public function get_chat_users_all()
    {
@ -381,7 +387,7 @@ class ChatController extends BaseController
        $pm = model(PresupuestoModel::class);
        $p = $pm->find($presupuesto_id);
        $cm = model(ClienteModel::class);
-        $clienteContactos = $cm->querySelectClienteContacto($p->cliente_id,$this->request->getGet('q'));
+        $clienteContactos = $cm->querySelectClienteContacto($p->cliente_id, $this->request->getGet('q'));
        return $this->response->setJSON($clienteContactos);
    }
    public function get_pedido_client_users(int $pedido_id)
@ -389,7 +395,7 @@ class ChatController extends BaseController
        $pm = model(PedidoModel::class);
        $p = $pm->find($pedido_id);
        $cm = model(ClienteModel::class);
-        $clienteContactos = $cm->querySelectClienteContacto($p->cliente()->id,$this->request->getGet('q'));
+        $clienteContactos = $cm->querySelectClienteContacto($p->cliente()->id, $this->request->getGet('q'));
        return $this->response->setJSON($clienteContactos);
    }
    public function get_factura_client_users(int $factura_id)
@ -397,7 +403,7 @@ class ChatController extends BaseController
        $fm = model(FacturaModel::class);
        $f = $fm->find($factura_id);
        $cm = model(ClienteModel::class);
-        $clienteContactos = $cm->querySelectClienteContacto($f->cliente_id,$this->request->getGet('q'));
+        $clienteContactos = $cm->querySelectClienteContacto($f->cliente_id, $this->request->getGet('q'));
        return $this->response->setJSON($clienteContactos);
    }
    public function get_orden_trabajo_client_users(int $orden_trabajo_id)
@ -406,14 +412,14 @@ class ChatController extends BaseController
        $ot = $otm->find($orden_trabajo_id);
        $cm = model(ClienteModel::class);
        $cliente = $ot->pedido()->cliente();
-        $clienteContactos = $cm->querySelectClienteContacto($cliente->id,$this->request->getGet('q'));
+        $clienteContactos = $cm->querySelectClienteContacto($cliente->id, $this->request->getGet('q'));
        return $this->response->setJSON($clienteContactos);
    }
    public function store_hebra(string $model)
    {
        $auth_user = auth()->user();
        $bodyData = $this->request->getPost();
-        $status = $this->chatService->storeHebra($model,$bodyData['modelId'],$bodyData);
+        $status = $this->chatService->storeHebra($model, $bodyData['modelId'], $bodyData);
        return $this->response->setJSON(["message" => "Hebra creada correctamente", "status" => $status]);
    }

@ -441,9 +447,9 @@ class ChatController extends BaseController
        }
        return $this->response->setJSON(["message" => "Hebra actualizada correctamente", "status" => true]);
    }
-    public function get_hebra(string $model,int $modelId)
+    public function get_hebra(string $model, int $modelId)
    {
-        $data = $this->chatService->getHebras($model,$modelId);
+        $data = $this->chatService->getHebras($model, $modelId);
        return $this->response->setJSON($data);
    }

@ -456,7 +462,7 @@ class ChatController extends BaseController
        return DataTable::of($query)
            ->edit('created_at', fn($q) => Time::createFromFormat('Y-m-d H:i:s', $q->created_at)->format("d/m/Y H:i"))
            ->edit('updated_at', fn($q) => Time::createFromFormat('Y-m-d H:i:s', $q->updated_at)->format("d/m/Y H:i"))
-            ->edit("creator",fn($q) => $q->userId == $auth_user_id ? '<span class="badge text-bg-success w-100">'.lang("App.me").'</span>' : $q->creator)
+            ->edit("creator", fn($q) => $q->userId == $auth_user_id ? '<span class="badge text-bg-success w-100">' . lang("App.me") . '</span>' : $q->creator)
            ->add("viewed", fn($q) => $this->chatModel->isMessageChatViewed($q->id, $auth_user_id))
            ->add("action", fn($q) => [
                "type" => "direct",
@ -479,11 +485,17 @@ class ChatController extends BaseController
            ->edit('created_at', fn($q) => $q->created_at ? Time::createFromFormat('Y-m-d H:i:s', $q->created_at)->format("d/m/Y H:i") : "")
            ->edit('updated_at', fn($q) => $q->updated_at ? Time::createFromFormat('Y-m-d H:i:s', $q->updated_at)->format("d/m/Y H:i") : "")
            ->add("viewed", fn($q) => $this->chatModel->isMessageChatViewed($q->chatMessageId))
-            ->edit("creator",fn($q) => $q->userId == $auth_user_id ? '<span class="badge text-bg-success w-100">'.lang("App.me").'</span>' : $q->creator)
-            ->add("action", fn($q) => ["type" => "presupuesto", "modelId" => $q->id, "isAdmin" => $isAdmin,"chatMessageId" => $q->chatMessageId, "lang" => [
+            ->edit("creator", fn($q) => $q->userId == $auth_user_id ? '<span class="badge text-bg-success w-100">' . lang("App.me") . '</span>' : $q->creator)
+            ->add("action", fn($q) => [
+                "type" => "presupuesto",
+                "modelId" => $q->id,
+                "isAdmin" => $isAdmin,
+                "chatMessageId" => $q->chatMessageId,
+                "lang" => [
                    "view_chat" => lang('Chat.view_chat'),
                    "view_by_alt_message" => lang('Chat.view_by_alt_message')
-            ]])
+                ]
+            ])
            ->toJson(true);
    }
    public function datatable_pedido_messages()
@ -494,12 +506,18 @@ class ChatController extends BaseController
        return DataTable::of($query)
            ->edit('created_at', fn($q) => $q->created_at ? Time::createFromFormat('Y-m-d H:i:s', $q->created_at)->format("d/m/Y H:i") : "")
            ->edit('updated_at', fn($q) => $q->updated_at ? Time::createFromFormat('Y-m-d H:i:s', $q->updated_at)->format("d/m/Y H:i") : "")
-            ->edit("creator",fn($q) => $q->userId == $auth_user_id ? '<span class="badge text-bg-success w-100">'.lang("App.me").'</span>' : $q->creator)
+            ->edit("creator", fn($q) => $q->userId == $auth_user_id ? '<span class="badge text-bg-success w-100">' . lang("App.me") . '</span>' : $q->creator)
            ->add("viewed", fn($q) => $this->chatModel->isMessageChatViewed($q->chatMessageId))
-            ->add("action", fn($q) => ["type" => "pedido", "modelId" => $q->id, "isAdmin" => $isAdmin,"chatMessageId" => $q->chatMessageId, "lang" => [
+            ->add("action", fn($q) => [
+                "type" => "pedido",
+                "modelId" => $q->id,
+                "isAdmin" => $isAdmin,
+                "chatMessageId" => $q->chatMessageId,
+                "lang" => [
                    "view_chat" => lang('Chat.view_chat'),
                    "view_by_alt_message" => lang('Chat.view_by_alt_message')
-            ]])
+                ]
+            ])

            ->toJson(true);
    }
@ -511,12 +529,18 @@ class ChatController extends BaseController
        return DataTable::of($query)
            ->edit('created_at', fn($q) => $q->created_at ? Time::createFromFormat('Y-m-d H:i:s', $q->created_at)->format("d/m/Y H:i") : "")
            ->edit('updated_at', fn($q) => $q->updated_at ? Time::createFromFormat('Y-m-d H:i:s', $q->updated_at)->format("d/m/Y H:i") : "")
-            ->edit("creator",fn($q) => $q->userId == $auth_user_id ? '<span class="badge text-bg-success w-100">'.lang("App.me").'</span>' : $q->creator)
+            ->edit("creator", fn($q) => $q->userId == $auth_user_id ? '<span class="badge text-bg-success w-100">' . lang("App.me") . '</span>' : $q->creator)
            ->add("viewed", fn($q) => $this->chatModel->isMessageChatViewed($q->chatMessageId))
-            ->add("action", fn($q) => ["type" => "factura", "modelId" => $q->id, "isAdmin" => $isAdmin,"chatMessageId" => $q->chatMessageId, "lang" => [
+            ->add("action", fn($q) => [
+                "type" => "factura",
+                "modelId" => $q->id,
+                "isAdmin" => $isAdmin,
+                "chatMessageId" => $q->chatMessageId,
+                "lang" => [
                    "view_chat" => lang('Chat.view_chat'),
                    "view_by_alt_message" => lang('Chat.view_by_alt_message')
-            ]])
+                ]
+            ])

            ->toJson(true);
    }
@ -528,12 +552,18 @@ class ChatController extends BaseController
        return DataTable::of($query)
            ->edit('created_at', fn($q) => $q->created_at ? Time::createFromFormat('Y-m-d H:i:s', $q->created_at)->format("d/m/Y H:i") : "")
            ->edit('updated_at', fn($q) => $q->updated_at ? Time::createFromFormat('Y-m-d H:i:s', $q->updated_at)->format("d/m/Y H:i") : "")
-            ->edit("creator",fn($q) => $q->userId == $auth_user_id ? '<span class="badge text-bg-success w-100">'.lang("App.me").'</span>' : $q->creator)
+            ->edit("creator", fn($q) => $q->userId == $auth_user_id ? '<span class="badge text-bg-success w-100">' . lang("App.me") . '</span>' : $q->creator)
            ->add("viewed", fn($q) => $this->chatModel->isMessageChatViewed($q->chatMessageId))
-            ->add("action", fn($q) => ["type" => "ot", "modelId" => $q->id, "isAdmin" => $isAdmin,"chatMessageId" => $q->chatMessageId, "lang" => [
+            ->add("action", fn($q) => [
+                "type" => "ot",
+                "modelId" => $q->id,
+                "isAdmin" => $isAdmin,
+                "chatMessageId" => $q->chatMessageId,
+                "lang" => [
                    "view_chat" => lang('Chat.view_chat'),
                    "view_by_alt_message" => lang('Chat.view_by_alt_message')
-            ]])
+                ]
+            ])

            ->toJson(true);
    }
@ -545,12 +575,18 @@ class ChatController extends BaseController
        return DataTable::of($query)
            ->edit('created_at', fn($q) => $q->created_at ? Time::createFromFormat('Y-m-d H:i:s', $q->created_at)->format("d/m/Y H:i") : "")
            ->edit('updated_at', fn($q) => $q->updated_at ? Time::createFromFormat('Y-m-d H:i:s', $q->updated_at)->format("d/m/Y H:i") : "")
-            ->edit("creator",fn($q) => $q->userId == $auth_user_id ? '<span class="badge text-bg-success w-100">'.lang("App.me").'</span>' : $q->creator)
+            ->edit("creator", fn($q) => $q->userId == $auth_user_id ? '<span class="badge text-bg-success w-100">' . lang("App.me") . '</span>' : $q->creator)
            ->add("viewed", fn($q) => $this->chatModel->isMessageChatViewed($q->chatMessageId))
-            ->add("action", fn($q) => ["type" => "direct", "modelId" => $q->id, "isAdmin" => $isAdmin,"chatMessageId" => $q->chatMessageId, "lang" => [
+            ->add("action", fn($q) => [
+                "type" => "direct",
+                "modelId" => $q->id,
+                "isAdmin" => $isAdmin,
+                "chatMessageId" => $q->chatMessageId,
+                "lang" => [
                    "view_chat" => lang('Chat.view_chat'),
                    "view_by_alt_message" => lang('Chat.view_by_alt_message')
-            ]])
+                ]
+            ])

            ->toJson(true);
    }
@ -658,7 +694,8 @@ class ChatController extends BaseController
            if ($user_id != $auth_user->id) {
                $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user_id]);
            }
-        };
+        }
+        ;
        $message = $this->chatMessageModel->get_chat_message($chat_message_id);
        return $this->response->setJSON($message);
    }