From 28affb5a55b2bcf77e171f1354ba7e1eece89d19 Mon Sep 17 00:00:00 2001
From: Lizandro Guarnizo <77708265+lizandrogd@users.noreply.github.com>
Date: Tue, 28 Jul 2026 23:39:03 -0500
Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=C3=A1rea=20de=20soporte=20con=20we?=
 =?UTF-8?q?bhook=20de=20correo=20y=20asignaci=C3=B3n=20de=20tickets?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.go                                     |   2 +
 pkg/models/proyecto_ticket.go               |  35 ++-
 pkg/models/proyecto_ticket_test.go          |  91 +++++++
 pkg/models/soporte_webhook.go               |  39 +++
 pkg/models/soporte_webhook_test.go          |  58 +++++
 pkg/services/notif_dispatch.go              |  24 +-
 pkg/services/soporte_service.go             |  85 +++++++
 pkg/services/soporte_service_test.go        | 105 ++++++++
 resources/views/soporte_webhook.html        | 120 +++++++++
 resources/views/tickets_admin.html          |  60 +++--
 rest/controllers/portal_controller.go       |  14 +-
 rest/controllers/proyecto_controller.go     |   6 +-
 rest/controllers/soporte_controller.go      | 261 ++++++++++++++++++++
 rest/controllers/soporte_controller_test.go |  80 ++++++
 rest/routes/publicas.go                     |   4 +
 rest/routes/user.go                         |   7 +
 16 files changed, 957 insertions(+), 34 deletions(-)
 create mode 100644 pkg/models/proyecto_ticket_test.go
 create mode 100644 pkg/models/soporte_webhook.go
 create mode 100644 pkg/models/soporte_webhook_test.go
 create mode 100644 pkg/services/soporte_service.go
 create mode 100644 pkg/services/soporte_service_test.go
 create mode 100644 resources/views/soporte_webhook.html
 create mode 100644 rest/controllers/soporte_controller.go
 create mode 100644 rest/controllers/soporte_controller_test.go

diff --git a/main.go b/main.go
index 241bae2..b2cc70e 100755
--- a/main.go
+++ b/main.go
@@ -118,6 +118,8 @@ func main() {
 			// Tablero de tareas
 			&models.Tarea{},
 			&models.TareaComentario{},
+			// Soporte: webhook de correo entrante
+			&models.SoporteWebhookConfig{},
 		)
 		// Seed automático (idempotente) de módulos del sistema
 		migrations.SeedRenovaciones()
diff --git a/pkg/models/proyecto_ticket.go b/pkg/models/proyecto_ticket.go
index a9a7b62..b8f5062 100644
--- a/pkg/models/proyecto_ticket.go
+++ b/pkg/models/proyecto_ticket.go
@@ -9,13 +9,17 @@ import (
 
 type ProyectoTicket struct {
 	gorm.Model
-	ProyectoID   uint            `json:"proyecto_id"   gorm:"column:proyecto_id;index"`
-	PortalUserID uint            `json:"portal_user_id" gorm:"column:portal_user_id;index"`
+	ProyectoID   *uint           `json:"proyecto_id"   gorm:"column:proyecto_id;index"`
+	PortalUserID *uint           `json:"portal_user_id" gorm:"column:portal_user_id;index"`
 	AutorNombre  string          `json:"autor_nombre"  gorm:"column:autor_nombre"`
+	EmailFrom    string          `json:"email_from"    gorm:"column:email_from;size:255"`
 	Titulo       string          `json:"titulo"        gorm:"column:titulo"`
 	Descripcion  string          `json:"descripcion"   gorm:"column:descripcion;type:text"`
 	Estado       string          `json:"estado"        gorm:"column:estado;default:'abierto'"` // abierto|en_progreso|resuelto|cerrado
 	Prioridad    string          `json:"prioridad"     gorm:"column:prioridad;default:'media'"` // baja|media|alta|urgente
+	Origen       string          `json:"origen"        gorm:"column:origen;default:'portal'"`   // portal|email
+	AsignadoA    *uint           `json:"asignado_a"    gorm:"column:asignado_a;index"`
+	Asignado     *Users          `json:"asignado"      gorm:"foreignKey:AsignadoA"`
 	Mensajes     []TicketMensaje `json:"mensajes"      gorm:"foreignKey:TicketID"`
 }
 
@@ -39,13 +43,13 @@ func (TicketMensaje) TableName() string { return "ticket_mensajes" }
 func GetTicketsByProyecto(proyectoID uint) ([]ProyectoTicket, error) {
 	var items []ProyectoTicket
 	err := app.Http.Database.DB.Where("proyecto_id = ?", proyectoID).
-		Preload("Mensajes").Order("created_at DESC").Find(&items).Error
+		Preload("Mensajes").Preload("Asignado").Order("created_at DESC").Find(&items).Error
 	return items, err
 }
 
 func GetTicketByID(id uint) (*ProyectoTicket, error) {
 	var item ProyectoTicket
-	err := app.Http.Database.DB.Preload("Mensajes").First(&item, id).Error
+	err := app.Http.Database.DB.Preload("Mensajes").Preload("Asignado").First(&item, id).Error
 	return &item, err
 }
 
@@ -65,13 +69,13 @@ func CreateTicketMensaje(m *TicketMensaje) error {
 func GetTicketsByPortalUser(portalUserID uint) ([]ProyectoTicket, error) {
 	var items []ProyectoTicket
 	err := app.Http.Database.DB.Where("portal_user_id = ?", portalUserID).
-		Preload("Mensajes").Order("created_at DESC").Find(&items).Error
+		Preload("Mensajes").Preload("Asignado").Order("created_at DESC").Find(&items).Error
 	return items, err
 }
 
 func GetAllTickets(estado string) ([]ProyectoTicket, error) {
 	var items []ProyectoTicket
-	db := app.Http.Database.DB.Preload("Mensajes").Order("created_at DESC")
+	db := app.Http.Database.DB.Preload("Mensajes").Preload("Asignado").Order("created_at DESC")
 	if estado != "" && estado != "todos" {
 		db = db.Where("estado = ?", estado)
 	}
@@ -79,6 +83,25 @@ func GetAllTickets(estado string) ([]ProyectoTicket, error) {
 	return items, err
 }
 
+func AssignedToUser(userID uint) error {
+	return app.Http.Database.DB.Model(&ProyectoTicket{}).
+		Where("asignado_a IS NULL OR asignado_a = 0").
+		Update("asignado_a", userID).Error
+}
+
+func CountTicketsByEstado() map[string]int64 {
+	result := map[string]int64{}
+	type row struct{ Estado string; Count int64 }
+	var rows []row
+	app.Http.Database.DB.Model(&ProyectoTicket{}).
+		Select("estado, count(*) as count").
+		Group("estado").Find(&rows)
+	for _, r := range rows {
+		result[r.Estado] = r.Count
+	}
+	return result
+}
+
 // MarkTicketMessagesReadByPortal marca como leídos todos los mensajes de admin
 // de un ticket para el portal user (cuando abre el ticket).
 func MarkTicketMessagesReadByPortal(ticketID uint) error {
diff --git a/pkg/models/proyecto_ticket_test.go b/pkg/models/proyecto_ticket_test.go
new file mode 100644
index 0000000..5a1f45d
--- /dev/null
+++ b/pkg/models/proyecto_ticket_test.go
@@ -0,0 +1,91 @@
+package models
+
+import (
+	"testing"
+)
+
+func TestProyectoTicketTableName(t *testing.T) {
+	if got := (ProyectoTicket{}).TableName(); got != "proyecto_tickets" {
+		t.Errorf("TableName() = %q, want %q", got, "proyecto_tickets")
+	}
+}
+
+func TestTicketMensajeTableName(t *testing.T) {
+	if got := (TicketMensaje{}).TableName(); got != "ticket_mensajes" {
+		t.Errorf("TableName() = %q, want %q", got, "ticket_mensajes")
+	}
+}
+
+func TestProyectoTicketDefaults(t *testing.T) {
+	ticket := ProyectoTicket{
+		Titulo:      "Test ticket",
+		Descripcion: "Descripción",
+		AutorNombre: "Cliente",
+	}
+	if ticket.Estado != "" {
+		t.Errorf("Estado debe ser vacío por defecto (GORM default), got %q", ticket.Estado)
+	}
+	if ticket.Prioridad != "" {
+		t.Errorf("Prioridad debe ser vacía por defecto (GORM default), got %q", ticket.Prioridad)
+	}
+	if ticket.Origen != "" {
+		t.Errorf("Origen debe ser vacío por defecto (GORM default), got %q", ticket.Origen)
+	}
+	if ticket.ProyectoID != nil {
+		t.Errorf("ProyectoID debe ser nil por defecto, got %v", ticket.ProyectoID)
+	}
+	if ticket.PortalUserID != nil {
+		t.Errorf("PortalUserID debe ser nil por defecto, got %v", ticket.PortalUserID)
+	}
+}
+
+func TestProyectoTicketEmailFrom(t *testing.T) {
+	ticket := ProyectoTicket{
+		EmailFrom:   "cliente@ejemplo.com",
+		AutorNombre: "Cliente",
+		Titulo:      "Soporte",
+		Origen:      "email",
+	}
+	if ticket.EmailFrom != "cliente@ejemplo.com" {
+		t.Errorf("EmailFrom = %q, want %q", ticket.EmailFrom, "cliente@ejemplo.com")
+	}
+	if ticket.Origen != "email" {
+		t.Errorf("Origen = %q, want %q", ticket.Origen, "email")
+	}
+}
+
+func TestProyectoTicketAsignado(t *testing.T) {
+	uid := uint(42)
+	ticket := ProyectoTicket{
+		AsignadoA: &uid,
+	}
+	if ticket.AsignadoA == nil {
+		t.Fatal("AsignadoA debe ser no nil")
+	}
+	if *ticket.AsignadoA != 42 {
+		t.Errorf("AsignadoA = %d, want %d", *ticket.AsignadoA, 42)
+	}
+}
+
+func TestProyectoTicketAsignadoNil(t *testing.T) {
+	ticket := ProyectoTicket{}
+	if ticket.AsignadoA != nil {
+		t.Errorf("AsignadoA debe ser nil por defecto, got %v", *ticket.AsignadoA)
+	}
+}
+
+func TestTicketMensajeDefaults(t *testing.T) {
+	msg := TicketMensaje{
+		TicketID:   1,
+		Contenido:  "Hola",
+		AutorNombre: "Admin",
+	}
+	if msg.EsAdmin {
+		t.Error("EsAdmin debe ser false por defecto")
+	}
+	if msg.LeidoPortal {
+		t.Error("LeidoPortal debe ser false por defecto")
+	}
+}
+
+// CountTicketsByEstado requiere DB real — probado en integration tests
diff --git a/pkg/models/soporte_webhook.go b/pkg/models/soporte_webhook.go
new file mode 100644
index 0000000..a5fcc68
--- /dev/null
+++ b/pkg/models/soporte_webhook.go
@@ -0,0 +1,39 @@
+package models
+
+import (
+	"github.com/sujit-baniya/fiber-boilerplate/app"
+	"gorm.io/gorm"
+)
+
+type SoporteWebhookConfig struct {
+	gorm.Model
+	Activo    bool   `json:"activo" gorm:"column:activo;default:true"`
+	Nombre    string `json:"nombre" gorm:"column:nombre;size:100"`
+	Provider  string `json:"provider" gorm:"column:provider;size:50;default:'sendgrid'"` // sendgrid|mailgun|generic
+	ApiKey    string `json:"api_key" gorm:"column:api_key;size:255"`
+	EmailDestino string `json:"email_destino" gorm:"column:email_destino;size:255"` // ej: soporte@u-s.app
+	ResponderAuto bool `json:"responder_auto" gorm:"column:responder_auto;default:true"`
+	MensajeAuto string `json:"mensaje_auto" gorm:"column:mensaje_auto;type:text"`
+	AsignarA    *uint `json:"asignar_a" gorm:"column:asignar_a;index"` // auto-asignar tickets a este user
+}
+
+func (SoporteWebhookConfig) TableName() string { return "soporte_webhook_config" }
+
+func GetSoporteWebhookActivo() (*SoporteWebhookConfig, error) {
+	var item SoporteWebhookConfig
+	err := app.Http.Database.DB.Where("activo = ?", true).First(&item).Error
+	return &item, err
+}
+
+func GetAllSoporteWebhookConfigs() ([]SoporteWebhookConfig, error) {
+	var items []SoporteWebhookConfig
+	err := app.Http.Database.DB.Order("created_at DESC").Find(&items).Error
+	return items, err
+}
+
+func SaveSoporteWebhookConfig(s *SoporteWebhookConfig) error {
+	if s.ID > 0 {
+		return app.Http.Database.DB.Model(s).Updates(s).Error
+	}
+	return app.Http.Database.DB.Create(s).Error
+}
diff --git a/pkg/models/soporte_webhook_test.go b/pkg/models/soporte_webhook_test.go
new file mode 100644
index 0000000..b2687b6
--- /dev/null
+++ b/pkg/models/soporte_webhook_test.go
@@ -0,0 +1,58 @@
+package models
+
+import (
+	"testing"
+)
+
+func TestSoporteWebhookConfigTableName(t *testing.T) {
+	if got := (SoporteWebhookConfig{}).TableName(); got != "soporte_webhook_config" {
+		t.Errorf("TableName() = %q, want %q", got, "soporte_webhook_config")
+	}
+}
+
+func TestSoporteWebhookConfigDefaults(t *testing.T) {
+	cfg := SoporteWebhookConfig{
+		Nombre:   "Test",
+		Provider: "sendgrid",
+	}
+	if cfg.Provider != "sendgrid" {
+		t.Errorf("Provider = %q, want %q", cfg.Provider, "sendgrid")
+	}
+	if cfg.EmailDestino != "" {
+		t.Errorf("EmailDestino debe ser vacío, got %q", cfg.EmailDestino)
+	}
+}
+
+func TestSoporteWebhookConfigAutoResponder(t *testing.T) {
+	cfg := SoporteWebhookConfig{
+		Nombre:        "Soporte",
+		ResponderAuto: true,
+		MensajeAuto:   "Gracias por contactarnos",
+	}
+	if !cfg.ResponderAuto {
+		t.Error("ResponderAuto debe ser true")
+	}
+	if cfg.MensajeAuto != "Gracias por contactarnos" {
+		t.Errorf("MensajeAuto = %q, want %q", cfg.MensajeAuto, "Gracias por contactarnos")
+	}
+}
+
+func TestSoporteWebhookConfigAsignarA(t *testing.T) {
+	uid := uint(5)
+	cfg := SoporteWebhookConfig{
+		AsignarA: &uid,
+	}
+	if cfg.AsignarA == nil {
+		t.Fatal("AsignarA debe ser no nil")
+	}
+	if *cfg.AsignarA != 5 {
+		t.Errorf("AsignarA = %d, want %d", *cfg.AsignarA, 5)
+	}
+}
+
+func TestSoporteWebhookConfigAsignarANil(t *testing.T) {
+	cfg := SoporteWebhookConfig{}
+	if cfg.AsignarA != nil {
+		t.Errorf("AsignarA debe ser nil por defecto, got %v", *cfg.AsignarA)
+	}
+}
diff --git a/pkg/services/notif_dispatch.go b/pkg/services/notif_dispatch.go
index 74da1da..dd26e9e 100644
--- a/pkg/services/notif_dispatch.go
+++ b/pkg/services/notif_dispatch.go
@@ -95,9 +95,25 @@ func DispatchTicketRespuestaAdmin(ticket *models.ProyectoTicket, contenido strin
 	if ticket == nil {
 		return
 	}
-	portalUser, err := models.GetPortalUserByID(ticket.PortalUserID)
+	proyectoSlug := ""
+	if ticket.ProyectoID != nil {
+		if proy, err := models.GetProyectoByID(*ticket.ProyectoID); err == nil {
+			proyectoSlug = proy.Slug
+			proyectoNombre = proy.Nombre
+		}
+	}
+
+	// Si no está asociado a un portal user (ej: ticket por email), responder por email directo
+	if ticket.PortalUserID == nil {
+		if ticket.EmailFrom != "" {
+			go SendTicketRespuestaPortalUser(ticket.EmailFrom, ticket.AutorNombre, proyectoNombre, ticket.Titulo, contenido, "")
+		}
+		return
+	}
+
+	portalUser, err := models.GetPortalUserByID(*ticket.PortalUserID)
 	if err != nil || portalUser == nil {
-		log.Printf("[Notif] PortalUser %d no encontrado: %v", ticket.PortalUserID, err)
+		log.Printf("[Notif] PortalUser %d no encontrado: %v", *ticket.PortalUserID, err)
 		return
 	}
 
@@ -106,10 +122,6 @@ func DispatchTicketRespuestaAdmin(ticket *models.ProyectoTicket, contenido strin
 		return
 	}
 
-	proyectoSlug := ""
-	if proy, err := models.GetProyectoByID(ticket.ProyectoID); err == nil {
-		proyectoSlug = proy.Slug
-	}
 	portalPath := portalTicketPath(proyectoSlug, ticket.ID)
 	portalURL := absAppURL(portalPath)
 	titulo := fmt.Sprintf("Respuesta en tu ticket: %s", ticket.Titulo)
diff --git a/pkg/services/soporte_service.go b/pkg/services/soporte_service.go
new file mode 100644
index 0000000..d3bd4a6
--- /dev/null
+++ b/pkg/services/soporte_service.go
@@ -0,0 +1,85 @@
+package services
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/sujit-baniya/fiber-boilerplate/app"
+	"github.com/sujit-baniya/fiber-boilerplate/pkg/models"
+)
+
+// SendSoporteAutoRespuesta envía acuse de recibo automático al crear un ticket por email
+func SendSoporteAutoRespuesta(ticket *models.ProyectoTicket) {
+	if ticket == nil || ticket.EmailFrom == "" {
+		return
+	}
+	subject := fmt.Sprintf("Recibimos tu solicitud: %s", ticket.Titulo)
+	mensaje := "Hemos recibido tu solicitud y te responderemos a la brevedad."
+	if app.Http.Database.DB != nil {
+		if cfg, err := models.GetSoporteWebhookActivo(); err == nil && cfg.MensajeAuto != "" {
+			mensaje = cfg.MensajeAuto
+		}
+	}
+	htmlBody := fmt.Sprintf(`<!DOCTYPE html>
+<html><body style="font-family:Inter,sans-serif;background:#f1f5f9;padding:32px">
+<div style="max-width:520px;margin:0 auto;background:#fff;border-radius:16px;padding:32px;border:1px solid #e2e8f0">
+  <div style="text-align:center;margin-bottom:24px">
+    <div style="width:48px;height:48px;border-radius:50%%;background:#8eb02f;display:inline-flex;align-items:center;justify-content:center;color:#fff;font-weight:700;font-size:20px">U</div>
+    <h2 style="margin:12px 0 4px;color:#1e293b">Ticket recibido</h2>
+    <p style="color:#64748b;font-size:14px;margin:0">Soporte U-site</p>
+  </div>
+  <p style="color:#334155;font-size:15px">Hola <strong>%s</strong>,</p>
+  <p style="color:#334155;font-size:14px">%s</p>
+  <div style="background:#f8fafc;border-radius:10px;padding:16px;margin:20px 0;border:1px solid #e2e8f0">
+    <p style="margin:0 0 6px;font-size:13px;color:#64748b"><strong>Ticket:</strong> #%d</p>
+    <p style="margin:0 0 6px;font-size:13px;color:#64748b"><strong>Asunto:</strong> %s</p>
+    <p style="margin:0;font-size:13px;color:#64748b"><strong>Mensaje:</strong> %s</p>
+  </div>
+  <p style="color:#94a3b8;font-size:12px">Este es un mensaje automático. No respondas a este correo.</p>
+</div></body></html>`, ticket.AutorNombre, mensaje, ticket.ID, ticket.Titulo, ticket.Descripcion)
+
+	go func() {
+		if err := app.Http.Mail.Send(ticket.EmailFrom, subject, htmlBody); err != nil {
+			log.Printf("[Soporte] Error enviando auto-respuesta a %s: %v", ticket.EmailFrom, err)
+		} else {
+			log.Printf("[Soporte] Auto-respuesta enviada a %s (ticket #%d)", ticket.EmailFrom, ticket.ID)
+		}
+	}()
+}
+
+// SendSoporteNotifAdmin notifica a los admins sobre un nuevo ticket de email
+func SendSoporteNotifAdmin(ticket *models.ProyectoTicket) {
+	if ticket == nil {
+		return
+	}
+	adminEmail := ""
+	if app.Http.Database.DB != nil {
+		if cfg, err := models.GetSmtpConfig(); err == nil {
+			adminEmail = cfg.FromAddress
+		}
+	}
+	if adminEmail == "" {
+		return
+	}
+	subject := fmt.Sprintf("🎫 Nuevo ticket por email: %s", ticket.Titulo)
+	htmlBody := fmt.Sprintf(`<!DOCTYPE html>
+<html><body style="font-family:Inter,sans-serif;background:#f1f5f9;padding:32px">
+<div style="max-width:520px;margin:0 auto;background:#fff;border-radius:16px;padding:32px;border:1px solid #e2e8f0">
+  <div style="display:flex;align-items:center;gap:12px;margin-bottom:20px">
+    <div style="width:40px;height:40px;border-radius:50%%;background:#8eb02f;display:flex;align-items:center;justify-content:center;color:#fff;font-size:18px">🎫</div>
+    <div><h2 style="margin:0;color:#1e293b;font-size:17px">Nuevo ticket por email</h2>
+    <p style="margin:0;color:#64748b;font-size:13px">De: <strong>%s</strong> &lt;%s&gt;</p></div>
+  </div>
+  <div style="background:#f8fafc;border-radius:10px;padding:16px;margin-bottom:20px;border:1px solid #e2e8f0">
+    <p style="margin:0 0 6px;font-size:14px;color:#334155"><strong>Asunto:</strong> %s</p>
+    <p style="margin:0;font-size:14px;color:#334155"><strong>Mensaje:</strong> %s</p>
+  </div>
+  <a href="%s/app/tickets?ticket=%d" style="display:block;text-align:center;background:#8eb02f;color:#fff;padding:12px 24px;border-radius:10px;font-weight:600;text-decoration:none;font-size:15px">Ver ticket</a>
+</div></body></html>`, ticket.AutorNombre, ticket.EmailFrom, ticket.Titulo, ticket.Descripcion, absAppURL(""), ticket.ID)
+
+	go func() {
+		if err := app.Http.Mail.Send(adminEmail, subject, htmlBody); err != nil {
+			log.Printf("[Soporte] Error notificando admin: %v", err)
+		}
+	}()
+}
diff --git a/pkg/services/soporte_service_test.go b/pkg/services/soporte_service_test.go
new file mode 100644
index 0000000..35c7c8e
--- /dev/null
+++ b/pkg/services/soporte_service_test.go
@@ -0,0 +1,105 @@
+package services
+
+import (
+	"testing"
+
+	"github.com/sujit-baniya/fiber-boilerplate/app"
+	"github.com/sujit-baniya/fiber-boilerplate/config"
+	"github.com/sujit-baniya/fiber-boilerplate/pkg/models"
+)
+
+// ─── Helpers ──────────────────────────────────────────────────────────────────
+
+func setupTestApp() {
+	if app.Http == nil {
+		app.Http = &config.AppConfig{
+			Server: config.ServerConfig{
+				Url:  "http://localhost",
+				Port: "8080",
+			},
+		}
+	}
+}
+
+func TestSendSoporteAutoRespuestaNilTicket(t *testing.T) {
+	setupTestApp()
+	// No debe panic si ticket es nil
+	SendSoporteAutoRespuesta(nil)
+}
+
+func TestSendSoporteAutoRespuestaSinEmail(t *testing.T) {
+	setupTestApp()
+	ticket := &models.ProyectoTicket{
+		Titulo:      "Test",
+		Descripcion: "Desc",
+		AutorNombre: "Cliente",
+		Origen:      "email",
+	}
+	// No debe hacer nada si no tiene email
+	SendSoporteAutoRespuesta(ticket)
+}
+
+func TestSendSoporteAutoRespuestaConEmail(t *testing.T) {
+	setupTestApp()
+	ticket := &models.ProyectoTicket{
+		EmailFrom:   "cliente@test.com",
+		Titulo:      "Ayuda con factura",
+		Descripcion: "No puedo ver mi factura de enero",
+		AutorNombre: "Juan Pérez",
+		Origen:      "email",
+	}
+	app.Http.Mail.FromAddress = "soporte@u-s.app"
+	app.Http.Mail.Host = "127.0.0.1"
+	app.Http.Mail.Port = 2525
+	// Solo verificar que no panic (enviaría a un SMTP que no existe, pero el go routine captura error)
+	SendSoporteAutoRespuesta(ticket)
+}
+
+func TestSendSoporteNotifAdminNil(t *testing.T) {
+	setupTestApp()
+	SendSoporteNotifAdmin(nil)
+}
+
+func TestSendSoporteNotifAdminSinSmtp(t *testing.T) {
+	setupTestApp()
+	ticket := &models.ProyectoTicket{
+		EmailFrom:   "cliente@test.com",
+		Titulo:      "Problema",
+		Descripcion: "No funciona",
+		AutorNombre: "Cliente",
+	}
+	// Sin SMTP config no debe panic
+	SendSoporteNotifAdmin(ticket)
+}
+
+func TestSendSoporteAutoRespuestaOrigenPortal(t *testing.T) {
+	setupTestApp()
+	ticket := &models.ProyectoTicket{
+		EmailFrom:   "",
+		Titulo:      "Portal ticket",
+		Descripcion: "Desc",
+		AutorNombre: "Portal User",
+		Origen:      "portal",
+	}
+	// No debe intentar enviar email porque EmailFrom está vacío
+	SendSoporteAutoRespuesta(ticket)
+}
+
+func TestSendSoporteNotifAdminConSmtp(t *testing.T) {
+	setupTestApp()
+	// Simular SMTP config en app.Http.Mail
+	app.Http.Mail.FromAddress = "admin@u-s.app"
+	app.Http.Mail.Host = "127.0.0.1"
+	app.Http.Mail.Port = 2525
+
+	ticket := &models.ProyectoTicket{
+		// gorm.Model embedido: ID se asigna via Create en DB real
+		EmailFrom:   "cliente@test.com",
+		Titulo:      "Error en el sistema",
+		Descripcion: "Recibo un error 500",
+		AutorNombre: "María López",
+		Origen:      "email",
+	}
+	// Verificar que no panic (el email se envía en goroutine)
+	SendSoporteNotifAdmin(ticket)
+}
diff --git a/resources/views/soporte_webhook.html b/resources/views/soporte_webhook.html
new file mode 100644
index 0000000..8851dc8
--- /dev/null
+++ b/resources/views/soporte_webhook.html
@@ -0,0 +1,120 @@
+<div x-data="soporteWebhook()" x-init="init()" class="p-6 max-w-2xl">
+  <h1 class="text-xl font-bold text-slate-800 mb-1">Webhook de correo entrante</h1>
+  <p class="text-sm text-slate-500 mb-6">Configura la integración para recibir correos de soporte@u-s.app y convertirlos automáticamente en tickets.</p>
+
+  <div class="bg-white border border-slate-200 rounded-xl p-6 space-y-4">
+    <div>
+      <label class="block text-sm font-medium text-slate-700 mb-1">Proveedor</label>
+      <select x-model="cfg.provider" class="w-full border border-slate-200 rounded-lg px-3 py-2 text-sm outline-none">
+        <option value="sendgrid">SendGrid</option>
+        <option value="mailgun">Mailgun</option>
+        <option value="generic">Genérico</option>
+      </select>
+    </div>
+
+    <div>
+      <label class="block text-sm font-medium text-slate-700 mb-1">Email destino</label>
+      <input x-model="cfg.email_destino" type="text" placeholder="soporte@u-s.app"
+        class="w-full border border-slate-200 rounded-lg px-3 py-2 text-sm outline-none">
+      <p class="text-xs text-slate-400 mt-1">Correo al que llegarán los mensajes. Ej: soporte@u-s.app</p>
+    </div>
+
+    <div>
+      <label class="block text-sm font-medium text-slate-700 mb-1">API Key / Secreto</label>
+      <input x-model="cfg.api_key" type="text" placeholder="opcional para validación"
+        class="w-full border border-slate-200 rounded-lg px-3 py-2 text-sm outline-none">
+      <p class="text-xs text-slate-400 mt-1">Si el proveedor envía un token de verificación, pégalo aquí.</p>
+    </div>
+
+    <div class="flex items-center gap-3">
+      <input x-model="cfg.responder_auto" type="checkbox" id="resp-auto"
+        class="rounded border-slate-300 text-[#8eb02f] focus:ring-[#8eb02f]">
+      <label for="resp-auto" class="text-sm text-slate-700">Responder automáticamente con acuse de recibo</label>
+    </div>
+
+    <div x-show="cfg.responder_auto">
+      <label class="block text-sm font-medium text-slate-700 mb-1">Mensaje de auto-respuesta</label>
+      <textarea x-model="cfg.mensaje_auto" rows="3" placeholder="Hemos recibido tu solicitud y te responderemos a la brevedad."
+        class="w-full border border-slate-200 rounded-lg px-3 py-2 text-sm outline-none"></textarea>
+    </div>
+
+    <div>
+      <label class="block text-sm font-medium text-slate-700 mb-1">Auto-asignar a</label>
+      <select x-model="cfg.asignar_a" class="w-full border border-slate-200 rounded-lg px-3 py-2 text-sm outline-none">
+        <option value="">Sin asignar</option>
+        <template x-for="a in admins" :key="a.id">
+          <option :value="a.id" x-text="a.name"></option>
+        </template>
+      </select>
+      <p class="text-xs text-slate-400 mt-1">Los tickets creados por email se asignarán automáticamente a este admin.</p>
+    </div>
+
+    <div class="pt-2">
+      <button @click="guardar()"
+        class="px-6 py-2 rounded-xl text-white text-sm font-medium transition-colors"
+        style="background:#8eb02f"
+        onmouseover="this.style.background='#6d8c24'" onmouseout="this.style.background='#8eb02f'">
+        Guardar configuración
+      </button>
+    </div>
+
+    <div x-show="webhookUrl" class="bg-slate-50 border border-slate-200 rounded-lg p-4 mt-4">
+      <p class="text-xs font-medium text-slate-600 mb-1">URL del webhook</p>
+      <p class="text-sm text-slate-800 font-mono break-all" x-text="webhookUrl"></p>
+      <p class="text-xs text-slate-400 mt-1">Configura esta URL en el proveedor de correo para enviar los emails entrantes.</p>
+    </div>
+  </div>
+</div>
+
+<script>
+function soporteWebhook() {
+  return {
+    cfg: {
+      id: 0,
+      nombre: 'Soporte',
+      provider: 'sendgrid',
+      email_destino: 'soporte@u-s.app',
+      api_key: '',
+      responder_auto: true,
+      mensaje_auto: '',
+      asignar_a: '',
+    },
+    admins: [],
+    webhookUrl: '',
+
+    async init() {
+      try {
+        const r = await axios.get('/app/soporte/webhook/data');
+        if (r.data && r.data.data) {
+          this.cfg = { ...this.cfg, ...r.data.data };
+          this.cfg.asignar_a = r.data.data.asignar_a || '';
+        }
+      } catch {}
+      try {
+        const r = await axios.get('/app/tickets/admins');
+        this.admins = r.data || [];
+      } catch {}
+      this.webhookUrl = window.location.origin + '/webhooks/soporte/' + this.cfg.provider;
+    },
+
+    async guardar() {
+      const payload = {
+        id: this.cfg.id || 0,
+        nombre: this.cfg.nombre || 'Soporte',
+        provider: this.cfg.provider,
+        email_destino: this.cfg.email_destino,
+        api_key: this.cfg.api_key,
+        responder_auto: this.cfg.responder_auto,
+        mensaje_auto: this.cfg.mensaje_auto,
+        asignar_a: this.cfg.asignar_a ? parseInt(this.cfg.asignar_a) : null,
+      };
+      try {
+        await axios.post('/app/soporte/webhook', payload);
+        alert('Configuración guardada');
+      } catch (e) {
+        alert('Error al guardar: ' + (e.response?.data?.error || e.message));
+      }
+    },
+  };
+}
+</script>
diff --git a/resources/views/tickets_admin.html b/resources/views/tickets_admin.html
index f53198c..4571ded 100644
--- a/resources/views/tickets_admin.html
+++ b/resources/views/tickets_admin.html
@@ -3,9 +3,8 @@
   <div class="flex items-center justify-between mb-6">
     <div>
       <h1 class="text-xl font-bold text-slate-800">Tickets de soporte</h1>
-      <p class="text-sm text-slate-500 mt-0.5">Todos los tickets abiertos por clientes del portal</p>
+      <p class="text-sm text-slate-500 mt-0.5">Todos los tickets abiertos por clientes del portal y correo</p>
     </div>
-    <!-- Filtro estado -->
     <div class="flex items-center gap-2">
       <template x-for="s in estados" :key="s.val">
         <button @click="filtro=s.val; load()"
@@ -32,25 +31,29 @@
       <div :id="'ticket-' + t.ID" class="bg-white border border-slate-200 rounded-xl overflow-hidden shadow-sm">
         <!-- Cabecera del ticket -->
         <div class="p-4 flex items-start gap-4 cursor-pointer" @click="t._open = !t._open">
-          <!-- Indicador de estado -->
           <div class="mt-0.5 w-2.5 h-2.5 rounded-full flex-shrink-0" :class="dotClass(t.estado)"></div>
           <div class="flex-1 min-w-0">
             <div class="flex flex-wrap items-center gap-2 mb-1">
               <span class="badge" :class="ticketBadge(t.estado)" x-text="t.estado"></span>
               <span class="badge" :class="prioridadBadge(t.prioridad)" x-text="t.prioridad"></span>
-              <span x-show="t.proyecto && t.proyecto.nombre" class="text-xs text-slate-400">
-                📁 <span x-text="t.proyecto ? t.proyecto.nombre : ''"></span>
-              </span>
+              <span x-show="t.origen==='email'" class="badge badge-default text-xs">📧 Email</span>
+              <span x-show="t.origen==='portal'" class="badge badge-default text-xs">🌐 Portal</span>
             </div>
             <h3 class="font-semibold text-sm text-slate-800 truncate" x-text="t.titulo"></h3>
             <p class="text-xs text-slate-500 mt-0.5">
-              Por: <span x-text="t.autor_nombre"></span> &middot; <span x-text="formatDate(t.CreatedAt)"></span>
+              <span x-text="t.autor_nombre"></span>
+              <span x-show="t.email_from" class="text-slate-400">&lt;<span x-text="t.email_from"></span>&gt;</span>
+              <span class="mx-1">&middot;</span>
+              <span x-text="formatDate(t.CreatedAt)"></span>
               <span x-show="t.mensajes && t.mensajes.length" class="ml-2 text-slate-400">
                 💬 <span x-text="t.mensajes ? t.mensajes.length : 0"></span>
               </span>
+              <span x-show="t.asignado" class="ml-2 text-slate-400">
+                👤 <span x-text="t.asignado.name"></span>
+              </span>
             </p>
           </div>
-          <!-- Cambiar estado -->
+          <!-- Acciones -->
           <div class="flex items-center gap-2 flex-shrink-0" @click.stop>
             <select @change="cambiarEstado(t, $event.target.value)"
               class="text-xs border border-slate-200 rounded-lg px-2 py-1.5 outline-none bg-white text-slate-700">
@@ -59,12 +62,14 @@
               <option value="resuelto"     :selected="t.estado==='resuelto'">Resuelto</option>
               <option value="cerrado"      :selected="t.estado==='cerrado'">Cerrado</option>
             </select>
-            <a :href="`/app/proyectos/${t.proyecto_id}/detalle`" title="Ver proyecto"
-              class="text-slate-400 hover:text-slate-600 transition-colors" @click.stop>
-              <svg class="w-4 h-4" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
-                <path stroke-linecap="round" stroke-linejoin="round" d="M10 6H6a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-4M14 4h6m0 0v6m0-6L10 14"/>
-              </svg>
-            </a>
+            <!-- Asignar -->
+            <select @change="asignar(t, $event.target.value)"
+              class="text-xs border border-slate-200 rounded-lg px-2 py-1.5 outline-none bg-white text-slate-700">
+              <option value="">Sin asignar</option>
+              <template x-for="a in admins" :key="a.id">
+                <option :value="a.id" :selected="t.asignado_a===a.id" x-text="a.name"></option>
+              </template>
+            </select>
           </div>
         </div>
 
@@ -108,12 +113,17 @@
     </template>
   </div>
 
+  <!-- Paginación simple -->
+  <div x-show="!loading && tickets.length > 0" class="mt-4 text-xs text-slate-400 text-center">
+    Mostrando <span x-text="tickets.length"></span> tickets
+  </div>
 </div>
 
 <script>
 function ticketsAdmin() {
   return {
     tickets: [],
+    admins: [],
     loading: true,
     filtro: 'todos',
     estados: [
@@ -125,12 +135,20 @@ function ticketsAdmin() {
     ],
 
     async init() {
+      await this.cargarAdmins();
       const params = new URLSearchParams(window.location.search);
       if (params.get('ticket')) this.filtro = 'todos';
       await this.load();
       this.openTicketFromQuery();
     },
 
+    async cargarAdmins() {
+      try {
+        const r = await axios.get('/app/tickets/admins');
+        this.admins = r.data || [];
+      } catch {}
+    },
+
     async load() {
       this.loading = true;
       try {
@@ -158,6 +176,20 @@ function ticketsAdmin() {
       t.estado = estado;
     },
 
+    async asignar(t, userId) {
+      if (!userId) {
+        await axios.put(`/app/tickets/${t.ID}/asignar`, { asignado_id: 0 });
+        t.asignado_a = null;
+        t.asignado = null;
+      } else {
+        const id = parseInt(userId);
+        await axios.put(`/app/tickets/${t.ID}/asignar`, { asignado_id: id });
+        t.asignado_a = id;
+        const a = this.admins.find(x => x.id === id);
+        t.asignado = a ? { name: a.name } : null;
+      }
+    },
+
     async responder(t) {
       const contenido = (t._reply || '').trim();
       if (!contenido) return;
diff --git a/rest/controllers/portal_controller.go b/rest/controllers/portal_controller.go
index 35337ba..10e779e 100644
--- a/rest/controllers/portal_controller.go
+++ b/rest/controllers/portal_controller.go
@@ -322,8 +322,8 @@ func PortalCrearTicket(c *fiber.Ctx) error {
 	}
 
 	t := &models.ProyectoTicket{
-		ProyectoID:   proy.ID,
-		PortalUserID: u.ID,
+		ProyectoID:   &proy.ID,
+		PortalUserID: &u.ID,
 		AutorNombre:  u.Nombre,
 		Titulo:       req.Titulo,
 		Descripcion:  req.Descripcion,
@@ -361,7 +361,7 @@ func PortalResponderTicket(c *fiber.Ctx) error {
 	if err != nil {
 		return c.Status(404).JSON(fiber.Map{"error": "Ticket no encontrado"})
 	}
-	if ticket.PortalUserID != u.ID {
+	if ticket.PortalUserID == nil || *ticket.PortalUserID != u.ID {
 		return c.Status(403).JSON(fiber.Map{"error": "Sin acceso"})
 	}
 	msg := &models.TicketMensaje{
@@ -375,8 +375,10 @@ func PortalResponderTicket(c *fiber.Ctx) error {
 	}
 	go func() {
 		proyNombre := ""
-		if proy, err := models.GetProyectoByID(ticket.ProyectoID); err == nil {
-			proyNombre = proy.Nombre
+		if ticket.ProyectoID != nil {
+			if proy, err := models.GetProyectoByID(*ticket.ProyectoID); err == nil {
+				proyNombre = proy.Nombre
+			}
 		}
 		services.DispatchTicketRespuestaCliente(ticket, req.Contenido, proyNombre)
 	}()
@@ -548,7 +550,7 @@ func PortalMarcarTicketLeido(c *fiber.Ctx) error {
 	if err != nil || ticket == nil {
 		return c.Status(404).JSON(fiber.Map{"error": "ticket no encontrado"})
 	}
-	if ticket.PortalUserID != u.ID {
+	if ticket.PortalUserID == nil || *ticket.PortalUserID != u.ID {
 		return c.Status(403).JSON(fiber.Map{"error": "sin permiso"})
 	}
 	_ = models.MarkTicketMessagesReadByPortal(uint(ticketID))
diff --git a/rest/controllers/proyecto_controller.go b/rest/controllers/proyecto_controller.go
index d61766d..a82c81a 100644
--- a/rest/controllers/proyecto_controller.go
+++ b/rest/controllers/proyecto_controller.go
@@ -578,8 +578,10 @@ func AdminResponderTicket(c *fiber.Ctx) error {
 			return
 		}
 		proyNombre := ""
-		if proy, err := models.GetProyectoByID(ticket.ProyectoID); err == nil {
-			proyNombre = proy.Nombre
+		if ticket.ProyectoID != nil {
+			if proy, err := models.GetProyectoByID(*ticket.ProyectoID); err == nil {
+				proyNombre = proy.Nombre
+			}
 		}
 		services.DispatchTicketRespuestaAdmin(ticket, req.Contenido, proyNombre)
 	}()
diff --git a/rest/controllers/soporte_controller.go b/rest/controllers/soporte_controller.go
new file mode 100644
index 0000000..c38162b
--- /dev/null
+++ b/rest/controllers/soporte_controller.go
@@ -0,0 +1,261 @@
+package controllers
+
+import (
+	"log"
+	"strconv"
+	"strings"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/sujit-baniya/fiber-boilerplate/app"
+	"github.com/sujit-baniya/fiber-boilerplate/pkg/models"
+	"github.com/sujit-baniya/fiber-boilerplate/pkg/services"
+)
+
+// ─── Webhook de correo entrante ───────────────────────────────────────────────
+// Recibe notificaciones de SendGrid, Mailgun, etc.
+// POST /webhooks/soporte/:provider
+// provider: sendgrid, mailgun, generic
+
+func SoporteWebhook(c *fiber.Ctx) error {
+	provider := c.Params("provider", "generic")
+
+	cfg, err := models.GetSoporteWebhookActivo()
+	if err != nil {
+		log.Printf("[SoporteWebhook] Sin config activa: %v", err)
+		return c.Status(200).JSON(fiber.Map{"ok": false, "error": "sin config"})
+	}
+
+	var emails []struct {
+		From     string `json:"from" form:"from"`
+		Subject  string `json:"subject" form:"subject"`
+		Text     string `json:"text" form:"text"`
+		Html     string `json:"html" form:"html"`
+		Sender   string `json:"sender" form:"sender"`
+		FromName string `json:"from_name" form:"from_name"`
+	}
+
+	switch provider {
+	case "sendgrid":
+		var sg struct {
+			From     string `json:"from"`
+			Subject  string `json:"subject"`
+			Text     string `json:"text"`
+			Html     string `json:"html"`
+			Sender   string `json:"sender"`
+			FromName string `json:"from_name"`
+		}
+		if err := c.BodyParser(&sg); err != nil {
+			return c.Status(200).JSON(fiber.Map{"ok": false, "error": "body inválido"})
+		}
+		emails = append(emails, struct {
+			From     string `json:"from" form:"from"`
+			Subject  string `json:"subject" form:"subject"`
+			Text     string `json:"text" form:"text"`
+			Html     string `json:"html" form:"html"`
+			Sender   string `json:"sender" form:"sender"`
+			FromName string `json:"from_name" form:"from_name"`
+		}{From: sg.From, Subject: sg.Subject, Text: sg.Text, Html: sg.Html, Sender: sg.Sender, FromName: sg.FromName})
+	case "mailgun":
+		var mg struct {
+			From        string `form:"from"`
+			Subject     string `form:"subject"`
+			Text        string `form:"body-plain"`
+			Html        string `form:"body-html"`
+			Sender      string `form:"sender"`
+			FromName    string `form:"from_name"`
+		}
+		if err := c.BodyParser(&mg); err != nil {
+			return c.Status(200).JSON(fiber.Map{"ok": false})
+		}
+		emails = append(emails, struct {
+			From     string `json:"from" form:"from"`
+			Subject  string `json:"subject" form:"subject"`
+			Text     string `json:"text" form:"text"`
+			Html     string `json:"html" form:"html"`
+			Sender   string `json:"sender" form:"sender"`
+			FromName string `json:"from_name" form:"from_name"`
+		}{
+			From: mg.From, Subject: mg.Subject, Text: mg.Text,
+			Html: mg.Html, Sender: mg.Sender, FromName: mg.FromName,
+		})
+	default:
+		var generic struct {
+			From     string `json:"from"`
+			Subject  string `json:"subject"`
+			Text     string `json:"text"`
+			Html     string `json:"html"`
+		}
+		if err := c.BodyParser(&generic); err != nil {
+			return c.Status(200).JSON(fiber.Map{"ok": false})
+		}
+		emails = append(emails, struct {
+			From     string `json:"from" form:"from"`
+			Subject  string `json:"subject" form:"subject"`
+			Text     string `json:"text" form:"text"`
+			Html     string `json:"html" form:"html"`
+			Sender   string `json:"sender" form:"sender"`
+			FromName string `json:"from_name" form:"from_name"`
+		}{
+			From: generic.From, Subject: generic.Subject, Text: generic.Text, Html: generic.Html,
+		})
+	}
+
+	for _, e := range emails {
+		if e.From == "" || e.Subject == "" {
+			continue
+		}
+		fromEmail := extractEmail(e.From)
+		fromName := e.FromName
+		if fromName == "" {
+			fromName = extractName(e.From)
+		}
+		if fromName == "" {
+			fromName = fromEmail
+		}
+
+		contenido := e.Text
+		if contenido == "" {
+			contenido = e.Html
+		}
+		contenido = strings.TrimSpace(contenido)
+		if len(contenido) > 5000 {
+			contenido = contenido[:5000]
+		}
+
+		ticket := &models.ProyectoTicket{
+			AutorNombre: fromName,
+			EmailFrom:   fromEmail,
+			Titulo:      e.Subject,
+			Descripcion: contenido,
+			Estado:      "abierto",
+			Origen:      "email",
+		}
+		if cfg.AsignarA != nil {
+			ticket.AsignadoA = cfg.AsignarA
+		}
+		if err := models.CreateProyectoTicket(ticket); err != nil {
+			log.Printf("[SoporteWebhook] Error creando ticket: %v", err)
+			continue
+		}
+		log.Printf("[SoporteWebhook] Ticket #%d creado desde email (%s): %s", ticket.ID, fromEmail, e.Subject)
+
+		// Notificar admin
+		services.SendSoporteNotifAdmin(ticket)
+
+		// Auto-responder
+		if cfg.ResponderAuto {
+			services.SendSoporteAutoRespuesta(ticket)
+		}
+	}
+
+	return c.Status(200).JSON(fiber.Map{"ok": true})
+}
+
+// ─── Asignar ticket a usuario ─────────────────────────────────────────────────
+// PUT /app/tickets/:ticketID/asignar
+
+func AsignarTicket(c *fiber.Ctx) error {
+	ticketID, _ := strconv.ParseUint(c.Params("ticketID"), 10, 32)
+	type Req struct{ AsignadoID uint `json:"asignado_id"` }
+	var req Req
+	if err := c.BodyParser(&req); err != nil {
+		return c.Status(400).JSON(fiber.Map{"error": "body inválido"})
+	}
+	if err := app.Http.Database.DB.Model(&models.ProyectoTicket{}).
+		Where("id = ?", ticketID).
+		Update("asignado_a", req.AsignadoID).Error; err != nil {
+		return c.Status(500).JSON(fiber.Map{"error": err.Error()})
+	}
+	return c.JSON(fiber.Map{"ok": true})
+}
+
+// ─── Listar admins para asignación ────────────────────────────────────────────
+// GET /app/tickets/admins
+
+func GetSoporteAdmins(c *fiber.Ctx) error {
+	var admins []models.Users
+	app.Http.Database.DB.Where("is_admin = ?", true).
+		Or("role_id IN (SELECT id FROM roles WHERE name = 'soporte' OR name = 'admin')").
+		Find(&admins)
+	type item struct {
+		ID   uint   `json:"id"`
+		Name string `json:"name"`
+	}
+	result := make([]item, 0)
+	for _, a := range admins {
+		result = append(result, item{ID: a.ID, Name: a.Name})
+	}
+	return c.JSON(result)
+}
+
+// ─── Configuración del webhook ────────────────────────────────────────────────
+
+func SoporteWebhookConfigPage(c *fiber.Ctx) error {
+	cfg, _ := models.GetSoporteWebhookActivo()
+	return c.Render("soporte_webhook", fiber.Map{
+		"user":    c.Locals("user"),
+		"modules": c.Locals("userModules"),
+		"cfg":     cfg,
+	}, "layouts/main")
+}
+
+func GetSoporteWebhookConfig(c *fiber.Ctx) error {
+	cfg, err := models.GetSoporteWebhookActivo()
+	if err != nil {
+		return c.JSON(fiber.Map{"data": nil})
+	}
+	return c.JSON(fiber.Map{"data": cfg})
+}
+
+func SaveSoporteWebhookConfig(c *fiber.Ctx) error {
+	type body struct {
+		ID         uint   `json:"id"`
+		Nombre     string `json:"nombre"`
+		Provider   string `json:"provider"`
+		ApiKey     string `json:"api_key"`
+		EmailDestino string `json:"email_destino"`
+		ResponderAuto bool `json:"responder_auto"`
+		MensajeAuto   string `json:"mensaje_auto"`
+		AsignarA    *uint  `json:"asignar_a"`
+	}
+	var b body
+	if err := c.BodyParser(&b); err != nil {
+		return c.Status(400).JSON(fiber.Map{"error": "body inválido"})
+	}
+	cfg := &models.SoporteWebhookConfig{
+		Nombre:       b.Nombre,
+		Provider:     b.Provider,
+		ApiKey:       b.ApiKey,
+		EmailDestino: b.EmailDestino,
+		ResponderAuto: b.ResponderAuto,
+		MensajeAuto:  b.MensajeAuto,
+		AsignarA:     b.AsignarA,
+		Activo:       true,
+	}
+	cfg.ID = b.ID
+	if err := models.SaveSoporteWebhookConfig(cfg); err != nil {
+		return c.Status(500).JSON(fiber.Map{"error": err.Error()})
+	}
+	return c.JSON(fiber.Map{"ok": true})
+}
+
+// ─── helpers ──────────────────────────────────────────────────────────────────
+
+func extractEmail(s string) string {
+	s = strings.TrimSpace(s)
+	if idx := strings.LastIndex(s, "<"); idx >= 0 {
+		s = s[idx+1:]
+	}
+	if idx := strings.LastIndex(s, ">"); idx >= 0 {
+		s = s[:idx]
+	}
+	return strings.TrimSpace(s)
+}
+
+func extractName(s string) string {
+	s = strings.TrimSpace(s)
+	if idx := strings.Index(s, "<"); idx >= 0 {
+		return strings.TrimSpace(s[:idx])
+	}
+	return ""
+}
diff --git a/rest/controllers/soporte_controller_test.go b/rest/controllers/soporte_controller_test.go
new file mode 100644
index 0000000..933ef7c
--- /dev/null
+++ b/rest/controllers/soporte_controller_test.go
@@ -0,0 +1,80 @@
+package controllers
+
+import (
+	"testing"
+)
+
+func TestExtractEmailSimple(t *testing.T) {
+	tests := []struct {
+		input string
+		want  string
+	}{
+		{"user@example.com", "user@example.com"},
+		{"<user@example.com>", "user@example.com"},
+		{"John Doe <john@example.com>", "john@example.com"},
+		{"\"John Doe\" <john@example.com>", "john@example.com"},
+		{"  spaced@example.com  ", "spaced@example.com"},
+		{"", ""},
+		{"<onlybrackets>", "onlybrackets"},
+	}
+	for _, tt := range tests {
+		got := extractEmail(tt.input)
+		if got != tt.want {
+			t.Errorf("extractEmail(%q) = %q, want %q", tt.input, got, tt.want)
+		}
+	}
+}
+
+func TestExtractNameSimple(t *testing.T) {
+	tests := []struct {
+		input string
+		want  string
+	}{
+		{"John Doe <john@example.com>", "John Doe"},
+		{"<user@example.com>", ""},
+		{"user@example.com", ""},
+		{"  Spaces Here <spaces@example.com>", "Spaces Here"},
+		{"\"Quoted Name\" <q@example.com>", "\"Quoted Name\""},
+		{"", ""},
+	}
+	for _, tt := range tests {
+		got := extractName(tt.input)
+		if got != tt.want {
+			t.Errorf("extractName(%q) = %q, want %q", tt.input, got, tt.want)
+		}
+	}
+}
+
+func TestExtractEmailRealWorld(t *testing.T) {
+	inputs := []struct {
+		full string
+		mail string
+		name string
+	}{
+		{"María López <maria@example.com>", "maria@example.com", "María López"},
+		{"soporte@u-s.app", "soporte@u-s.app", ""},
+		{"Cliente Final <cliente+tag@dominio.co>", "cliente+tag@dominio.co", "Cliente Final"},
+		{"", "", ""},
+	}
+	for _, tt := range inputs {
+		gotMail := extractEmail(tt.full)
+		gotName := extractName(tt.full)
+		if gotMail != tt.mail {
+			t.Errorf("extractEmail(%q) = %q, want %q", tt.full, gotMail, tt.mail)
+		}
+		if gotName != tt.name {
+			t.Errorf("extractName(%q) = %q, want %q", tt.full, gotName, tt.name)
+		}
+	}
+}
+
+func TestExtractEmailEdgeCases(t *testing.T) {
+	// Formato RFC 5322 con nombre y ángulos
+	if got := extractEmail("a<b@c.com>"); got != "b@c.com" {
+		t.Errorf("extractEmail('a<b@c.com>') = %q, want 'b@c.com'", got)
+	}
+	// Múltiples brackets — usa el último par
+	if got := extractEmail("<a><b@c.com>"); got != "b@c.com" {
+		t.Errorf("extractEmail('<a><b@c.com>') = %q, want 'b@c.com'", got)
+	}
+}
diff --git a/rest/routes/publicas.go b/rest/routes/publicas.go
index bedf8d7..04b5544 100755
--- a/rest/routes/publicas.go
+++ b/rest/routes/publicas.go
@@ -76,6 +76,10 @@ func RutasPublicas(web fiber.Router) {
 	// ─── Página de estado del sistema (Atlassian Statuspage) ────────────────
 	web.Get("/status", controllers.StatusPage)
 
+	// ─── Webhook de soporte (correo entrante) ────────────────────────────────
+	// Configurar en SendGrid/Mailgun: POST {HOST}/webhooks/soporte/{provider}
+	web.Post("/webhooks/soporte/:provider", controllers.SoporteWebhook)
+
 	// ─── Landing Generator (acceso con X-Landing-Secret) ─────────────────────
 	// Rutas públicas (sin secret) para lectura de preview y polling
 	web.Get("/landing/preview/:token", apiControllers.LandingGetSession)
diff --git a/rest/routes/user.go b/rest/routes/user.go
index 03eadf4..c2ea6c0 100755
--- a/rest/routes/user.go
+++ b/rest/routes/user.go
@@ -454,6 +454,13 @@ func UserRoutes(app fiber.Router) {
 	protected.Get("/tickets/data", controllers.GetAllTicketsAdmin)
 	protected.Put("/tickets/:ticketID/estado", controllers.UpdateTicketEstadoAdmin)
 	protected.Post("/tickets/:ticketID/mensaje", controllers.AdminResponderTicket)
+	protected.Put("/tickets/:ticketID/asignar", controllers.AsignarTicket)
+	protected.Get("/tickets/admins", controllers.GetSoporteAdmins)
+
+	// Configuración webhook de soporte
+	protected.Get("/soporte/webhook", middlewares.MenuMiddleware, controllers.SoporteWebhookConfigPage)
+	protected.Get("/soporte/webhook/data", controllers.GetSoporteWebhookConfig)
+	protected.Post("/soporte/webhook", controllers.SaveSoporteWebhookConfig)
 
 	// Configuración de notificaciones
 	protected.Get("/notif-config", middlewares.MenuMiddleware, controllers.NotifConfigIndex)

From 1d7bfd35961d4a1bce37db94b0f4596e2959a0e4 Mon Sep 17 00:00:00 2001
From: Lizandro Guarnizo <77708265+lizandrogd@users.noreply.github.com>
Date: Thu, 30 Jul 2026 09:19:24 -0500
Subject: [PATCH 2/4] feat: multi-query/upload .sql en query runner + selector
 BD por rol

---
 pkg/models/roles.go                         |  11 +-
 pkg/models/users.go                         |   2 +-
 resources/views/query_runner.html           | 138 +++++++++++++++++++-
 resources/views/roles.html                  |  49 ++++++-
 rest/controllers/query_runner_controller.go | 120 ++++++++++++++++-
 rest/controllers/roles_controller.go        |  29 +++-
 rest/routes/hermes.go                       |   1 +
 rest/routes/user.go                         |   1 +
 8 files changed, 337 insertions(+), 14 deletions(-)

diff --git a/pkg/models/roles.go b/pkg/models/roles.go
index 50c93a5..8e1159d 100755
--- a/pkg/models/roles.go
+++ b/pkg/models/roles.go
@@ -17,6 +17,7 @@ type Roles struct {
 	EsPortalCliente bool         `json:"es_portal_cliente" gorm:"column:es_portal_cliente;default:false"`
 	EsPortalPartner bool         `json:"es_portal_partner" gorm:"column:es_portal_partner;default:false"`
 	Submodules      []Submodules `json:"submodules" gorm:"many2many:roles_submodules"`
+	ConxDBs         []ConxDb     `json:"conx_dbs" gorm:"many2many:roles_conx_db"`
 }
 
 // TableName overrides the table name used by Modules to `modules`
@@ -41,7 +42,7 @@ func AllRoles(limit, offset int, search string) ([]Roles, int64, error) {
 	}
 
 	// Obtener los módulos con paginación
-	if err := db.Order("id DESC").Limit(limit).Offset(offset).Preload("Submodules").Find(&roles).Error; err != nil {
+	if err := db.Order("id DESC").Limit(limit).Offset(offset).Preload("Submodules").Preload("ConxDBs").Find(&roles).Error; err != nil {
 		return nil, 0, err
 	}
 
@@ -62,6 +63,14 @@ func AllRolesSelect() ([]Roles, error) {
 
 // CreateModule creates a new rol
 func CreateRole(role Roles) error {
+	var conxDbs []ConxDb
+	for _, db := range role.ConxDBs {
+		var found ConxDb
+		if err := app.Http.Database.DB.First(&found, db.ID).Error; err == nil {
+			conxDbs = append(conxDbs, found)
+		}
+	}
+	role.ConxDBs = conxDbs
 	if err := app.Http.Database.DB.Create(&role).Error; err != nil {
 		return err
 	}
diff --git a/pkg/models/users.go b/pkg/models/users.go
index 5586003..97523b9 100755
--- a/pkg/models/users.go
+++ b/pkg/models/users.go
@@ -175,7 +175,7 @@ func FindUserByID(id interface{}) (*Users, error) {
 	db := app.Http.Database.DB.Model(&Users{})
 
 	// Buscar el usuario por ID
-	if err := db.Where("id = ?", id).Preload("Role.Submodules.Module").First(&user).Error; err != nil {
+	if err := db.Where("id = ?", id).Preload("Role.Submodules.Module").Preload("Role.ConxDBs").First(&user).Error; err != nil {
 		// Manejar el error si el registro no se encuentra
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, fmt.Errorf("usuario no encontrado con ID: %d", id)
diff --git a/resources/views/query_runner.html b/resources/views/query_runner.html
index 4d8d176..74ee195 100644
--- a/resources/views/query_runner.html
+++ b/resources/views/query_runner.html
@@ -136,6 +136,19 @@
                     Limpiar
                 </button>
 
+                <!-- Batch mode toggle -->
+                <button @click="batchMode = !batchMode; if(!batchMode) batchResults = []"
+                    class="px-3 py-1.5 text-xs border rounded transition"
+                    :class="batchMode ? 'bg-amber-500 text-white border-amber-500' : 'hover:bg-gray-50'">
+                    <span x-text="batchMode ? '📚 Lote ON' : '📄 Lote OFF'"></span>
+                </button>
+
+                <!-- Subir .sql -->
+                <label x-show="!isMongo && !isRedis" class="px-3 py-1.5 text-xs border rounded hover:bg-gray-50 cursor-pointer transition">
+                    📁 Subir .sql
+                    <input type="file" accept=".sql" @change="uploadSQLFile($event)" class="hidden">
+                </label>
+
                 <!-- Botón AI -->
                 <button @click="askAI()" :disabled="aiLoading || !sqlText.trim()"
                     class="flex items-center gap-1 px-3 py-1.5 text-xs rounded transition disabled:opacity-40"
@@ -555,13 +568,68 @@
 
                 <!-- ── TAB: Resultados ── -->
                 <div x-show="activeTab === 'results'" class="flex-1 overflow-auto border rounded-lg">
-                    <div x-show="results.length === 0 && !loadingQuery" class="flex flex-col items-center justify-center h-40 text-gray-400 text-sm gap-2">
+                    <!-- Sin resultados -->
+                    <div x-show="!batchMode && results.length === 0 && !loadingQuery" class="flex flex-col items-center justify-center h-40 text-gray-400 text-sm gap-2">
                         <svg class="w-10 h-10 opacity-30" fill="none" stroke="currentColor" stroke-width="1.5" viewBox="0 0 24 24">
                             <path stroke-linecap="round" stroke-linejoin="round" d="M20.25 6.375c0 2.278-3.694 4.125-8.25 4.125S3.75 8.653 3.75 6.375m16.5 0c0-2.278-3.694-4.125-8.25-4.125S3.75 4.097 3.75 6.375m16.5 0v11.25c0 2.278-3.694 4.125-8.25 4.125s-8.25-1.847-8.25-4.125V6.375m16.5 5.625c0 2.278-3.694 4.125-8.25 4.125s-8.25-1.847-8.25-4.125"/>
                         </svg>
                         <span>Sin resultados. Ejecuta una consulta.</span>
                     </div>
-                    <table x-show="results.length > 0" class="table-auto w-full text-xs">
+
+                    <!-- Batch results tabs -->
+                    <div x-show="batchMode && batchResults.length > 0" class="flex flex-col h-full">
+                        <div class="flex items-center gap-1 px-2 py-1.5 border-b bg-gray-50 sticky top-0 overflow-x-auto shrink-0">
+                            <template x-for="(br, i) in batchResults" :key="i">
+                                <button @click="batchActiveIdx = i"
+                                    class="px-2.5 py-1 text-[10px] rounded whitespace-nowrap font-mono transition flex items-center gap-1"
+                                    :class="batchActiveIdx === i
+                                        ? (br.status === 'error' ? 'bg-red-100 text-red-700 border border-red-200' : 'bg-[#8eb02f] text-white')
+                                        : (br.status === 'error' ? 'bg-red-50 text-red-500 border border-red-100' : 'bg-white text-gray-600 border border-gray-200 hover:bg-gray-50')">
+                                    <span x-text="'#' + (i+1)"></span>
+                                    <span class="truncate max-w-[100px]" x-text="br.sql.substring(0, 30)"></span>
+                                    <span x-show="br.status === 'ok'" class="text-green-500">✓</span>
+                                    <span x-show="br.status === 'error'" class="text-red-500">✗</span>
+                                </button>
+                            </template>
+                        </div>
+
+                        <!-- Resultado activo del batch -->
+                        <template x-for="(br, i) in batchResults" :key="i">
+                            <div x-show="batchActiveIdx === i" class="flex-1 overflow-auto">
+                                <div x-show="br.status === 'error'" class="p-4 text-xs text-red-600 bg-red-50 font-mono" x-text="br.error"></div>
+                                <div x-show="br.status === 'ok' && (!br.columns || br.columns.length === 0)" class="p-4 text-xs text-green-700 bg-green-50">
+                                    ✅ Consulta ejecutada — <span x-text="br.rows + ' filas afectadas'"></span> · <span x-text="br.duration"></span>
+                                </div>
+                                <table x-show="br.status === 'ok' && br.columns && br.columns.length > 0" class="table-auto w-full text-xs">
+                                    <thead class="sticky top-0 bg-gray-50 z-10">
+                                        <tr>
+                                            <th class="py-2 px-3 border-b text-left font-semibold text-gray-500 w-10">#</th>
+                                            <template x-for="col in br.columns" :key="col">
+                                                <th class="py-2 px-3 border-b text-left font-semibold text-gray-600 whitespace-nowrap" x-text="col"></th>
+                                            </template>
+                                        </tr>
+                                    </thead>
+                                    <tbody class="divide-y divide-gray-100">
+                                        <template x-for="(row, idx) in br.data" :key="idx">
+                                            <tr class="hover:bg-gray-50">
+                                                <td class="py-2 px-3 text-gray-400 select-none" x-text="idx+1"></td>
+                                                <template x-for="col in br.columns" :key="col">
+                                                    <td class="py-2 px-3 font-mono max-w-xs truncate" :title="nullStr(row[col])" x-text="nullStr(row[col])"></td>
+                                                </template>
+                                            </tr>
+                                        </template>
+                                    </tbody>
+                                </table>
+                                <div x-show="br.status === 'ok'" class="px-3 py-1.5 text-[10px] text-gray-400 border-t bg-gray-50">
+                                    <span x-text="(br.data || []).length + ' filas'"></span> ·
+                                    <span x-text="br.duration"></span>
+                                </div>
+                            </div>
+                        </template>
+                    </div>
+
+                    <!-- Single results table (modo normal) -->
+                    <table x-show="!batchMode && results.length > 0" class="table-auto w-full text-xs">
                         <thead class="sticky top-0 bg-gray-50 z-10">
                             <tr>
                                 <th class="py-2 px-3 border-b text-left font-semibold text-gray-500 w-10">#</th>
@@ -704,6 +772,9 @@ document.addEventListener('alpine:init', () => {
         results: [],
         history: [],
         activeTab: 'results',
+        batchMode: false,
+        batchResults: [],
+        batchActiveIdx: 0,
         statusMsg: '',
         statusOk: true,
         testMsg: '',
@@ -1374,6 +1445,10 @@ document.addEventListener('alpine:init', () => {
 
         async runQuery() {
             if (!this.selectedConxId || !this.sqlText.trim()) return;
+            if (this.batchMode) {
+                await this.runBatch();
+                return;
+            }
             this.loadingQuery = true;
             this.statusMsg = '';
             this.results = [];
@@ -1407,6 +1482,65 @@ document.addEventListener('alpine:init', () => {
             await this.loadHistory();
         },
 
+        // ── Batch mode ──────────────────────────────────────────────
+        extractSQLStatements(text) {
+            // Split by semicolons, trim whitespace, remove empty
+            return text
+                .split(';')
+                .map(s => s.trim())
+                .filter(s => s.length > 0 && !s.toUpperCase().startsWith('--') && !s.startsWith('#'));
+        },
+
+        uploadSQLFile(event) {
+            const file = event.target.files[0];
+            if (!file) return;
+            const reader = new FileReader();
+            reader.onload = (e) => {
+                const content = e.target.result;
+                this.sqlText = content;
+                this.batchMode = true;
+                this.showToast(`📁 Archivo "${file.name}" cargado (${(content.length / 1024).toFixed(1)} KB)`);
+            };
+            reader.readAsText(file);
+            // Reset input so re-selecting same file triggers change
+            event.target.value = '';
+        },
+
+        async runBatch() {
+            if (!this.selectedConxId) return;
+            const sqls = this.extractSQLStatements(this.sqlText);
+            if (sqls.length === 0) {
+                this.showToast('No se encontraron sentencias SQL válidas', 'error');
+                return;
+            }
+            this.loadingQuery = true;
+            this.statusMsg = '';
+            this.batchResults = [];
+            this.batchActiveIdx = 0;
+            this.activeTab = 'results';
+            try {
+                const formData = new FormData();
+                formData.append('conx_db_id', this.selectedConxId);
+                formData.append('database', this.selectedDb || '');
+                sqls.forEach((sql, i) => formData.append('sqls[]', sql));
+                const res = await axios.post('/app/query-runner/run-batch', formData, {
+                    headers: { 'Content-Type': 'multipart/form-data' }
+                });
+                this.batchResults = res.data.results || [];
+                const okCount = this.batchResults.filter(r => r.status === 'ok').length;
+                const errCount = this.batchResults.filter(r => r.status === 'error').length;
+                this.statusOk = errCount === 0;
+                this.statusMsg = `✓ ${okCount} consultas ejecutadas, ${errCount} con error — ${res.data.duration || ''}`;
+            } catch (e) {
+                this.statusOk = false;
+                this.statusMsg = '✗ ' + (e.response?.data?.error || 'Error al ejecutar batch');
+                if (e.response?.data?.results) {
+                    this.batchResults = e.response.data.results;
+                }
+            }
+            this.loadingQuery = false;
+        },
+
         async loadHistory() {
             if (!this.selectedConxId) return;
             try {
diff --git a/resources/views/roles.html b/resources/views/roles.html
index a7900ef..3c2dd72 100755
--- a/resources/views/roles.html
+++ b/resources/views/roles.html
@@ -120,6 +120,7 @@
                                     Name = registro.name;
                                     Description = registro.description;
                                     Submodules = [...registro.submodules];
+                                    ConxDBs = [...(registro.conx_dbs || [])];
                                     EsPortalCliente = registro.es_portal_cliente || false;
                                     EsPortalPartner = registro.es_portal_partner || false;
                                     HomeUrl = registro.home_url || '';
@@ -254,6 +255,20 @@
                         </template>
                     </select>
                 </div>
+                <div class="mt-4 p-3 border rounded-md bg-slate-50">
+                    <p class="font-semibold text-sm mb-2">Bases de datos permitidas (Query Runner)</p>
+                    <div class="grid grid-cols-2 gap-1 max-h-32 overflow-y-auto">
+                        <template x-for="con in conexiones" :key="con.ID">
+                            <div>
+                                <input type="checkbox" :value="con.ID" :id="'edit-conxdb-' + con.ID"
+                                    :checked="ConxDBs.some(c => c.ID === con.ID)"
+                                    @change="if($event.target.checked) { ConxDBs.push(con) } else { ConxDBs = ConxDBs.filter(c => c.ID !== con.ID) }"
+                                    class="mr-2">
+                                <label :for="'edit-conxdb-' + con.ID" x-text="con.nombre" class="text-xs"></label>
+                            </div>
+                        </template>
+                    </div>
+                </div>
                 <div class="mt-4 flex justify-between">
                     <button type="submit" class="bg-[#8eb02f] text-white px-4 py-2 rounded">Guardar Cambios</button>
                     <button type="button" class="bg-gray-600 text-white px-4 py-2 rounded"
@@ -326,6 +341,20 @@
                         </template>
                     </select>
                 </div>
+                <div class="mt-4 p-3 border rounded-md bg-slate-50">
+                    <p class="font-semibold text-sm mb-2">Bases de datos permitidas (Query Runner)</p>
+                    <div class="grid grid-cols-2 gap-1 max-h-32 overflow-y-auto">
+                        <template x-for="con in conexiones" :key="con.ID">
+                            <div>
+                                <input type="checkbox" :value="con.ID" :id="'add-conxdb-' + con.ID"
+                                    :checked="newConxDBs.some(c => c.ID === con.ID)"
+                                    @change="if($event.target.checked) { newConxDBs.push(con) } else { newConxDBs = newConxDBs.filter(c => c.ID !== con.ID) }"
+                                    class="mr-2">
+                                <label :for="'add-conxdb-' + con.ID" x-text="con.nombre" class="text-xs"></label>
+                            </div>
+                        </template>
+                    </div>
+                </div>
                 <div class="mt-4 flex justify-between">
                     <button type="submit" class="bg-[#8eb02f] text-white px-4 py-2 rounded">Guardar</button>
                     <button type="button" class="bg-gray-600 text-white px-4 py-2 rounded"
@@ -378,6 +407,9 @@
 
                 sinregistro: '',
                 modules: [],
+                conexiones: [],
+                ConxDBs: [],
+                newConxDBs: [],
 
 
 
@@ -405,10 +437,11 @@
                     fetch(`/app/loadroles?page=${page}${search}`)
                         .then(response => response.json())
                         .then(data => {
-                            this.totalRecords = data.total; // Establece el total de registros aquí
+                            this.totalRecords = data.total;
                             this.modulos = data.modules;
-                            this.registros = data.roles; // Asignar
-                            this.totalPages = data.totalPages; // Asignar total de páginas
+                            this.registros = data.roles;
+                            this.conexiones = data.conexiones || [];
+                            this.totalPages = data.totalPages;
                             this.createPagination(this.totalPages, page);
                             if (data.roles.length === 0) {
                                 this.sinregistro = true;
@@ -496,7 +529,8 @@
                         es_portal_cliente: this.newEsPortalCliente,
                         es_portal_partner: this.newEsPortalPartner,
                         home_url: this.newHomeUrl,
-                        submodules: selectedSubmodules.flatMap(modulo => modulo.submodules) 
+                        submodules: selectedSubmodules.flatMap(modulo => modulo.submodules),
+                        conx_dbs: this.newConxDBs
                     };
 
                     fetch('/app/roles', {
@@ -510,8 +544,9 @@
                             this.newDescription = '';
                             this.newEsPortalCliente = false;
                             this.newEsPortalPartner = false;
+                            this.newConxDBs = [];
                             this.modulos.forEach(modulo => {
-                                modulo.submodules.forEach(submodulo => submodulo.checked = false); // Reset checkboxes
+                                modulo.submodules.forEach(submodulo => submodulo.checked = false);
                             });
 
                             this.closeModal();
@@ -557,7 +592,8 @@
                             es_portal_cliente: this.EsPortalCliente,
                             es_portal_partner: this.EsPortalPartner,
                             home_url: this.HomeUrl,
-                            submodules: this.submodulos
+                            submodules: this.submodulos,
+                            conx_dbs: this.ConxDBs
                         })
                     })
                         .then(response => response.json())
@@ -567,6 +603,7 @@
                             this.EsPortalCliente = false;
                             this.EsPortalPartner = false;
                             this.submodulos = [];
+                            this.ConxDBs = [];
                             this.modulos.forEach(modulo => {
                                 modulo.submodules.forEach(submodulo => {
                                     submodulo.checked = false; 
diff --git a/rest/controllers/query_runner_controller.go b/rest/controllers/query_runner_controller.go
index 70e71f5..70417c2 100644
--- a/rest/controllers/query_runner_controller.go
+++ b/rest/controllers/query_runner_controller.go
@@ -14,6 +14,7 @@ import (
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/sujit-baniya/fiber-boilerplate/app"
+	"github.com/sujit-baniya/fiber-boilerplate/pkg/auth"
 	"github.com/sujit-baniya/fiber-boilerplate/pkg/models"
 	"github.com/sujit-baniya/fiber-boilerplate/pkg/services"
 )
@@ -42,10 +43,29 @@ func QueryRunnerPage(c *fiber.Ctx) error {
 	return nil
 }
 
-// GetConxDbList devuelve todas las conexiones DB disponibles (para el selector).
+// GetConxDbList devuelve las conexiones DB disponibles (según el rol del usuario).
+// Para API calls (Hermes) sin sesión retorna todas.
 func GetConxDbList(c *fiber.Ctx) error {
+	user, err := auth.User(c)
+	if err != nil || user == nil {
+		var all []models.ConxDb
+		app.Http.Database.DB.Preload("TipoDb").Preload("Servidor").Find(&all)
+		return c.JSON(fiber.Map{"data": all})
+	}
+
 	var items []models.ConxDb
-	app.Http.Database.DB.Preload("TipoDb").Preload("Servidor").Find(&items)
+	if user.IsAdmin {
+		app.Http.Database.DB.Preload("TipoDb").Preload("Servidor").Find(&items)
+	} else {
+		ids := make([]uint, 0)
+		for _, db := range user.Role.ConxDBs {
+			ids = append(ids, db.ID)
+		}
+		if len(ids) == 0 {
+			return c.JSON(fiber.Map{"data": []models.ConxDb{}})
+		}
+		app.Http.Database.DB.Preload("TipoDb").Preload("Servidor").Where("id IN ?", ids).Find(&items)
+	}
 	return c.JSON(fiber.Map{"data": items})
 }
 
@@ -103,6 +123,102 @@ func RunQuery(c *fiber.Ctx) error {
 	return c.JSON(result)
 }
 
+// RunBatchQuery ejecuta múltiples consultas en lote.
+// POST /app/query-runner/run-batch
+// Body: { conx_db_id, database, sqls: ["...", "..."] }
+// También soporta multipart/form-data con file .sql
+func RunBatchQuery(c *fiber.Ctx) error {
+	conxDbIDStr := c.FormValue("conx_db_id", c.Query("conx_db_id"))
+	database := c.FormValue("database", c.Query("database"))
+
+	// Obtener statements del body o del archivo subido
+	var statements []string
+
+	// 1. Intentar leer archivo .sql subido
+	if file, err := c.FormFile("file"); err == nil {
+		f, err := file.Open()
+		if err == nil {
+			defer f.Close()
+			buf := new(bytes.Buffer)
+			buf.ReadFrom(f)
+			content := buf.String()
+			// Dividir por ;
+			for _, stmt := range strings.Split(content, ";") {
+				stmt = strings.TrimSpace(stmt)
+				if stmt != "" {
+					statements = append(statements, stmt)
+				}
+			}
+		}
+	}
+
+	// 2. Si no hay archivo, leer del body JSON
+	if len(statements) == 0 {
+		var body struct {
+			ConxDbID uint     `json:"conx_db_id"`
+			Database string   `json:"database"`
+			SQLs     []string `json:"sqls"`
+		}
+		if err := c.BodyParser(&body); err == nil {
+			conxDbIDStr = strconv.Itoa(int(body.ConxDbID))
+			if body.Database != "" {
+				database = body.Database
+			}
+			for _, s := range body.SQLs {
+				s = strings.TrimSpace(s)
+				if s != "" {
+					statements = append(statements, s)
+				}
+			}
+		}
+	}
+
+	if len(statements) == 0 {
+		return c.Status(400).JSON(fiber.Map{"error": "No hay consultas para ejecutar. Envía sqls[] o un archivo .sql"})
+	}
+
+	conx, err := loadConxDb(conxDbIDStr)
+	if err != nil {
+		return c.Status(400).JSON(fiber.Map{"error": err.Error()})
+	}
+
+	type batchResult struct {
+		Index    int         `json:"index"`
+		SQL      string      `json:"sql"`
+		Status   string      `json:"status"`
+		Duration string      `json:"duration"`
+		Rows     int         `json:"rows"`
+		Columns  []string    `json:"columns,omitempty"`
+		Data     []fiber.Map `json:"data,omitempty"`
+		Error    string      `json:"error,omitempty"`
+	}
+	results := make([]batchResult, 0, len(statements))
+
+	for i, stmt := range statements {
+		r := services.ExecuteSQL(conx, database, stmt)
+		br := batchResult{
+			Index:    i,
+			SQL:      stmt,
+			Status:   "ok",
+			Duration: fmt.Sprintf("%dms", r.DurationMs),
+			Rows:     r.RowCount,
+		}
+		if r.Error != "" {
+			br.Status = "error"
+			br.Error = r.Error
+		} else {
+			br.Columns = r.Columns
+			br.Data = make([]fiber.Map, len(r.Rows))
+			for j, row := range r.Rows {
+				br.Data[j] = fiber.Map(row)
+			}
+		}
+		results = append(results, br)
+	}
+
+	return c.JSON(fiber.Map{"results": results, "total": len(results)})
+}
+
 // TestConnection verifica que la conexión funciona.
 // GET /app/query-runner/test?conx_db_id=1
 func TestConnection(c *fiber.Ctx) error {
diff --git a/rest/controllers/roles_controller.go b/rest/controllers/roles_controller.go
index 1af57ad..d26074a 100755
--- a/rest/controllers/roles_controller.go
+++ b/rest/controllers/roles_controller.go
@@ -69,6 +69,12 @@ func GetRoles(c *fiber.Ctx) error {
 	// 	})
 	// }
 
+	// Obtener todas las conexiones disponibles para asignar a roles
+	conexiones, err := models.GetConxDbSelect("")
+	if err != nil {
+		conexiones = []models.ConxDb{}
+	}
+
 	// Calcular el total de páginas
 	totalPages := int(math.Ceil(float64(total) / float64(limit)))
 
@@ -76,6 +82,7 @@ func GetRoles(c *fiber.Ctx) error {
 	return c.JSON(fiber.Map{
 		"roles":      roles,
 		"modules":    modules,
+		"conexiones": conexiones,
 		"total":      total,      // Total de  disponibles
 		"totalPages": totalPages, // Total de páginas
 		"page":       page,       // Página actual
@@ -128,10 +135,18 @@ func UpdateRole(c *fiber.Ctx) error {
 			newSubmodules = append(newSubmodules, newSubmodule)
 		}
 	}
-
-	// Asignar los nuevos submódulos al rol
 	m.Submodules = newSubmodules
 
+	// Agregar las nuevas conexiones a BD
+	var newConxDBs []models.ConxDb
+	for _, db := range m.ConxDBs {
+		var found models.ConxDb
+		if err := app.Http.Database.DB.First(&found, db.ID).Error; err == nil {
+			newConxDBs = append(newConxDBs, found)
+		}
+	}
+	m.ConxDBs = newConxDBs
+
 	// Actualizar el rol en la base de datos
 	if err := app.Http.Database.DB.Session(&gorm.Session{FullSaveAssociations: true}).Save(&m).Error; err != nil {
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
@@ -158,6 +173,16 @@ func CreateRole(c *fiber.Ctx) error {
 		})
 	}
 
+	// Look up ConxDBs by ID
+	var conxDbs []models.ConxDb
+	for _, db := range m.ConxDBs {
+		var found models.ConxDb
+		if err := app.Http.Database.DB.First(&found, db.ID).Error; err == nil {
+			conxDbs = append(conxDbs, found)
+		}
+	}
+	m.ConxDBs = conxDbs
+
 	// Create the role in the database
 	if err := models.CreateRole(m); err != nil {
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
diff --git a/rest/routes/hermes.go b/rest/routes/hermes.go
index 3f93bdc..faf25f5 100644
--- a/rest/routes/hermes.go
+++ b/rest/routes/hermes.go
@@ -332,6 +332,7 @@ func AdminApiRoutes(api fiber.Router) {
 	h.Get("/query-runner/tables", controllers.GetTables)
 	h.Get("/query-runner/test", controllers.TestConnection)
 	h.Post("/query-runner/run", controllers.RunQuery)
+	h.Post("/query-runner/run-batch", controllers.RunBatchQuery)
 	h.Get("/query-runner/history", controllers.GetHistory)
 	h.Get("/query-runner/columns", controllers.GetTableColumnsHandler)
 
diff --git a/rest/routes/user.go b/rest/routes/user.go
index c2ea6c0..7c16293 100755
--- a/rest/routes/user.go
+++ b/rest/routes/user.go
@@ -139,6 +139,7 @@ func UserRoutes(app fiber.Router) {
 	protected.Get("/query-runner/tables", controllers.GetTables)
 	protected.Get("/query-runner/test", controllers.TestConnection)
 	protected.Post("/query-runner/run", controllers.RunQuery)
+	protected.Post("/query-runner/run-batch", controllers.RunBatchQuery)
 	protected.Get("/query-runner/history", controllers.GetHistory)
 	protected.Delete("/query-runner/history", controllers.ClearHistory)
 	protected.Post("/query-runner/export/csv", controllers.ExportCSV)

From 333fe03de0693dbbdc7c9ece7193f0d7bc602a46 Mon Sep 17 00:00:00 2001
From: Lizandro Guarnizo <77708265+lizandrogd@users.noreply.github.com>
Date: Thu, 30 Jul 2026 11:02:19 -0500
Subject: [PATCH 3/4] fix: historial por usuario (user_id en query_history)

---
 pkg/models/query_history.go                 | 24 +++++++--
 pkg/services/query_runner_service.go        | 55 +++++++++++++--------
 rest/controllers/query_runner_controller.go | 51 ++++++++++++++++---
 3 files changed, 98 insertions(+), 32 deletions(-)

diff --git a/pkg/models/query_history.go b/pkg/models/query_history.go
index 57a88b8..6505782 100644
--- a/pkg/models/query_history.go
+++ b/pkg/models/query_history.go
@@ -12,6 +12,7 @@ type QueryHistory struct {
 	gorm.Model
 	ConxDbID   uint      `json:"conx_db_id" gorm:"column:conx_db_id;index"`
 	ConxDb     ConxDb    `json:"conx_db" gorm:"foreignKey:ConxDbID"`
+	UserID     uint      `json:"user_id" gorm:"column:user_id;index;default:0"`
 	SQL        string    `json:"sql" gorm:"column:sql;type:text"`
 	Status     string    `json:"status" gorm:"column:status"`         // ok | error
 	ErrorMsg   string    `json:"error_msg" gorm:"column:error_msg;type:text"`
@@ -29,8 +30,23 @@ func SaveQueryHistory(h QueryHistory) error {
 	return app.Http.Database.DB.Create(&h).Error
 }
 
-// GetQueryHistory devuelve el historial de una conexión con paginación.
-func GetQueryHistory(conxDbID uint, limit, offset int) ([]QueryHistory, int64, error) {
+// GetQueryHistory devuelve el historial de una conexión con paginación, filtrado por usuario.
+func GetQueryHistory(conxDbID, userID uint, limit, offset int) ([]QueryHistory, int64, error) {
+	var items []QueryHistory
+	var total int64
+	db := app.Http.Database.DB.Model(&QueryHistory{}).Where("conx_db_id = ? AND user_id = ?", conxDbID, userID)
+	db.Count(&total)
+	err := db.Order("executed_at DESC").Limit(limit).Offset(offset).Find(&items).Error
+	return items, total, err
+}
+
+// DeleteQueryHistory elimina el historial de una conexión para un usuario.
+func DeleteQueryHistory(conxDbID, userID uint) error {
+	return app.Http.Database.DB.Where("conx_db_id = ? AND user_id = ?", conxDbID, userID).Delete(&QueryHistory{}).Error
+}
+
+// GetQueryHistoryAdmin devuelve todo el historial de una conexión (solo admin).
+func GetQueryHistoryAdmin(conxDbID uint, limit, offset int) ([]QueryHistory, int64, error) {
 	var items []QueryHistory
 	var total int64
 	db := app.Http.Database.DB.Model(&QueryHistory{}).Where("conx_db_id = ?", conxDbID)
@@ -39,7 +55,7 @@ func GetQueryHistory(conxDbID uint, limit, offset int) ([]QueryHistory, int64, e
 	return items, total, err
 }
 
-// DeleteQueryHistory elimina todo el historial de una conexión.
-func DeleteQueryHistory(conxDbID uint) error {
+// DeleteQueryHistoryAdmin elimina todo el historial de una conexión (solo admin).
+func DeleteQueryHistoryAdmin(conxDbID uint) error {
 	return app.Http.Database.DB.Where("conx_db_id = ?", conxDbID).Delete(&QueryHistory{}).Error
 }
diff --git a/pkg/services/query_runner_service.go b/pkg/services/query_runner_service.go
index 3ec5bba..c200d6b 100644
--- a/pkg/services/query_runner_service.go
+++ b/pkg/services/query_runner_service.go
@@ -82,18 +82,22 @@ func openDynamicDB(c models.ConxDb) (*sql.DB, error) {
 
 // ExecuteSQL ejecuta SQL arbitrario contra la conexión y devuelve QueryResult.
 // También guarda en query_history.
-func ExecuteSQL(conx models.ConxDb, database, sqlText string) QueryResult {
+func ExecuteSQL(conx models.ConxDb, database, sqlText string, userID ...uint) QueryResult {
+	uid := uint(0)
+	if len(userID) > 0 {
+		uid = userID[0]
+	}
 	if isMongoDriver(strings.ToLower(conx.TipoDb.Nombre)) {
-		return mongoExecuteSQL(conx, database, sqlText)
+		return mongoExecuteSQL(conx, database, sqlText, uid)
 	}
 	if isRedisDriver(strings.ToLower(conx.TipoDb.Nombre)) {
-		return redisExecuteCommand(conx, database, sqlText)
+		return redisExecuteCommand(conx, database, sqlText, uid)
 	}
 	start := time.Now()
 
 	db, err := openDynamicDB(conx)
 	if err != nil {
-		saveHistory(conx.ID, sqlText, "error", err.Error(), 0, time.Since(start).Milliseconds())
+		saveHistory(conx.ID, uid, sqlText, "error", err.Error(), 0, time.Since(start).Milliseconds())
 		return QueryResult{Error: err.Error()}
 	}
 	defer db.Close()
@@ -110,7 +114,7 @@ func ExecuteSQL(conx models.ConxDb, database, sqlText string) QueryResult {
 			}
 		} else {
 			if _, err2 := db.Exec("USE " + quoteIdentifier(database, conx.TipoDb.Nombre)); err2 != nil {
-				saveHistory(conx.ID, sqlText, "error", err2.Error(), 0, time.Since(start).Milliseconds())
+				saveHistory(conx.ID, uid, sqlText, "error", err2.Error(), 0, time.Since(start).Milliseconds())
 				return QueryResult{Error: err2.Error()}
 			}
 		}
@@ -126,7 +130,7 @@ func ExecuteSQL(conx models.ConxDb, database, sqlText string) QueryResult {
 		rows, err := db.Query(trimmed)
 		if err != nil {
 			elapsed := time.Since(start).Milliseconds()
-			saveHistory(conx.ID, sqlText, "error", err.Error(), 0, elapsed)
+			saveHistory(conx.ID, uid, sqlText, "error", err.Error(), 0, elapsed)
 			return QueryResult{Error: err.Error(), IsSelect: true}
 		}
 		defer rows.Close()
@@ -170,7 +174,7 @@ func ExecuteSQL(conx models.ConxDb, database, sqlText string) QueryResult {
 						if len(preview) > 80 {
 							preview = preview[:80] + "..."
 						}
-						saveHistory(conx.ID, sqlText, "error", execErr.Error(), 0, elapsed)
+						saveHistory(conx.ID, uid, sqlText, "error", execErr.Error(), 0, elapsed)
 						return QueryResult{Error: fmt.Sprintf("[%s]: %s", preview, execErr.Error())}
 					}
 					if affected, err2 := res.RowsAffected(); err2 == nil {
@@ -180,7 +184,7 @@ func ExecuteSQL(conx models.ConxDb, database, sqlText string) QueryResult {
 				elapsed := time.Since(start).Milliseconds()
 				result.AffectedRows = totalAffected
 				result.DurationMs = elapsed
-				saveHistory(conx.ID, sqlText, "ok", "", totalAffected, elapsed)
+				saveHistory(conx.ID, uid, sqlText, "ok", "", totalAffected, elapsed)
 				return result
 			}
 		}
@@ -188,18 +192,18 @@ func ExecuteSQL(conx models.ConxDb, database, sqlText string) QueryResult {
 		res, err := db.Exec(trimmed)
 		elapsed := time.Since(start).Milliseconds()
 		if err != nil {
-			saveHistory(conx.ID, sqlText, "error", err.Error(), 0, elapsed)
+			saveHistory(conx.ID, uid, sqlText, "error", err.Error(), 0, elapsed)
 			return QueryResult{Error: err.Error()}
 		}
 		affected, _ := res.RowsAffected()
 		result.AffectedRows = affected
 		result.DurationMs = elapsed
-		saveHistory(conx.ID, sqlText, "ok", "", affected, elapsed)
+		saveHistory(conx.ID, uid, sqlText, "ok", "", affected, elapsed)
 		return result
 	}
 
 	result.DurationMs = time.Since(start).Milliseconds()
-	saveHistory(conx.ID, sqlText, "ok", "", int64(result.RowCount), result.DurationMs)
+	saveHistory(conx.ID, uid, sqlText, "ok", "", int64(result.RowCount), result.DurationMs)
 	return result
 }
 
@@ -559,9 +563,10 @@ func quoteIdentifier(name, driver string) string {
 	return "`" + strings.ReplaceAll(name, "`", "``") + "`"
 }
 
-func saveHistory(conxID uint, sqlText, status, errMsg string, rows, durationMs int64) {
+func saveHistory(conxID, userID uint, sqlText, status, errMsg string, rows, durationMs int64) {
 	models.SaveQueryHistory(models.QueryHistory{
 		ConxDbID:   conxID,
+		UserID:     userID,
 		SQL:        sqlText,
 		Status:     status,
 		ErrorMsg:   errMsg,
@@ -670,7 +675,11 @@ func redisListKeys(c models.ConxDb, database string) ([]string, error) {
 // redisExecuteCommand parsea y ejecuta un comando Redis.
 // Los comandos se escriben como en redis-cli: GET key / SET key value / etc.
 // Soporta múltiples líneas: cada línea no vacía es un comando independiente.
-func redisExecuteCommand(conx models.ConxDb, database, cmdText string) QueryResult {
+func redisExecuteCommand(conx models.ConxDb, database, cmdText string, userID ...uint) QueryResult {
+	uid := uint(0)
+	if len(userID) > 0 {
+		uid = userID[0]
+	}
 	start := time.Now()
 
 	dbIndex := 0
@@ -682,7 +691,7 @@ func redisExecuteCommand(conx models.ConxDb, database, cmdText string) QueryResu
 
 	client, err := redisConnect(conx, dbIndex)
 	if err != nil {
-		saveHistory(conx.ID, cmdText, "error", err.Error(), 0, time.Since(start).Milliseconds())
+		saveHistory(conx.ID, uid, cmdText, "error", err.Error(), 0, time.Since(start).Milliseconds())
 		return QueryResult{Error: err.Error()}
 	}
 	defer client.Close()
@@ -735,7 +744,7 @@ func redisExecuteCommand(conx models.ConxDb, database, cmdText string) QueryResu
 			IsSelect:   true,
 			DurationMs: elapsed,
 		}
-		saveHistory(conx.ID, cmdText, "ok", "", int64(len(rows)), elapsed)
+		saveHistory(conx.ID, uid, cmdText, "ok", "", int64(len(rows)), elapsed)
 		return result
 	}
 
@@ -753,13 +762,13 @@ func redisExecuteCommand(conx models.ConxDb, database, cmdText string) QueryResu
 	elapsed := time.Since(start).Milliseconds()
 
 	if execErr != nil && execErr != goredis.Nil {
-		saveHistory(conx.ID, cmdText, "error", execErr.Error(), 0, elapsed)
+		saveHistory(conx.ID, uid, cmdText, "error", execErr.Error(), 0, elapsed)
 		return QueryResult{Error: execErr.Error(), DurationMs: elapsed}
 	}
 
 	result := redisResultToQueryResult(val, lines[0])
 	result.DurationMs = elapsed
-	saveHistory(conx.ID, cmdText, "ok", "", int64(result.RowCount), elapsed)
+	saveHistory(conx.ID, uid, cmdText, "ok", "", int64(result.RowCount), elapsed)
 	return result
 }
 
@@ -1052,11 +1061,15 @@ func mongoSingleToDoubleQuotes(s string) string {
 	return b.String()
 }
 
-func mongoExecuteSQL(conx models.ConxDb, database, queryText string) QueryResult {
+func mongoExecuteSQL(conx models.ConxDb, database, queryText string, userID ...uint) QueryResult {
+	uid := uint(0)
+	if len(userID) > 0 {
+		uid = userID[0]
+	}
 	start := time.Now()
 	client, err := mongoConnect(conx)
 	if err != nil {
-		saveHistory(conx.ID, queryText, "error", err.Error(), 0, time.Since(start).Milliseconds())
+		saveHistory(conx.ID, uid, queryText, "error", err.Error(), 0, time.Since(start).Milliseconds())
 		return QueryResult{Error: err.Error()}
 	}
 	defer client.Disconnect(context.Background()) //nolint
@@ -1066,11 +1079,11 @@ func mongoExecuteSQL(conx models.ConxDb, database, queryText string) QueryResult
 	result, err := mongoRunQuery(ctx, db, strings.TrimSpace(queryText))
 	elapsed := time.Since(start).Milliseconds()
 	if err != nil {
-		saveHistory(conx.ID, queryText, "error", err.Error(), 0, elapsed)
+		saveHistory(conx.ID, uid, queryText, "error", err.Error(), 0, elapsed)
 		return QueryResult{Error: err.Error()}
 	}
 	result.DurationMs = elapsed
-	saveHistory(conx.ID, queryText, "ok", "", int64(result.RowCount)+result.AffectedRows, elapsed)
+	saveHistory(conx.ID, uid, queryText, "ok", "", int64(result.RowCount)+result.AffectedRows, elapsed)
 	return *result
 }
 
diff --git a/rest/controllers/query_runner_controller.go b/rest/controllers/query_runner_controller.go
index 70417c2..bfc8700 100644
--- a/rest/controllers/query_runner_controller.go
+++ b/rest/controllers/query_runner_controller.go
@@ -119,7 +119,8 @@ func RunQuery(c *fiber.Ctx) error {
 		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": err.Error()})
 	}
 
-	result := services.ExecuteSQL(conx, body.Database, body.SQL)
+	uid := extractUserID(c)
+	result := services.ExecuteSQL(conx, body.Database, body.SQL, uid)
 	return c.JSON(result)
 }
 
@@ -128,6 +129,7 @@ func RunQuery(c *fiber.Ctx) error {
 // Body: { conx_db_id, database, sqls: ["...", "..."] }
 // También soporta multipart/form-data con file .sql
 func RunBatchQuery(c *fiber.Ctx) error {
+	uid := extractUserID(c)
 	conxDbIDStr := c.FormValue("conx_db_id", c.Query("conx_db_id"))
 	database := c.FormValue("database", c.Query("database"))
 
@@ -195,7 +197,7 @@ func RunBatchQuery(c *fiber.Ctx) error {
 	results := make([]batchResult, 0, len(statements))
 
 	for i, stmt := range statements {
-		r := services.ExecuteSQL(conx, database, stmt)
+		r := services.ExecuteSQL(conx, database, stmt, uid)
 		br := batchResult{
 			Index:    i,
 			SQL:      stmt,
@@ -244,7 +246,19 @@ func GetHistory(c *fiber.Ctx) error {
 	limit := 50
 	offset := (page - 1) * limit
 
-	items, total, err := models.GetQueryHistory(uint(conxID), limit, offset)
+	user, _ := auth.User(c)
+	var items []models.QueryHistory
+	var total int64
+	var err error
+	if user != nil && user.IsAdmin {
+		items, total, err = models.GetQueryHistoryAdmin(uint(conxID), limit, offset)
+	} else {
+		uid := uint(0)
+		if user != nil {
+			uid = user.ID
+		}
+		items, total, err = models.GetQueryHistory(uint(conxID), uid, limit, offset)
+	}
 	if err != nil {
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{"error": err.Error()})
 	}
@@ -262,7 +276,19 @@ func GetHistory(c *fiber.Ctx) error {
 func ClearHistory(c *fiber.Ctx) error {
 	conxIDStr := c.Query("conx_db_id", "0")
 	conxID, _ := strconv.ParseUint(conxIDStr, 10, 32)
-	if err := models.DeleteQueryHistory(uint(conxID)); err != nil {
+
+	user, _ := auth.User(c)
+	var err error
+	if user != nil && user.IsAdmin {
+		err = models.DeleteQueryHistoryAdmin(uint(conxID))
+	} else {
+		uid := uint(0)
+		if user != nil {
+			uid = user.ID
+		}
+		err = models.DeleteQueryHistory(uint(conxID), uid)
+	}
+	if err != nil {
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{"error": err.Error()})
 	}
 	return c.JSON(fiber.Map{"ok": true})
@@ -284,7 +310,8 @@ func ExportCSV(c *fiber.Ctx) error {
 		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": err.Error()})
 	}
 
-	result := services.ExecuteSQL(conx, body.Database, body.SQL)
+	uid := extractUserID(c)
+	result := services.ExecuteSQL(conx, body.Database, body.SQL, uid)
 	if result.Error != "" {
 		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": result.Error})
 	}
@@ -328,7 +355,8 @@ func ExportJSON(c *fiber.Ctx) error {
 		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": err.Error()})
 	}
 
-	result := services.ExecuteSQL(conx, body.Database, body.SQL)
+	uid := extractUserID(c)
+	result := services.ExecuteSQL(conx, body.Database, body.SQL, uid)
 	if result.Error != "" {
 		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": result.Error})
 	}
@@ -423,7 +451,8 @@ func UpdateCellHandler(c *fiber.Ctx) error {
 	sqlText := fmt.Sprintf("UPDATE %s SET %s = %s WHERE %s = %s",
 		qTable, qCol, valueSQL, qPkCol, pkValueSQL)
 
-	result := services.ExecuteSQL(conx, body.Database, sqlText)
+	uid := extractUserID(c)
+	result := services.ExecuteSQL(conx, body.Database, sqlText, uid)
 	if result.Error != "" {
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{"error": result.Error})
 	}
@@ -792,3 +821,11 @@ func loadConxDb(idStr string) (models.ConxDb, error) {
 	}
 	return conx, nil
 }
+
+func extractUserID(c *fiber.Ctx) uint {
+	user, err := auth.User(c)
+	if err != nil || user == nil {
+		return 0
+	}
+	return user.ID
+}

From 03b18418eb6ef0f43342cae0818d1a4fe385e8ff Mon Sep 17 00:00:00 2001
From: Lizandro Guarnizo <77708265+lizandrogd@users.noreply.github.com>
Date: Thu, 30 Jul 2026 12:19:56 -0500
Subject: [PATCH 4/4] feat: SMTP salida propio en webhook de soporte

---
 pkg/models/soporte_webhook.go          |  9 +++
 pkg/models/soporte_webhook_test.go     | 11 ++++
 pkg/services/soporte_service.go        | 86 +++++++++++++++++++++++++-
 resources/views/soporte_webhook.html   | 71 ++++++++++++++++++++-
 rest/controllers/soporte_controller.go | 36 ++++++++---
 5 files changed, 203 insertions(+), 10 deletions(-)

diff --git a/pkg/models/soporte_webhook.go b/pkg/models/soporte_webhook.go
index a5fcc68..a83ea77 100644
--- a/pkg/models/soporte_webhook.go
+++ b/pkg/models/soporte_webhook.go
@@ -15,6 +15,15 @@ type SoporteWebhookConfig struct {
 	ResponderAuto bool `json:"responder_auto" gorm:"column:responder_auto;default:true"`
 	MensajeAuto string `json:"mensaje_auto" gorm:"column:mensaje_auto;type:text"`
 	AsignarA    *uint `json:"asignar_a" gorm:"column:asignar_a;index"` // auto-asignar tickets a este user
+
+	// SMTP salida para notificaciones y auto-respuesta
+	SmtpHost      string `json:"smtp_host" gorm:"column:smtp_host;size:255"`
+	SmtpPort      int    `json:"smtp_port" gorm:"column:smtp_port;default:587"`
+	SmtpUsername  string `json:"smtp_username" gorm:"column:smtp_username;size:255"`
+	SmtpPassword  string `json:"smtp_password" gorm:"column:smtp_password;size:255"` // cifrado AES
+	SmtpEncryption string `json:"smtp_encryption" gorm:"column:smtp_encryption;size:20;default:'tls'"` // tls|starttls|none
+	SmtpFromAddr  string `json:"smtp_from_addr" gorm:"column:smtp_from_addr;size:255"`
+	SmtpFromName  string `json:"smtp_from_name" gorm:"column:smtp_from_name;size:255"`
 }
 
 func (SoporteWebhookConfig) TableName() string { return "soporte_webhook_config" }
diff --git a/pkg/models/soporte_webhook_test.go b/pkg/models/soporte_webhook_test.go
index b2687b6..b2d43b4 100644
--- a/pkg/models/soporte_webhook_test.go
+++ b/pkg/models/soporte_webhook_test.go
@@ -56,3 +56,14 @@ func TestSoporteWebhookConfigAsignarANil(t *testing.T) {
 		t.Errorf("AsignarA debe ser nil por defecto, got %v", *cfg.AsignarA)
 	}
 }
+
+func TestSoporteWebhookConfigSmtpDefaults(t *testing.T) {
+	cfg := SoporteWebhookConfig{Nombre: "SMTP Test"}
+	// Go zero values — los defaults reales los aplica GORM o el controller
+	if cfg.SmtpHost != "" {
+		t.Errorf("SmtpHost debe ser vacío por defecto, got %q", cfg.SmtpHost)
+	}
+	if cfg.SmtpPort != 0 {
+		t.Errorf("SmtpPort debe ser 0 en Go, got %d", cfg.SmtpPort)
+	}
+}
diff --git a/pkg/services/soporte_service.go b/pkg/services/soporte_service.go
index d3bd4a6..a43c690 100644
--- a/pkg/services/soporte_service.go
+++ b/pkg/services/soporte_service.go
@@ -1,13 +1,95 @@
 package services
 
 import (
+	"crypto/tls"
 	"fmt"
 	"log"
+	"net/smtp"
+	"strings"
 
 	"github.com/sujit-baniya/fiber-boilerplate/app"
 	"github.com/sujit-baniya/fiber-boilerplate/pkg/models"
 )
 
+// soporteSendMail envía un correo usando la configuración SMTP del webhook de soporte.
+// Si no hay SMTP configurado, usa app.Http.Mail como fallback.
+func soporteSendMail(to, subject, htmlBody string) error {
+	cfg, err := models.GetSoporteWebhookActivo()
+	if err != nil || cfg == nil || cfg.SmtpHost == "" {
+		return app.Http.Mail.Send(to, subject, htmlBody)
+	}
+	from := cfg.SmtpFromAddr
+	if from == "" {
+		from = cfg.EmailDestino
+	}
+	if from == "" {
+		return app.Http.Mail.Send(to, subject, htmlBody)
+	}
+	fromName := cfg.SmtpFromName
+	if fromName == "" {
+		fromName = "Soporte"
+	}
+	port := cfg.SmtpPort
+	if port == 0 {
+		port = 587
+	}
+	auth := smtp.PlainAuth("", cfg.SmtpUsername, cfg.SmtpPassword, cfg.SmtpHost)
+	msg := []byte(fmt.Sprintf("From: %s <%s>\r\nTo: %s\r\nSubject: %s\r\nMIME-Version: 1.0\r\nContent-Type: text/html; charset=UTF-8\r\n\r\n%s", fromName, from, to, subject, htmlBody))
+	addr := fmt.Sprintf("%s:%d", cfg.SmtpHost, port)
+	enc := strings.ToLower(cfg.SmtpEncryption)
+	if enc == "tls" {
+		tlsCfg := &tls.Config{ServerName: cfg.SmtpHost}
+		conn, err := tls.Dial("tcp", addr, tlsCfg)
+		if err != nil {
+			return fmt.Errorf("soporte SMTP TLS: %w", err)
+		}
+		client, err := smtp.NewClient(conn, cfg.SmtpHost)
+		if err != nil {
+			conn.Close()
+			return fmt.Errorf("soporte SMTP client: %w", err)
+		}
+		defer client.Close()
+		if err = client.Auth(auth); err != nil {
+			return fmt.Errorf("soporte SMTP auth: %w", err)
+		}
+		if err = client.Mail(from); err != nil {
+			return err
+		}
+		if err = client.Rcpt(to); err != nil {
+			return err
+		}
+		w, err := client.Data()
+		if err != nil {
+			return err
+		}
+		_, err = w.Write(msg)
+		if err != nil {
+			return err
+		}
+		return w.Close()
+	}
+	if enc == "starttls" {
+		tlsCfg := &tls.Config{ServerName: cfg.SmtpHost}
+		conn, err := smtp.Dial(addr)
+		if err != nil {
+			goto fallback
+		}
+		if err = conn.StartTLS(tlsCfg); err != nil {
+			conn.Close()
+			goto fallback
+		}
+		if err = conn.Auth(auth); err != nil {
+			conn.Close()
+			return fmt.Errorf("soporte SMTP STARTTLS auth: %w", err)
+		}
+		return smtp.SendMail(addr, auth, from, []string{to}, msg)
+	}
+	return smtp.SendMail(addr, auth, from, []string{to}, msg)
+
+fallback:
+	return app.Http.Mail.Send(to, subject, htmlBody)
+}
+
 // SendSoporteAutoRespuesta envía acuse de recibo automático al crear un ticket por email
 func SendSoporteAutoRespuesta(ticket *models.ProyectoTicket) {
 	if ticket == nil || ticket.EmailFrom == "" {
@@ -39,7 +121,7 @@ func SendSoporteAutoRespuesta(ticket *models.ProyectoTicket) {
 </div></body></html>`, ticket.AutorNombre, mensaje, ticket.ID, ticket.Titulo, ticket.Descripcion)
 
 	go func() {
-		if err := app.Http.Mail.Send(ticket.EmailFrom, subject, htmlBody); err != nil {
+		if err := soporteSendMail(ticket.EmailFrom, subject, htmlBody); err != nil {
 			log.Printf("[Soporte] Error enviando auto-respuesta a %s: %v", ticket.EmailFrom, err)
 		} else {
 			log.Printf("[Soporte] Auto-respuesta enviada a %s (ticket #%d)", ticket.EmailFrom, ticket.ID)
@@ -78,7 +160,7 @@ func SendSoporteNotifAdmin(ticket *models.ProyectoTicket) {
 </div></body></html>`, ticket.AutorNombre, ticket.EmailFrom, ticket.Titulo, ticket.Descripcion, absAppURL(""), ticket.ID)
 
 	go func() {
-		if err := app.Http.Mail.Send(adminEmail, subject, htmlBody); err != nil {
+		if err := soporteSendMail(adminEmail, subject, htmlBody); err != nil {
 			log.Printf("[Soporte] Error notificando admin: %v", err)
 		}
 	}()
diff --git a/resources/views/soporte_webhook.html b/resources/views/soporte_webhook.html
index 8851dc8..c0a7887 100644
--- a/resources/views/soporte_webhook.html
+++ b/resources/views/soporte_webhook.html
@@ -49,7 +49,62 @@
       <p class="text-xs text-slate-400 mt-1">Los tickets creados por email se asignarán automáticamente a este admin.</p>
     </div>
 
-    <div class="pt-2">
+    <!-- ─── SMTP salida ──────────────────────────────────────────── -->
+    <div class="border-t border-slate-100 pt-4 mt-4">
+      <p class="text-sm font-semibold text-slate-700 mb-3">SMTP salida (notificaciones y auto-respuesta)</p>
+
+      <div class="grid grid-cols-2 gap-3">
+        <div class="col-span-1">
+          <label class="block text-xs font-medium text-slate-600 mb-1">Host</label>
+          <input x-model="cfg.smtp_host" type="text" placeholder="smtp.example.com"
+            class="w-full border border-slate-200 rounded-lg px-3 py-2 text-sm outline-none">
+        </div>
+        <div class="col-span-1">
+          <label class="block text-xs font-medium text-slate-600 mb-1">Puerto</label>
+          <input x-model="cfg.smtp_port" type="number" placeholder="587"
+            class="w-full border border-slate-200 rounded-lg px-3 py-2 text-sm outline-none">
+        </div>
+      </div>
+
+      <div class="grid grid-cols-2 gap-3 mt-2">
+        <div>
+          <label class="block text-xs font-medium text-slate-600 mb-1">Usuario</label>
+          <input x-model="cfg.smtp_username" type="text" placeholder="correo@example.com"
+            class="w-full border border-slate-200 rounded-lg px-3 py-2 text-sm outline-none">
+        </div>
+        <div>
+          <label class="block text-xs font-medium text-slate-600 mb-1">Contraseña</label>
+          <input x-model="cfg.smtp_password" type="password" placeholder="••••••••"
+            class="w-full border border-slate-200 rounded-lg px-3 py-2 text-sm outline-none">
+        </div>
+      </div>
+
+      <div class="grid grid-cols-2 gap-3 mt-2">
+        <div>
+          <label class="block text-xs font-medium text-slate-600 mb-1">Email remitente</label>
+          <input x-model="cfg.smtp_from_addr" type="text" placeholder="soporte@u-s.app"
+            class="w-full border border-slate-200 rounded-lg px-3 py-2 text-sm outline-none">
+        </div>
+        <div>
+          <label class="block text-xs font-medium text-slate-600 mb-1">Nombre remitente</label>
+          <input x-model="cfg.smtp_from_name" type="text" placeholder="Soporte U-site"
+            class="w-full border border-slate-200 rounded-lg px-3 py-2 text-sm outline-none">
+        </div>
+      </div>
+
+      <div class="mt-2">
+        <label class="block text-xs font-medium text-slate-600 mb-1">Encriptación</label>
+        <select x-model="cfg.smtp_encryption" class="w-full border border-slate-200 rounded-lg px-3 py-2 text-sm outline-none">
+          <option value="tls">TLS (puerto 465)</option>
+          <option value="starttls">STARTTLS (puerto 587)</option>
+          <option value="none">Sin encriptación</option>
+        </select>
+      </div>
+
+      <p class="text-xs text-slate-400 mt-2">Si se deja vacío, se usará la configuración SMTP general del sistema.</p>
+    </div>
+
+    <div class="pt-4">
       <button @click="guardar()"
         class="px-6 py-2 rounded-xl text-white text-sm font-medium transition-colors"
         style="background:#8eb02f"
@@ -78,6 +133,13 @@ function soporteWebhook() {
       responder_auto: true,
       mensaje_auto: '',
       asignar_a: '',
+      smtp_host: '',
+      smtp_port: 587,
+      smtp_username: '',
+      smtp_password: '',
+      smtp_encryption: 'starttls',
+      smtp_from_addr: '',
+      smtp_from_name: '',
     },
     admins: [],
     webhookUrl: '',
@@ -107,6 +169,13 @@ function soporteWebhook() {
         responder_auto: this.cfg.responder_auto,
         mensaje_auto: this.cfg.mensaje_auto,
         asignar_a: this.cfg.asignar_a ? parseInt(this.cfg.asignar_a) : null,
+        smtp_host: this.cfg.smtp_host || '',
+        smtp_port: parseInt(this.cfg.smtp_port) || 587,
+        smtp_username: this.cfg.smtp_username || '',
+        smtp_password: this.cfg.smtp_password || '',
+        smtp_encryption: this.cfg.smtp_encryption || 'starttls',
+        smtp_from_addr: this.cfg.smtp_from_addr || '',
+        smtp_from_name: this.cfg.smtp_from_name || '',
       };
       try {
         await axios.post('/app/soporte/webhook', payload);
diff --git a/rest/controllers/soporte_controller.go b/rest/controllers/soporte_controller.go
index c38162b..a436687 100644
--- a/rest/controllers/soporte_controller.go
+++ b/rest/controllers/soporte_controller.go
@@ -217,20 +217,42 @@ func SaveSoporteWebhookConfig(c *fiber.Ctx) error {
 		ResponderAuto bool `json:"responder_auto"`
 		MensajeAuto   string `json:"mensaje_auto"`
 		AsignarA    *uint  `json:"asignar_a"`
+		SmtpHost      string `json:"smtp_host"`
+		SmtpPort      int    `json:"smtp_port"`
+		SmtpUsername  string `json:"smtp_username"`
+		SmtpPassword  string `json:"smtp_password"`
+		SmtpEncryption string `json:"smtp_encryption"`
+		SmtpFromAddr  string `json:"smtp_from_addr"`
+		SmtpFromName  string `json:"smtp_from_name"`
 	}
 	var b body
 	if err := c.BodyParser(&b); err != nil {
 		return c.Status(400).JSON(fiber.Map{"error": "body inválido"})
 	}
+	port := b.SmtpPort
+	if port == 0 {
+		port = 587
+	}
+	enc := b.SmtpEncryption
+	if enc == "" {
+		enc = "starttls"
+	}
 	cfg := &models.SoporteWebhookConfig{
-		Nombre:       b.Nombre,
-		Provider:     b.Provider,
-		ApiKey:       b.ApiKey,
-		EmailDestino: b.EmailDestino,
+		Nombre:        b.Nombre,
+		Provider:      b.Provider,
+		ApiKey:        b.ApiKey,
+		EmailDestino:  b.EmailDestino,
 		ResponderAuto: b.ResponderAuto,
-		MensajeAuto:  b.MensajeAuto,
-		AsignarA:     b.AsignarA,
-		Activo:       true,
+		MensajeAuto:   b.MensajeAuto,
+		AsignarA:      b.AsignarA,
+		SmtpHost:      b.SmtpHost,
+		SmtpPort:      port,
+		SmtpUsername:  b.SmtpUsername,
+		SmtpPassword:  b.SmtpPassword,
+		SmtpEncryption: enc,
+		SmtpFromAddr:  b.SmtpFromAddr,
+		SmtpFromName:  b.SmtpFromName,
+		Activo:        true,
 	}
 	cfg.ID = b.ID
 	if err := models.SaveSoporteWebhookConfig(cfg); err != nil {