${htmlEscape(row.title)}
${htmlEscape(row.description).replace(/\n/g, '
')}
${htmlEscape(occurrenceStart || row.starts_at)} – ${htmlEscape(row.ends_at)} (America/Guayaquil)
${htmlEscape(row.location)}
${row.video_url ? `` : ''}`; + await Promise.allSettled(recipients.map((to) => sendMail({ to, subject: `${method === 'CANCEL' ? 'Reunión cancelada / Meeting cancelled' : 'Invitación / Invitation'}: ${row.title}`, html, icalEvent: { method, content: buildIcs(row, method, occurrenceStart), filename: 'reunion.ics' } }))); +} +function dispatch(row, action, method = 'REQUEST', extraIds = []) { + setImmediate(() => { void Promise.allSettled([notify(row, action, extraIds), mail(row, method)]); }); +} +function deferMail(row, method, recipients = null, occurrenceStart = null) { + setImmediate(() => { void mail(row, method, recipients, occurrenceStart).catch((err) => console.error('[meetings] correo:', err.message)); }); +} +function overlaps(a, b) { + let i = 0, j = 0; + while (i < a.length && j < b.length) { + if (a[i].occurrence_start < b[j].occurrence_end && a[i].occurrence_end > b[j].occurrence_start) return true; + if (a[i].occurrence_end <= b[j].occurrence_end) i++; else j++; + } + return false; +} +async function conflictWarnings(data, excludeId) { + const ids = data.participantUserIds; + if (!ids.length) return []; + const proposed = expand({ starts_at: data.startsAt, ends_at: data.endsAt, recurrence_json: data.recurrence ? JSON.stringify(data.recurrence) : null, exceptions: [] }, data.startsAt, '9999-12-31 23:59:59'); + const end = proposed.at(-1)?.occurrence_end || data.endsAt; + const rows = await repo.findParticipantConflicts(data.startsAt, end, ids, excludeId || null); + const exceptionMap = await repo.exceptionsFor(rows.map((r) => r.id)); + const conflicts = new Set(); + for (const row of rows) { + const existing = expand({ ...row, exceptions: exceptionMap.get(row.id) || [] }, data.startsAt, end); + if (overlaps(proposed, existing)) row.conflict_names.forEach((name) => conflicts.add(name)); + } + return [...conflicts]; +} +export async function list(query, user) { + const [from, to] = range(query.from, query.to); + const page = Number(query.page || 1), pageSize = Number(query.pageSize || 1500); + if (!Number.isSafeInteger(page) || page < 1 || !Number.isSafeInteger(pageSize) || pageSize < 1 || pageSize > 1500 || !Number.isSafeInteger((page-1)*pageSize)) throw new HttpError(400, 'Paginacion invalida'); + const rows = await repo.findVisibleCandidates(from, to, user); + const exceptions = await repo.exceptionsFor(rows.map((r) => r.id)); + const all = rows.flatMap((r) => expand({ ...r, exceptions: exceptions.get(r.id) || [] }, from, to)) + .sort((a, b) => a.occurrence_start.localeCompare(b.occurrence_start) || a.id - b.id); + return { items: all.slice((page-1)*pageSize, page*pageSize), total: all.length, page, pageSize }; +} +export async function activities(query, user) { + const [from, to] = range(query.from, query.to); + if (!user.modules.includes('projects')) return []; + return repo.activityDue(from.slice(0, 10), to.slice(0, 10), user); +} +export async function create(raw, user) { + const data = await normalize(raw, user); + const warnings = await conflictWarnings(data); + if (warnings.length && raw.confirmConflicts !== true) return { requiresConfirmation: true, warnings }; + const row = await repo.create(data, user.id, randomUUID()); + await logAudit({ userId: user.id, action: 'create', entityType: 'meeting', entityId: row.id }); + dispatch(row, 'created'); + return { meeting: row, warnings }; +} +export async function update(id, raw, user) { + const before = await detail(id, user); + if (!canManage(before, user)) throw new HttpError(403, 'Sin permiso para editar'); + if (before.cancelled_at) throw new HttpError(409, 'Reunion cancelada'); + requireEditVersion(raw.editVersion); + const data = await normalize(raw, user); + const warnings = await conflictWarnings(data, id); + if (warnings.length && raw.confirmConflicts !== true) return { requiresConfirmation: true, warnings }; + const resetExceptions = before.starts_at !== data.startsAt || before.ends_at !== data.endsAt || before.recurrence_json !== (data.recurrence ? JSON.stringify(data.recurrence) : null); + const row = requireUpdated(await repo.update(id, data, raw.editVersion, resetExceptions)); + await logAudit({ userId: user.id, action: 'update', entityType: 'meeting', entityId: id }); + const currentEmails = new Set([...row.participants.map((p) => p.email), ...row.external_emails]); + const removedEmails = [...new Set([...before.participants.map((p) => p.email), ...before.external_emails])].filter((email) => !currentEmails.has(email)); + const currentIds = new Set(row.participants.map((p) => p.user_id)); + const removedIds = before.participants.filter((p) => !currentIds.has(p.user_id)).map((p) => p.user_id); + if (removedEmails.length) deferMail(row, 'CANCEL', removedEmails); + if (before.starts_at !== row.starts_at || before.ends_at !== row.ends_at || before.location !== row.location || before.video_url !== row.video_url || before.recurrence_json !== row.recurrence_json || removedIds.length || before.participants.length !== row.participants.length) dispatch(row, 'updated', 'REQUEST', removedIds); + else deferMail(row, 'REQUEST'); + return { meeting: row, warnings }; +} +export async function cancel(id, user) { + const before = await detail(id, user); + if (!canManage(before, user)) throw new HttpError(403, 'Sin permiso para cancelar'); + if (before.cancelled_at) throw new HttpError(409, 'Reunion ya cancelada'); + const row = requireUpdated(await repo.cancel(id)); + await logAudit({ userId: user.id, action: 'cancel', entityType: 'meeting', entityId: id }); + dispatch(row, 'cancelled', 'CANCEL'); + return { cancelled: true }; +} +export async function cancelOccurrence(id, date, user) { + const before = await detail(id, user); + if (!canManage(before, user)) throw new HttpError(403, 'Sin permiso para cancelar'); + if (!before.recurrence_json) throw new HttpError(400, 'Esta reunion no es recurrente'); + const start = normalizeDate(date); + if (!start || !expand(before, start, addMinutes(start, 1)).some((r) => r.occurrence_start === start)) throw new HttpError(400, 'Ocurrencia invalida'); + const row = requireUpdated(await repo.cancelOccurrence(id, start, user.id)); + await logAudit({ userId: user.id, action: 'cancel_occurrence', entityType: 'meeting', entityId: id, detail: { start } }); + dispatch(row, 'occurrence_cancelled'); + deferMail(row, 'CANCEL', null, start); + return row; +} +export async function rsvp(id, status, user) { + if (!['accepted','declined','tentative'].includes(status)) throw new HttpError(400, 'Respuesta invalida'); + const row = await detail(id, user); + if (row.cancelled_at) throw new HttpError(409, 'Reunion cancelada'); + if (!(await repo.rsvp(id, user.id, status))) throw new HttpError(403, 'Solo el participante puede responder'); + await logAudit({ userId: user.id, action: 'rsvp', entityType: 'meeting', entityId: id, detail: { status } }); + if (row.organizer_id !== user.id) { + setImmediate(() => { void createNotification({ userId: row.organizer_id, type: `meeting_rsvp_${status}`, message: `${user.name || ''} · ${row.title}`.slice(0, 255), entityType: 'meeting', entityId: id }).catch(() => {}); }); + } + return repo.findById(id); +} +export async function sendDueReminders() { + const now = guayaquilNow(), end = addMinutes(now, 1441); + const rows = await repo.findCandidates(now, end); + const map = await repo.exceptionsFor(rows.map((r) => r.id)); + let count = 0; + for (const row of rows) { + if (!row.reminder_minutes) continue; + const occurrences = expand({ ...row, exceptions: map.get(row.id) || [] }, now, end); + for (const occurrence of occurrences) { + const due = addMinutes(occurrence.occurrence_start, -row.reminder_minutes); + if (due > now || due < addMinutes(now, -2)) continue; + const full = await repo.findById(row.id); + const recipientIds = [...new Set([row.organizer_id, ...full.participants.map((p) => p.user_id)])]; + if (await repo.sendReminderOnce(row.id, occurrence.occurrence_start, recipientIds, row.title)) count++; + } + } + return count; +} diff --git a/backend/src/modules/notifications/repository.js b/backend/src/modules/notifications/repository.js index 9850dcf..b63177c 100644 --- a/backend/src/modules/notifications/repository.js +++ b/backend/src/modules/notifications/repository.js @@ -14,8 +14,8 @@ export async function countUnread(userId) { return rows[0].c; } -export async function create({ userId, type, message, entityType, entityId }) { - const [result] = await pool.query( +export async function create({ userId, type, message, entityType, entityId }, connection = pool) { + const [result] = await connection.query( 'INSERT INTO notifications (user_id, type, message, entity_type, entity_id) VALUES (?, ?, ?, ?, ?)', [userId, type, message, entityType || null, entityId || null] ); diff --git a/backend/src/server.js b/backend/src/server.js index 2bdb355..12d5b91 100644 --- a/backend/src/server.js +++ b/backend/src/server.js @@ -1,9 +1,11 @@ import { app } from './app.js'; import { env } from './config/env.js'; import { startRecurringTaskReminderJob } from './jobs/recurringTaskReminders.js'; +import { startMeetingReminderJob } from './jobs/meetingReminders.js'; app.listen(env.port, () => { console.log(`[server] project.linkedcorp.net backend escuchando en :${env.port} (${env.nodeEnv})`); }); startRecurringTaskReminderJob(); +startMeetingReminderJob(); diff --git a/backend/src/utils/mailer.js b/backend/src/utils/mailer.js index 1c8c211..7445930 100644 --- a/backend/src/utils/mailer.js +++ b/backend/src/utils/mailer.js @@ -3,12 +3,12 @@ import { getSmtpConfigInternal } from '../modules/settings/service.js'; // Degradacion a modo dev cuando el SMTP no esta configurado (regla del orquestador): en vez de // fallar, se loguea el contenido/enlace y el flujo que llamo a esto sigue funcionando. -export async function sendMail({ to, subject, html }) { +export async function sendMail({ to, subject, html, icalEvent }) { try { const config = await getSmtpConfigInternal(); if (!config) { - console.log(`[mail:dev] to=${to} subject="${subject}"\n${html}`); + console.log(`[mail:dev] to=${to} subject="${subject}"\n${html}${icalEvent?.content ? `\n[icalEvent]\n${icalEvent.content}` : ''}`); return { sent: false, dev: true }; } @@ -22,7 +22,7 @@ export async function sendMail({ to, subject, html }) { // Nunca dejar que un fallo de envio (SMTP mal configurado, host caido) tumbe al que llama — // critico para forgot-password, que siempre debe responder generico sin importar el resultado. - await transporter.sendMail({ from: config.from, to, subject, html }); + await transporter.sendMail({ from: config.from, to, subject, html, ...(icalEvent ? { icalEvent } : {}) }); return { sent: true, dev: false }; } catch (err) { console.error('[mail:error]', err.message); diff --git a/frontend/package.json b/frontend/package.json index bc22067..55b3221 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,7 +1,7 @@ { "name": "project-linkedcorp-frontend", "private": true, - "version": "4.3.0", + "version": "4.4.0", "type": "module", "scripts": { "dev": "vite", diff --git a/frontend/src/app/App.jsx b/frontend/src/app/App.jsx index 5f04315..0919201 100644 --- a/frontend/src/app/App.jsx +++ b/frontend/src/app/App.jsx @@ -24,6 +24,7 @@ import ContrasenasPage from '../pages/Contrasenas/ContrasenasPage.jsx'; import EquiposPage from '../pages/Equipos/EquiposPage.jsx'; import ResetVaultPinPage from '../pages/Login/ResetVaultPinPage.jsx'; import MiCuentaPage from '../pages/MiCuenta/MiCuentaPage.jsx'; +import CalendarioPage from '../pages/Calendario/CalendarioPage.jsx'; // Router de datos (createBrowserRouter): necesario para useBlocker, que avisa al salir de una // seccion con cambios sin guardar (ver components/NavigationGuard.jsx). Mismas rutas de antes. @@ -40,6 +41,7 @@ const router = createBrowserRouter(createRoutesFromElements({t('calendar_empty')}
}{t('calendar_start')}: {readable(selected.starts_at, lang, !!selected.all_day)}
{t('calendar_end')}: {readable(selected.ends_at, lang, !!selected.all_day)}
{t('calendar_all_day')}
} + {selected.description &&{selected.description}
}{selected.location &&{t('calendar_location')}: {selected.location}
} + {selected.video_url && } + {selected.project_name &&{t('calendar_project')}: {selected.project_name}
} + {!!selected.reminder_minutes &&{t('calendar_reminder')}: {selected.reminder_minutes === 1440 ? t('calendar_one_day') : `${selected.reminder_minutes} ${t('calendar_minutes')}`}
} + {selected.recurrence_json &&{t('calendar_recurrence')}: {t(`calendar_${JSON.parse(selected.recurrence_json).frequency}`)}
} +{t('calendar_organizer')}: {selected.organizer_name}
+