feat: vínculo Empresa+Filial e DRE detalhado por empresa - #379
Merged
Conversation
- DRE: linha de empresa/setor expansível com lista de pessoas (nome, empresa, setor, valor) e botão "Ir para o pedido" (1.30.0) - Vínculo por Empresa + Filial no onboarding e na tela de Usuários; enterprise derivado/sincronizado no servidor a partir da filial (1.31.0) - DRE agrupa/exibe pela Empresa cadastrada (nome real) e novo filtro de e-mail dedicado na aba de Pedidos (1.32.0) - Backfill SQL de filialId para colaboradores Cristallux_Filial Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Deployment failed with the following error: View Documentation: https://vercel.com/docs/accounts/team-members-and-roles |
Contributor
📝 WalkthroughWalkthroughThis PR refactors enterprise/filial management across the entire platform: enterprises are no longer provided as direct user input but are instead derived from the selected filial, affecting user profiles, the food order reporting API, and admin UI for user and DRE data management, with a historical backfill for Cristallux_Filial users. ChangesEnterprise-from-Filial Migration
Sequence DiagramssequenceDiagram
participant Client
participant FoodOrderRouter
participant DREFlow
participant Database
Client->>FoodOrderRouter: getDREData(year, period, grouping)
FoodOrderRouter->>DREFlow: resolveDrePeriod(inputs)
DREFlow->>Database: query orders with date range
Database-->>DREFlow: orders with filial/empresa data
DREFlow->>DREFlow: group by empresaId+sector
DREFlow->>Database: fetch related entities (usuario, menuItem, restaurant)
Database-->>DREFlow: enriched order data
DREFlow-->>FoodOrderRouter: aggregated rows with empresaId, empresaName
FoodOrderRouter-->>Client: DRE response
sequenceDiagram
participant User
participant DREReport
participant OrdersAPI
participant OrdersTab
User->>DREReport: click expand chevron on empresa-sector row
DREReport->>DREReport: set expandedGroup state
DREReport->>OrdersAPI: getEnterpriseSectorOrders(empresa, sector, date range)
OrdersAPI-->>DREReport: list of orders with user, filial, menuItem
DREReport->>DREReport: render nested order details table
User->>DREReport: click "Ir para o pedido" action
DREReport->>OrdersTab: onOpenOrder({date, email})
OrdersTab->>OrdersTab: set userEmail and activeTab
OrdersTab->>OrdersAPI: list(userEmail=email)
OrdersAPI-->>OrdersTab: filtered orders for that user
Estimated code review effort🎯 4 (Complex) | ⏱️ ~60 minutes Possibly related PRs
Poem
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
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. Comment |
Contributor
There was a problem hiding this comment.
Actionable comments posted: 3
🧹 Nitpick comments (3)
scripts/sql/backfill-cristallux-filial-users.sql (1)
17-24: ⚡ Quick winWrap UPDATE in a transaction for safer backfill execution.
For data migration scripts, wrapping the operation in an explicit transaction provides better control and rollback capability if validation fails or errors occur.
🛡️ Proposed transaction wrapper
+BEGIN;+ -- 2) Aplicação do backfill: UPDATE "users" SET "filialId" = 'cmpxzjlta000gjk04dvipce45', "updatedAt" = NOW() WHERE "enterprise" = 'Cristallux_Filial' AND EXISTS ( SELECT 1 FROM "filiais" WHERE "id" = 'cmpxzjlta000gjk04dvipce45' ); ++-- Conferir quantas linhas foram afetadas antes de commitar:+-- Se o número estiver correto, execute: COMMIT;+-- Caso contrário, execute: ROLLBACK;This allows you to review the affected row count before committing, and provides an explicit rollback path if needed.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@scripts/sql/backfill-cristallux-filial-users.sql` around lines 17 - 24, Wrap the UPDATE that sets "filialId" for rows in "users" (WHERE "enterprise" = 'Cristallux_Filial' AND EXISTS (SELECT 1 FROM "filiais" WHERE "id" = 'cmpxzjlta000gjk04dvipce45')) in an explicit transaction: BEGIN the transaction, run the UPDATE, capture the affected row count for verification, and then COMMIT if the count is as expected or ROLLBACK on error/unexpected counts to ensure safe backfill execution; reference the UPDATE statement, the "users" table, the "filiais" existence check, and the "filialId"/"updatedAt" assignments when making the change.src/app/(authenticated)/admin/food/page.tsx (1)
31-39: ⚡ Quick winWrap
handleOpenOrderFromDreinuseCallbackto prevent unnecessary re-renders.Per coding guidelines, functions passed as props should use
useCallback. Currently,handleOpenOrderFromDreis recreated on every render, causingDREReportto potentially re-render unnecessarily.♻️ Proposed fix
+import { useState, useCallback } from "react"-import { useState } from "react"- const handleOpenOrderFromDre = ({ date, email }: { date: Date; email: string }) => {- setSelectedDate(date)- setUserEmail(email)- setUserName("")- setSelectedRestaurant("")- setSelectedStatus("")- setActiveTab("orders")- }+ const handleOpenOrderFromDre = useCallback(({ date, email }: { date: Date; email: string }) => {+ setSelectedDate(date)+ setUserEmail(email)+ setUserName("")+ setSelectedRestaurant("")+ setSelectedStatus("")+ setActiveTab("orders")+ }, [])🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/app/`(authenticated)/admin/food/page.tsx around lines 31 - 39, Wrap the handleOpenOrderFromDre function in React's useCallback to avoid recreation on every render and prevent unnecessary re-renders of child components like DREReport; specifically, replace the inline function declaration of handleOpenOrderFromDre with a const handleOpenOrderFromDre = useCallback(({ date, email }: { date: Date; email: string }) => { setSelectedDate(date); setUserEmail(email); setUserName(""); setSelectedRestaurant(""); setSelectedStatus(""); setActiveTab("orders"); }, [setSelectedDate, setUserEmail, setUserName, setSelectedRestaurant, setSelectedStatus, setActiveTab]) so the callback only changes when its setter dependencies change.src/app/(authenticated)/admin/food/_components/orders-tab.tsx (1)
853-859: ⚖️ Poor tradeoffConsider adding debounce to search inputs.
Both the name and email filter inputs trigger API calls on every keystroke. As per coding guidelines, search inputs and expensive async operations should implement debounce. While this follows the existing pattern for
userName, adding debounce would reduce unnecessary API calls.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/app/`(authenticated)/admin/food/_components/orders-tab.tsx around lines 853 - 859, The userEmail input currently updates on every keystroke (value={userEmail}, onChange={e => setUserEmail(e.target.value)}), causing immediate API calls; implement debounce for the email filter analogous to the existing userName pattern by introducing a debouncedEmail (via the same useDebounce hook or lodash.debounce) and use the debounced value to trigger the orders fetch instead of userEmail, or debounce the function that performs the API call (e.g., fetchOrders); update the Input handler to still setUserEmail immediately but ensure API calls read debouncedEmail so rapid keystrokes do not fire requests.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@scripts/sql/backfill-cristallux-filial-users.sql`:
- Around line 22-24: Update the EXISTS condition so it verifies the filial's
empresa has enterprise = 'Cristallux_Filial' rather than just checking the
filial exists; specifically, change the subquery against "filiais" (for id
'cmpxzjlta000gjk04dvipce45') to join the related empresa row and assert
empresa.enterprise = 'Cristallux_Filial' (ensuring consistency with
resolveEnterpriseFromFilial logic that derives enterprise from
filial.empresa.enterprise).
- Around line 18-21: The UPDATE statement for table "users" currently updates
every row with "enterprise" = 'Cristallux_Filial'; modify the UPDATE so it
matches the pre-check by adding an idempotency guard comparing "filialId" to the
target value using IS DISTINCT FROM (i.e., only update rows where "filialId" IS
DISTINCT FROM 'cmpxzjlta000gjk04dvipce45'), and keep the "updatedAt" = NOW()
assignment; this ensures only users that actually need the change are updated
and makes the script safe to re-run.
In `@src/app/`(authenticated)/admin/food/_components/dre-report.tsx:
- Around line 694-761: The expanded nested row is using a hardcoded colSpan={7}
which is too small when groupBy === "enterprise_sector" (table has 8 columns);
modify the TableCell that currently uses colSpan={7} to compute the span
dynamically—e.g. replace it with colSpan={groupBy === "enterprise_sector" ? 8 :
7} or compute a visibleColumns count and use colSpan={visibleColumns} so the
nested table always spans the full width (update the TableCell in the isExpanded
block where detailQuery is rendered).
---
Nitpick comments:
In `@scripts/sql/backfill-cristallux-filial-users.sql`:
- Around line 17-24: Wrap the UPDATE that sets "filialId" for rows in "users"
(WHERE "enterprise" = 'Cristallux_Filial' AND EXISTS (SELECT 1 FROM "filiais"
WHERE "id" = 'cmpxzjlta000gjk04dvipce45')) in an explicit transaction: BEGIN the
transaction, run the UPDATE, capture the affected row count for verification,
and then COMMIT if the count is as expected or ROLLBACK on error/unexpected
counts to ensure safe backfill execution; reference the UPDATE statement, the
"users" table, the "filiais" existence check, and the "filialId"/"updatedAt"
assignments when making the change.
In `@src/app/`(authenticated)/admin/food/_components/orders-tab.tsx:
- Around line 853-859: The userEmail input currently updates on every keystroke
(value={userEmail}, onChange={e => setUserEmail(e.target.value)}), causing
immediate API calls; implement debounce for the email filter analogous to the
existing userName pattern by introducing a debouncedEmail (via the same
useDebounce hook or lodash.debounce) and use the debounced value to trigger the
orders fetch instead of userEmail, or debounce the function that performs the
API call (e.g., fetchOrders); update the Input handler to still setUserEmail
immediately but ensure API calls read debouncedEmail so rapid keystrokes do not
fire requests.
In `@src/app/`(authenticated)/admin/food/page.tsx:
- Around line 31-39: Wrap the handleOpenOrderFromDre function in React's
useCallback to avoid recreation on every render and prevent unnecessary
re-renders of child components like DREReport; specifically, replace the inline
function declaration of handleOpenOrderFromDre with a const
handleOpenOrderFromDre = useCallback(({ date, email }: { date: Date; email:
string }) => { setSelectedDate(date); setUserEmail(email); setUserName("");
setSelectedRestaurant(""); setSelectedStatus(""); setActiveTab("orders"); },
[setSelectedDate, setUserEmail, setUserName, setSelectedRestaurant,
setSelectedStatus, setActiveTab]) so the callback only changes when its setter
dependencies change.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro
Run ID: c554e447-4569-47a6-a143-5fcdd2b4a713
📒 Files selected for processing (11)
package.jsonscripts/sql/backfill-cristallux-filial-users.sqlsrc/app/(authenticated)/admin/food/_components/dre-report.tsxsrc/app/(authenticated)/admin/food/_components/orders-tab.tsxsrc/app/(authenticated)/admin/food/page.tsxsrc/app/(authenticated)/admin/users/page.tsxsrc/components/ui/complete-profile-modal.tsxsrc/const/app-release-notes.tssrc/server/api/routers/food-order.tssrc/server/api/routers/user.tssrc/server/validators/filial-enterprise.ts
Comment on lines
+18
to
+21
| UPDATE "users" | ||
| SET "filialId" = 'cmpxzjlta000gjk04dvipce45', | ||
| "updatedAt" = NOW() | ||
| WHERE "enterprise" = 'Cristallux_Filial' |
Contributor
There was a problem hiding this comment.
Add idempotency filter to match the pre-check query.
The UPDATE lacks the IS DISTINCT FROM filter that appears in the pre-check query (line 15), causing inconsistent behavior:
- Pre-check counts users whose
filialIddiffers from the target - UPDATE modifies all
enterprise='Cristallux_Filial'users, even those already linked to the target filial - Running the script multiple times will unnecessarily update
updatedAtfor already-correct rows
♻️ Proposed fix to add idempotency guard
UPDATE "users"
SET "filialId" = 'cmpxzjlta000gjk04dvipce45',
"updatedAt" = NOW()
WHERE "enterprise" = 'Cristallux_Filial'
+ AND ("filialId" IS DISTINCT FROM 'cmpxzjlta000gjk04dvipce45')
AND EXISTS (This ensures the script only updates users who need the change, making it safely re-runnable.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@scripts/sql/backfill-cristallux-filial-users.sql` around lines 18 - 21, The
UPDATE statement for table "users" currently updates every row with "enterprise"
= 'Cristallux_Filial'; modify the UPDATE so it matches the pre-check by adding
an idempotency guard comparing "filialId" to the target value using IS DISTINCT
FROM (i.e., only update rows where "filialId" IS DISTINCT FROM
'cmpxzjlta000gjk04dvipce45'), and keep the "updatedAt" = NOW() assignment; this
ensures only users that actually need the change are updated and makes the
script safe to re-run.
Comment on lines
+22
to
+24
| AND EXISTS ( | ||
| SELECT 1 FROM "filiais" WHERE "id" = 'cmpxzjlta000gjk04dvipce45' | ||
| ); |
Contributor
There was a problem hiding this comment.
Validate that the target filial's empresa matches Cristallux_Filial.
The EXISTS check verifies that the filial exists but doesn't validate that its empresa.enterprise corresponds to 'Cristallux_Filial'. This creates a critical data integrity risk:
- After backfill, users will have
enterprise='Cristallux_Filial'butfilialIdpointing to a filial whoseempresa.enterprisemight differ - When these users are updated via the API,
enterprisewill be synced to match the filial's empresa (perresolveEnterpriseFromFiliallogic in context) - This could break reports or queries filtering by
enterprise='Cristallux_Filial'
🔒 Proposed fix to validate empresa compatibility
WHERE "enterprise" = 'Cristallux_Filial'
AND EXISTS (
- SELECT 1 FROM "filiais" WHERE "id" = 'cmpxzjlta000gjk04dvipce45'+ SELECT 1 + FROM "filiais" f+ JOIN "empresas" e ON f."empresaId" = e."id"+ WHERE f."id" = 'cmpxzjlta000gjk04dvipce45'+ AND e."enterprise" = 'Cristallux_Filial'
);This ensures the target filial belongs to an empresa with enterprise='Cristallux_Filial', preventing data inconsistency.
Based on learnings from context: resolveEnterpriseFromFilial derives enterprise from filial.empresa.enterprise, and API updates sync the enterprise field when filialId changes.
📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| AND EXISTS ( | |
| SELECT1FROM"filiais"WHERE"id"='cmpxzjlta000gjk04dvipce45' | |
| ); | |
| AND EXISTS ( | |
| SELECT1 | |
| FROM"filiais" f | |
| JOIN"empresas" e ON f."empresaId"= e."id" | |
| WHERE f."id"='cmpxzjlta000gjk04dvipce45' | |
| AND e."enterprise"='Cristallux_Filial' | |
| ); |
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@scripts/sql/backfill-cristallux-filial-users.sql` around lines 22 - 24,
Update the EXISTS condition so it verifies the filial's empresa has enterprise =
'Cristallux_Filial' rather than just checking the filial exists; specifically,
change the subquery against "filiais" (for id 'cmpxzjlta000gjk04dvipce45') to
join the related empresa row and assert empresa.enterprise = 'Cristallux_Filial'
(ensuring consistency with resolveEnterpriseFromFilial logic that derives
enterprise from filial.empresa.enterprise).
Comment on lines
+694
to
+761
| {isExpanded ? ( | ||
| <TableRow className="hover:bg-transparent"> | ||
| <TableCell colSpan={7} className="bg-muted/30 p-0"> | ||
| <div className="p-3"> | ||
| {detailQuery.isLoading ? ( | ||
| <p className="py-2 text-sm text-muted-foreground">Carregando pedidos...</p> | ||
| ) : detailQuery.isError ? ( | ||
| <p className="py-2 text-sm text-muted-foreground"> | ||
| Erro ao carregar os pedidos deste grupo. | ||
| </p> | ||
| ) : detailQuery.data && detailQuery.data.length > 0 ? ( | ||
| <Table> | ||
| <TableHeader> | ||
| <TableRow> | ||
| <TableHead>Pessoa</TableHead> | ||
| <TableHead>Empresa</TableHead> | ||
| <TableHead>Setor</TableHead> | ||
| <TableHead>Data do pedido</TableHead> | ||
| <TableHead>Prato</TableHead> | ||
| <TableHead className="text-right">Valor (R$)</TableHead> | ||
| <TableHead className="text-right">Pedido</TableHead> | ||
| </TableRow> | ||
| </TableHeader> | ||
| <TableBody> | ||
| {detailQuery.data.map((order) => ( | ||
| <TableRow key={order.id}> | ||
| <TableCell> | ||
| <div className="font-medium">{order.userName || "—"}</div> | ||
| <div className="text-xs text-muted-foreground">{order.email}</div> | ||
| </TableCell> | ||
| <TableCell> | ||
| <Badge variant="outline">{order.empresaName ?? order.enterprise}</Badge> | ||
| </TableCell> | ||
| <TableCell>{order.sector ?? "Não informado"}</TableCell> | ||
| <TableCell> | ||
| {format(new Date(order.orderDate), "dd/MM/yyyy", { locale: ptBR })} | ||
| </TableCell> | ||
| <TableCell>{order.menuItemName}</TableCell> | ||
| <TableCell className="text-right">R$ {order.price.toFixed(2)}</TableCell> | ||
| <TableCell className="text-right"> | ||
| <Button | ||
| variant="outline" | ||
| size="sm" | ||
| className="flex items-center gap-1" | ||
| onClick={(e) => { | ||
| e.stopPropagation() | ||
| onOpenOrder?.({ | ||
| date: new Date(order.orderDate), | ||
| email: order.email, | ||
| }) | ||
| }} | ||
| > | ||
| <ExternalLink className="h-3.5 w-3.5" /> | ||
| Ir para o pedido | ||
| </Button> | ||
| </TableCell> | ||
| </TableRow> | ||
| ))} | ||
| </TableBody> | ||
| </Table> | ||
| ) : ( | ||
| <p className="py-2 text-sm text-muted-foreground"> | ||
| Nenhum pedido encontrado para este grupo. | ||
| </p> | ||
| )} | ||
| </div> | ||
| </TableCell> | ||
| </TableRow> |
Contributor
There was a problem hiding this comment.
Incorrect colSpan value for expanded row.
The expanded row uses colSpan={7}, but when groupBy === "enterprise_sector", the table has 8 columns: expand icon + Empresa + Setor + Pedidos + Valor + Representatividade + Rateio = 7 visible data columns, plus the new expand column = 8 total. This mismatch may cause the nested table to not span the full width.
🐛 Proposed fix
- <TableCell colSpan={7} className="bg-muted/30 p-0">+ <TableCell colSpan={8} className="bg-muted/30 p-0">🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@src/app/`(authenticated)/admin/food/_components/dre-report.tsx around lines
694 - 761, The expanded nested row is using a hardcoded colSpan={7} which is too
small when groupBy === "enterprise_sector" (table has 8 columns); modify the
TableCell that currently uses colSpan={7} to compute the span dynamically—e.g.
replace it with colSpan={groupBy === "enterprise_sector" ? 8 : 7} or compute a
visibleColumns count and use colSpan={visibleColumns} so the nested table always
spans the full width (update the TableCell in the isExpanded block where
detailQuery is rendered).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary by CodeRabbit
New Features
Improvements