30 problema envio emails - #33
Conversation
WalkthroughRefactors cron route logging and variable names for per-restaurant order processing without changing behavior. Overhauls email grouping logic to normalize and deterministically parse option tokens (p.opc), handling diacritics, case, duplicates, and defaults, producing canonicalized strings for grouping while preserving the existing public API. Changes
Sequence Diagram(s)sequenceDiagram
autonumber
participant Cron as Cron Route
participant DB as Orders Source
participant Grouper as Opc Normalizer (updated)
participant Mail as Email Builder/Sender
Cron->>DB: Fetch today's orders
Cron->>Cron: Normalize date to midnight (log)
loop per restaurant
Cron->>Grouper: Build grouped keys from p.opc
Note right of Grouper: New deterministic parsing<br/>• normalize diacritics/case<br/>• resolve duplicates<br/>• fill defaults
Grouper-->>Cron: Canonical grouping strings
Cron->>Mail: Generate grouped email sections
Mail-->>Cron: Email content
Cron->>Mail: Send email
Mail-->>Cron: Result (success/failure)
end
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~25 minutes Possibly related PRs
Suggested reviewers
Poem
Tip 🔌 Remote MCP (Model Context Protocol) integration is now available!Pro plan users can now connect to remote MCP servers from the Integrations page. Connect with popular remote MCPs such as Notion and Linear to add more context to your reviews and chats. ✨ Finishing Touches
🧪 Generate unit tests
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
SupportNeed help? Create a ticket on our support page for assistance with any issues or questions. CodeRabbit Commands (Invoked using PR/Issue comments)Type Other keywords and placeholders
CodeRabbit Configuration File ( |
The latest updates on your projects. Learn more about Vercel for GitHub.
|
There was a problem hiding this comment.
Actionable comments posted: 1
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (3)
src/lib/mail/html-mock.ts (1)
598-606: Security: escape dynamic HTML to prevent injection in emailsUser-controlled fields (e.g., funcionário, observações) and DB-configured strings (opções, pratos) are injected raw into HTML. Many email clients render HTML and allow URLs; this is a phishing/XSS vector. Escape all dynamic text before embedding in the template. Key strings produced by getGroupKey can also contain raw option names.
Minimal patch:
+ function escapeHtml(s: string): string {+ return String(s)+ .replace(/&/g, "&")+ .replace(/</g, "<")+ .replace(/>/g, ">")+ .replace(/"/g, """)+ .replace(/'/g, "'");+ } ... - const totalsHtml = Array.from(groups.entries())- .map(([key, arr]) => `<li><strong>Total de pedidos de ${key}:</strong> ${arr.length}</li>`)+ const totalsHtml = Array.from(groups.entries())+ .map(([key, arr]) => `<li><strong>Total de pedidos de ${escapeHtml(key)}:</strong> ${arr.length}</li>`) .join(""); const sectionsHtml = Array.from(groups.entries()) .map(([key, arr]) => { const itemsHtml = arr .map( (p) => ` <div class="pedido"> - <div><strong>Pedido:</strong> ${p.num}</div>- <div><strong>Data:</strong> ${p.data}</div>- <div><strong>Funcionário:</strong> ${p.func}</div>- <div><strong>Prato:</strong> ${p.prato}</div>- <div><strong>Opcionais:</strong> ${(p.opc ?? "").trim() || "-"}</div>- <div><strong>Observações:</strong> ${p.obs ?? "-"}</div>+ <div><strong>Pedido:</strong> ${p.num}</div>+ <div><strong>Data:</strong> ${escapeHtml(p.data)}</div>+ <div><strong>Funcionário:</strong> ${escapeHtml(p.func)}</div>+ <div><strong>Prato:</strong> ${escapeHtml(p.prato)}</div>+ <div><strong>Opcionais:</strong> ${escapeHtml(((p.opc ?? "").trim() || "-"))}</div>+ <div><strong>Observações:</strong> ${escapeHtml(p.obs ?? "-")}</div> </div> `, ) .join(""); return ` <section class="group"> - <h2>${key}</h2>- <div class="group-count">Total de pedidos de ${key}: ${arr.length}</div>+ <h2>${escapeHtml(key)}</h2>+ <div class="group-count">Total de pedidos de ${escapeHtml(key)}: ${arr.length}</div> <div class="pedidos"> ${itemsHtml} </div> </section> `; })Optionally also escape nomeRestaurante in the header. I can provide a follow-up patch covering all templates in this file if you want.
Also applies to: 620-623, 606-617, 612-614
src/app/api/cron/food_orders/route.ts (2)
11-19: Bug: equality on Date (midnight) + server timezone likely filters out valid orders; use day range in a fixed tzUsing orderDate: today where today is set to 00:00:00.000 in the server’s local tz typically misses rows whose timestamps aren’t exactly midnight. In serverless/containers (often UTC), this gets worse for BR users. Query by [startOfDay, endOfDay) in America/Sao_Paulo and also format dataPedidos in the same tz.
Apply this diff:
- const today = new Date();- today.setHours(0, 0, 0, 0);- console.log("| CRONJOB | Data de hoje:", today);+ const now = new Date();+ const tz = "America/Sao_Paulo";+ const fmt = new Intl.DateTimeFormat("pt-BR", {+ timeZone: tz,+ year: "numeric",+ month: "2-digit",+ day: "2-digit",+ });+ const parts = fmt.formatToParts(now);+ const year = Number(parts.find(p => p.type === "year")!.value);+ const month = Number(parts.find(p => p.type === "month")!.value);+ const day = Number(parts.find(p => p.type === "day")!.value);+ const startOfDay = new Date(Date.UTC(year, month - 1, day, 0, 0, 0, 0));+ const endOfDay = new Date(Date.UTC(year, month - 1, day + 1, 0, 0, 0, 0));+ console.log("| CRONJOB | Data de hoje (America/Sao_Paulo):", fmt.format(now), "| janela:", startOfDay.toISOString(), "->", endOfDay.toISOString()); // Buscar todos os pedidos de hoje const orders = await db.foodOrder.findMany({ where: { - orderDate: today,+ orderDate: {+ gte: startOfDay,+ lt: endOfDay,+ }, status: "PENDING", },And later when building the display date:
- const dataPedidos = today.toLocaleDateString('pt-BR');+ const dataPedidos = fmt.format(now);Also applies to: 63-64
11-19: Convert Exact-Date Filters to Day-Range QueriesWe’ve identified several places where
orderDateis compared by exact equality—this will miss orders with timestamps later in the day. To ensure you’re capturing the full day, each equality filter should be replaced with a half-open range filter:where: {orderDate: {gte: startOfDay,lt: nextDayStart,},// …}Please update the following occurrences:
• src/server/api/routers/food-order.ts
– Lines ~21:orderDate: new Date(input.orderDate.setHours(0, 0, 0, 0))
– Line 67:orderDate: input.orderDate
– Line 266:{ ...(input.startDate && input.endDate && { orderDate: new Date(input.startDate.setHours(0, 0, 0, 0)) }) }
– Lines ~510:orderDate: today
– Line 531:orderDate: date• src/app/api/cron/food_orders/route.ts
– Lines 17–19:orderDate: today• src/app/(authenticated)/food/page.tsx
– Line 172: client-pass-throughorderDate: orderDate• src/app/(authenticated)/admin/food/page.tsx
– Line 354:orderDate: signatureExportDateRather than matching
orderDateexactly at midnight, calculatestartOfDay = today.setHours(0,0,0,0)andnextDayStart = new Date(startOfDay).setDate(startOfDay.getDate()+1), then use:where: {orderDate: {gte: startOfDay,lt: nextDayStart},status: "PENDING",// …}This change ensures you include all orders placed any time during the target day.
🧹 Nitpick comments (4)
src/lib/mail/html-mock.ts (2)
566-569: Nit: reuse a Collator instance to avoid repeated localeCompare setup in sortCreating a Collator once and reusing its compare function is a tiny perf/readability improvement.
- .sort((a, b) =>- a[1].display.localeCompare(b[1].display, "pt-BR", {- sensitivity: "base",- }),- )+ .sort(() => {+ const collator = new Intl.Collator("pt-BR", { sensitivity: "base" });+ return (a, b) => collator.compare(a[1].display, b[1].display);+ }())
598-606: Optional: sort groups for deterministic email sections (e.g., by count desc, then alpha)Stable ordering improves readability and diffability in email archives. Current Map iteration order depends on first-seen items.
- const totalsHtml = Array.from(groups.entries())+ const sortedGroups = Array.from(groups.entries()).sort((a, b) => {+ const byCount = b[1].length - a[1].length;+ return byCount !== 0 ? byCount : a[0].localeCompare(b[0], "pt-BR", { sensitivity: "base" });+ });++ const totalsHtml = sortedGroups .map(([key, arr]) => `<li><strong>Total de pedidos de ${escapeHtml(key)}:</strong> ${arr.length}</li>`) .join(""); - const sectionsHtml = Array.from(groups.entries())+ const sectionsHtml = sortedGroups .map(([key, arr]) => { ... }) .join("");Also applies to: 602-629
src/app/api/cron/food_orders/route.ts (2)
88-101: Resilience: isolate per-restaurant sendEmail in its own try/catch to avoid aborting the loopA single SMTP failure will currently stop processing for remaining restaurants. Wrap per-restaurant send with try/catch; continue on error.
- const emailContent = emailPedidosRestauranteAgrupado(+ const emailContent = emailPedidosRestauranteAgrupado( restaurant.name, dataPedidos, pedidosAgrupados, ); -- await sendEmail(- restaurant.email,- `Pedidos do Dia - ${restaurant.name}`,- emailContent,- "rh@boxdistribuidor.com.br"- );-- console.log(`| CRONJOB | Email enviado para ${restaurant.name} com ${ordersData.length} pedidos`);+ try {+ await sendEmail(+ restaurant.email,+ `Pedidos do Dia - ${restaurant.name}`,+ emailContent,+ "rh@boxdistribuidor.com.br"+ );+ console.log(`| CRONJOB | Email enviado para ${restaurant.name} com ${ordersData.length} pedidos`);+ } catch (e) {+ console.error(`| CRONJOB | Falha ao enviar email para ${restaurant.name}:`, e);+ }
13-14: Nit: log the human date in the same timezone used for the queryOnce you adopt the tz-aware range, logging fmt.format(now) is more useful to operators than a raw Date object.
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
💡 Knowledge Base configuration:
- MCP integration is disabled by default for public repositories
- Jira integration is disabled by default for public repositories
- Linear integration is disabled by default for public repositories
You can enable these sources in your CodeRabbit configuration.
📒 Files selected for processing (2)
src/app/api/cron/food_orders/route.ts(3 hunks)src/lib/mail/html-mock.ts(1 hunks)
🧰 Additional context used
🧬 Code graph analysis (1)
src/app/api/cron/food_orders/route.ts (1)
src/lib/mail/html-mock.ts (1)
GroupedEmailOrder(487-494)
🔇 Additional comments (3)
src/lib/mail/html-mock.ts (1)
496-502: LGTM on normalizeStrGood choice for Portuguese inputs: NFD + combining mark strip + lowercase + trim covers the common diacritics in pt-BR and aligns with the “feijao/salada” normalization.
src/app/api/cron/food_orders/route.ts (2)
60-63: Rename to ordersData: clearer, avoids shadowing; LGTMThe destructuring rename clarifies intent and prevents confusion with the outer orders variable.
68-76: Stable opc generation: sorting by option then choice is a good callThis ensures deterministic opc strings fed into the grouping logic and improves email grouping predictability.
| for (const tok of tokens) { | ||
| const parts = tok.split(":"); | ||
| const kRaw = parts[0]?.trim(); | ||
| const vRaw = parts.slice(1).join(":").trim(); // suporta "Observação: algo: extra" | ||
| if (!kRaw || !vRaw) continue; | ||
| const kNorm = normalizeStr(kRaw); | ||
| const display = | ||
| kNorm === "feijao" ? "Feijão" : kNorm === "salada" ? "Salada" : kRaw; | ||
| const vBase = normalizeStr(vRaw); | ||
| const v = vBase.startsWith("s") | ||
| ? "Sim" | ||
| : vBase.startsWith("n") | ||
| ? "Não" | ||
| : vRaw; | ||
| if (map.has(kNorm)) { | ||
| // Se já existir, prioriza "Sim" se houver conflito/duplicata | ||
| const prev = map.get(kNorm)!; | ||
| const newVal = prev.value === "Sim" || v === "Sim" ? "Sim" : v; | ||
| map.set(kNorm, { display, value: newVal }); | ||
| } else { | ||
| map.set(kNorm, { display, value: v }); | ||
| } | ||
| } |
There was a problem hiding this comment.
Fix: fallback when no valid "chave: valor" tokens are parsed to avoid "Prato com " keys
If every token in opc lacks a colon (e.g., "sem feijão, sem salada") or all tokens are invalid, the map stays empty. The current flow then builds an empty ordered list and returns something like "Prato com " (note the trailing space), producing a misleading and unstable grouping key.
Add a guard to treat this as “sem adicional” when map.size === 0, before the allNo check.
Apply this diff:
// Completa pares esperados: se só veio Salada, assume Feijão: Não; e vice-versa
const hasFeijao = map.has("feijao");
const hasSalada = map.has("salada");
if (hasFeijao && !hasSalada) map.set("salada", { display: "Salada", value: "Não" });
if (hasSalada && !hasFeijao) map.set("feijao", { display: "Feijão", value: "Não" });
+ // Se nenhum par válido foi extraído, trata como "sem adicional"+ if (map.size === 0) return `${p.prato} sem adicional`;
// Se tudo é "Não", trata como "sem adicional"
const entries = Array.from(map.values());
const allNo = entries.length > 0 && entries.every((e) => e.value === "Não");
if (allNo) return `${p.prato} sem adicional`;
// Ordena: Feijão, Salada, depois demais chaves em ordem alfabéticaAlso applies to: 554-557, 573-577
🤖 Prompt for AI Agents
In src/lib/mail/html-mock.ts around lines 520-545 (and similarly at 554-557 and
573-577), add a guard that if after parsing tokens the map is empty (map.size
=== 0) then insert a fallback entry to represent "sem adicional" before the
existing allNo check; specifically set map.set("sem adicional", { display: "Sem
adicional", value: "Não" }) (or equivalent normalized key/display/value you use
elsewhere) so the subsequent formatting produces a stable "Sem adicional"
grouping instead of "Prato com " or an empty list.
Summary by CodeRabbit
Bug Fixes
Refactor