refactor: traduz dominio de payers no app

This commit is contained in:
Felipe Coutinho
2026-03-14 12:51:08 +00:00
parent 67ad4b9d02
commit 43b0f0c47e
31 changed files with 691 additions and 720 deletions

View File

@@ -3,8 +3,8 @@ import { fetchPendingInboxCount } from "@/features/inbox/queries";
import { AppNavbar } from "@/shared/components/navigation/navbar/app-navbar"; import { AppNavbar } from "@/shared/components/navigation/navbar/app-navbar";
import { PrivacyProvider } from "@/shared/components/providers/privacy-provider"; import { PrivacyProvider } from "@/shared/components/providers/privacy-provider";
import { getUserSession } from "@/shared/lib/auth/server"; import { getUserSession } from "@/shared/lib/auth/server";
import { fetchPagadoresWithAccess } from "@/shared/lib/payers/access"; import { fetchPayersWithAccess } from "@/shared/lib/payers/access";
import { PAGADOR_ROLE_ADMIN } from "@/shared/lib/payers/constants"; import { PAYER_ROLE_ADMIN } from "@/shared/lib/payers/constants";
import { parsePeriodParam } from "@/shared/utils/period"; import { parsePeriodParam } from "@/shared/utils/period";
export default async function DashboardLayout({ export default async function DashboardLayout({
@@ -15,11 +15,11 @@ export default async function DashboardLayout({
searchParams?: Promise<Record<string, string | string[] | undefined>>; searchParams?: Promise<Record<string, string | string[] | undefined>>;
}>) { }>) {
const session = await getUserSession(); const session = await getUserSession();
const pagadoresList = await fetchPagadoresWithAccess(session.user.id); const payerList = await fetchPayersWithAccess(session.user.id);
// Encontrar o pagador admin do usuário // Encontrar o pagador admin do usuário
const adminPagador = pagadoresList.find( const adminPagador = payerList.find(
(p) => p.role === PAGADOR_ROLE_ADMIN && p.userId === session.user.id, (p) => p.role === PAYER_ROLE_ADMIN && p.userId === session.user.id,
); );
// Buscar notificações para o período atual // Buscar notificações para o período atual

View File

@@ -4,41 +4,41 @@ import {
RiWallet3Line, RiWallet3Line,
} from "@remixicon/react"; } from "@remixicon/react";
import { notFound } from "next/navigation"; import { notFound } from "next/navigation";
import { PagadorCardUsageCard } from "@/features/payers/components/details/payer-card-usage-card"; import { PayerCardUsageCard } from "@/features/payers/components/details/payer-card-usage-card";
import { PagadorHeaderCard } from "@/features/payers/components/details/payer-header-card"; import { PayerHeaderCard } from "@/features/payers/components/details/payer-header-card";
import { PagadorHistoryCard } from "@/features/payers/components/details/payer-history-card"; import { PayerHistoryCard } from "@/features/payers/components/details/payer-history-card";
import { PagadorInfoCard } from "@/features/payers/components/details/payer-info-card"; import { PagadorInfoCard } from "@/features/payers/components/details/payer-info-card";
import { PagadorLeaveShareCard } from "@/features/payers/components/details/payer-leave-share-card"; import { PayerLeaveShareCard } from "@/features/payers/components/details/payer-leave-share-card";
import { PagadorMonthlySummaryCard } from "@/features/payers/components/details/payer-monthly-summary-card"; import { PayerMonthlySummaryCard } from "@/features/payers/components/details/payer-monthly-summary-card";
import { import {
PagadorBoletoCard, PayerBoletoCard,
PagadorPaymentStatusCard, PayerPaymentStatusCard,
} from "@/features/payers/components/details/payer-payment-method-cards"; } from "@/features/payers/components/details/payer-payment-method-cards";
import { PagadorSharingCard } from "@/features/payers/components/details/payer-sharing-card"; import { PayerSharingCard } from "@/features/payers/components/details/payer-sharing-card";
import { import {
fetchCurrentUserShare, fetchCurrentUserShare,
fetchPagadorLancamentos, fetchPagadorLancamentos,
fetchPagadorShares, fetchPayerShares,
} from "@/features/payers/detail-queries"; } from "@/features/payers/detail-queries";
import { buildReadOnlyOptionSets } from "@/features/payers/lib/build-readonly-option-sets"; import { buildReadOnlyOptionSets } from "@/features/payers/lib/build-readonly-option-sets";
import { fetchUserPreferences } from "@/features/settings/queries"; import { fetchUserPreferences } from "@/features/settings/queries";
import { LancamentosPage as LancamentosSection } from "@/features/transactions/components/page/transactions-page"; import { TransactionsPage as LancamentosSection } from "@/features/transactions/components/page/transactions-page";
import { import {
buildLancamentoWhere,
buildOptionSets, buildOptionSets,
buildSluggedFilters, buildSluggedFilters,
buildSlugMaps, buildSlugMaps,
extractLancamentoSearchFilters, buildTransactionWhere,
extractTransactionSearchFilters,
getSingleParam, getSingleParam,
type LancamentoSearchFilters, mapTransactionsData,
mapLancamentosData,
type ResolvedSearchParams, type ResolvedSearchParams,
type SluggedFilters, type SluggedFilters,
type SlugMaps, type SlugMaps,
type TransactionSearchFilters,
} from "@/features/transactions/page-helpers"; } from "@/features/transactions/page-helpers";
import { import {
fetchLancamentoFilterSources,
fetchRecentEstablishments, fetchRecentEstablishments,
fetchTransactionFilterSources,
} from "@/features/transactions/queries"; } from "@/features/transactions/queries";
import { ExpandableWidgetCard } from "@/shared/components/expandable-widget-card"; import { ExpandableWidgetCard } from "@/shared/components/expandable-widget-card";
import MonthNavigation from "@/shared/components/month-picker/month-navigation"; import MonthNavigation from "@/shared/components/month-picker/month-navigation";
@@ -49,15 +49,15 @@ import {
TabsTrigger, TabsTrigger,
} from "@/shared/components/ui/tabs"; } from "@/shared/components/ui/tabs";
import { getUserId } from "@/shared/lib/auth/server"; import { getUserId } from "@/shared/lib/auth/server";
import { getPagadorAccess } from "@/shared/lib/payers/access"; import { getPayerAccess } from "@/shared/lib/payers/access";
import { import {
fetchPagadorBoletoItems, fetchPagadorBoletoItems,
fetchPagadorBoletoStats, fetchPagadorBoletoStats,
fetchPagadorCardUsage, fetchPagadorCardUsage,
fetchPagadorHistory,
fetchPagadorMonthlyBreakdown,
fetchPagadorPaymentStatus, fetchPagadorPaymentStatus,
type PagadorCardUsageItem, fetchPayerHistory,
fetchPayerMonthlyBreakdown,
type PayerCardUsageItem,
} from "@/shared/lib/payers/details"; } from "@/shared/lib/payers/details";
import { parsePeriodParam } from "@/shared/utils/period"; import { parsePeriodParam } from "@/shared/utils/period";
@@ -71,31 +71,31 @@ type PageProps = {
const capitalize = (value: string) => const capitalize = (value: string) =>
value.length ? value.charAt(0).toUpperCase().concat(value.slice(1)) : value; value.length ? value.charAt(0).toUpperCase().concat(value.slice(1)) : value;
const EMPTY_FILTERS: LancamentoSearchFilters = { const EMPTY_FILTERS: TransactionSearchFilters = {
transactionFilter: null, transactionFilter: null,
conditionFilter: null, conditionFilter: null,
paymentFilter: null, paymentFilter: null,
pagadorFilter: null, payerFilter: null,
categoriaFilter: null, categoryFilter: null,
contaCartaoFilter: null, accountCardFilter: null,
searchFilter: null, searchFilter: null,
}; };
const createEmptySlugMaps = (): SlugMaps => ({ const createEmptySlugMaps = (): SlugMaps => ({
pagador: new Map(), payer: new Map(),
categoria: new Map(), category: new Map(),
conta: new Map(), financialAccount: new Map(),
cartao: new Map(), card: new Map(),
}); });
type OptionSet = ReturnType<typeof buildOptionSets>; type OptionSet = ReturnType<typeof buildOptionSets>;
export default async function Page({ params, searchParams }: PageProps) { export default async function Page({ params, searchParams }: PageProps) {
const { payerId: pagadorId } = await params; const { payerId } = await params;
const userId = await getUserId(); const userId = await getUserId();
const resolvedSearchParams = searchParams ? await searchParams : undefined; const resolvedSearchParams = searchParams ? await searchParams : undefined;
const access = await getPagadorAccess(userId, pagadorId); const access = await getPayerAccess(userId, payerId);
if (!access) { if (!access) {
notFound(); notFound();
@@ -112,7 +112,8 @@ export default async function Page({ params, searchParams }: PageProps) {
} = parsePeriodParam(periodoParamRaw); } = parsePeriodParam(periodoParamRaw);
const periodLabel = `${capitalize(monthName)} de ${year}`; const periodLabel = `${capitalize(monthName)} de ${year}`;
const allSearchFilters = extractLancamentoSearchFilters(resolvedSearchParams); const allSearchFilters =
extractTransactionSearchFilters(resolvedSearchParams);
const searchFilters = canEdit const searchFilters = canEdit
? allSearchFilters ? allSearchFilters
: { : {
@@ -121,40 +122,40 @@ export default async function Page({ params, searchParams }: PageProps) {
}; };
let filterSources: Awaited< let filterSources: Awaited<
ReturnType<typeof fetchLancamentoFilterSources> ReturnType<typeof fetchTransactionFilterSources>
> | null = null; > | null = null;
let loggedUserFilterSources: Awaited< let loggedUserFilterSources: Awaited<
ReturnType<typeof fetchLancamentoFilterSources> ReturnType<typeof fetchTransactionFilterSources>
> | null = null; > | null = null;
let sluggedFilters: SluggedFilters; let sluggedFilters: SluggedFilters;
let slugMaps: SlugMaps; let slugMaps: SlugMaps;
if (canEdit) { if (canEdit) {
filterSources = await fetchLancamentoFilterSources(dataOwnerId); filterSources = await fetchTransactionFilterSources(dataOwnerId);
sluggedFilters = buildSluggedFilters(filterSources); sluggedFilters = buildSluggedFilters(filterSources);
slugMaps = buildSlugMaps(sluggedFilters); slugMaps = buildSlugMaps(sluggedFilters);
} else { } else {
// Buscar opções do usuário logado para usar ao importar // Buscar opções do usuário logado para usar ao importar
loggedUserFilterSources = await fetchLancamentoFilterSources(userId); loggedUserFilterSources = await fetchTransactionFilterSources(userId);
sluggedFilters = { sluggedFilters = {
pagadorFiltersRaw: [], payerFiltersRaw: [],
categoriaFiltersRaw: [], categoryFiltersRaw: [],
contaFiltersRaw: [], accountFiltersRaw: [],
cartaoFiltersRaw: [], cardFiltersRaw: [],
}; };
slugMaps = createEmptySlugMaps(); slugMaps = createEmptySlugMaps();
} }
const filters = buildLancamentoWhere({ const filters = buildTransactionWhere({
userId: dataOwnerId, userId: dataOwnerId,
period: selectedPeriod, period: selectedPeriod,
filters: searchFilters, filters: searchFilters,
slugMaps, slugMaps,
pagadorId: pagador.id, payerId: pagador.id,
}); });
const sharesPromise = canEdit const sharesPromise = canEdit
? fetchPagadorShares(pagador.id) ? fetchPayerShares(pagador.id)
: Promise.resolve([]); : Promise.resolve([]);
const currentUserSharePromise = !canEdit const currentUserSharePromise = !canEdit
@@ -162,7 +163,7 @@ export default async function Page({ params, searchParams }: PageProps) {
: Promise.resolve(null); : Promise.resolve(null);
const [ const [
lancamentoRows, transactionRows,
monthlyBreakdown, monthlyBreakdown,
historyData, historyData,
cardUsage, cardUsage,
@@ -175,34 +176,34 @@ export default async function Page({ params, searchParams }: PageProps) {
userPreferences, userPreferences,
] = await Promise.all([ ] = await Promise.all([
fetchPagadorLancamentos(filters), fetchPagadorLancamentos(filters),
fetchPagadorMonthlyBreakdown({ fetchPayerMonthlyBreakdown({
userId: dataOwnerId, userId: dataOwnerId,
pagadorId: pagador.id, payerId: pagador.id,
period: selectedPeriod, period: selectedPeriod,
}), }),
fetchPagadorHistory({ fetchPayerHistory({
userId: dataOwnerId, userId: dataOwnerId,
pagadorId: pagador.id, payerId: pagador.id,
period: selectedPeriod, period: selectedPeriod,
}), }),
fetchPagadorCardUsage({ fetchPagadorCardUsage({
userId: dataOwnerId, userId: dataOwnerId,
pagadorId: pagador.id, payerId: pagador.id,
period: selectedPeriod, period: selectedPeriod,
}), }),
fetchPagadorBoletoStats({ fetchPagadorBoletoStats({
userId: dataOwnerId, userId: dataOwnerId,
pagadorId: pagador.id, payerId: pagador.id,
period: selectedPeriod, period: selectedPeriod,
}), }),
fetchPagadorBoletoItems({ fetchPagadorBoletoItems({
userId: dataOwnerId, userId: dataOwnerId,
pagadorId: pagador.id, payerId: pagador.id,
period: selectedPeriod, period: selectedPeriod,
}), }),
fetchPagadorPaymentStatus({ fetchPagadorPaymentStatus({
userId: dataOwnerId, userId: dataOwnerId,
pagadorId: pagador.id, payerId: pagador.id,
period: selectedPeriod, period: selectedPeriod,
}), }),
sharesPromise, sharesPromise,
@@ -211,12 +212,12 @@ export default async function Page({ params, searchParams }: PageProps) {
fetchUserPreferences(userId), fetchUserPreferences(userId),
]); ]);
const mappedLancamentos = mapLancamentosData(lancamentoRows); const mappedTransactions = mapTransactionsData(transactionRows);
const lancamentosData = canEdit const transactionData = canEdit
? mappedLancamentos ? mappedTransactions
: mappedLancamentos.map((item) => ({ ...item, readonly: true })); : mappedTransactions.map((item) => ({ ...item, readonly: true }));
const pagadorSharesData = shareRows; const payerSharesData = shareRows;
let optionSets: OptionSet; let optionSets: OptionSet;
let loggedUserOptionSets: OptionSet | null = null; let loggedUserOptionSets: OptionSet | null = null;
@@ -225,11 +226,11 @@ export default async function Page({ params, searchParams }: PageProps) {
if (canEdit && filterSources) { if (canEdit && filterSources) {
optionSets = buildOptionSets({ optionSets = buildOptionSets({
...sluggedFilters, ...sluggedFilters,
pagadorRows: filterSources.pagadorRows, payerRows: filterSources.payerRows,
}); });
} else { } else {
effectiveSluggedFilters = { effectiveSluggedFilters = {
pagadorFiltersRaw: [ payerFiltersRaw: [
{ {
id: pagador.id, id: pagador.id,
label: pagador.name, label: pagador.name,
@@ -238,11 +239,11 @@ export default async function Page({ params, searchParams }: PageProps) {
avatarUrl: pagador.avatarUrl, avatarUrl: pagador.avatarUrl,
}, },
], ],
categoriaFiltersRaw: [], categoryFiltersRaw: [],
contaFiltersRaw: [], accountFiltersRaw: [],
cartaoFiltersRaw: [], cardFiltersRaw: [],
}; };
optionSets = buildReadOnlyOptionSets(lancamentosData, pagador); optionSets = buildReadOnlyOptionSets(transactionData, pagador);
// Construir opções do usuário logado para usar ao importar // Construir opções do usuário logado para usar ao importar
if (loggedUserFilterSources) { if (loggedUserFilterSources) {
@@ -251,23 +252,23 @@ export default async function Page({ params, searchParams }: PageProps) {
); );
loggedUserOptionSets = buildOptionSets({ loggedUserOptionSets = buildOptionSets({
...loggedUserSluggedFilters, ...loggedUserSluggedFilters,
pagadorRows: loggedUserFilterSources.pagadorRows, payerRows: loggedUserFilterSources.payerRows,
}); });
} }
} }
const pagadorSlug = const payerSlug =
effectiveSluggedFilters.pagadorFiltersRaw.find( effectiveSluggedFilters.payerFiltersRaw.find(
(item) => item.id === pagador.id, (item) => item.id === pagador.id,
)?.slug ?? null; )?.slug ?? null;
const pagadorFilterOptions = pagadorSlug const payerFilterOptions = payerSlug
? optionSets.pagadorFilterOptions.filter( ? optionSets.payerFilterOptions.filter(
(option) => option.slug === pagadorSlug, (option) => option.slug === payerSlug,
) )
: optionSets.pagadorFilterOptions; : optionSets.payerFilterOptions;
const pagadorData = { const payerData = {
id: pagador.id, id: pagador.id,
name: pagador.name, name: pagador.name,
email: pagador.email ?? null, email: pagador.email ?? null,
@@ -288,7 +289,7 @@ export default async function Page({ params, searchParams }: PageProps) {
periodLabel, periodLabel,
totalExpenses: monthlyBreakdown.totalExpenses, totalExpenses: monthlyBreakdown.totalExpenses,
paymentSplits: monthlyBreakdown.paymentSplits, paymentSplits: monthlyBreakdown.paymentSplits,
cardUsage: cardUsage.slice(0, 3).map((item: PagadorCardUsageItem) => ({ cardUsage: cardUsage.slice(0, 3).map((item: PayerCardUsageItem) => ({
name: item.name, name: item.name,
amount: item.amount, amount: item.amount,
})), })),
@@ -299,7 +300,7 @@ export default async function Page({ params, searchParams }: PageProps) {
paidCount: boletoStats.paidCount, paidCount: boletoStats.paidCount,
pendingCount: boletoStats.pendingCount, pendingCount: boletoStats.pendingCount,
}, },
lancamentoCount: lancamentosData.length, lancamentoCount: transactionData.length,
}; };
return ( return (
@@ -312,25 +313,25 @@ export default async function Page({ params, searchParams }: PageProps) {
<TabsTrigger value="painel">Painel</TabsTrigger> <TabsTrigger value="painel">Painel</TabsTrigger>
<TabsTrigger value="lancamentos">Lançamentos</TabsTrigger> <TabsTrigger value="lancamentos">Lançamentos</TabsTrigger>
</TabsList> </TabsList>
<PagadorHeaderCard <PayerHeaderCard
pagador={pagadorData} payer={payerData}
selectedPeriod={selectedPeriod} selectedPeriod={selectedPeriod}
summary={summaryPreview} summary={summaryPreview}
/> />
<TabsContent value="profile" className="space-y-4"> <TabsContent value="profile" className="space-y-4">
<PagadorInfoCard pagador={pagadorData} /> <PagadorInfoCard payer={payerData} />
{canEdit && pagadorData.shareCode ? ( {canEdit && payerData.shareCode ? (
<PagadorSharingCard <PayerSharingCard
pagadorId={pagador.id} payerId={pagador.id}
shareCode={pagadorData.shareCode} shareCode={payerData.shareCode}
shares={pagadorSharesData} shares={payerSharesData}
/> />
) : null} ) : null}
{!canEdit && currentUserShare ? ( {!canEdit && currentUserShare ? (
<PagadorLeaveShareCard <PayerLeaveShareCard
shareId={currentUserShare.id} shareId={currentUserShare.id}
pagadorName={pagadorData.name} pagadorName={payerData.name}
createdAt={currentUserShare.createdAt} createdAt={currentUserShare.createdAt}
/> />
) : null} ) : null}
@@ -338,11 +339,11 @@ export default async function Page({ params, searchParams }: PageProps) {
<TabsContent value="painel" className="space-y-4"> <TabsContent value="painel" className="space-y-4">
<section className="grid gap-3 lg:grid-cols-2"> <section className="grid gap-3 lg:grid-cols-2">
<PagadorMonthlySummaryCard <PayerMonthlySummaryCard
periodLabel={periodLabel} periodLabel={periodLabel}
breakdown={monthlyBreakdown} breakdown={monthlyBreakdown}
/> />
<PagadorHistoryCard data={historyData} /> <PayerHistoryCard data={historyData} />
</section> </section>
<section className="grid gap-3 lg:grid-cols-3"> <section className="grid gap-3 lg:grid-cols-3">
@@ -351,21 +352,21 @@ export default async function Page({ params, searchParams }: PageProps) {
subtitle="Valores por cartão neste período" subtitle="Valores por cartão neste período"
icon={<RiBankCard2Line className="size-4" />} icon={<RiBankCard2Line className="size-4" />}
> >
<PagadorCardUsageCard items={cardUsage} /> <PayerCardUsageCard items={cardUsage} />
</ExpandableWidgetCard> </ExpandableWidgetCard>
<ExpandableWidgetCard <ExpandableWidgetCard
title="Boletos" title="Boletos"
subtitle="Boletos registrados neste período" subtitle="Boletos registrados neste período"
icon={<RiBarcodeLine className="size-4" />} icon={<RiBarcodeLine className="size-4" />}
> >
<PagadorBoletoCard items={boletoItems} /> <PayerBoletoCard items={boletoItems} />
</ExpandableWidgetCard> </ExpandableWidgetCard>
<ExpandableWidgetCard <ExpandableWidgetCard
title="Status de Pagamento" title="Status de Pagamento"
subtitle="Situação das despesas no período" subtitle="Situação das despesas no período"
icon={<RiWallet3Line className="size-4" />} icon={<RiWallet3Line className="size-4" />}
> >
<PagadorPaymentStatusCard data={paymentStatus} /> <PayerPaymentStatusCard data={paymentStatus} />
</ExpandableWidgetCard> </ExpandableWidgetCard>
</section> </section>
</TabsContent> </TabsContent>
@@ -374,29 +375,27 @@ export default async function Page({ params, searchParams }: PageProps) {
<section className="flex flex-col gap-4"> <section className="flex flex-col gap-4">
<LancamentosSection <LancamentosSection
currentUserId={userId} currentUserId={userId}
lancamentos={lancamentosData} transactions={transactionData}
pagadorOptions={optionSets.pagadorOptions} payerOptions={optionSets.payerOptions}
splitPagadorOptions={optionSets.splitPagadorOptions} splitPayerOptions={optionSets.splitPayerOptions}
defaultPagadorId={pagador.id} defaultPayerId={pagador.id}
contaOptions={optionSets.contaOptions} accountOptions={optionSets.accountOptions}
cartaoOptions={optionSets.cartaoOptions} cardOptions={optionSets.cardOptions}
categoriaOptions={optionSets.categoriaOptions} categoryOptions={optionSets.categoryOptions}
pagadorFilterOptions={pagadorFilterOptions} payerFilterOptions={payerFilterOptions}
categoriaFilterOptions={optionSets.categoriaFilterOptions} categoryFilterOptions={optionSets.categoryFilterOptions}
contaCartaoFilterOptions={optionSets.contaCartaoFilterOptions} accountCardFilterOptions={optionSets.accountCardFilterOptions}
selectedPeriod={selectedPeriod} selectedPeriod={selectedPeriod}
estabelecimentos={estabelecimentos} estabelecimentos={estabelecimentos}
allowCreate={canEdit} allowCreate={canEdit}
noteAsColumn={userPreferences?.extratoNoteAsColumn ?? false} noteAsColumn={userPreferences?.statementNoteAsColumn ?? false}
columnOrder={userPreferences?.lancamentosColumnOrder ?? null} columnOrder={userPreferences?.transactionsColumnOrder ?? null}
importPagadorOptions={loggedUserOptionSets?.pagadorOptions} importPayerOptions={loggedUserOptionSets?.payerOptions}
importSplitPagadorOptions={ importSplitPayerOptions={loggedUserOptionSets?.splitPayerOptions}
loggedUserOptionSets?.splitPagadorOptions importDefaultPayerId={loggedUserOptionSets?.defaultPayerId}
} importAccountOptions={loggedUserOptionSets?.accountOptions}
importDefaultPagadorId={loggedUserOptionSets?.defaultPagadorId} importCardOptions={loggedUserOptionSets?.cardOptions}
importContaOptions={loggedUserOptionSets?.contaOptions} importCategoryOptions={loggedUserOptionSets?.categoryOptions}
importCartaoOptions={loggedUserOptionSets?.cartaoOptions}
importCategoriaOptions={loggedUserOptionSets?.categoriaOptions}
/> />
</section> </section>
</TabsContent> </TabsContent>

View File

@@ -1,14 +1,14 @@
import { PagadoresPage } from "@/features/payers/components/payers-page"; import { PayersPage } from "@/features/payers/components/payers-page";
import { fetchPagadoresForUser } from "@/features/payers/queries"; import { fetchPayersForUser } from "@/features/payers/queries";
import { getUserId } from "@/shared/lib/auth/server"; import { getUserId } from "@/shared/lib/auth/server";
export default async function Page() { export default async function Page() {
const userId = await getUserId(); const userId = await getUserId();
const { pagadores, avatarOptions } = await fetchPagadoresForUser(userId); const { payers, avatarOptions } = await fetchPayersForUser(userId);
return ( return (
<main className="flex flex-col items-start gap-6"> <main className="flex flex-col items-start gap-6">
<PagadoresPage pagadores={pagadores} avatarOptions={avatarOptions} /> <PayersPage payers={payers} avatarOptions={avatarOptions} />
</main> </main>
); );
} }

View File

@@ -4,7 +4,7 @@ import { randomBytes } from "node:crypto";
import { and, eq } from "drizzle-orm"; import { and, eq } from "drizzle-orm";
import { revalidatePath } from "next/cache"; import { revalidatePath } from "next/cache";
import { z } from "zod"; import { z } from "zod";
import { compartilhamentosPagador, pagadores, user } from "@/db/schema"; import { payerShares, payers, user } from "@/db/schema";
import { import {
handleActionError, handleActionError,
revalidateForEntity, revalidateForEntity,
@@ -12,21 +12,25 @@ import {
import { getUser } from "@/shared/lib/auth/server"; import { getUser } from "@/shared/lib/auth/server";
import { db } from "@/shared/lib/db"; import { db } from "@/shared/lib/db";
import { import {
DEFAULT_PAGADOR_AVATAR, DEFAULT_PAYER_AVATAR,
PAGADOR_ROLE_ADMIN, PAYER_ROLE_ADMIN,
PAGADOR_ROLE_TERCEIRO, PAYER_ROLE_THIRD_PARTY,
PAGADOR_STATUS_OPTIONS, PAYER_STATUS_OPTIONS,
} from "@/shared/lib/payers/constants"; } from "@/shared/lib/payers/constants";
import { normalizeAvatarPath } from "@/shared/lib/payers/utils"; import { normalizeAvatarPath } from "@/shared/lib/payers/utils";
import { noteSchema, uuidSchema } from "@/shared/lib/schemas/common"; import { noteSchema, uuidSchema } from "@/shared/lib/schemas/common";
import type { ActionResult } from "@/shared/lib/types/actions"; import type { ActionResult } from "@/shared/lib/types/actions";
import { normalizeOptionalString } from "@/shared/utils/string"; import { normalizeOptionalString } from "@/shared/utils/string";
const statusEnum = z.enum(PAGADOR_STATUS_OPTIONS as [string, ...string[]], { const statusEnum = z
errorMap: () => ({ .enum([...PAYER_STATUS_OPTIONS] as [string, ...string[]])
message: "Selecione um status válido.", .refine(
}), (v) =>
}); PAYER_STATUS_OPTIONS.includes(v as (typeof PAYER_STATUS_OPTIONS)[number]),
{
message: "Selecione um status válido.",
},
);
const baseSchema = z.object({ const baseSchema = z.object({
name: z name: z
@@ -48,11 +52,11 @@ const baseSchema = z.object({
const createSchema = baseSchema; const createSchema = baseSchema;
const updateSchema = baseSchema.extend({ const updateSchema = baseSchema.extend({
id: uuidSchema("Pagador"), id: uuidSchema("Payer"),
}); });
const deleteSchema = z.object({ const deleteSchema = z.object({
id: uuidSchema("Pagador"), id: uuidSchema("Payer"),
}); });
const shareDeleteSchema = z.object({ const shareDeleteSchema = z.object({
@@ -67,7 +71,7 @@ const shareCodeJoinSchema = z.object({
}); });
const shareCodeRegenerateSchema = z.object({ const shareCodeRegenerateSchema = z.object({
pagadorId: uuidSchema("Pagador"), payerId: uuidSchema("Payer"),
}); });
type CreateInput = z.infer<typeof createSchema>; type CreateInput = z.infer<typeof createSchema>;
@@ -77,7 +81,7 @@ type ShareDeleteInput = z.infer<typeof shareDeleteSchema>;
type ShareCodeJoinInput = z.infer<typeof shareCodeJoinSchema>; type ShareCodeJoinInput = z.infer<typeof shareCodeJoinSchema>;
type ShareCodeRegenerateInput = z.infer<typeof shareCodeRegenerateSchema>; type ShareCodeRegenerateInput = z.infer<typeof shareCodeRegenerateSchema>;
const revalidate = () => revalidateForEntity("pagadores"); const revalidate = () => revalidateForEntity("payers");
const generateShareCode = () => { const generateShareCode = () => {
// base64url já retorna apenas [a-zA-Z0-9_-] // base64url já retorna apenas [a-zA-Z0-9_-]
@@ -85,56 +89,53 @@ const generateShareCode = () => {
return randomBytes(18).toString("base64url").slice(0, 24); return randomBytes(18).toString("base64url").slice(0, 24);
}; };
export async function createPagadorAction( export async function createPayerAction(
input: CreateInput, input: CreateInput,
): Promise<ActionResult> { ): Promise<ActionResult> {
try { try {
const user = await getUser(); const user = await getUser();
const data = createSchema.parse(input); const data = createSchema.parse(input);
await db.insert(pagadores).values({ await db.insert(payers).values({
name: data.name, name: data.name,
email: data.email, email: data.email,
status: data.status, status: data.status,
note: data.note, note: data.note,
avatarUrl: normalizeAvatarPath(data.avatarUrl) ?? DEFAULT_PAGADOR_AVATAR, avatarUrl: normalizeAvatarPath(data.avatarUrl) ?? DEFAULT_PAYER_AVATAR,
isAutoSend: data.isAutoSend ?? false, isAutoSend: data.isAutoSend ?? false,
role: PAGADOR_ROLE_TERCEIRO, role: PAYER_ROLE_THIRD_PARTY,
shareCode: generateShareCode(), shareCode: generateShareCode(),
userId: user.id, userId: user.id,
}); });
revalidate(); revalidate();
return { success: true, message: "Pagador criado com sucesso." }; return { success: true, message: "Payer criado com sucesso." };
} catch (error) { } catch (error) {
return handleActionError(error); return handleActionError(error);
} }
} }
export async function updatePagadorAction( export async function updatePayerAction(
input: UpdateInput, input: UpdateInput,
): Promise<ActionResult> { ): Promise<ActionResult> {
try { try {
const currentUser = await getUser(); const currentUser = await getUser();
const data = updateSchema.parse(input); const data = updateSchema.parse(input);
const existing = await db.query.pagadores.findFirst({ const existing = await db.query.payers.findFirst({
where: and( where: and(eq(payers.id, data.id), eq(payers.userId, currentUser.id)),
eq(pagadores.id, data.id),
eq(pagadores.userId, currentUser.id),
),
}); });
if (!existing) { if (!existing) {
return { return {
success: false, success: false,
error: "Pagador não encontrado.", error: "Payer não encontrado.",
}; };
} }
await db await db
.update(pagadores) .update(payers)
.set({ .set({
name: data.name, name: data.name,
email: data.email, email: data.email,
@@ -143,14 +144,12 @@ export async function updatePagadorAction(
avatarUrl: avatarUrl:
normalizeAvatarPath(data.avatarUrl) ?? existing.avatarUrl ?? null, normalizeAvatarPath(data.avatarUrl) ?? existing.avatarUrl ?? null,
isAutoSend: data.isAutoSend ?? false, isAutoSend: data.isAutoSend ?? false,
role: existing.role ?? PAGADOR_ROLE_TERCEIRO, role: existing.role ?? PAYER_ROLE_THIRD_PARTY,
}) })
.where( .where(and(eq(payers.id, data.id), eq(payers.userId, currentUser.id)));
and(eq(pagadores.id, data.id), eq(pagadores.userId, currentUser.id)),
);
// Se o pagador é admin, sincronizar nome com o usuário // Se o pagador é admin, sincronizar nome com o usuário
if (existing.role === PAGADOR_ROLE_ADMIN) { if (existing.role === PAYER_ROLE_ADMIN) {
await db await db
.update(user) .update(user)
.set({ name: data.name }) .set({ name: data.name })
@@ -161,31 +160,31 @@ export async function updatePagadorAction(
revalidate(); revalidate();
return { success: true, message: "Pagador atualizado com sucesso." }; return { success: true, message: "Payer atualizado com sucesso." };
} catch (error) { } catch (error) {
return handleActionError(error); return handleActionError(error);
} }
} }
export async function deletePagadorAction( export async function deletePayerAction(
input: DeleteInput, input: DeleteInput,
): Promise<ActionResult> { ): Promise<ActionResult> {
try { try {
const user = await getUser(); const user = await getUser();
const data = deleteSchema.parse(input); const data = deleteSchema.parse(input);
const existing = await db.query.pagadores.findFirst({ const existing = await db.query.payers.findFirst({
where: and(eq(pagadores.id, data.id), eq(pagadores.userId, user.id)), where: and(eq(payers.id, data.id), eq(payers.userId, user.id)),
}); });
if (!existing) { if (!existing) {
return { return {
success: false, success: false,
error: "Pagador não encontrado.", error: "Payer não encontrado.",
}; };
} }
if (existing.role === PAGADOR_ROLE_ADMIN) { if (existing.role === PAYER_ROLE_ADMIN) {
return { return {
success: false, success: false,
error: "Pagadores administradores não podem ser removidos.", error: "Pagadores administradores não podem ser removidos.",
@@ -193,26 +192,26 @@ export async function deletePagadorAction(
} }
await db await db
.delete(pagadores) .delete(payers)
.where(and(eq(pagadores.id, data.id), eq(pagadores.userId, user.id))); .where(and(eq(payers.id, data.id), eq(payers.userId, user.id)));
revalidate(); revalidate();
return { success: true, message: "Pagador removido com sucesso." }; return { success: true, message: "Payer removido com sucesso." };
} catch (error) { } catch (error) {
return handleActionError(error); return handleActionError(error);
} }
} }
export async function joinPagadorByShareCodeAction( export async function joinPayerByShareCodeAction(
input: ShareCodeJoinInput, input: ShareCodeJoinInput,
): Promise<ActionResult> { ): Promise<ActionResult> {
try { try {
const user = await getUser(); const user = await getUser();
const data = shareCodeJoinSchema.parse(input); const data = shareCodeJoinSchema.parse(input);
const pagadorRow = await db.query.pagadores.findFirst({ const pagadorRow = await db.query.payers.findFirst({
where: eq(pagadores.shareCode, data.code), where: eq(payers.shareCode, data.code),
}); });
if (!pagadorRow) { if (!pagadorRow) {
@@ -226,10 +225,10 @@ export async function joinPagadorByShareCodeAction(
}; };
} }
const existingShare = await db.query.compartilhamentosPagador.findFirst({ const existingShare = await db.query.payerShares.findFirst({
where: and( where: and(
eq(compartilhamentosPagador.pagadorId, pagadorRow.id), eq(payerShares.payerId, pagadorRow.id),
eq(compartilhamentosPagador.sharedWithUserId, user.id), eq(payerShares.sharedWithUserId, user.id),
), ),
}); });
@@ -240,8 +239,8 @@ export async function joinPagadorByShareCodeAction(
}; };
} }
await db.insert(compartilhamentosPagador).values({ await db.insert(payerShares).values({
pagadorId: pagadorRow.id, payerId: pagadorRow.id,
sharedWithUserId: user.id, sharedWithUserId: user.id,
permission: "read", permission: "read",
createdByUserId: pagadorRow.userId, createdByUserId: pagadorRow.userId,
@@ -249,28 +248,28 @@ export async function joinPagadorByShareCodeAction(
revalidate(); revalidate();
return { success: true, message: "Pagador adicionado à sua lista." }; return { success: true, message: "Payer adicionado à sua lista." };
} catch (error) { } catch (error) {
return handleActionError(error); return handleActionError(error);
} }
} }
export async function deletePagadorShareAction( export async function deletePayerShareAction(
input: ShareDeleteInput, input: ShareDeleteInput,
): Promise<ActionResult> { ): Promise<ActionResult> {
try { try {
const user = await getUser(); const user = await getUser();
const data = shareDeleteSchema.parse(input); const data = shareDeleteSchema.parse(input);
const existing = await db.query.compartilhamentosPagador.findFirst({ const existing = await db.query.payerShares.findFirst({
columns: { columns: {
id: true, id: true,
pagadorId: true, payerId: true,
sharedWithUserId: true, sharedWithUserId: true,
}, },
where: eq(compartilhamentosPagador.id, data.shareId), where: eq(payerShares.id, data.shareId),
with: { with: {
pagador: { payer: {
columns: { columns: {
userId: true, userId: true,
}, },
@@ -279,10 +278,10 @@ export async function deletePagadorShareAction(
}); });
// Permitir que o owner OU o próprio usuário compartilhado remova o share // Permitir que o owner OU o próprio usuário compartilhado remova o share
const payerOwner = existing?.payer as { userId: string } | null | undefined;
if ( if (
!existing || !existing ||
(existing.pagador.userId !== user.id && (payerOwner?.userId !== user.id && existing.sharedWithUserId !== user.id)
existing.sharedWithUserId !== user.id)
) { ) {
return { return {
success: false, success: false,
@@ -290,12 +289,10 @@ export async function deletePagadorShareAction(
}; };
} }
await db await db.delete(payerShares).where(eq(payerShares.id, data.shareId));
.delete(compartilhamentosPagador)
.where(eq(compartilhamentosPagador.id, data.shareId));
revalidate(); revalidate();
revalidatePath(`/payers/${existing.pagadorId}`); revalidatePath(`/payers/${existing.payerId}`);
return { success: true, message: "Compartilhamento removido." }; return { success: true, message: "Compartilhamento removido." };
} catch (error) { } catch (error) {
@@ -303,23 +300,20 @@ export async function deletePagadorShareAction(
} }
} }
export async function regeneratePagadorShareCodeAction( export async function regeneratePayerShareCodeAction(
input: ShareCodeRegenerateInput, input: ShareCodeRegenerateInput,
): Promise<{ success: true; message: string; code: string } | ActionResult> { ): Promise<{ success: true; message: string; code: string } | ActionResult> {
try { try {
const user = await getUser(); const user = await getUser();
const data = shareCodeRegenerateSchema.parse(input); const data = shareCodeRegenerateSchema.parse(input);
const existing = await db.query.pagadores.findFirst({ const existing = await db.query.payers.findFirst({
columns: { id: true, userId: true }, columns: { id: true, userId: true },
where: and( where: and(eq(payers.id, data.payerId), eq(payers.userId, user.id)),
eq(pagadores.id, data.pagadorId),
eq(pagadores.userId, user.id),
),
}); });
if (!existing) { if (!existing) {
return { success: false, error: "Pagador não encontrado." }; return { success: false, error: "Payer não encontrado." };
} }
let attempts = 0; let attempts = 0;
@@ -327,17 +321,12 @@ export async function regeneratePagadorShareCodeAction(
const newCode = generateShareCode(); const newCode = generateShareCode();
try { try {
await db await db
.update(pagadores) .update(payers)
.set({ shareCode: newCode }) .set({ shareCode: newCode })
.where( .where(and(eq(payers.id, data.payerId), eq(payers.userId, user.id)));
and(
eq(pagadores.id, data.pagadorId),
eq(pagadores.userId, user.id),
),
);
revalidate(); revalidate();
revalidatePath(`/payers/${data.pagadorId}`); revalidatePath(`/payers/${data.payerId}`);
return { return {
success: true, success: true,
message: "Código atualizado com sucesso.", message: "Código atualizado com sucesso.",
@@ -347,8 +336,8 @@ export async function regeneratePagadorShareCodeAction(
if ( if (
error instanceof Error && error instanceof Error &&
"constraint" in error && "constraint" in error &&
// @ts-expect-error constraint is present in postgres errors (error as { constraint?: string }).constraint ===
error.constraint === "pagadores_share_code_key" "pagadores_share_code_key"
) { ) {
attempts += 1; attempts += 1;
continue; continue;

View File

@@ -4,7 +4,7 @@ import MoneyValues from "@/shared/components/money-values";
import { CardContent } from "@/shared/components/ui/card"; import { CardContent } from "@/shared/components/ui/card";
import { WidgetEmptyState } from "@/shared/components/widget-empty-state"; import { WidgetEmptyState } from "@/shared/components/widget-empty-state";
import { resolveLogoSrc } from "@/shared/lib/logo"; import { resolveLogoSrc } from "@/shared/lib/logo";
import type { PagadorCardUsageItem } from "@/shared/lib/payers/details"; import type { PayerCardUsageItem } from "@/shared/lib/payers/details";
const buildInitials = (value: string) => { const buildInitials = (value: string) => {
const parts = value.trim().split(/\s+/).filter(Boolean); const parts = value.trim().split(/\s+/).filter(Boolean);
@@ -19,10 +19,10 @@ const buildInitials = (value: string) => {
}; };
type PagadorCardUsageCardProps = { type PagadorCardUsageCardProps = {
items: PagadorCardUsageItem[]; items: PayerCardUsageItem[];
}; };
export function PagadorCardUsageCard({ items }: PagadorCardUsageCardProps) { export function PayerCardUsageCard({ items }: PagadorCardUsageCardProps) {
if (items.length === 0) { if (items.length === 0) {
return ( return (
<CardContent className="px-0"> <CardContent className="px-0">

View File

@@ -13,7 +13,7 @@ import Link from "next/link";
import { useRouter } from "next/navigation"; import { useRouter } from "next/navigation";
import { useState, useTransition } from "react"; import { useState, useTransition } from "react";
import { toast } from "sonner"; import { toast } from "sonner";
import { sendPagadorSummaryAction } from "@/features/payers/detail-actions"; import { sendPayerSummaryAction } from "@/features/payers/detail-actions";
import { Badge } from "@/shared/components/ui/badge"; import { Badge } from "@/shared/components/ui/badge";
import { Button } from "@/shared/components/ui/button"; import { Button } from "@/shared/components/ui/button";
import { import {
@@ -30,41 +30,41 @@ import {
DialogHeader, DialogHeader,
DialogTitle, DialogTitle,
} from "@/shared/components/ui/dialog"; } from "@/shared/components/ui/dialog";
import { PAGADOR_ROLE_ADMIN } from "@/shared/lib/payers/constants"; import { PAYER_ROLE_ADMIN } from "@/shared/lib/payers/constants";
import { getAvatarSrc } from "@/shared/lib/payers/utils"; import { getAvatarSrc } from "@/shared/lib/payers/utils";
import { formatCurrency } from "@/shared/utils/currency"; import { formatCurrency } from "@/shared/utils/currency";
import { formatDateTime } from "@/shared/utils/date"; import { formatDateTime } from "@/shared/utils/date";
import type { PagadorInfo, PagadorSummaryPreview } from "./types"; import type { PayerInfo, PayerSummaryPreview } from "./types";
type PagadorHeaderCardProps = { type PayerHeaderCardProps = {
pagador: PagadorInfo; payer: PayerInfo;
selectedPeriod: string; selectedPeriod: string;
summary: PagadorSummaryPreview; summary: PayerSummaryPreview;
}; };
export function PagadorHeaderCard({ export function PayerHeaderCard({
pagador, payer,
selectedPeriod, selectedPeriod,
summary, summary,
}: PagadorHeaderCardProps) { }: PayerHeaderCardProps) {
const router = useRouter(); const router = useRouter();
const [isSending, startTransition] = useTransition(); const [isSending, startTransition] = useTransition();
const [confirmOpen, setConfirmOpen] = useState(false); const [confirmOpen, setConfirmOpen] = useState(false);
const avatarSrc = getAvatarSrc(pagador.avatarUrl); const avatarSrc = getAvatarSrc(payer.avatarUrl);
const createdAtLabel = formatDate(pagador.createdAt); const createdAtLabel = formatDate(payer.createdAt);
const isAdmin = pagador.role === PAGADOR_ROLE_ADMIN; const isAdmin = payer.role === PAYER_ROLE_ADMIN;
const lastMailLabel = const lastMailLabel =
formatDateTime(pagador.lastMailAt, { formatDateTime(payer.lastMailAt, {
dateStyle: "short", dateStyle: "short",
timeStyle: "short", timeStyle: "short",
}) ?? "Nunca enviado"; }) ?? "Nunca enviado";
const disableSend = isSending || !pagador.email || !pagador.canEdit; const disableSend = isSending || !payer.email || !payer.canEdit;
const openConfirmDialog = () => { const openConfirmDialog = () => {
if (!pagador.email) { if (!payer.email) {
toast.error("Cadastre um e-mail para este pagador antes de enviar."); toast.error("Cadastre um e-mail para este pagador antes de enviar.");
return; return;
} }
@@ -72,14 +72,14 @@ export function PagadorHeaderCard({
}; };
const handleSendSummary = () => { const handleSendSummary = () => {
if (!pagador.email) { if (!payer.email) {
toast.error("Cadastre um e-mail para este pagador antes de enviar."); toast.error("Cadastre um e-mail para este pagador antes de enviar.");
return; return;
} }
startTransition(async () => { startTransition(async () => {
const result = await sendPagadorSummaryAction({ const result = await sendPayerSummaryAction({
pagadorId: pagador.id, payerId: payer.id,
period: selectedPeriod, period: selectedPeriod,
}); });
@@ -109,7 +109,7 @@ export function PagadorHeaderCard({
<div className="relative flex size-16 shrink-0 items-center justify-center overflow-hidden"> <div className="relative flex size-16 shrink-0 items-center justify-center overflow-hidden">
<Image <Image
src={avatarSrc} src={avatarSrc}
alt={`Avatar de ${pagador.name}`} alt={`Avatar de ${payer.name}`}
width={64} width={64}
height={64} height={64}
className="h-full w-full rounded-full object-cover" className="h-full w-full rounded-full object-cover"
@@ -119,7 +119,7 @@ export function PagadorHeaderCard({
<div className="flex flex-1 flex-col gap-2"> <div className="flex flex-1 flex-col gap-2">
<div className="flex flex-wrap items-center gap-2"> <div className="flex flex-wrap items-center gap-2">
<CardTitle className="text-xl font-semibold text-foreground"> <CardTitle className="text-xl font-semibold text-foreground">
{pagador.name} {payer.name}
</CardTitle> </CardTitle>
{isAdmin ? ( {isAdmin ? (
<RiVerifiedBadgeFill <RiVerifiedBadgeFill
@@ -128,12 +128,12 @@ export function PagadorHeaderCard({
/> />
) : null} ) : null}
<Badge <Badge
variant={getStatusBadgeVariant(pagador.status)} variant={getStatusBadgeVariant(payer.status)}
className="text-xs" className="text-xs"
> >
{pagador.status} {payer.status}
</Badge> </Badge>
{pagador.isAutoSend ? ( {payer.isAutoSend ? (
<Badge variant="info" className="gap-1 text-xs"> <Badge variant="info" className="gap-1 text-xs">
<RiMailSendLine className="size-3.5" aria-hidden /> <RiMailSendLine className="size-3.5" aria-hidden />
Envio automático Envio automático
@@ -144,14 +144,14 @@ export function PagadorHeaderCard({
<CardDescription className="flex flex-wrap items-center gap-x-3 gap-y-1 text-sm"> <CardDescription className="flex flex-wrap items-center gap-x-3 gap-y-1 text-sm">
<span>Criado em {createdAtLabel}</span> <span>Criado em {createdAtLabel}</span>
<span className="hidden text-border/80 sm:inline"></span> <span className="hidden text-border/80 sm:inline"></span>
{pagador.email ? ( {payer.email ? (
<Link <Link
prefetch prefetch
href={`mailto:${pagador.email}`} href={`mailto:${payer.email}`}
className="inline-flex items-center gap-1.5 text-primary" className="inline-flex items-center gap-1.5 text-primary"
> >
<RiMailLine className="size-4" aria-hidden /> <RiMailLine className="size-4" aria-hidden />
{pagador.email} {payer.email}
</Link> </Link>
) : ( ) : (
<span>Sem e-mail cadastrado</span> <span>Sem e-mail cadastrado</span>
@@ -161,7 +161,7 @@ export function PagadorHeaderCard({
</div> </div>
<div className="flex w-full flex-col items-stretch gap-2 lg:w-auto lg:items-end"> <div className="flex w-full flex-col items-stretch gap-2 lg:w-auto lg:items-end">
{pagador.canEdit ? ( {payer.canEdit ? (
<> <>
<Button <Button
type="button" type="button"
@@ -184,7 +184,7 @@ export function PagadorHeaderCard({
</div> </div>
</CardHeader> </CardHeader>
{pagador.canEdit ? ( {payer.canEdit ? (
<Dialog <Dialog
open={confirmOpen} open={confirmOpen}
onOpenChange={(open) => { onOpenChange={(open) => {
@@ -202,7 +202,7 @@ export function PagadorHeaderCard({
</span>{" "} </span>{" "}
para{" "} para{" "}
<span className="font-medium text-foreground"> <span className="font-medium text-foreground">
{pagador.email} {payer.email}
</span> </span>
</DialogDescription> </DialogDescription>
</DialogHeader> </DialogHeader>

View File

@@ -21,7 +21,7 @@ import {
ChartTooltipContent, ChartTooltipContent,
} from "@/shared/components/ui/chart"; } from "@/shared/components/ui/chart";
import { WidgetEmptyState } from "@/shared/components/widget-empty-state"; import { WidgetEmptyState } from "@/shared/components/widget-empty-state";
import type { PagadorHistoryPoint } from "@/shared/lib/payers/details"; import type { PayerHistoryPoint } from "@/shared/lib/payers/details";
import { currencyFormatter } from "@/shared/utils/currency"; import { currencyFormatter } from "@/shared/utils/currency";
const chartConfig = { const chartConfig = {
@@ -32,7 +32,7 @@ const chartConfig = {
}; };
type PagadorHistoryCardProps = { type PagadorHistoryCardProps = {
data: PagadorHistoryPoint[]; data: PayerHistoryPoint[];
}; };
const ValueLabel = (props: LabelProps) => { const ValueLabel = (props: LabelProps) => {
@@ -57,7 +57,7 @@ const ValueLabel = (props: LabelProps) => {
); );
}; };
export function PagadorHistoryCard({ data }: PagadorHistoryCardProps) { export function PayerHistoryCard({ data }: PagadorHistoryCardProps) {
const hasData = data.length > 0; const hasData = data.length > 0;
return ( return (

View File

@@ -8,17 +8,17 @@ import {
CardHeader, CardHeader,
CardTitle, CardTitle,
} from "@/shared/components/ui/card"; } from "@/shared/components/ui/card";
import { PAGADOR_ROLE_ADMIN } from "@/shared/lib/payers/constants"; import { PAYER_ROLE_ADMIN } from "@/shared/lib/payers/constants";
import { formatDateTime } from "@/shared/utils/date"; import { formatDateTime } from "@/shared/utils/date";
import { cn } from "@/shared/utils/ui"; import { cn } from "@/shared/utils/ui";
import type { PagadorInfo } from "./types"; import type { PayerInfo } from "./types";
type PagadorInfoCardProps = { type PayerInfoCardProps = {
pagador: PagadorInfo; payer: PayerInfo;
}; };
export function PagadorInfoCard({ pagador }: PagadorInfoCardProps) { export function PagadorInfoCard({ payer }: PayerInfoCardProps) {
const showSensitiveDetails = pagador.canEdit; const showSensitiveDetails = payer.canEdit;
const getStatusBadgeVariant = (status: string): "success" | "outline" => { const getStatusBadgeVariant = (status: string): "success" | "outline" => {
const normalizedStatus = status.toLowerCase(); const normalizedStatus = status.toLowerCase();
@@ -32,7 +32,7 @@ export function PagadorInfoCard({ pagador }: PagadorInfoCardProps) {
<Card className="border gap-4"> <Card className="border gap-4">
<CardHeader className="gap-1.5"> <CardHeader className="gap-1.5">
<CardTitle className="text-lg font-semibold"> <CardTitle className="text-lg font-semibold">
Detalhes do pagador Detalhes do payer
</CardTitle> </CardTitle>
<CardDescription> <CardDescription>
{showSensitiveDetails {showSensitiveDetails
@@ -46,10 +46,10 @@ export function PagadorInfoCard({ pagador }: PagadorInfoCardProps) {
label="Status" label="Status"
value={ value={
<Badge <Badge
variant={getStatusBadgeVariant(pagador.status)} variant={getStatusBadgeVariant(payer.status)}
className="text-xs" className="text-xs"
> >
{pagador.status} {payer.status}
</Badge> </Badge>
} }
/> />
@@ -59,23 +59,23 @@ export function PagadorInfoCard({ pagador }: PagadorInfoCardProps) {
value={ value={
<span className="inline-flex items-center gap-2"> <span className="inline-flex items-center gap-2">
<RiUser3Line className="size-4 text-muted-foreground" /> <RiUser3Line className="size-4 text-muted-foreground" />
{resolveRoleLabel(pagador.role)} {resolveRoleLabel(payer.role)}
</span> </span>
} }
/> />
{showSensitiveDetails ? ( {showSensitiveDetails ? (
<InfoItem <InfoItem
label="Envio automático" label="Envio automático"
value={pagador.isAutoSend ? "Ativado" : "Desativado"} value={payer.isAutoSend ? "Ativado" : "Desativado"}
/> />
) : null} ) : null}
{showSensitiveDetails ? ( {showSensitiveDetails ? (
<InfoItem <InfoItem
label="Último envio" label="Último envio"
value={formatDateTime(pagador.lastMailAt) ?? "Nunca enviado"} value={formatDateTime(payer.lastMailAt) ?? "Nunca enviado"}
/> />
) : null} ) : null}
{showSensitiveDetails && !pagador.email ? ( {showSensitiveDetails && !payer.email ? (
<InfoItem <InfoItem
label="Aviso" label="Aviso"
value={ value={
@@ -90,8 +90,8 @@ export function PagadorInfoCard({ pagador }: PagadorInfoCardProps) {
<InfoItem <InfoItem
label="Observações" label="Observações"
value={ value={
pagador.note ? ( payer.note ? (
<span className="text-muted-foreground">{pagador.note}</span> <span className="text-muted-foreground">{payer.note}</span>
) : ( ) : (
"Sem observações" "Sem observações"
) )
@@ -105,8 +105,8 @@ export function PagadorInfoCard({ pagador }: PagadorInfoCardProps) {
} }
const resolveRoleLabel = (role: string | null) => { const resolveRoleLabel = (role: string | null) => {
if (role === PAGADOR_ROLE_ADMIN) return "Administrador"; if (role === PAYER_ROLE_ADMIN) return "Administrador";
return "Pagador"; return "Payer";
}; };
type InfoItemProps = { type InfoItemProps = {

View File

@@ -4,7 +4,7 @@ import { RiLogoutBoxLine } from "@remixicon/react";
import { useRouter } from "next/navigation"; import { useRouter } from "next/navigation";
import { useState, useTransition } from "react"; import { useState, useTransition } from "react";
import { toast } from "sonner"; import { toast } from "sonner";
import { deletePagadorShareAction } from "@/features/payers/actions"; import { deletePayerShareAction } from "@/features/payers/actions";
import { Button } from "@/shared/components/ui/button"; import { Button } from "@/shared/components/ui/button";
import { import {
Card, Card,
@@ -20,7 +20,7 @@ interface PagadorLeaveShareCardProps {
createdAt: string; createdAt: string;
} }
export function PagadorLeaveShareCard({ export function PayerLeaveShareCard({
shareId, shareId,
pagadorName, pagadorName,
createdAt, createdAt,
@@ -31,7 +31,7 @@ export function PagadorLeaveShareCard({
const handleLeave = () => { const handleLeave = () => {
startTransition(async () => { startTransition(async () => {
const result = await deletePagadorShareAction({ shareId }); const result = await deletePayerShareAction({ shareId });
if (!result.success) { if (!result.success) {
toast.error(result.error); toast.error(result.error);

View File

@@ -6,7 +6,7 @@ import {
CardHeader, CardHeader,
CardTitle, CardTitle,
} from "@/shared/components/ui/card"; } from "@/shared/components/ui/card";
import type { PagadorMonthlyBreakdown } from "@/shared/lib/payers/details"; import type { PayerMonthlyBreakdown } from "@/shared/lib/payers/details";
import { cn } from "@/shared/utils/ui"; import { cn } from "@/shared/utils/ui";
const segmentConfig = { const segmentConfig = {
@@ -26,10 +26,10 @@ const segmentConfig = {
type PagadorMonthlySummaryCardProps = { type PagadorMonthlySummaryCardProps = {
periodLabel: string; periodLabel: string;
breakdown: PagadorMonthlyBreakdown; breakdown: PayerMonthlyBreakdown;
}; };
export function PagadorMonthlySummaryCard({ export function PayerMonthlySummaryCard({
periodLabel, periodLabel,
breakdown, breakdown,
}: PagadorMonthlySummaryCardProps) { }: PagadorMonthlySummaryCardProps) {

View File

@@ -11,18 +11,18 @@ import { CardContent } from "@/shared/components/ui/card";
import { Progress } from "@/shared/components/ui/progress"; import { Progress } from "@/shared/components/ui/progress";
import { WidgetEmptyState } from "@/shared/components/widget-empty-state"; import { WidgetEmptyState } from "@/shared/components/widget-empty-state";
import type { import type {
PagadorBoletoItem, PayerBoletoItem,
PagadorPaymentStatusData, PayerPaymentStatusData,
} from "@/shared/lib/payers/details"; } from "@/shared/lib/payers/details";
import { cn } from "@/shared/utils/ui"; import { cn } from "@/shared/utils/ui";
// --- PagadorBoletoCard --- // --- PayerBoletoCard ---
type PagadorBoletoCardProps = { type PagadorBoletoCardProps = {
items: PagadorBoletoItem[]; items: PayerBoletoItem[];
}; };
export function PagadorBoletoCard({ items }: PagadorBoletoCardProps) { export function PayerBoletoCard({ items }: PagadorBoletoCardProps) {
if (items.length === 0) { if (items.length === 0) {
return ( return (
<CardContent className="px-0"> <CardContent className="px-0">
@@ -72,13 +72,13 @@ export function PagadorBoletoCard({ items }: PagadorBoletoCardProps) {
); );
} }
// --- PagadorPaymentStatusCard --- // --- PayerPaymentStatusCard ---
type PagadorPaymentStatusCardProps = { type PagadorPaymentStatusCardProps = {
data: PagadorPaymentStatusData; data: PayerPaymentStatusData;
}; };
export function PagadorPaymentStatusCard({ export function PayerPaymentStatusCard({
data, data,
}: PagadorPaymentStatusCardProps) { }: PagadorPaymentStatusCardProps) {
const { paidAmount, paidCount, pendingAmount, pendingCount, totalAmount } = const { paidAmount, paidCount, pendingAmount, pendingCount, totalAmount } =

View File

@@ -5,8 +5,8 @@ import { useRouter } from "next/navigation";
import { useState, useTransition } from "react"; import { useState, useTransition } from "react";
import { toast } from "sonner"; import { toast } from "sonner";
import { import {
deletePagadorShareAction, deletePayerShareAction,
regeneratePagadorShareCodeAction, regeneratePayerShareCodeAction,
} from "@/features/payers/actions"; } from "@/features/payers/actions";
import { Button } from "@/shared/components/ui/button"; import { Button } from "@/shared/components/ui/button";
import { import {
@@ -25,13 +25,13 @@ type PagadorShare = {
}; };
interface PagadorSharingCardProps { interface PagadorSharingCardProps {
pagadorId: string; payerId: string;
shareCode: string; shareCode: string;
shares: PagadorShare[]; shares: PagadorShare[];
} }
export function PagadorSharingCard({ export function PayerSharingCard({
pagadorId, payerId,
shareCode, shareCode,
shares, shares,
}: PagadorSharingCardProps) { }: PagadorSharingCardProps) {
@@ -51,14 +51,14 @@ export function PagadorSharingCard({
const handleRegenerate = () => { const handleRegenerate = () => {
startRegenerate(async () => { startRegenerate(async () => {
const result = await regeneratePagadorShareCodeAction({ pagadorId }); const result = await regeneratePayerShareCodeAction({ payerId });
if (!result.success) { if (!result.success) {
toast.error(result.error); toast.error(result.error);
return; return;
} }
setCurrentCode(result.code); if ("code" in result) setCurrentCode(result.code);
toast.success("Novo código gerado com sucesso."); toast.success("Novo código gerado com sucesso.");
router.refresh(); router.refresh();
}); });
@@ -67,7 +67,7 @@ export function PagadorSharingCard({
const handleRemove = (shareId: string) => { const handleRemove = (shareId: string) => {
setRemovePendingId(shareId); setRemovePendingId(shareId);
startRegenerate(async () => { startRegenerate(async () => {
const result = await deletePagadorShareAction({ shareId }); const result = await deletePayerShareAction({ shareId });
if (!result.success) { if (!result.success) {
toast.error(result.error); toast.error(result.error);

View File

@@ -1,4 +1,4 @@
export type PagadorInfo = { export type PayerInfo = {
id: string; id: string;
name: string; name: string;
email: string | null; email: string | null;
@@ -13,7 +13,7 @@ export type PagadorInfo = {
canEdit: boolean; canEdit: boolean;
}; };
export type PagadorSummaryPreview = { export type PayerSummaryPreview = {
periodLabel: string; periodLabel: string;
totalExpenses: number; totalExpenses: number;
paymentSplits: { paymentSplits: {

View File

@@ -11,20 +11,20 @@ import Image from "next/image";
import Link from "next/link"; import Link from "next/link";
import { Badge } from "@/shared/components/ui/badge"; import { Badge } from "@/shared/components/ui/badge";
import { Card } from "@/shared/components/ui/card"; import { Card } from "@/shared/components/ui/card";
import { PAGADOR_ROLE_ADMIN } from "@/shared/lib/payers/constants"; import { PAYER_ROLE_ADMIN } from "@/shared/lib/payers/constants";
import { getAvatarSrc } from "@/shared/lib/payers/utils"; import { getAvatarSrc } from "@/shared/lib/payers/utils";
import type { Pagador } from "./types"; import type { Payer } from "./types";
interface PagadorCardProps { interface PayerCardProps {
pagador: Pagador; payer: Payer;
onEdit?: () => void; onEdit?: () => void;
onRemove?: () => void; onRemove?: () => void;
} }
export function PagadorCard({ pagador, onEdit, onRemove }: PagadorCardProps) { export function PayerCard({ payer, onEdit, onRemove }: PayerCardProps) {
const avatarSrc = getAvatarSrc(pagador.avatarUrl); const avatarSrc = getAvatarSrc(payer.avatarUrl);
const isAdmin = pagador.role === PAGADOR_ROLE_ADMIN; const isAdmin = payer.role === PAYER_ROLE_ADMIN;
const isReadOnly = !pagador.canEdit; const isReadOnly = !payer.canEdit;
return ( return (
<Card className=" overflow-hidden px-6"> <Card className=" overflow-hidden px-6">
@@ -33,7 +33,7 @@ export function PagadorCard({ pagador, onEdit, onRemove }: PagadorCardProps) {
<div className="relative mb-3 flex size-16 items-center justify-center overflow-hidden rounded-full border-background bg-background shadow-lg"> <div className="relative mb-3 flex size-16 items-center justify-center overflow-hidden rounded-full border-background bg-background shadow-lg">
<Image <Image
src={avatarSrc} src={avatarSrc}
alt={`Avatar de ${pagador.name}`} alt={`Avatar de ${payer.name}`}
width={80} width={80}
height={80} height={80}
className="h-full w-full object-cover" className="h-full w-full object-cover"
@@ -43,19 +43,19 @@ export function PagadorCard({ pagador, onEdit, onRemove }: PagadorCardProps) {
{/* Nome e badges */} {/* Nome e badges */}
<div className="flex items-center gap-1.5"> <div className="flex items-center gap-1.5">
<h3 className="text-base font-semibold text-foreground"> <h3 className="text-base font-semibold text-foreground">
{pagador.name} {payer.name}
</h3> </h3>
{isAdmin ? ( {isAdmin ? (
<RiVerifiedBadgeFill className="size-4 text-blue-500" aria-hidden /> <RiVerifiedBadgeFill className="size-4 text-blue-500" aria-hidden />
) : null} ) : null}
{pagador.isAutoSend ? ( {payer.isAutoSend ? (
<RiMailSendLine className="size-4 text-primary" aria-hidden /> <RiMailSendLine className="size-4 text-primary" aria-hidden />
) : null} ) : null}
</div> </div>
{/* Email */} {/* Email */}
{pagador.email ? ( {payer.email ? (
<p className="mt-1 text-xs text-muted-foreground">{pagador.email}</p> <p className="mt-1 text-xs text-muted-foreground">{payer.email}</p>
) : ( ) : (
<p className="mt-1 text-xs text-muted-foreground"> <p className="mt-1 text-xs text-muted-foreground">
Sem email cadastrado Sem email cadastrado
@@ -65,10 +65,10 @@ export function PagadorCard({ pagador, onEdit, onRemove }: PagadorCardProps) {
{/* Status badges */} {/* Status badges */}
<div className="mt-2 flex flex-wrap items-center justify-center gap-1.5"> <div className="mt-2 flex flex-wrap items-center justify-center gap-1.5">
<Badge <Badge
variant={pagador.status === "Ativo" ? "success" : "outline"} variant={payer.status === "Ativo" ? "success" : "outline"}
className="text-xs" className="text-xs"
> >
{pagador.status} {payer.status}
</Badge> </Badge>
{isReadOnly ? ( {isReadOnly ? (
@@ -93,7 +93,7 @@ export function PagadorCard({ pagador, onEdit, onRemove }: PagadorCardProps) {
) : null} ) : null}
<Link <Link
href={`/payers/${pagador.id}`} href={`/payers/${payer.id}`}
className={`text-primary flex items-center gap-1 font-medium transition-opacity hover:opacity-80`} className={`text-primary flex items-center gap-1 font-medium transition-opacity hover:opacity-80`}
> >
<RiFileList2Line className="size-4" aria-hidden /> <RiFileList2Line className="size-4" aria-hidden />

View File

@@ -3,8 +3,8 @@ import Image from "next/image";
import { useEffect, useMemo, useState, useTransition } from "react"; import { useEffect, useMemo, useState, useTransition } from "react";
import { toast } from "sonner"; import { toast } from "sonner";
import { import {
createPagadorAction, createPayerAction,
updatePagadorAction, updatePayerAction,
} from "@/features/payers/actions"; } from "@/features/payers/actions";
import { Button } from "@/shared/components/ui/button"; import { Button } from "@/shared/components/ui/button";
import { Checkbox } from "@/shared/components/ui/checkbox"; import { Checkbox } from "@/shared/components/ui/checkbox";
@@ -29,50 +29,50 @@ import {
import { useControlledState } from "@/shared/hooks/use-controlled-state"; import { useControlledState } from "@/shared/hooks/use-controlled-state";
import { useFormState } from "@/shared/hooks/use-form-state"; import { useFormState } from "@/shared/hooks/use-form-state";
import { import {
DEFAULT_PAGADOR_AVATAR, DEFAULT_PAYER_AVATAR,
PAGADOR_STATUS_OPTIONS, PAYER_STATUS_OPTIONS,
type PagadorStatus, type PayerStatus,
} from "@/shared/lib/payers/constants"; } from "@/shared/lib/payers/constants";
import { getAvatarSrc } from "@/shared/lib/payers/utils"; import { getAvatarSrc } from "@/shared/lib/payers/utils";
import { StatusSelectContent } from "./payer-select-items"; import { StatusSelectContent } from "./payer-select-items";
import type { Pagador, PagadorFormValues } from "./types"; import type { Payer, PayerFormValues } from "./types";
interface PagadorDialogProps { interface PayerDialogProps {
mode: "create" | "update"; mode: "create" | "update";
trigger?: React.ReactNode; trigger?: React.ReactNode;
pagador?: Pagador; payer?: Payer;
avatarOptions: string[]; avatarOptions: string[];
open?: boolean; open?: boolean;
onOpenChange?: (open: boolean) => void; onOpenChange?: (open: boolean) => void;
} }
const buildInitialValues = ({ const buildInitialValues = ({
pagador, payer,
avatarOptions, avatarOptions,
}: { }: {
pagador?: Pagador; payer?: Payer;
avatarOptions: string[]; avatarOptions: string[];
}): PagadorFormValues => { }): PayerFormValues => {
const defaultAvatar = avatarOptions[0] ?? DEFAULT_PAGADOR_AVATAR; const defaultAvatar = avatarOptions[0] ?? DEFAULT_PAYER_AVATAR;
return { return {
name: pagador?.name ?? "", name: payer?.name ?? "",
email: pagador?.email ?? "", email: payer?.email ?? "",
status: (pagador?.status as PagadorStatus) ?? PAGADOR_STATUS_OPTIONS[0], status: (payer?.status as PayerStatus) ?? PAYER_STATUS_OPTIONS[0],
avatarUrl: pagador?.avatarUrl ?? defaultAvatar, avatarUrl: payer?.avatarUrl ?? defaultAvatar,
note: pagador?.note ?? "", note: payer?.note ?? "",
isAutoSend: pagador?.isAutoSend ?? false, isAutoSend: payer?.isAutoSend ?? false,
}; };
}; };
export function PagadorDialog({ export function PayerDialog({
mode, mode,
trigger, trigger,
pagador, payer,
avatarOptions, avatarOptions,
open, open,
onOpenChange, onOpenChange,
}: PagadorDialogProps) { }: PayerDialogProps) {
const [errorMessage, setErrorMessage] = useState<string | null>(null); const [errorMessage, setErrorMessage] = useState<string | null>(null);
const [isPending, startTransition] = useTransition(); const [isPending, startTransition] = useTransition();
@@ -84,19 +84,19 @@ export function PagadorDialog({
); );
const initialState = useMemo( const initialState = useMemo(
() => buildInitialValues({ pagador, avatarOptions }), () => buildInitialValues({ payer, avatarOptions }),
[pagador, avatarOptions], [payer, avatarOptions],
); );
// Use form state hook for form management // Use form state hook for form management
const { formState, resetForm, updateField } = const { formState, resetForm, updateField } =
useFormState<PagadorFormValues>(initialState); useFormState<PayerFormValues>(initialState);
const availableAvatars = useMemo(() => { const availableAvatars = useMemo(() => {
const set = new Set<string>(); const set = new Set<string>();
avatarOptions.forEach((avatar) => set.add(avatar)); avatarOptions.forEach((avatar) => set.add(avatar));
set.add(initialState.avatarUrl); set.add(initialState.avatarUrl);
set.add(DEFAULT_PAGADOR_AVATAR); set.add(DEFAULT_PAYER_AVATAR);
return Array.from(set).sort((a, b) => return Array.from(set).sort((a, b) =>
a.localeCompare(b, "pt-BR", { sensitivity: "base" }), a.localeCompare(b, "pt-BR", { sensitivity: "base" }),
); );
@@ -110,22 +110,22 @@ export function PagadorDialog({
} }
}, [dialogOpen, initialState, resetForm]); }, [dialogOpen, initialState, resetForm]);
type PagadorCreatePayload = Parameters<typeof createPagadorAction>[0]; type PayerCreatePayload = Parameters<typeof createPayerAction>[0];
const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => { const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
event.preventDefault(); event.preventDefault();
setErrorMessage(null); setErrorMessage(null);
const pagadorId = pagador?.id; const payerId = payer?.id;
if (mode === "update" && !pagadorId) { if (mode === "update" && !payerId) {
const message = "Pagador inválido."; const message = "Payer inválido.";
setErrorMessage(message); setErrorMessage(message);
toast.error(message); toast.error(message);
return; return;
} }
const emailValue = formState.email.trim(); const emailValue = formState.email.trim();
const payload: PagadorCreatePayload = { const payload: PayerCreatePayload = {
name: formState.name.trim(), name: formState.name.trim(),
status: formState.status, status: formState.status,
avatarUrl: formState.avatarUrl, avatarUrl: formState.avatarUrl,
@@ -136,7 +136,7 @@ export function PagadorDialog({
startTransition(async () => { startTransition(async () => {
if (mode === "create") { if (mode === "create") {
const result = await createPagadorAction(payload); const result = await createPayerAction(payload);
if (result.success) { if (result.success) {
toast.success(result.message); toast.success(result.message);
@@ -150,12 +150,12 @@ export function PagadorDialog({
return; return;
} }
if (!pagadorId) { if (!payerId) {
return; return;
} }
const result = await updatePagadorAction({ const result = await updatePayerAction({
id: pagadorId, id: payerId,
...payload, ...payload,
}); });
@@ -193,9 +193,9 @@ export function PagadorDialog({
<div className="flex flex-col gap-3"> <div className="flex flex-col gap-3">
<div className="flex w-full gap-2"> <div className="flex w-full gap-2">
<div className="flex flex-col gap-2 w-full"> <div className="flex flex-col gap-2 w-full">
<Label htmlFor="pagador-name">Nome</Label> <Label htmlFor="payer-name">Nome</Label>
<Input <Input
id="pagador-name" id="payer-name"
value={formState.name} value={formState.name}
onChange={(event) => onChange={(event) =>
updateField("name", event.target.value) updateField("name", event.target.value)
@@ -206,9 +206,9 @@ export function PagadorDialog({
</div> </div>
<div className="flex flex-col gap-2 w-full"> <div className="flex flex-col gap-2 w-full">
<Label htmlFor="pagador-email">E-mail</Label> <Label htmlFor="payer-email">E-mail</Label>
<Input <Input
id="pagador-email" id="payer-email"
type="email" type="email"
value={formState.email} value={formState.email}
onChange={(event) => onChange={(event) =>
@@ -220,14 +220,14 @@ export function PagadorDialog({
</div> </div>
<div className="flex flex-col gap-2"> <div className="flex flex-col gap-2">
<Label htmlFor="pagador-status">Status</Label> <Label htmlFor="payer-status">Status</Label>
<Select <Select
value={formState.status} value={formState.status}
onValueChange={(value: PagadorStatus) => onValueChange={(value: PayerStatus) =>
updateField("status", value) updateField("status", value)
} }
> >
<SelectTrigger id="pagador-status" className="w-full"> <SelectTrigger id="payer-status" className="w-full">
<SelectValue placeholder="Selecione o status"> <SelectValue placeholder="Selecione o status">
{formState.status && ( {formState.status && (
<StatusSelectContent label={formState.status} /> <StatusSelectContent label={formState.status} />
@@ -235,7 +235,7 @@ export function PagadorDialog({
</SelectValue> </SelectValue>
</SelectTrigger> </SelectTrigger>
<SelectContent> <SelectContent>
{PAGADOR_STATUS_OPTIONS.map((status) => ( {PAYER_STATUS_OPTIONS.map((status) => (
<SelectItem key={status} value={status}> <SelectItem key={status} value={status}>
<StatusSelectContent label={status} /> <StatusSelectContent label={status} />
</SelectItem> </SelectItem>
@@ -247,7 +247,7 @@ export function PagadorDialog({
<fieldset className="flex flex-col gap-3"> <fieldset className="flex flex-col gap-3">
<div className="flex items-start gap-3 rounded-lg border border-border/60 bg-muted/10 p-3"> <div className="flex items-start gap-3 rounded-lg border border-border/60 bg-muted/10 p-3">
<Checkbox <Checkbox
id="pagador-auto-send" id="payer-auto-send"
checked={formState.isAutoSend} checked={formState.isAutoSend}
onCheckedChange={(checked) => onCheckedChange={(checked) =>
updateField("isAutoSend", Boolean(checked)) updateField("isAutoSend", Boolean(checked))
@@ -256,7 +256,7 @@ export function PagadorDialog({
/> />
<div className="space-y-1"> <div className="space-y-1">
<Label <Label
htmlFor="pagador-auto-send" htmlFor="payer-auto-send"
className="text-sm font-medium text-foreground" className="text-sm font-medium text-foreground"
> >
Enviar automaticamente Enviar automaticamente
@@ -296,9 +296,9 @@ export function PagadorDialog({
</fieldset> </fieldset>
<div className="flex flex-col gap-2"> <div className="flex flex-col gap-2">
<Label htmlFor="pagador-note">Anotações</Label> <Label htmlFor="payer-note">Anotações</Label>
<Input <Input
id="pagador-note" id="payer-note"
value={formState.note} value={formState.note}
onChange={(event) => updateField("note", event.target.value)} onChange={(event) => updateField("note", event.target.value)}
placeholder="Observações sobre este pagador" placeholder="Observações sobre este pagador"

View File

@@ -5,84 +5,81 @@ import { useRouter } from "next/navigation";
import { useMemo, useState, useTransition } from "react"; import { useMemo, useState, useTransition } from "react";
import { toast } from "sonner"; import { toast } from "sonner";
import { import {
deletePagadorAction, deletePayerAction,
joinPagadorByShareCodeAction, joinPayerByShareCodeAction,
} from "@/features/payers/actions"; } from "@/features/payers/actions";
import { PagadorCard } from "@/features/payers/components/payer-card"; import { PayerCard } from "@/features/payers/components/payer-card";
import { PagadorDialog } from "@/features/payers/components/payer-dialog"; import { PayerDialog } from "@/features/payers/components/payer-dialog";
import { ConfirmActionDialog } from "@/shared/components/confirm-action-dialog"; import { ConfirmActionDialog } from "@/shared/components/confirm-action-dialog";
import { Button } from "@/shared/components/ui/button"; import { Button } from "@/shared/components/ui/button";
import { Input } from "@/shared/components/ui/input"; import { Input } from "@/shared/components/ui/input";
import { PAGADOR_ROLE_ADMIN } from "@/shared/lib/payers/constants"; import { PAYER_ROLE_ADMIN } from "@/shared/lib/payers/constants";
import type { Pagador } from "./types"; import type { Payer } from "./types";
interface PagadoresPageProps { interface PayersPageProps {
pagadores: Pagador[]; payers: Payer[];
avatarOptions: string[]; avatarOptions: string[];
} }
export function PagadoresPage({ export function PayersPage({ payers, avatarOptions }: PayersPageProps) {
pagadores,
avatarOptions,
}: PagadoresPageProps) {
const router = useRouter(); const router = useRouter();
const [editOpen, setEditOpen] = useState(false); const [editOpen, setEditOpen] = useState(false);
const [selectedPagador, setSelectedPagador] = useState<Pagador | null>(null); const [selectedPayer, setSelectedPayer] = useState<Payer | null>(null);
const [removeOpen, setRemoveOpen] = useState(false); const [removeOpen, setRemoveOpen] = useState(false);
const [pagadorToRemove, setPagadorToRemove] = useState<Pagador | null>(null); const [payerToRemove, setPayerToRemove] = useState<Payer | null>(null);
const [shareCodeInput, setShareCodeInput] = useState(""); const [shareCodeInput, setShareCodeInput] = useState("");
const [joinPending, startJoin] = useTransition(); const [joinPending, startJoin] = useTransition();
const orderedPagadores = useMemo( const orderedPayers = useMemo(
() => () =>
[...pagadores].sort((a, b) => { [...payers].sort((a, b) => {
// Admin sempre primeiro // Admin sempre primeiro
if (a.role === PAGADOR_ROLE_ADMIN && b.role !== PAGADOR_ROLE_ADMIN) { if (a.role === PAYER_ROLE_ADMIN && b.role !== PAYER_ROLE_ADMIN) {
return -1; return -1;
} }
if (a.role !== PAGADOR_ROLE_ADMIN && b.role === PAGADOR_ROLE_ADMIN) { if (a.role !== PAYER_ROLE_ADMIN && b.role === PAYER_ROLE_ADMIN) {
return 1; return 1;
} }
// Se ambos têm o mesmo tipo de role, ordena por nome // Se ambos têm o mesmo tipo de role, ordena por nome
return a.name.localeCompare(b.name, "pt-BR", { sensitivity: "base" }); return a.name.localeCompare(b.name, "pt-BR", { sensitivity: "base" });
}), }),
[pagadores], [payers],
); );
const handleEdit = (pagador: Pagador) => { const handleEdit = (payer: Payer) => {
setSelectedPagador(pagador); setSelectedPayer(payer);
setEditOpen(true); setEditOpen(true);
}; };
const handleEditOpenChange = (open: boolean) => { const handleEditOpenChange = (open: boolean) => {
setEditOpen(open); setEditOpen(open);
if (!open) { if (!open) {
setSelectedPagador(null); setSelectedPayer(null);
} }
}; };
const handleRemoveRequest = (pagador: Pagador) => { const handleRemoveRequest = (payer: Payer) => {
if (pagador.role === PAGADOR_ROLE_ADMIN) { if (payer.role === PAYER_ROLE_ADMIN) {
toast.error("Pagadores administradores não podem ser removidos."); toast.error("Pagadores administradores não podem ser removidos.");
return; return;
} }
setPagadorToRemove(pagador); setPayerToRemove(payer);
setRemoveOpen(true); setRemoveOpen(true);
}; };
const handleRemoveOpenChange = (open: boolean) => { const handleRemoveOpenChange = (open: boolean) => {
setRemoveOpen(open); setRemoveOpen(open);
if (!open) { if (!open) {
setPagadorToRemove(null); setPayerToRemove(null);
} }
}; };
const handleRemoveConfirm = async () => { const handleRemoveConfirm = async () => {
if (!pagadorToRemove) { if (!payerToRemove) {
return; return;
} }
const result = await deletePagadorAction({ id: pagadorToRemove.id }); const result = await deletePayerAction({ id: payerToRemove.id });
if (result.success) { if (result.success) {
toast.success(result.message); toast.success(result.message);
@@ -93,8 +90,8 @@ export function PagadoresPage({
throw new Error(result.error); throw new Error(result.error);
}; };
const removeTitle = pagadorToRemove const removeTitle = payerToRemove
? `Remover pagador "${pagadorToRemove.name}"?` ? `Remover pagador "${payerToRemove.name}"?`
: "Remover pagador?"; : "Remover pagador?";
const handleJoinByCode = (event: React.FormEvent<HTMLFormElement>) => { const handleJoinByCode = (event: React.FormEvent<HTMLFormElement>) => {
@@ -105,7 +102,7 @@ export function PagadoresPage({
} }
startJoin(async () => { startJoin(async () => {
const result = await joinPagadorByShareCodeAction({ const result = await joinPayerByShareCodeAction({
code: shareCodeInput.trim(), code: shareCodeInput.trim(),
}); });
@@ -124,7 +121,7 @@ export function PagadoresPage({
<> <>
<div className="flex flex-col gap-6 w-full"> <div className="flex flex-col gap-6 w-full">
<div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between"> <div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
<PagadorDialog <PayerDialog
mode="create" mode="create"
avatarOptions={avatarOptions} avatarOptions={avatarOptions}
trigger={ trigger={
@@ -151,7 +148,7 @@ export function PagadoresPage({
</form> </form>
</div> </div>
{orderedPagadores.length === 0 ? ( {orderedPayers.length === 0 ? (
<div className="flex min-h-[320px] items-center justify-center rounded-lg border border-dashed bg-muted/30"> <div className="flex min-h-[320px] items-center justify-center rounded-lg border border-dashed bg-muted/30">
<div className="max-w-sm text-center text-sm text-muted-foreground"> <div className="max-w-sm text-center text-sm text-muted-foreground">
Cadastre seu primeiro pagador para organizar cobranças e Cadastre seu primeiro pagador para organizar cobranças e
@@ -160,14 +157,14 @@ export function PagadoresPage({
</div> </div>
) : ( ) : (
<div className="grid gap-4 sm:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4"> <div className="grid gap-4 sm:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4">
{orderedPagadores.map((pagador) => ( {orderedPayers.map((payer) => (
<PagadorCard <PayerCard
key={pagador.id} key={payer.id}
pagador={pagador} payer={payer}
onEdit={pagador.canEdit ? () => handleEdit(pagador) : undefined} onEdit={payer.canEdit ? () => handleEdit(payer) : undefined}
onRemove={ onRemove={
pagador.canEdit && pagador.role !== PAGADOR_ROLE_ADMIN payer.canEdit && payer.role !== PAYER_ROLE_ADMIN
? () => handleRemoveRequest(pagador) ? () => handleRemoveRequest(payer)
: undefined : undefined
} }
/> />
@@ -176,16 +173,16 @@ export function PagadoresPage({
)} )}
</div> </div>
<PagadorDialog <PayerDialog
mode="update" mode="update"
pagador={selectedPagador ?? undefined} payer={selectedPayer ?? undefined}
avatarOptions={avatarOptions} avatarOptions={avatarOptions}
open={editOpen && !!selectedPagador} open={editOpen && !!selectedPayer}
onOpenChange={handleEditOpenChange} onOpenChange={handleEditOpenChange}
/> />
<ConfirmActionDialog <ConfirmActionDialog
open={removeOpen && !!pagadorToRemove} open={removeOpen && !!payerToRemove}
onOpenChange={handleRemoveOpenChange} onOpenChange={handleRemoveOpenChange}
title={removeTitle} title={removeTitle}
description="Ao remover este pagador, os registros relacionados a ele deixarão de ser associados automaticamente." description="Ao remover este pagador, os registros relacionados a ele deixarão de ser associados automaticamente."

View File

@@ -1,11 +1,11 @@
import type { PagadorStatus } from "@/shared/lib/payers/constants"; import type { PayerStatus } from "@/shared/lib/payers/constants";
export type Pagador = { export type Payer = {
id: string; id: string;
name: string; name: string;
email: string | null; email: string | null;
avatarUrl: string | null; avatarUrl: string | null;
status: PagadorStatus; status: PayerStatus;
note: string | null; note: string | null;
role: string | null; role: string | null;
isAutoSend: boolean; isAutoSend: boolean;
@@ -17,10 +17,10 @@ export type Pagador = {
shareCode?: string | null; shareCode?: string | null;
}; };
export type PagadorFormValues = { export type PayerFormValues = {
name: string; name: string;
email: string; email: string;
status: PagadorStatus; status: PayerStatus;
avatarUrl: string; avatarUrl: string;
note: string; note: string;
isAutoSend: boolean; isAutoSend: boolean;

View File

@@ -4,22 +4,22 @@ import { and, desc, eq } from "drizzle-orm";
import { revalidatePath } from "next/cache"; import { revalidatePath } from "next/cache";
import { Resend } from "resend"; import { Resend } from "resend";
import { z } from "zod"; import { z } from "zod";
import { lancamentos, pagadores } from "@/db/schema"; import { payers, transactions } from "@/db/schema";
import { getUser } from "@/shared/lib/auth/server"; import { getUser } from "@/shared/lib/auth/server";
import { db } from "@/shared/lib/db"; import { db } from "@/shared/lib/db";
import { getResendFromEmail } from "@/shared/lib/email/resend"; import { getResendFromEmail } from "@/shared/lib/email/resend";
import { import {
fetchPagadorBoletoStats, fetchPagadorBoletoStats,
fetchPagadorCardUsage, fetchPagadorCardUsage,
fetchPagadorHistory, fetchPayerHistory,
fetchPagadorMonthlyBreakdown, fetchPayerMonthlyBreakdown,
} from "@/shared/lib/payers/details"; } from "@/shared/lib/payers/details";
import { formatCurrency } from "@/shared/utils/currency"; import { formatCurrency } from "@/shared/utils/currency";
import { formatDateTime } from "@/shared/utils/date"; import { formatDateTime } from "@/shared/utils/date";
import { displayPeriod } from "@/shared/utils/period"; import { displayPeriod } from "@/shared/utils/period";
const inputSchema = z.object({ const inputSchema = z.object({
pagadorId: z.string().uuid("Pagador inválido."), payerId: z.string().uuid("Payer inválido."),
period: z period: z
.string() .string()
.regex(/^\d{4}-\d{2}$/, "Período inválido. Informe no formato AAAA-MM."), .regex(/^\d{4}-\d{2}$/, "Período inválido. Informe no formato AAAA-MM."),
@@ -78,12 +78,12 @@ type ParceladoItem = {
type SummaryPayload = { type SummaryPayload = {
pagadorName: string; pagadorName: string;
periodLabel: string; periodLabel: string;
monthlyBreakdown: Awaited<ReturnType<typeof fetchPagadorMonthlyBreakdown>>; monthlyBreakdown: Awaited<ReturnType<typeof fetchPayerMonthlyBreakdown>>;
historyData: Awaited<ReturnType<typeof fetchPagadorHistory>>; historyData: Awaited<ReturnType<typeof fetchPayerHistory>>;
cardUsage: Awaited<ReturnType<typeof fetchPagadorCardUsage>>; cardUsage: Awaited<ReturnType<typeof fetchPagadorCardUsage>>;
boletoStats: Awaited<ReturnType<typeof fetchPagadorBoletoStats>>; boletoStats: Awaited<ReturnType<typeof fetchPagadorBoletoStats>>;
boletos: BoletoItem[]; boletos: BoletoItem[];
lancamentos: LancamentoRow[]; transactions: LancamentoRow[];
parcelados: ParceladoItem[]; parcelados: ParceladoItem[];
}; };
@@ -98,7 +98,7 @@ const buildSummaryHtml = ({
cardUsage, cardUsage,
boletoStats, boletoStats,
boletos, boletos,
lancamentos, transactions,
parcelados, parcelados,
}: SummaryPayload) => { }: SummaryPayload) => {
// Calcular máximo de despesas para barras de progresso // Calcular máximo de despesas para barras de progresso
@@ -173,9 +173,9 @@ const buildSummaryHtml = ({
.join("") .join("")
: `<tr><td colspan="3" style="padding:16px;text-align:center;color:#94a3b8;">Sem boletos neste período.</td></tr>`; : `<tr><td colspan="3" style="padding:16px;text-align:center;color:#94a3b8;">Sem boletos neste período.</td></tr>`;
const lancamentoRows = const transactionRows =
lancamentos.length > 0 transactions.length > 0
? lancamentos ? transactions
.map( .map(
(item) => ` (item) => `
<tr> <tr>
@@ -361,7 +361,7 @@ const buildSummaryHtml = ({
<th style="text-align:right;padding:12px 14px;border-bottom:1px solid #e2e8f0;font-weight:600;color:#475569;">Valor</th> <th style="text-align:right;padding:12px 14px;border-bottom:1px solid #e2e8f0;font-weight:600;color:#475569;">Valor</th>
</tr> </tr>
</thead> </thead>
<tbody>${lancamentoRows}</tbody> <tbody>${transactionRows}</tbody>
</table> </table>
<!-- Lançamentos Parcelados --> <!-- Lançamentos Parcelados -->
@@ -392,19 +392,19 @@ const buildSummaryHtml = ({
`; `;
}; };
export async function sendPagadorSummaryAction( export async function sendPayerSummaryAction(
input: z.infer<typeof inputSchema>, input: z.infer<typeof inputSchema>,
): Promise<ActionResult> { ): Promise<ActionResult> {
try { try {
const { pagadorId, period } = inputSchema.parse(input); const { payerId, period } = inputSchema.parse(input);
const user = await getUser(); const user = await getUser();
const pagadorRow = await db.query.pagadores.findFirst({ const pagadorRow = await db.query.payers.findFirst({
where: and(eq(pagadores.id, pagadorId), eq(pagadores.userId, user.id)), where: and(eq(payers.id, payerId), eq(payers.userId, user.id)),
}); });
if (!pagadorRow) { if (!pagadorRow) {
return { success: false, error: "Pagador não encontrado." }; return { success: false, error: "Payer não encontrado." };
} }
if (!pagadorRow.email) { if (!pagadorRow.email) {
@@ -432,83 +432,83 @@ export async function sendPagadorSummaryAction(
cardUsage, cardUsage,
boletoStats, boletoStats,
boletoRows, boletoRows,
lancamentoRows, transactionRows,
parceladoRows, parceladoRows,
] = await Promise.all([ ] = await Promise.all([
fetchPagadorMonthlyBreakdown({ fetchPayerMonthlyBreakdown({
userId: user.id, userId: user.id,
pagadorId, payerId,
period, period,
}), }),
fetchPagadorHistory({ fetchPayerHistory({
userId: user.id, userId: user.id,
pagadorId, payerId,
period, period,
}), }),
fetchPagadorCardUsage({ fetchPagadorCardUsage({
userId: user.id, userId: user.id,
pagadorId, payerId,
period, period,
}), }),
fetchPagadorBoletoStats({ fetchPagadorBoletoStats({
userId: user.id, userId: user.id,
pagadorId, payerId,
period, period,
}), }),
db db
.select({ .select({
name: lancamentos.name, name: transactions.name,
amount: lancamentos.amount, amount: transactions.amount,
dueDate: lancamentos.dueDate, dueDate: transactions.dueDate,
}) })
.from(lancamentos) .from(transactions)
.where( .where(
and( and(
eq(lancamentos.userId, user.id), eq(transactions.userId, user.id),
eq(lancamentos.pagadorId, pagadorId), eq(transactions.payerId, payerId),
eq(lancamentos.period, period), eq(transactions.period, period),
eq(lancamentos.paymentMethod, "Boleto"), eq(transactions.paymentMethod, "Boleto"),
), ),
) )
.orderBy(desc(lancamentos.dueDate)), .orderBy(desc(transactions.dueDate)),
db db
.select({ .select({
id: lancamentos.id, id: transactions.id,
name: lancamentos.name, name: transactions.name,
paymentMethod: lancamentos.paymentMethod, paymentMethod: transactions.paymentMethod,
condition: lancamentos.condition, condition: transactions.condition,
amount: lancamentos.amount, amount: transactions.amount,
transactionType: lancamentos.transactionType, transactionType: transactions.transactionType,
purchaseDate: lancamentos.purchaseDate, purchaseDate: transactions.purchaseDate,
}) })
.from(lancamentos) .from(transactions)
.where( .where(
and( and(
eq(lancamentos.userId, user.id), eq(transactions.userId, user.id),
eq(lancamentos.pagadorId, pagadorId), eq(transactions.payerId, payerId),
eq(lancamentos.period, period), eq(transactions.period, period),
), ),
) )
.orderBy(desc(lancamentos.purchaseDate)), .orderBy(desc(transactions.purchaseDate)),
db db
.select({ .select({
name: lancamentos.name, name: transactions.name,
amount: lancamentos.amount, amount: transactions.amount,
installmentCount: lancamentos.installmentCount, installmentCount: transactions.installmentCount,
currentInstallment: lancamentos.currentInstallment, currentInstallment: transactions.currentInstallment,
purchaseDate: lancamentos.purchaseDate, purchaseDate: transactions.purchaseDate,
}) })
.from(lancamentos) .from(transactions)
.where( .where(
and( and(
eq(lancamentos.userId, user.id), eq(transactions.userId, user.id),
eq(lancamentos.pagadorId, pagadorId), eq(transactions.payerId, payerId),
eq(lancamentos.period, period), eq(transactions.period, period),
eq(lancamentos.condition, "Parcelado"), eq(transactions.condition, "Parcelado"),
eq(lancamentos.isAnticipated, false), eq(transactions.isAnticipated, false),
), ),
) )
.orderBy(desc(lancamentos.purchaseDate)), .orderBy(desc(transactions.purchaseDate)),
]); ]);
const normalizedBoletos: BoletoItem[] = ( const normalizedBoletos: BoletoItem[] = (
@@ -524,7 +524,7 @@ export async function sendPagadorSummaryAction(
})); }));
const normalizedLancamentos: LancamentoRow[] = ( const normalizedLancamentos: LancamentoRow[] = (
lancamentoRows as Array<{ transactionRows as Array<{
id: string; id: string;
name: string | null; name: string | null;
paymentMethod: string | null; paymentMethod: string | null;
@@ -574,7 +574,7 @@ export async function sendPagadorSummaryAction(
cardUsage, cardUsage,
boletoStats, boletoStats,
boletos: normalizedBoletos, boletos: normalizedBoletos,
lancamentos: normalizedLancamentos, transactions: normalizedLancamentos,
parcelados: normalizedParcelados, parcelados: normalizedParcelados,
}); });
@@ -588,11 +588,9 @@ export async function sendPagadorSummaryAction(
const now = new Date(); const now = new Date();
await db await db
.update(pagadores) .update(payers)
.set({ lastMailAt: now }) .set({ lastMailAt: now })
.where( .where(and(eq(payers.id, pagadorRow.id), eq(payers.userId, user.id)));
and(eq(pagadores.id, pagadorRow.id), eq(pagadores.userId, user.id)),
);
revalidatePath(`/payers/${pagadorRow.id}`); revalidatePath(`/payers/${pagadorRow.id}`);
@@ -600,7 +598,7 @@ export async function sendPagadorSummaryAction(
} catch (error) { } catch (error) {
// Log estruturado em desenvolvimento // Log estruturado em desenvolvimento
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
console.error("[sendPagadorSummaryAction]", error); console.error("[sendPayerSummaryAction]", error);
} }
// Tratar erros de validação separadamente // Tratar erros de validação separadamente

View File

@@ -1,11 +1,11 @@
import { and, desc, eq, type SQL } from "drizzle-orm"; import { and, desc, eq, type SQL } from "drizzle-orm";
import { import {
cartoes, cards,
categorias, categories,
compartilhamentosPagador, financialAccounts,
contas, payerShares,
lancamentos, payers,
pagadores, transactions,
user as usersTable, user as usersTable,
} from "@/db/schema"; } from "@/db/schema";
import { db } from "@/shared/lib/db"; import { db } from "@/shared/lib/db";
@@ -18,23 +18,18 @@ export type ShareData = {
createdAt: string; createdAt: string;
}; };
export async function fetchPagadorShares( export async function fetchPayerShares(payerId: string): Promise<ShareData[]> {
pagadorId: string,
): Promise<ShareData[]> {
const shareRows = await db const shareRows = await db
.select({ .select({
id: compartilhamentosPagador.id, id: payerShares.id,
sharedWithUserId: compartilhamentosPagador.sharedWithUserId, sharedWithUserId: payerShares.sharedWithUserId,
createdAt: compartilhamentosPagador.createdAt, createdAt: payerShares.createdAt,
userName: usersTable.name, userName: usersTable.name,
userEmail: usersTable.email, userEmail: usersTable.email,
}) })
.from(compartilhamentosPagador) .from(payerShares)
.innerJoin( .innerJoin(usersTable, eq(payerShares.sharedWithUserId, usersTable.id))
usersTable, .where(eq(payerShares.payerId, payerId));
eq(compartilhamentosPagador.sharedWithUserId, usersTable.id),
)
.where(eq(compartilhamentosPagador.pagadorId, pagadorId));
return shareRows.map((share) => ({ return shareRows.map((share) => ({
id: share.id, id: share.id,
@@ -46,17 +41,17 @@ export async function fetchPagadorShares(
} }
export async function fetchCurrentUserShare( export async function fetchCurrentUserShare(
pagadorId: string, payerId: string,
userId: string, userId: string,
): Promise<{ id: string; createdAt: string } | null> { ): Promise<{ id: string; createdAt: string } | null> {
const shareRow = await db.query.compartilhamentosPagador.findFirst({ const shareRow = await db.query.payerShares.findFirst({
columns: { columns: {
id: true, id: true,
createdAt: true, createdAt: true,
}, },
where: and( where: and(
eq(compartilhamentosPagador.pagadorId, pagadorId), eq(payerShares.payerId, payerId),
eq(compartilhamentosPagador.sharedWithUserId, userId), eq(payerShares.sharedWithUserId, userId),
), ),
}); });
@@ -71,28 +66,31 @@ export async function fetchCurrentUserShare(
} }
export async function fetchPagadorLancamentos(filters: SQL[]) { export async function fetchPagadorLancamentos(filters: SQL[]) {
const lancamentoRows = await db const transactionRows = await db
.select({ .select({
lancamento: lancamentos, transaction: transactions,
pagador: pagadores, payer: payers,
conta: contas, financialAccount: financialAccounts,
cartao: cartoes, card: cards,
categoria: categorias, category: categories,
}) })
.from(lancamentos) .from(transactions)
.leftJoin(pagadores, eq(lancamentos.pagadorId, pagadores.id)) .leftJoin(payers, eq(transactions.payerId, payers.id))
.leftJoin(contas, eq(lancamentos.contaId, contas.id)) .leftJoin(
.leftJoin(cartoes, eq(lancamentos.cartaoId, cartoes.id)) financialAccounts,
.leftJoin(categorias, eq(lancamentos.categoriaId, categorias.id)) eq(transactions.accountId, financialAccounts.id),
)
.leftJoin(cards, eq(transactions.cardId, cards.id))
.leftJoin(categories, eq(transactions.categoryId, categories.id))
.where(and(...filters)) .where(and(...filters))
.orderBy(desc(lancamentos.purchaseDate), desc(lancamentos.createdAt)); .orderBy(desc(transactions.purchaseDate), desc(transactions.createdAt));
// Transformar resultado para o formato esperado // Transformar resultado para o formato esperado
return lancamentoRows.map((row: Record<string, unknown>) => ({ return transactionRows.map((row) => ({
...row.lancamento, ...row.transaction,
pagador: row.pagador, payer: row.payer,
conta: row.conta, financialAccount: row.financialAccount,
cartao: row.cartao, card: row.card,
categoria: row.categoria, category: row.category,
})); }));
} }

View File

@@ -1,6 +1,6 @@
import { readdir } from "node:fs/promises"; import { readdir } from "node:fs/promises";
import path from "node:path"; import path from "node:path";
import { DEFAULT_PAGADOR_AVATAR } from "@/shared/lib/payers/constants"; import { DEFAULT_PAYER_AVATAR } from "@/shared/lib/payers/constants";
const AVATAR_DIRECTORY = path.join(process.cwd(), "public", "avatars"); const AVATAR_DIRECTORY = path.join(process.cwd(), "public", "avatars");
const AVATAR_EXTENSIONS = new Set([".png", ".jpg", ".jpeg", ".svg", ".webp"]); const AVATAR_EXTENSIONS = new Set([".png", ".jpg", ".jpeg", ".svg", ".webp"]);
@@ -20,11 +20,11 @@ export async function loadAvatarOptions() {
.sort((a, b) => a.localeCompare(b, "pt-BR", { sensitivity: "base" })); .sort((a, b) => a.localeCompare(b, "pt-BR", { sensitivity: "base" }));
if (items.length === 0) { if (items.length === 0) {
items.push(DEFAULT_PAGADOR_AVATAR); items.push(DEFAULT_PAYER_AVATAR);
} }
return Array.from(new Set(items)); return Array.from(new Set(items));
} catch { } catch {
return [DEFAULT_PAGADOR_AVATAR]; return [DEFAULT_PAYER_AVATAR];
} }
} }

View File

@@ -1,9 +1,9 @@
import type { pagadores } from "@/db/schema"; import type { payers } from "@/db/schema";
import type { import type {
ContaCartaoFilterOption, AccountCardFilterOption,
LancamentoFilterOption, TransactionFilterOption,
LancamentoItem,
SelectOption, SelectOption,
TransactionItem,
} from "@/features/transactions/components/types"; } from "@/features/transactions/components/types";
import type { buildOptionSets } from "@/features/transactions/page-helpers"; import type { buildOptionSets } from "@/features/transactions/page-helpers";
@@ -15,15 +15,15 @@ const normalizeOptionLabel = (
) => (value?.trim().length ? value.trim() : fallback); ) => (value?.trim().length ? value.trim() : fallback);
export function buildReadOnlyOptionSets( export function buildReadOnlyOptionSets(
items: LancamentoItem[], items: TransactionItem[],
pagador: typeof pagadores.$inferSelect, payer: typeof payers.$inferSelect,
): OptionSet { ): OptionSet {
const pagadorLabel = normalizeOptionLabel(pagador.name, "Pagador"); const pagadorLabel = normalizeOptionLabel(payer.name, "Payer");
const pagadorOptions: SelectOption[] = [ const payerOptions: SelectOption[] = [
{ {
value: pagador.id, value: payer.id,
label: pagadorLabel, label: pagadorLabel,
slug: pagador.id, slug: payer.id,
}, },
]; ];
@@ -32,51 +32,54 @@ export function buildReadOnlyOptionSets(
const categoriaOptionsMap = new Map<string, SelectOption>(); const categoriaOptionsMap = new Map<string, SelectOption>();
items.forEach((item) => { items.forEach((item) => {
if (item.contaId && !contaOptionsMap.has(item.contaId)) { if (item.accountId && !contaOptionsMap.has(item.accountId)) {
contaOptionsMap.set(item.contaId, { contaOptionsMap.set(item.accountId, {
value: item.contaId, value: item.accountId,
label: normalizeOptionLabel(item.contaName, "Conta sem nome"), label: normalizeOptionLabel(
slug: item.contaId, item.contaName,
"FinancialAccount sem nome",
),
slug: item.accountId,
}); });
} }
if (item.cartaoId && !cartaoOptionsMap.has(item.cartaoId)) { if (item.cardId && !cartaoOptionsMap.has(item.cardId)) {
cartaoOptionsMap.set(item.cartaoId, { cartaoOptionsMap.set(item.cardId, {
value: item.cartaoId, value: item.cardId,
label: normalizeOptionLabel(item.cartaoName, "Cartão sem nome"), label: normalizeOptionLabel(item.cartaoName, "Cartão sem nome"),
slug: item.cartaoId, slug: item.cardId,
}); });
} }
if (item.categoriaId && !categoriaOptionsMap.has(item.categoriaId)) { if (item.categoryId && !categoriaOptionsMap.has(item.categoryId)) {
categoriaOptionsMap.set(item.categoriaId, { categoriaOptionsMap.set(item.categoryId, {
value: item.categoriaId, value: item.categoryId,
label: normalizeOptionLabel(item.categoriaName, "Categoria"), label: normalizeOptionLabel(item.categoriaName, "Category"),
slug: item.categoriaId, slug: item.categoryId,
}); });
} }
}); });
const contaOptions = Array.from(contaOptionsMap.values()); const accountOptions = Array.from(contaOptionsMap.values());
const cartaoOptions = Array.from(cartaoOptionsMap.values()); const cardOptions = Array.from(cartaoOptionsMap.values());
const categoriaOptions = Array.from(categoriaOptionsMap.values()); const categoryOptions = Array.from(categoriaOptionsMap.values());
const pagadorFilterOptions: LancamentoFilterOption[] = [ const payerFilterOptions: TransactionFilterOption[] = [
{ slug: pagador.id, label: pagadorLabel }, { slug: payer.id, label: pagadorLabel },
]; ];
const categoriaFilterOptions: LancamentoFilterOption[] = categoriaOptions.map( const categoryFilterOptions: TransactionFilterOption[] = categoryOptions.map(
(option) => ({ (option) => ({
slug: option.value, slug: option.value,
label: option.label, label: option.label,
}), }),
); );
const contaCartaoFilterOptions: ContaCartaoFilterOption[] = [ const accountCardFilterOptions: AccountCardFilterOption[] = [
...contaOptions.map((option) => ({ ...accountOptions.map((option) => ({
slug: option.value, slug: option.value,
label: option.label, label: option.label,
kind: "conta" as const, kind: "conta" as const,
})), })),
...cartaoOptions.map((option) => ({ ...cardOptions.map((option) => ({
slug: option.value, slug: option.value,
label: option.label, label: option.label,
kind: "cartao" as const, kind: "cartao" as const,
@@ -84,14 +87,14 @@ export function buildReadOnlyOptionSets(
]; ];
return { return {
pagadorOptions, payerOptions,
splitPagadorOptions: [], splitPayerOptions: [],
defaultPagadorId: pagador.id, defaultPayerId: payer.id,
contaOptions, accountOptions,
cartaoOptions, cardOptions,
categoriaOptions, categoryOptions,
pagadorFilterOptions, payerFilterOptions,
categoriaFilterOptions, categoryFilterOptions,
contaCartaoFilterOptions, accountCardFilterOptions,
}; };
} }

View File

@@ -2,21 +2,21 @@ import { eq } from "drizzle-orm";
import { user } from "@/db/schema"; import { user } from "@/db/schema";
import { loadAvatarOptions } from "@/features/payers/lib/avatar-options"; import { loadAvatarOptions } from "@/features/payers/lib/avatar-options";
import { db } from "@/shared/lib/db"; import { db } from "@/shared/lib/db";
import { fetchPagadoresWithAccess } from "@/shared/lib/payers/access"; import { fetchPayersWithAccess } from "@/shared/lib/payers/access";
import type { PagadorStatus } from "@/shared/lib/payers/constants"; import type { PayerStatus } from "@/shared/lib/payers/constants";
import { import {
PAGADOR_ROLE_ADMIN, PAYER_ROLE_ADMIN,
PAGADOR_STATUS_OPTIONS, PAYER_STATUS_OPTIONS,
} from "@/shared/lib/payers/constants"; } from "@/shared/lib/payers/constants";
export type PagadorData = { export type PayerData = {
id: string; id: string;
name: string; name: string;
email: string | null; email: string | null;
avatarUrl: string | null; avatarUrl: string | null;
status: PagadorStatus; status: PayerStatus;
note: string | null; note: string | null;
role: string; role: string | null;
isAutoSend: boolean; isAutoSend: boolean;
createdAt: string; createdAt: string;
canEdit: boolean; canEdit: boolean;
@@ -26,19 +26,19 @@ export type PagadorData = {
shareCode: string | null; shareCode: string | null;
}; };
const resolveStatus = (status: string | null): PagadorStatus => { const resolveStatus = (status: string | null): PayerStatus => {
const normalized = status?.trim() ?? ""; const normalized = status?.trim() ?? "";
const found = PAGADOR_STATUS_OPTIONS.find( const found = PAYER_STATUS_OPTIONS.find(
(option) => option.toLowerCase() === normalized.toLowerCase(), (option) => option.toLowerCase() === normalized.toLowerCase(),
); );
return found ?? PAGADOR_STATUS_OPTIONS[0]; return found ?? PAYER_STATUS_OPTIONS[0];
}; };
export async function fetchPagadoresForUser( export async function fetchPayersForUser(
userId: string, userId: string,
): Promise<{ pagadores: PagadorData[]; avatarOptions: string[] }> { ): Promise<{ payers: PayerData[]; avatarOptions: string[] }> {
const [pagadorRows, localAvatarOptions, userData] = await Promise.all([ const [payerRows, localAvatarOptions, userData] = await Promise.all([
fetchPagadoresWithAccess(userId), fetchPayersWithAccess(userId),
loadAvatarOptions(), loadAvatarOptions(),
db.query.user.findFirst({ db.query.user.findFirst({
columns: { image: true }, columns: { image: true },
@@ -51,7 +51,7 @@ export async function fetchPagadoresForUser(
? [userImage, ...localAvatarOptions] ? [userImage, ...localAvatarOptions]
: localAvatarOptions; : localAvatarOptions;
const pagadores = pagadorRows const payers = payerRows
.map((pagador) => ({ .map((pagador) => ({
id: pagador.id, id: pagador.id,
name: pagador.name, name: pagador.name,
@@ -69,12 +69,10 @@ export async function fetchPagadoresForUser(
shareCode: pagador.canEdit ? (pagador.shareCode ?? null) : null, shareCode: pagador.canEdit ? (pagador.shareCode ?? null) : null,
})) }))
.sort((a, b) => { .sort((a, b) => {
if (a.role === PAGADOR_ROLE_ADMIN && b.role !== PAGADOR_ROLE_ADMIN) if (a.role === PAYER_ROLE_ADMIN && b.role !== PAYER_ROLE_ADMIN) return -1;
return -1; if (a.role !== PAYER_ROLE_ADMIN && b.role === PAYER_ROLE_ADMIN) return 1;
if (a.role !== PAGADOR_ROLE_ADMIN && b.role === PAGADOR_ROLE_ADMIN)
return 1;
return 0; return 0;
}); });
return { pagadores, avatarOptions }; return { payers, avatarOptions };
} }

View File

@@ -68,7 +68,7 @@ export function createSidebarNavData(
.map((pagador) => ({ .map((pagador) => ({
title: pagador.name?.trim().length title: pagador.name?.trim().length
? pagador.name.trim() ? pagador.name.trim()
: "Pagador sem nome", : "Payer sem nome",
url: `/payers/${pagador.id}`, url: `/payers/${pagador.id}`,
key: pagador.canEdit ? pagador.id : `${pagador.id}-shared`, key: pagador.canEdit ? pagador.id : `${pagador.id}-shared`,
isShared: !pagador.canEdit, isShared: !pagador.canEdit,

View File

@@ -115,7 +115,7 @@ export const auth = betterAuth({
/** /**
* Após criar novo usuário, inicializa: * Após criar novo usuário, inicializa:
* 1. Categorias padrão (Receitas/Despesas) * 1. Categorias padrão (Receitas/Despesas)
* 2. Pagador padrão (vinculado ao usuário) * 2. Payer padrão (vinculado ao usuário)
*/ */
after: async (user) => { after: async (user) => {
// Se falhar aqui, o usuário já foi criado - considere usar queue para retry // Se falhar aqui, o usuário já foi criado - considere usar queue para retry

View File

@@ -1,42 +1,36 @@
import { and, eq } from "drizzle-orm"; import { and, eq } from "drizzle-orm";
import { import { payerShares, payers, user as usersTable } from "@/db/schema";
compartilhamentosPagador,
pagadores,
user as usersTable,
} from "@/db/schema";
import { db } from "@/shared/lib/db"; import { db } from "@/shared/lib/db";
export type PagadorWithAccess = typeof pagadores.$inferSelect & { export type PayerWithAccess = Omit<typeof payers.$inferSelect, "shareCode"> & {
shareCode: string | null;
canEdit: boolean; canEdit: boolean;
sharedByName: string | null; sharedByName: string | null;
sharedByEmail: string | null; sharedByEmail: string | null;
shareId: string | null; shareId: string | null;
}; };
export async function fetchPagadoresWithAccess( export async function fetchPayersWithAccess(
userId: string, userId: string,
): Promise<PagadorWithAccess[]> { ): Promise<PayerWithAccess[]> {
const [owned, shared] = await Promise.all([ const [owned, shared] = await Promise.all([
db.query.pagadores.findMany({ db.query.payers.findMany({
where: eq(pagadores.userId, userId), where: eq(payers.userId, userId),
}), }),
db db
.select({ .select({
shareId: compartilhamentosPagador.id, shareId: payerShares.id,
pagador: pagadores, payer: payers,
ownerName: usersTable.name, ownerName: usersTable.name,
ownerEmail: usersTable.email, ownerEmail: usersTable.email,
}) })
.from(compartilhamentosPagador) .from(payerShares)
.innerJoin( .innerJoin(payers, eq(payerShares.payerId, payers.id))
pagadores, .leftJoin(usersTable, eq(payers.userId, usersTable.id))
eq(compartilhamentosPagador.pagadorId, pagadores.id), .where(eq(payerShares.sharedWithUserId, userId)),
)
.leftJoin(usersTable, eq(pagadores.userId, usersTable.id))
.where(eq(compartilhamentosPagador.sharedWithUserId, userId)),
]); ]);
const ownedMapped: PagadorWithAccess[] = owned.map((item) => ({ const ownedMapped: PayerWithAccess[] = owned.map((item) => ({
...item, ...item,
canEdit: true, canEdit: true,
sharedByName: null, sharedByName: null,
@@ -44,8 +38,8 @@ export async function fetchPagadoresWithAccess(
shareId: null, shareId: null,
})); }));
const sharedMapped: PagadorWithAccess[] = shared.map((item) => ({ const sharedMapped: PayerWithAccess[] = shared.map((item) => ({
...item.pagador, ...(item.payer as typeof payers.$inferSelect),
shareCode: null, shareCode: null,
canEdit: false, canEdit: false,
sharedByName: item.ownerName ?? null, sharedByName: item.ownerName ?? null,
@@ -56,9 +50,9 @@ export async function fetchPagadoresWithAccess(
return [...ownedMapped, ...sharedMapped]; return [...ownedMapped, ...sharedMapped];
} }
export async function getPagadorAccess(userId: string, pagadorId: string) { export async function getPayerAccess(userId: string, payerId: string) {
const pagador = await db.query.pagadores.findFirst({ const pagador = await db.query.payers.findFirst({
where: and(eq(pagadores.id, pagadorId)), where: and(eq(payers.id, payerId)),
}); });
if (!pagador) { if (!pagador) {
@@ -69,14 +63,14 @@ export async function getPagadorAccess(userId: string, pagadorId: string) {
return { return {
pagador, pagador,
canEdit: true, canEdit: true,
share: null as typeof compartilhamentosPagador.$inferSelect | null, share: null as typeof payerShares.$inferSelect | null,
}; };
} }
const share = await db.query.compartilhamentosPagador.findFirst({ const share = await db.query.payerShares.findFirst({
where: and( where: and(
eq(compartilhamentosPagador.pagadorId, pagadorId), eq(payerShares.payerId, payerId),
eq(compartilhamentosPagador.sharedWithUserId, userId), eq(payerShares.sharedWithUserId, userId),
), ),
}); });

View File

@@ -1,7 +1,7 @@
export const PAGADOR_STATUS_OPTIONS = ["Ativo", "Inativo"] as const; export const PAYER_STATUS_OPTIONS = ["Ativo", "Inativo"] as const;
export type PagadorStatus = (typeof PAGADOR_STATUS_OPTIONS)[number]; export type PayerStatus = (typeof PAYER_STATUS_OPTIONS)[number];
export const PAGADOR_ROLE_ADMIN = "admin"; export const PAYER_ROLE_ADMIN = "admin";
export const PAGADOR_ROLE_TERCEIRO = "terceiro"; export const PAYER_ROLE_THIRD_PARTY = "terceiro";
export const DEFAULT_PAGADOR_AVATAR = "default_icon.png"; export const DEFAULT_PAYER_AVATAR = "default_icon.png";

View File

@@ -1,14 +1,14 @@
import { eq } from "drizzle-orm"; import { eq } from "drizzle-orm";
import { pagadores } from "@/db/schema"; import { payers } from "@/db/schema";
import { db } from "@/shared/lib/db"; import { db } from "@/shared/lib/db";
import { import {
DEFAULT_PAGADOR_AVATAR, DEFAULT_PAYER_AVATAR,
PAGADOR_ROLE_ADMIN, PAYER_ROLE_ADMIN,
PAGADOR_STATUS_OPTIONS, PAYER_STATUS_OPTIONS,
} from "./constants"; } from "./constants";
import { normalizeNameFromEmail } from "./utils"; import { normalizeNameFromEmail } from "./utils";
const DEFAULT_STATUS = PAGADOR_STATUS_OPTIONS[0]; const DEFAULT_STATUS = PAYER_STATUS_OPTIONS[0];
interface SeedUserLike { interface SeedUserLike {
id?: string; id?: string;
@@ -24,9 +24,9 @@ export async function ensureDefaultPagadorForUser(user: SeedUserLike) {
return; return;
} }
const hasAnyPagador = await db.query.pagadores.findFirst({ const hasAnyPagador = await db.query.payers.findFirst({
columns: { id: true, role: true }, columns: { id: true, role: true },
where: eq(pagadores.userId, userId), where: eq(payers.userId, userId),
}); });
if (hasAnyPagador) { if (hasAnyPagador) {
@@ -36,16 +36,16 @@ export async function ensureDefaultPagadorForUser(user: SeedUserLike) {
const name = const name =
(user.name && user.name.trim().length > 0 (user.name && user.name.trim().length > 0
? user.name.trim() ? user.name.trim()
: normalizeNameFromEmail(user.email)) || "Pagador principal"; : normalizeNameFromEmail(user.email)) || "Payer principal";
// Usa a imagem do Google se disponível, senão usa o avatar padrão // Usa a imagem do Google se disponível, senão usa o avatar padrão
const avatarUrl = user.image ?? DEFAULT_PAGADOR_AVATAR; const avatarUrl = user.image ?? DEFAULT_PAYER_AVATAR;
await db.insert(pagadores).values({ await db.insert(payers).values({
name, name,
email: user.email ?? null, email: user.email ?? null,
status: DEFAULT_STATUS, status: DEFAULT_STATUS,
role: PAGADOR_ROLE_ADMIN, role: PAYER_ROLE_ADMIN,
avatarUrl, avatarUrl,
note: null, note: null,
isAutoSend: false, isAutoSend: false,

View File

@@ -11,7 +11,7 @@ import {
sql, sql,
sum, sum,
} from "drizzle-orm"; } from "drizzle-orm";
import { cartoes, lancamentos } from "@/db/schema"; import { cards, transactions } from "@/db/schema";
import { ACCOUNT_AUTO_INVOICE_NOTE_PREFIX } from "@/shared/lib/accounts/constants"; import { ACCOUNT_AUTO_INVOICE_NOTE_PREFIX } from "@/shared/lib/accounts/constants";
import { db } from "@/shared/lib/db"; import { db } from "@/shared/lib/db";
import { toDateOnlyString } from "@/shared/utils/date"; import { toDateOnlyString } from "@/shared/utils/date";
@@ -27,27 +27,27 @@ const DESPESA = "Despesa";
const PAYMENT_METHOD_CARD = "Cartão de crédito"; const PAYMENT_METHOD_CARD = "Cartão de crédito";
const PAYMENT_METHOD_BOLETO = "Boleto"; const PAYMENT_METHOD_BOLETO = "Boleto";
export type PagadorMonthlyBreakdown = { export type PayerMonthlyBreakdown = {
totalExpenses: number; totalExpenses: number;
totalIncomes: number; totalIncomes: number;
paymentSplits: Record<"card" | "boleto" | "instant", number>; paymentSplits: Record<"card" | "boleto" | "instant", number>;
}; };
export type PagadorHistoryPoint = { export type PayerHistoryPoint = {
period: string; period: string;
label: string; label: string;
receitas: number; receitas: number;
despesas: number; despesas: number;
}; };
export type PagadorCardUsageItem = { export type PayerCardUsageItem = {
id: string; id: string;
name: string; name: string;
logo: string | null; logo: string | null;
amount: number; amount: number;
}; };
export type PagadorBoletoStats = { export type PayerBoletoStats = {
totalAmount: number; totalAmount: number;
paidAmount: number; paidAmount: number;
pendingAmount: number; pendingAmount: number;
@@ -55,7 +55,7 @@ export type PagadorBoletoStats = {
pendingCount: number; pendingCount: number;
}; };
export type PagadorBoletoItem = { export type PayerBoletoItem = {
id: string; id: string;
name: string; name: string;
amount: number; amount: number;
@@ -64,7 +64,7 @@ export type PagadorBoletoItem = {
isSettled: boolean; isSettled: boolean;
}; };
export type PagadorPaymentStatusData = { export type PayerPaymentStatusData = {
paidAmount: number; paidAmount: number;
paidCount: number; paidCount: number;
pendingAmount: number; pendingAmount: number;
@@ -74,39 +74,39 @@ export type PagadorPaymentStatusData = {
const excludeAutoInvoiceEntries = () => const excludeAutoInvoiceEntries = () =>
or( or(
isNull(lancamentos.note), isNull(transactions.note),
not(ilike(lancamentos.note, `${ACCOUNT_AUTO_INVOICE_NOTE_PREFIX}%`)), not(ilike(transactions.note, `${ACCOUNT_AUTO_INVOICE_NOTE_PREFIX}%`)),
); );
type BaseFilters = { type BaseFilters = {
userId: string; userId: string;
pagadorId: string; payerId: string;
period: string; period: string;
}; };
export async function fetchPagadorMonthlyBreakdown({ export async function fetchPayerMonthlyBreakdown({
userId, userId,
pagadorId, payerId,
period, period,
}: BaseFilters): Promise<PagadorMonthlyBreakdown> { }: BaseFilters): Promise<PayerMonthlyBreakdown> {
const rows = await db const rows = await db
.select({ .select({
paymentMethod: lancamentos.paymentMethod, paymentMethod: transactions.paymentMethod,
transactionType: lancamentos.transactionType, transactionType: transactions.transactionType,
totalAmount: sum(lancamentos.amount).as("total"), totalAmount: sum(transactions.amount).as("total"),
}) })
.from(lancamentos) .from(transactions)
.where( .where(
and( and(
eq(lancamentos.userId, userId), eq(transactions.userId, userId),
eq(lancamentos.pagadorId, pagadorId), eq(transactions.payerId, payerId),
eq(lancamentos.period, period), eq(transactions.period, period),
excludeAutoInvoiceEntries(), excludeAutoInvoiceEntries(),
), ),
) )
.groupBy(lancamentos.paymentMethod, lancamentos.transactionType); .groupBy(transactions.paymentMethod, transactions.transactionType);
const paymentSplits: PagadorMonthlyBreakdown["paymentSplits"] = { const paymentSplits: PayerMonthlyBreakdown["paymentSplits"] = {
card: 0, card: 0,
boleto: 0, boleto: 0,
instant: 0, instant: 0,
@@ -137,12 +137,12 @@ export async function fetchPagadorMonthlyBreakdown({
}; };
} }
export async function fetchPagadorHistory({ export async function fetchPayerHistory({
userId, userId,
pagadorId, payerId,
period, period,
months = 6, months = 6,
}: BaseFilters & { months?: number }): Promise<PagadorHistoryPoint[]> { }: BaseFilters & { months?: number }): Promise<PayerHistoryPoint[]> {
const startPeriod = addMonthsToPeriod(period, -(Math.max(months, 1) - 1)); const startPeriod = addMonthsToPeriod(period, -(Math.max(months, 1) - 1));
const windowPeriods = buildPeriodRange(startPeriod, period); const windowPeriods = buildPeriodRange(startPeriod, period);
const start = windowPeriods[0]; const start = windowPeriods[0];
@@ -150,21 +150,21 @@ export async function fetchPagadorHistory({
const rows = await db const rows = await db
.select({ .select({
period: lancamentos.period, period: transactions.period,
transactionType: lancamentos.transactionType, transactionType: transactions.transactionType,
totalAmount: sum(lancamentos.amount).as("total"), totalAmount: sum(transactions.amount).as("total"),
}) })
.from(lancamentos) .from(transactions)
.where( .where(
and( and(
eq(lancamentos.userId, userId), eq(transactions.userId, userId),
eq(lancamentos.pagadorId, pagadorId), eq(transactions.payerId, payerId),
gte(lancamentos.period, start), gte(transactions.period, start),
lte(lancamentos.period, end), lte(transactions.period, end),
excludeAutoInvoiceEntries(), excludeAutoInvoiceEntries(),
), ),
) )
.groupBy(lancamentos.period, lancamentos.transactionType); .groupBy(transactions.period, transactions.transactionType);
const totalsByPeriod = new Map< const totalsByPeriod = new Map<
string, string,
@@ -198,38 +198,38 @@ export async function fetchPagadorHistory({
export async function fetchPagadorCardUsage({ export async function fetchPagadorCardUsage({
userId, userId,
pagadorId, payerId,
period, period,
}: BaseFilters): Promise<PagadorCardUsageItem[]> { }: BaseFilters): Promise<PayerCardUsageItem[]> {
const rows = await db const rows = await db
.select({ .select({
cartaoId: lancamentos.cartaoId, cardId: transactions.cardId,
cardName: cartoes.name, cardName: cards.name,
cardLogo: cartoes.logo, cardLogo: cards.logo,
totalAmount: sum(lancamentos.amount).as("total"), totalAmount: sum(transactions.amount).as("total"),
}) })
.from(lancamentos) .from(transactions)
.innerJoin(cartoes, eq(lancamentos.cartaoId, cartoes.id)) .innerJoin(cards, eq(transactions.cardId, cards.id))
.where( .where(
and( and(
eq(lancamentos.userId, userId), eq(transactions.userId, userId),
eq(lancamentos.pagadorId, pagadorId), eq(transactions.payerId, payerId),
eq(lancamentos.period, period), eq(transactions.period, period),
eq(lancamentos.paymentMethod, PAYMENT_METHOD_CARD), eq(transactions.paymentMethod, PAYMENT_METHOD_CARD),
excludeAutoInvoiceEntries(), excludeAutoInvoiceEntries(),
), ),
) )
.groupBy(lancamentos.cartaoId, cartoes.name, cartoes.logo); .groupBy(transactions.cardId, cards.name, cards.logo);
const items: PagadorCardUsageItem[] = []; const items: PayerCardUsageItem[] = [];
for (const row of rows) { for (const row of rows) {
if (!row.cartaoId) { if (!row.cardId) {
continue; continue;
} }
items.push({ items.push({
id: row.cartaoId, id: row.cardId,
name: row.cardName ?? "Cartão", name: row.cardName ?? "Cartão",
logo: row.cardLogo ?? null, logo: row.cardLogo ?? null,
amount: Math.abs(toNumber(row.totalAmount)), amount: Math.abs(toNumber(row.totalAmount)),
@@ -241,26 +241,26 @@ export async function fetchPagadorCardUsage({
export async function fetchPagadorBoletoStats({ export async function fetchPagadorBoletoStats({
userId, userId,
pagadorId, payerId,
period, period,
}: BaseFilters): Promise<PagadorBoletoStats> { }: BaseFilters): Promise<PayerBoletoStats> {
const rows = await db const rows = await db
.select({ .select({
isSettled: lancamentos.isSettled, isSettled: transactions.isSettled,
totalAmount: sum(lancamentos.amount).as("total"), totalAmount: sum(transactions.amount).as("total"),
totalCount: sql<number>`count(${lancamentos.id})`.as("count"), totalCount: sql<number>`count(${transactions.id})`.as("count"),
}) })
.from(lancamentos) .from(transactions)
.where( .where(
and( and(
eq(lancamentos.userId, userId), eq(transactions.userId, userId),
eq(lancamentos.pagadorId, pagadorId), eq(transactions.payerId, payerId),
eq(lancamentos.period, period), eq(transactions.period, period),
eq(lancamentos.paymentMethod, PAYMENT_METHOD_BOLETO), eq(transactions.paymentMethod, PAYMENT_METHOD_BOLETO),
excludeAutoInvoiceEntries(), excludeAutoInvoiceEntries(),
), ),
) )
.groupBy(lancamentos.isSettled); .groupBy(transactions.isSettled);
let paidAmount = 0; let paidAmount = 0;
let pendingAmount = 0; let pendingAmount = 0;
@@ -290,31 +290,31 @@ export async function fetchPagadorBoletoStats({
export async function fetchPagadorBoletoItems({ export async function fetchPagadorBoletoItems({
userId, userId,
pagadorId, payerId,
period, period,
}: BaseFilters): Promise<PagadorBoletoItem[]> { }: BaseFilters): Promise<PayerBoletoItem[]> {
const rows = await db const rows = await db
.select({ .select({
id: lancamentos.id, id: transactions.id,
name: lancamentos.name, name: transactions.name,
amount: lancamentos.amount, amount: transactions.amount,
dueDate: lancamentos.dueDate, dueDate: transactions.dueDate,
boletoPaymentDate: lancamentos.boletoPaymentDate, boletoPaymentDate: transactions.boletoPaymentDate,
isSettled: lancamentos.isSettled, isSettled: transactions.isSettled,
}) })
.from(lancamentos) .from(transactions)
.where( .where(
and( and(
eq(lancamentos.userId, userId), eq(transactions.userId, userId),
eq(lancamentos.pagadorId, pagadorId), eq(transactions.payerId, payerId),
eq(lancamentos.period, period), eq(transactions.period, period),
eq(lancamentos.paymentMethod, PAYMENT_METHOD_BOLETO), eq(transactions.paymentMethod, PAYMENT_METHOD_BOLETO),
excludeAutoInvoiceEntries(), excludeAutoInvoiceEntries(),
), ),
) )
.orderBy(asc(lancamentos.dueDate)); .orderBy(asc(transactions.dueDate));
const items: PagadorBoletoItem[] = []; const items: PayerBoletoItem[] = [];
for (const row of rows) { for (const row of rows) {
items.push({ items.push({
@@ -332,23 +332,23 @@ export async function fetchPagadorBoletoItems({
export async function fetchPagadorPaymentStatus({ export async function fetchPagadorPaymentStatus({
userId, userId,
pagadorId, payerId,
period, period,
}: BaseFilters): Promise<PagadorPaymentStatusData> { }: BaseFilters): Promise<PayerPaymentStatusData> {
const rows = await db const rows = await db
.select({ .select({
paidAmount: sql<string>`coalesce(sum(case when ${lancamentos.isSettled} = true then abs(${lancamentos.amount}) else 0 end), 0)`, paidAmount: sql<string>`coalesce(sum(case when ${transactions.isSettled} = true then abs(${transactions.amount}) else 0 end), 0)`,
paidCount: sql<number>`sum(case when ${lancamentos.isSettled} = true then 1 else 0 end)`, paidCount: sql<number>`sum(case when ${transactions.isSettled} = true then 1 else 0 end)`,
pendingAmount: sql<string>`coalesce(sum(case when (${lancamentos.isSettled} = false or ${lancamentos.isSettled} is null) then abs(${lancamentos.amount}) else 0 end), 0)`, pendingAmount: sql<string>`coalesce(sum(case when (${transactions.isSettled} = false or ${transactions.isSettled} is null) then abs(${transactions.amount}) else 0 end), 0)`,
pendingCount: sql<number>`sum(case when (${lancamentos.isSettled} = false or ${lancamentos.isSettled} is null) then 1 else 0 end)`, pendingCount: sql<number>`sum(case when (${transactions.isSettled} = false or ${transactions.isSettled} is null) then 1 else 0 end)`,
}) })
.from(lancamentos) .from(transactions)
.where( .where(
and( and(
eq(lancamentos.userId, userId), eq(transactions.userId, userId),
eq(lancamentos.pagadorId, pagadorId), eq(transactions.payerId, payerId),
eq(lancamentos.period, period), eq(transactions.period, period),
eq(lancamentos.transactionType, DESPESA), eq(transactions.transactionType, DESPESA),
excludeAutoInvoiceEntries(), excludeAutoInvoiceEntries(),
), ),
); );

View File

@@ -1,24 +1,19 @@
import { and, eq } from "drizzle-orm"; import { and, eq } from "drizzle-orm";
import { cache } from "react"; import { cache } from "react";
import { pagadores } from "@/db/schema"; import { payers } from "@/db/schema";
import { db } from "@/shared/lib/db"; import { db } from "@/shared/lib/db";
import { PAGADOR_ROLE_ADMIN } from "@/shared/lib/payers/constants"; import { PAYER_ROLE_ADMIN } from "@/shared/lib/payers/constants";
/** /**
* Returns the admin pagador ID for a user (cached per request via React.cache). * Returns the admin pagador ID for a user (cached per request via React.cache).
* Eliminates the need for JOIN with pagadores in ~20 dashboard queries. * Eliminates the need for JOIN with payers in ~20 dashboard queries.
*/ */
export const getAdminPagadorId = cache( export const getAdminPayerId = cache(
async (userId: string): Promise<string | null> => { async (userId: string): Promise<string | null> => {
const [row] = await db const [row] = await db
.select({ id: pagadores.id }) .select({ id: payers.id })
.from(pagadores) .from(payers)
.where( .where(and(eq(payers.userId, userId), eq(payers.role, PAYER_ROLE_ADMIN)))
and(
eq(pagadores.userId, userId),
eq(pagadores.role, PAGADOR_ROLE_ADMIN),
),
)
.limit(1); .limit(1);
return row?.id ?? null; return row?.id ?? null;
}, },

View File

@@ -1,6 +1,6 @@
import { inArray } from "drizzle-orm"; import { inArray } from "drizzle-orm";
import { Resend } from "resend"; import { Resend } from "resend";
import { pagadores } from "@/db/schema"; import { payers } from "@/db/schema";
import { db } from "@/shared/lib/db"; import { db } from "@/shared/lib/db";
import { getResendFromEmail } from "@/shared/lib/email/resend"; import { getResendFromEmail } from "@/shared/lib/email/resend";
import { formatCurrency } from "@/shared/utils/currency"; import { formatCurrency } from "@/shared/utils/currency";
@@ -9,7 +9,7 @@ import { formatDateTime } from "@/shared/utils/date";
type ActionType = "created" | "deleted"; type ActionType = "created" | "deleted";
export type NotificationEntry = { export type NotificationEntry = {
pagadorId: string; payerId: string;
name: string | null; name: string | null;
amount: number; amount: number;
transactionType: string | null; transactionType: string | null;
@@ -20,13 +20,13 @@ export type NotificationEntry = {
note: string | null; note: string | null;
}; };
export type PagadorNotificationRequest = { export type PayerNotificationRequest = {
userLabel: string; userLabel: string;
action: ActionType; action: ActionType;
entriesByPagador: Map<string, NotificationEntry[]>; entriesByPagador: Map<string, NotificationEntry[]>;
}; };
type PagadorNotificationRecipient = { type PayerNotificationRecipient = {
id: string; id: string;
name: string | null; name: string | null;
email: string | null; email: string | null;
@@ -110,11 +110,11 @@ const buildHtmlBody = ({
`; `;
}; };
export async function sendPagadorAutoEmails({ export async function sendPayerAutoEmails({
userLabel, userLabel,
action, action,
entriesByPagador, entriesByPagador,
}: PagadorNotificationRequest) { }: PayerNotificationRequest) {
"use server"; "use server";
if (entriesByPagador.size === 0) { if (entriesByPagador.size === 0) {
@@ -136,11 +136,11 @@ export async function sendPagadorAutoEmails({
return; return;
} }
const pagadorRows = (await db.query.pagadores.findMany({ const payerRows = (await db.query.payers.findMany({
where: inArray(pagadores.id, pagadorIds), where: inArray(payers.id, pagadorIds),
})) as PagadorNotificationRecipient[]; })) as PayerNotificationRecipient[];
if (pagadorRows.length === 0) { if (payerRows.length === 0) {
return; return;
} }
@@ -149,12 +149,12 @@ export async function sendPagadorAutoEmails({
action === "created" ? "Novo lançamento" : "Lançamento removido"; action === "created" ? "Novo lançamento" : "Lançamento removido";
const results = await Promise.allSettled( const results = await Promise.allSettled(
pagadorRows.map(async (pagador: PagadorNotificationRecipient) => { payerRows.map(async (payer: PayerNotificationRecipient) => {
if (!pagador.email || !pagador.isAutoSend) { if (!payer.email || !payer.isAutoSend) {
return; return;
} }
const entries = entriesByPagador.get(pagador.id); const entries = entriesByPagador.get(payer.id);
if (!entries || entries.length === 0) { if (!entries || entries.length === 0) {
return; return;
} }
@@ -167,8 +167,8 @@ export async function sendPagadorAutoEmails({
await resend.emails.send({ await resend.emails.send({
from: resendFrom, from: resendFrom,
to: pagador.email, to: payer.email,
subject: `${subjectPrefix} - ${pagador.name}`, subject: `${subjectPrefix} - ${payer.name}`,
html, html,
}); });
}), }),
@@ -177,7 +177,7 @@ export async function sendPagadorAutoEmails({
// Log any failed email sends // Log any failed email sends
results.forEach((result: PromiseSettledResult<void>, index: number) => { results.forEach((result: PromiseSettledResult<void>, index: number) => {
if (result.status === "rejected") { if (result.status === "rejected") {
const pagador = pagadorRows[index]; const pagador = payerRows[index];
console.error( console.error(
`Failed to send email notification to ${pagador?.name} (${pagador?.email}):`, `Failed to send email notification to ${pagador?.name} (${pagador?.email}):`,
result.reason, result.reason,
@@ -187,7 +187,7 @@ export async function sendPagadorAutoEmails({
} }
export type RawNotificationRecord = { export type RawNotificationRecord = {
pagadorId: string | null; payerId: string | null;
name: string | null; name: string | null;
amount: string | number | null; amount: string | number | null;
transactionType: string | null; transactionType: string | null;
@@ -198,13 +198,13 @@ export type RawNotificationRecord = {
note: string | null; note: string | null;
}; };
export const buildEntriesByPagador = ( export const buildEntriesByPayer = (
records: RawNotificationRecord[], records: RawNotificationRecord[],
): Map<string, NotificationEntry[]> => { ): Map<string, NotificationEntry[]> => {
const map = new Map<string, NotificationEntry[]>(); const map = new Map<string, NotificationEntry[]>();
records.forEach((record) => { records.forEach((record) => {
if (!record.pagadorId) { if (!record.payerId) {
return; return;
} }
@@ -220,7 +220,7 @@ export const buildEntriesByPagador = (
: null; : null;
const entry: NotificationEntry = { const entry: NotificationEntry = {
pagadorId: record.pagadorId, payerId: record.payerId,
name: record.name ?? null, name: record.name ?? null,
amount, amount,
transactionType: record.transactionType ?? null, transactionType: record.transactionType ?? null,
@@ -231,9 +231,9 @@ export const buildEntriesByPagador = (
note: record.note ?? null, note: record.note ?? null,
}; };
const list = map.get(record.pagadorId) ?? []; const list = map.get(record.payerId) ?? [];
list.push(entry); list.push(entry);
map.set(record.pagadorId, list); map.set(record.payerId, list);
}); });
return map; return map;

View File

@@ -1,4 +1,4 @@
import { DEFAULT_PAGADOR_AVATAR } from "./constants"; import { DEFAULT_PAYER_AVATAR } from "./constants";
/** /**
* Normaliza o caminho do avatar extraindo apenas o nome do arquivo. * Normaliza o caminho do avatar extraindo apenas o nome do arquivo.
@@ -29,7 +29,7 @@ export const normalizeAvatarPath = (
*/ */
export const getAvatarSrc = (avatar: string | null | undefined): string => { export const getAvatarSrc = (avatar: string | null | undefined): string => {
if (!avatar) { if (!avatar) {
return `/avatars/${DEFAULT_PAGADOR_AVATAR}`; return `/avatars/${DEFAULT_PAYER_AVATAR}`;
} }
// Se for uma URL completa (Google, etc), retorna diretamente // Se for uma URL completa (Google, etc), retorna diretamente
@@ -43,7 +43,7 @@ export const getAvatarSrc = (avatar: string | null | undefined): string => {
// Se for um caminho local, normaliza e adiciona o prefixo // Se for um caminho local, normaliza e adiciona o prefixo
const normalized = normalizeAvatarPath(avatar); const normalized = normalizeAvatarPath(avatar);
return `/avatars/${normalized ?? DEFAULT_PAGADOR_AVATAR}`; return `/avatars/${normalized ?? DEFAULT_PAYER_AVATAR}`;
}; };
/** /**