From 2abe5e8697ae732b186baa29165046bb6a697045 Mon Sep 17 00:00:00 2001 From: julian Date: Fri, 29 May 2026 14:07:04 +0000 Subject: [PATCH] =?UTF-8?q?feat(infra):=20conecta=20ao=20banco=20ERP=20lib?= =?UTF-8?q?replast=20e=20fixa=20rep=2029=20como=20usu=C3=A1rio=20dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - sar-erp-schema.sql: corrige grupo.nome (era descricao), tp_pauta inexistente em pauxpro, COALESCE(id_empresa,1) em vw_clientes para bancos single-tenant, e nome do cliente via COALESCE(NULLIF(TRIM(nome),''), TRIM(razao)) - WorkspacePrismaPool: PrismaPg({ schema: 'sar' }) + options search_path=sar para ORM e queries raw funcionarem no schema correto - JwtAuthGuard: força DEV_REP_CODE/DEV_EMPRESA_ID em não-prod — filtro global sem tocar em nenhum service - env.schema: adiciona DEV_REP_CODE e DEV_EMPRESA_ID com defaults 29 e 1 Co-Authored-By: Claude Sonnet 4.6 (1M context) --- apps/api/src/app/auth/jwt-auth.guard.ts | 18 ++++++++++++------ apps/api/src/app/config/env.schema.ts | 4 ++++ .../workspace/workspace-prisma-pool.service.ts | 8 ++++++-- scripts/sar-erp-schema.sql | 18 +++++++++--------- 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/apps/api/src/app/auth/jwt-auth.guard.ts b/apps/api/src/app/auth/jwt-auth.guard.ts index b1c299a..db81b7e 100644 --- a/apps/api/src/app/auth/jwt-auth.guard.ts +++ b/apps/api/src/app/auth/jwt-auth.guard.ts @@ -18,6 +18,9 @@ import { IS_PUBLIC_KEY } from './public.decorator'; @Injectable() export class JwtAuthGuard implements CanActivate { private readonly secret: Uint8Array; + private readonly isProd: boolean; + private readonly devRepCode: string; + private readonly devEmpresaId: number; constructor( private readonly reflector: Reflector, @@ -26,6 +29,9 @@ export class JwtAuthGuard implements CanActivate { config: ConfigService, ) { this.secret = new TextEncoder().encode(config.get('MASTER_LOGIN_JWT_SECRET', { infer: true })); + this.isProd = config.get('NODE_ENV', { infer: true }) === 'production'; + this.devRepCode = String(config.get('DEV_REP_CODE', { infer: true })); + this.devEmpresaId = config.get('DEV_EMPRESA_ID', { infer: true }); } async canActivate(context: ExecutionContext): Promise { @@ -45,18 +51,18 @@ export class JwtAuthGuard implements CanActivate { (req as Request & { user: JwtPayload }).user = payload as JwtPayload; - // Sobrescreve CLS com idEmpresa real do JWT (corre depois do middleware). - const idEmpresa = payload.id_empresa; + // Em dev: força representante fixo (DEV_REP_CODE / DEV_EMPRESA_ID) ignorando o JWT. + // Em prod: usa os valores reais do JWT. + const idEmpresa = this.isProd ? payload.id_empresa : this.devEmpresaId; + const userId = this.isProd ? payload.sub : this.devRepCode; this.cls.set('idEmpresa', idEmpresa); - this.cls.set('userId', payload.sub); + this.cls.set('userId', userId); this.cls.set('role', payload.role); - // URL inclui ?schema=sar para o Prisma rotear ao schema correto no ERP const baseUrl = process.env['DATABASE_URL'] ?? 'postgresql://sar:sar_dev_password@localhost:5432/sar_workspace_dev'; - const dbUrl = baseUrl.includes('?') ? `${baseUrl}&schema=sar` : `${baseUrl}?schema=sar`; - this.cls.set('prisma', this.pool.getOrCreate(idEmpresa, dbUrl)); + this.cls.set('prisma', this.pool.getOrCreate(idEmpresa, baseUrl)); return true; } catch { diff --git a/apps/api/src/app/config/env.schema.ts b/apps/api/src/app/config/env.schema.ts index 271a034..b6a7186 100644 --- a/apps/api/src/app/config/env.schema.ts +++ b/apps/api/src/app/config/env.schema.ts @@ -41,6 +41,10 @@ export const EnvSchema = z // Multi-tenancy — workspace de dev (até master-login real entrar) DEFAULT_WORKSPACE_ID: z.string().min(1).default('dev-workspace'), + // Representante fixo de dev — forçado no guard enquanto não há login real + DEV_REP_CODE: z.coerce.number().int().positive().default(29), + DEV_EMPRESA_ID: z.coerce.number().int().positive().default(1), + // Postgres (Prisma virá depois) DATABASE_URL: z.string().optional(), MIGRATION_DATABASE_URL: z.string().optional(), diff --git a/apps/api/src/app/workspace/workspace-prisma-pool.service.ts b/apps/api/src/app/workspace/workspace-prisma-pool.service.ts index 9c67713..a9ff8bf 100644 --- a/apps/api/src/app/workspace/workspace-prisma-pool.service.ts +++ b/apps/api/src/app/workspace/workspace-prisma-pool.service.ts @@ -37,8 +37,12 @@ export class WorkspacePrismaPool implements OnModuleDestroy { this.evictOldest(); } - const pgPool = new pg.Pool({ connectionString: dbUrl, max: PG_POOL_SIZE }); - const adapter = new PrismaPg(pgPool); + const pgPool = new pg.Pool({ + connectionString: dbUrl, + max: PG_POOL_SIZE, + options: '-c search_path=sar', + }); + const adapter = new PrismaPg(pgPool, { schema: 'sar' }); const client = new PrismaClient({ adapter }); this.cache.set(key, { client, pgPool }); this.logger.log(`pool criado: idEmpresa=${idEmpresa} total=${this.cache.size}`); diff --git a/scripts/sar-erp-schema.sql b/scripts/sar-erp-schema.sql index 710f13d..9a4aaee 100644 --- a/scripts/sar-erp-schema.sql +++ b/scripts/sar-erp-schema.sql @@ -154,9 +154,9 @@ SELECT m.vl_fator, -- Filtros de segmento (opcionais — NULL = meta geral) m.cod_grupo, - grp.descricao AS desc_grupo, + grp.nome AS desc_grupo, m.cod_subgrupo, - sub.descricao AS desc_subgrupo, + sub.nome AS desc_subgrupo, m.cod_produto, m.cod_marca, mrc.nome AS nome_marca, @@ -172,11 +172,11 @@ LEFT JOIN gestao.marca mrc ON mrc.codigo = m.cod_marca AND mrc.id_empre -- ----------------------------------------------------------------------------- CREATE OR REPLACE VIEW sar.vw_clientes AS SELECT - c.id_empresa, + COALESCE(c.id_empresa, 1) AS id_empresa, c.id_corrent AS id_cliente, c.ativo, - c.nome, - c.razao, + COALESCE(NULLIF(TRIM(c.nome), ''), TRIM(c.razao)) AS nome, + TRIM(c.razao) AS razao, c.pesso AS pessoa, -- 0=PJ 1=PF c.consfinal, c.cgcpf, @@ -258,9 +258,9 @@ SELECT COALESCE(p.vl_preco2, 0) AS vl_preco2, COALESCE(p.vl_preco3, 0) AS vl_preco3, p.cod_grupo, - grp.descricao AS grupo, + grp.nome AS grupo, p.cod_subgrupo, - sub.descricao AS subgrupo, + sub.nome AS subgrupo, sub.desc_max, COALESCE(p.grupo_st, '') AS grupo_st, p.cod_marca, @@ -378,7 +378,7 @@ SELECT COALESCE(pp.preco2, 0) AS preco2, COALESCE(pp.preco3, 0) AS preco3, COALESCE(pp.valor_pauta_icms_st, 0) AS valor_pauta_icms_st, - pp.tp_pauta + NULL::integer AS tp_pauta FROM gestao.pauxpro pp; -- ----------------------------------------------------------------------------- @@ -486,7 +486,7 @@ CREATE OR REPLACE VIEW sar.vw_grupos AS SELECT id_empresa, codigo, - descricao, + nome AS descricao, int_sar, produto_variacao, desc_max,