WebSVN – LeadersLinked - Services – Diff – /module/LeadersLinked/src/Controller/InMailController.php

                 'name' => trim($user->first_name . ' ' . $user->last_name),
                 'image' => $storage->getUserImage($user),
                 'profile' => $this->url()->fromRoute('profile/view', ['id' => $user->uuid]),
                 'last_message' => $timeElapsedString,
                 'count_unread' => $unread,
-                'messages_url' => $this->url()->fromRoute('email/messages',['uuid' => $user->uuid]),
                 'selected' => 0,
+                'last_message' => $lastMessage,
+                'messages_url' => $this->url()->fromRoute('email/messages',['uuid' => $user->uuid]),
+                'save_url' => $this->url()->fromRoute('email/messages/send',['uuid' => $user->uuid]),
+                'delete_url' => $this->url()->fromRoute('email/messages/delete',['uuid' => $user->uuid]),
             ]);
+        }
         // Ordenar por: seleccionados primero, luego por fecha del último mensaje
     /**
      * Prepara los datos del usuario para evitar repetición en la construcción de mensajes
      */
     private function prepareUserData($user)
+    {
+        $storage = Storage::getInstance($this->config, $this->adapter);
         return [
             'name' => trim($user->first_name . ' ' . $user->last_name),
-            'image_url' => $this->url()->fromRoute('storage', [
+            'image' => $storage->getUserImage($user),
-                'type' => 'user',
-                'filename' => $user->image,
-                'code' => $user->uuid
-            ], ['force_canonical' => true]),
             'profile_url' => $this->url()->fromRoute('profile/view', ['id' => $user->uuid])
         ];
+    }
     /**
+     * Construye los datos de un mensaje normal
+     *
+     * @param \LeadersLinked\Model\Message $record
+     * @param array $senderData
+     * @param array $receiverData
+     * @param string $side
+     * @param string $timeElapsedString
-     * Construye los datos de un mensaje normal
+     * @param string $abuseReportUrl
      */
     private function buildMessageData($record, $senderData, $receiverData, $side, $timeElapsedString, $abuseReportUrl)
+    {
+        $storage = Storage::getInstance($this->config, $this->adapter);
+        $path = $storage->getPathMessage();
         return [
             'uuid' => $record->uuid,
             'sender_name' => $senderData['name'],
             'sender_image' => $senderData['image_url'],
             'receiver_image' => $receiverData['image_url'],
             'receiver_profile' => $receiverData['profile_url'],
             'side' => $side,
             'message' => $record->message,
             'type' => $record->type,
-            'filename' => $record->filename ? $this->url()->fromRoute('storage', [
+            'filename' => $record->filename ? $storage->getGenericFile($path, $record->uuid, $record->filename) : '',
-                'type' => 'message',
-                'filename' => $record->filename,
-                'code' => $record->uuid
-            ], ['force_canonical' => true]) : '',
             'date' => $timeElapsedString,
             'url_abuse_report' => $abuseReportUrl,
         ];
+    }
     public function sendMessageAction()
+    {
         // Verificar que la petición sea POST
+        $request = $this->getRequest();
         $request = $this->getRequest();
         if (!$request->isPost()) {
             return new JsonModel([
                 'success' => false,
                 'data' => 'ERROR_METHOD_NOT_ALLOWED'
+        }
         // Combinar datos POST y archivos
-        $data = array_merge($request->getPost()->toArray(), $request->getFiles()->toArray());
-        // Si se envía un archivo sin error, usar su nombre como mensaje
-        if (!empty($data['file']) && empty($data['file']['error'])) {
-            $data['message'] = $data['file']['name'];
         $data = array_merge($request->getPost()->toArray(), $request->getFiles()->toArray());
         // Validar los datos del formulario
         $form = new SendForm();
                     'success' => false,
                     'data' => $conversationMapper->getError()
                 ]);
+            }
+        }
+        // Storage
+        $storage = Storage::getInstance($this->config, $this->adapter);
+        $storage->setFiles($request->getFiles()->toArray());
+        $path = $storage->getPathMessage();
-        // Procesar archivo adjunto si existe
-        $files = $this->getRequest()->getFiles()->toArray();
+        // Determinar el tipo de archivo
         $type = Message::TYPE_TEXT;
-        $message_tmp_filename = '';
-        $message_filename = '';
-        if (isset($files['file']) && empty($files['file']['error'])) {
+        if($storage->setCurrentFilename('file')){
-            $message_tmp_filename = $files['file']['tmp_name'];
-            $message_filename = \LeadersLinked\Library\Functions::normalizeStringFilename($files['file']['name']);
-            // Determinar el tipo de archivo
-            $mime_type = mime_content_type($message_tmp_filename);
-            if ($mime_type == 'image/jpg' || $mime_type == 'image/jpeg' || $mime_type == 'image/png') {
-                $type = Storage::FILE_TYPE_IMAGE;
-            } else if ($mime_type == 'video/webm' || $mime_type == 'video/mpeg' || $mime_type == 'video/mpg' || $mime_type == 'video/mp4') {
+            $tmp_filename = $storage->getTmpFilename();
-                $type = Storage::FILE_TYPE_VIDEO;
-            } else if ($mime_type == 'application/pdf') {
-                $type = Storage::FILE_TYPE_DOCUMENT;
             $type = $storage->getFileType();
+        }
         // Crear y guardar el mensaje
                 'data' => $messageMapper->getError()
             ]);
+        }
         // Procesar archivo adjunto si existe
-        if ($message_filename) {
-            $storage = new Storage();
+        if ($tmp_filename) {
-            $storage->setAdapter($this->adapter);
-            $storage->setLogger($this->logger);
+            $filename = 'inmail_message_' . $message->uuid . '.' . $storage->getExtension();
-            $storage->setTranslator($this->translator);
+            $target_filename = $storage->composePathToFilename(Storage::TYPE_MESSAGE, $message->uuid, $filename);
-            if (!$storage->uploadMessageFile($message_tmp_filename, $message_filename, $message->uuid)) {
+            if (!$storage->uploadImageWithOutChangeSize($tmp_filename, $target_filename)) {
                 return new JsonModel([
                     'success' => false,
-                    'data' => $storage->getError()
+                    'data' => 'ERROR_UPLOAD_FILE'
                 ]);
+            }
-            $message->filename = $message_filename;
+            $message->filename = $filename;
             if (!$messageMapper->update($message)) {
                 return new JsonModel([
                     'success' => false,
                     'data' => $messageMapper->getError()
-                ]);
-            }
-        }
-        // Preparar respuesta exitosa
-        $filename = '';
-        if ($message->filename) {
-            $filename = $this->url()->fromRoute('storage', [
-                'type' => 'message',
-                'filename' => $message->filename,
-                'code' => $message->uuid
+                ]);
             ], ['force_canonical' => true]);
+        }
+        // Actualizar última actividad del usuario
+        $userMapper->updateLastActivity($currentUser->id);
+        // Preparar datos para la respuesta
+        $sender_image = $storage->getUserImage($currentUser);
         $receiver_image = $storage->getUserImage($user);
         $filename =  $storage->getGenericFile($path, $message->uuid, $message->filename);
-        // Actualizar última actividad del usuario
+        $sender_profile = $this->url()->fromRoute('profile/view', ['id' => $currentUser->uuid]);
-        $userMapper->updateLastActivity($currentUser->id);
+        $receiver_profile = $this->url()->fromRoute('profile/view', ['id' => $user->uuid]);
-        // Devolver respuesta exitosa con datos del mensaje
-        return new JsonModel([
-            'success' => true,
+        // Devolver respuesta exitosa con datos del mensaje
-            'data' => [
+        return new JsonModel([
-                'sender_name' => trim($currentUser->first_name . ' ' . $currentUser->last_name),
-                'sender_image' => $this->url()->fromRoute('storage', [
-                    'type' => 'user',
+            'success' => true,
-                    'filename' => $currentUser->image,
-                    'code' => $currentUser->uuid
-                ], ['force_canonical' => true]),
+            'data' => [
-                'sender_profile' => $this->url()->fromRoute('profile/view', ['id' => $currentUser->uuid]),
+                'sender_name' => trim($currentUser->first_name . ' ' . $currentUser->last_name),
-                'receiver_name' => trim($user->first_name . ' ' . $user->last_name),
-                'receiver_image' => $this->url()->fromRoute('storage', [
-                    'type' => 'user',
+                'sender_image' => $sender_image,
-                    'filename' => $user->image,
+                'sender_profile' => $sender_profile,
-                    'code' => $user->uuid
+                'receiver_name' => trim($user->first_name . ' ' . $user->last_name),
-                ], ['force_canonical' => true]),
+                'receiver_image' => $receiver_image,
-                'receiver_profile' => $this->url()->fromRoute('profile/view', ['id' => $user->uuid]),
+                'receiver_profile' => $receiver_profile,

Proyectos de Subversion LeadersLinked - Services

(root)/module/LeadersLinked/src/Controller/InMailController.php – Rev 704 → 705