This commit is contained in:
lizandrogd
2026-01-21 02:22:29 -05:00
parent 3fffb0d023
commit b1961f0116
35 changed files with 1006 additions and 122 deletions
+16
View File
@@ -0,0 +1,16 @@
<?php
require_once __DIR__ . '/../config/config_enhanced.php';
require_once __DIR__ . '/../config/config.php';
require_once __DIR__ . '/../api/webhook.php';
header('Content-Type: application/json; charset=utf-8');
try {
$w = new WhatsAppWebhook();
echo json_encode(['ok' => true, 'message' => 'Webhook class instantiated successfully']);
} catch (Throwable $t) {
http_response_code(500);
error_log('[debug_webhook_init] Throwable: ' . $t->getMessage());
error_log($t->getTraceAsString());
echo json_encode(['ok' => false, 'error' => $t->getMessage(), 'trace' => $t->getTraceAsString()]);
}
+30
View File
@@ -0,0 +1,30 @@
<?php
require_once __DIR__ . '/../config/config_enhanced.php';
require_once __DIR__ . '/../config/config.php';
header('Content-Type: application/json; charset=utf-8');
if (function_exists('requireAuthentication')) requireAuthentication();
$input = json_decode(file_get_contents('php://input'), true) ?: $_POST;
$conversationId = isset($input['conversation_id']) ? intval($input['conversation_id']) : null;
$userId = isset($input['user_id']) ? intval($input['user_id']) : null;
if (!$conversationId && !$userId) {
http_response_code(400);
echo json_encode(['success' => false, 'error' => 'conversation_id or user_id required']);
exit;
}
try {
$db = Database::getInstance();
if ($conversationId) {
$db->execute('DELETE FROM conversations WHERE id = ?', [$conversationId]);
}
if ($userId) {
$db->execute('DELETE FROM conversations WHERE user_id = ?', [$userId]);
}
echo json_encode(['success' => true]);
} catch (Exception $e) {
http_response_code(500);
echo json_encode(['success' => false, 'error' => $e->getMessage()]);
}
+25
View File
@@ -0,0 +1,25 @@
<?php
require_once __DIR__ . '/../config/config_enhanced.php';
require_once __DIR__ . '/../config/config.php';
header('Content-Type: application/json; charset=utf-8');
if (function_exists('requireAuthentication')) requireAuthentication();
$input = json_decode(file_get_contents('php://input'), true) ?: $_POST;
$id = intval($input['id'] ?? 0);
if (!$id) {
http_response_code(400);
echo json_encode(['success' => false, 'error' => 'id is required']);
exit;
}
try {
$db = Database::getInstance();
$db->execute("DELETE FROM message_templates WHERE id = ?", [$id]);
echo json_encode(['success' => true]);
} catch (Exception $e) {
http_response_code(500);
echo json_encode(['success' => false, 'error' => $e->getMessage()]);
}
+20 -12
View File
@@ -14,21 +14,29 @@ header('Access-Control-Allow-Headers: Content-Type');
try {
$db = Database::getInstance();
// Obtener conversaciones de la tabla conversations
// Obtener conversaciones agregadas por usuario: último mensaje + conteo de no leídos + avatar
$conversations = $db->fetchAll(
"SELECT
c.id,
c.user_id,
COALESCE(c.content, '') as content,
c.direction,
c.message_type,
c.status,
c.created_at,
u.id AS user_id,
COALESCE(u.name, u.phone_number) AS name,
u.phone_number,
COALESCE(u.name, u.phone_number) as name
FROM conversations c
JOIN users u ON c.user_id = u.id
ORDER BY c.created_at DESC
u.avatar_url,
lm.message_id AS last_message_id,
lm.content AS last_message,
lm.direction AS direction,
lm.message_type AS message_type,
lm.created_at AS last_time,
IFNULL(SUM(CASE WHEN c.direction = 'incoming' AND (c.is_read IS NULL OR c.is_read = 0) THEN 1 ELSE 0 END), 0) AS unread_count
FROM users u
LEFT JOIN conversations c ON c.user_id = u.id
LEFT JOIN (
SELECT t1.* FROM conversations t1
JOIN (
SELECT user_id, MAX(created_at) AS last_time FROM conversations GROUP BY user_id
) t2 ON t1.user_id = t2.user_id AND t1.created_at = t2.last_time
) lm ON lm.user_id = u.id
GROUP BY u.id
ORDER BY lm.created_at DESC
LIMIT 500"
);
+17 -12
View File
@@ -24,18 +24,23 @@ header('Access-Control-Allow-Headers: Content-Type');
try {
$db = Database::getInstance();
$templates = $db->fetchAll(
"SELECT
id,
name,
template_name,
language_code,
category,
status,
created_at
FROM message_templates
ORDER BY name ASC"
);
$approvedOnly = isset($_GET['approved_only']) && $_GET['approved_only'] == '1';
$limit = isset($_GET['limit']) ? intval($_GET['limit']) : null;
$sql = "SELECT id, name, template_name, language_code, category, status, body_text, created_at FROM message_templates";
$params = [];
if ($approvedOnly) {
$sql .= " WHERE status = 'approved'";
}
$sql .= " ORDER BY name ASC";
if ($limit && $limit > 0) {
$sql .= " LIMIT " . $limit;
}
$templates = $db->fetchAll($sql, $params);
echo json_encode([
'success' => true,
+7 -2
View File
@@ -37,7 +37,8 @@ try {
direction,
message_type,
status,
created_at
created_at,
COALESCE(c.is_read, 0) as is_read
FROM conversations c
LEFT JOIN users u ON c.user_id = u.id
WHERE user_id = :user_id
@@ -46,10 +47,14 @@ try {
id,
user_id,
message_text as content,
NULL as message_id,
NULL as media_url,
NULL as user_phone,
direction,
message_type,
status,
created_at
created_at,
1 as is_read
FROM messages
WHERE user_id = :user_id
ORDER BY created_at ASC",
+22
View File
@@ -0,0 +1,22 @@
<?php
require_once '../config/config.php';
header('Content-Type: application/json; charset=utf-8');
requireAuthentication();
try {
$input = json_decode(file_get_contents('php://input'), true) ?: $_POST;
$userId = isset($input['user_id']) ? intval($input['user_id']) : 0;
if (!$userId) {
http_response_code(400);
echo json_encode(['success' => false, 'error' => 'user_id is required']);
exit;
}
$db = Database::getInstance();
$db->execute("UPDATE conversations SET is_read = 1 WHERE user_id = ? AND direction = 'incoming' AND (is_read IS NULL OR is_read = 0)", [$userId]);
echo json_encode(['success' => true]);
} catch (Exception $e) {
http_response_code(500);
echo json_encode(['success' => false, 'error' => $e->getMessage()]);
}
+3 -36
View File
@@ -371,13 +371,8 @@ try {
$messageContent = "Plantilla: {$templateName}";
}
// Guardar en la tabla conversations
$stmt = $db->query(
"INSERT INTO conversations (user_id, content, direction, message_type, status, message_id, created_at) VALUES (?, ?, 'outgoing', ?, 'sent', ?, NOW())",
[$userId, $messageContent, $messageType, $response['messages'][0]['id'] ?? null]
);
error_log("Mensaje guardado en BD - User ID: $userId, Content: $messageContent");
// Guardado en BD manejado por WhatsAppService->saveOutgoingMessage()
error_log("Outgoing message saving delegated to WhatsAppService - User ID: $userId, Content: $messageContent");
} else {
error_log("Error: No se pudo obtener o crear user_id para recipient: $recipient");
}
@@ -476,35 +471,7 @@ try {
$response = $whatsappService->sendTextMessage($user['phone_number'], $message);
if ($response && isset($response['messages']) && !empty($response['messages'])) {
// Guardar mensaje en la base de datos
$messageData = [
'user_id' => $userId,
'content' => $message,
'direction' => 'outgoing',
'message_type' => 'text',
'status' => 'sent',
'message_id' => $response['messages'][0]['id'] ?? null,
'created_at' => date('Y-m-d H:i:s')
];
// Intentar insertar en conversations primero
try {
$stmt = $db->query(
"INSERT INTO conversations (user_id, content, direction, message_type, status, message_id, created_at) VALUES (?, ?, ?, ?, ?, ?, ?)",
array_values($messageData)
);
} catch (Exception $e) {
// Si falla, intentar en messages
try {
$stmt = $db->query(
"INSERT INTO messages (user_id, message_text, direction, message_type, status, message_id, created_at) VALUES (?, ?, ?, ?, ?, ?, ?)",
[$userId, $message, 'outgoing', 'text', 'sent', $response['messages'][0]['id'] ?? null, date('Y-m-d H:i:s')]
);
} catch (Exception $e2) {
error_log("Error guardando mensaje: " . $e2->getMessage());
}
}
// Saving handled by WhatsAppService->saveOutgoingMessage(), skip manual insert to avoid duplicates
echo json_encode([
'success' => true,
'message' => 'Mensaje enviado correctamente',
+32 -17
View File
@@ -42,12 +42,13 @@ try {
throw new Exception('Datos inválidos');
}
// Validar datos requeridos
if (!isset($data['user_id']) || empty($data['user_id'])) {
throw new Exception('ID de usuario requerido');
// Validar datos requeridos: user_id o phone
if ((!isset($data['user_id']) || empty($data['user_id'])) && (!isset($data['phone']) || empty($data['phone']))) {
throw new Exception('ID de usuario o teléfono requerido');
}
$user_id = intval($data['user_id']);
$user_id = isset($data['user_id']) ? intval($data['user_id']) : null;
$phone = isset($data['phone']) ? trim($data['phone']) : null;
$name = isset($data['name']) && !empty(trim($data['name'])) ? trim($data['name']) : null;
$status = isset($data['status']) ? $data['status'] : 'active';
@@ -60,20 +61,34 @@ try {
// Crear conexión a la base de datos usando el patrón Singleton
$db = Database::getInstance();
// Verificar si el usuario existe
$checkUser = $db->fetch("SELECT id FROM users WHERE id = :user_id", ['user_id' => $user_id]);
if (!$checkUser) {
throw new Exception('Usuario no encontrado');
}
// Si tenemos user_id - actualizar
if ($user_id) {
// Verificar si el usuario existe
$checkUser = $db->fetch("SELECT id FROM users WHERE id = :user_id", ['user_id' => $user_id]);
if (!$checkUser) {
throw new Exception('Usuario no encontrado');
}
// Actualizar usuario usando el método de la clase Database
$updateData = [
'name' => $name,
'status' => $status
];
$result = $db->update('users', $updateData, 'id = :user_id', ['user_id' => $user_id]);
// Actualizar usuario usando el método de la clase Database
$updateData = [
'name' => $name,
'status' => $status
];
$result = $db->update('users', $updateData, 'id = :user_id', ['user_id' => $user_id]);
} else {
// Buscar por teléfono y crear/actualizar
$existing = $db->fetch('SELECT id FROM users WHERE phone_number = :p LIMIT 1', ['p' => $phone]);
if ($existing) {
$result = $db->update('users', ['name' => $name, 'status' => $status], 'id = :id', ['id' => $existing['id']]);
$user_id = $existing['id'];
} else {
$user_id = $db->insert('users', ['phone_number' => $phone, 'name' => $name, 'status' => $status, 'created_at' => date('Y-m-d H:i:s')]);
$result = $user_id ? true : false;
}
}
if ($result === false) {
throw new Exception('No se pudo actualizar el usuario');
+24 -4
View File
@@ -100,7 +100,7 @@ class WhatsAppWebhook {
if (!isset($value['messages'])) {
return;
}
foreach ($value['messages'] as $message) {
$phoneNumber = $message['from'];
$messageId = $message['id'];
@@ -134,6 +134,13 @@ class WhatsAppWebhook {
$emoji = $message['reaction']['emoji'] ?? '';
$reactionTo = $message['reaction']['message_id'] ?? '';
$messageText = json_encode(['emoji' => $emoji, 'message_id' => $reactionTo]);
// Guardar campos específicos para reacciones
$extraFields = [
'reaction_to_message_id' => $reactionTo ? intval($reactionTo) : null,
'reaction_emoji' => $emoji
];
} elseif (isset($message['text'])) {
$messageText = $message['text']['body'];
$messageType = 'text';
@@ -155,15 +162,28 @@ class WhatsAppWebhook {
}
// Guardar mensaje en base de datos
$this->saveMessage([
$saveData = [
'user_id' => $user['id'],
'message_id' => $messageId,
'direction' => 'incoming',
'message_type' => $messageType,
'content' => $messageText,
'media_url' => $mediaUrl,
'status' => 'received'
]);
'status' => 'received',
'is_read' => 0
];
// Si el mensaje incluye contexto (es respuesta a otro mensaje)
if (isset($message['context']) && isset($message['context']['id'])) {
$saveData['reply_to_message_id'] = $message['context']['id'];
}
// Añadir campos extra (si se detectaron)
if (isset($extraFields) && is_array($extraFields)) {
$saveData = array_merge($saveData, $extraFields);
}
$this->saveMessage($saveData);
// Procesar con bot (protección contra excepciones externas)
try {