rikrdo/mercadodevida
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(admin): resolve notification and cash-close 500s

Browse Source
This commit is contained in:
Deploy
2026-08-25 22:16:08 +02:00
parent ed031f8a94
commit ae42bae61e
13 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/VERSION
View File

@@ -1 +1 @@
0.2.0 0.2.1

4
project/apps/admin/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "@mercadodevida/admin", "name": "@mercadodevida/admin",
"version": "0.2.0", "version": "0.2.1",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@mercadodevida/admin", "name": "@mercadodevida/admin",
"version": "0.2.0", "version": "0.2.1",
"dependencies": { "dependencies": {
"@lexical/history": "^0.49.0", "@lexical/history": "^0.49.0",
"@lexical/html": "^0.49.0", "@lexical/html": "^0.49.0",

2
project/apps/admin/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "@mercadodevida/admin", "name": "@mercadodevida/admin",
"version": "0.2.0", "version": "0.2.1",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev --port 3001", "dev": "next dev --port 3001",

4
project/apps/pos/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "mercadodevida-pos", "name": "mercadodevida-pos",
"version": "0.2.0", "version": "0.2.1",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "mercadodevida-pos", "name": "mercadodevida-pos",
"version": "0.2.0", "version": "0.2.1",
"dependencies": { "dependencies": {
"next": "^16.3.1", "next": "^16.3.1",
"react": "^19.2.8", "react": "^19.2.8",

2
project/apps/pos/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "mercadodevida-pos", "name": "mercadodevida-pos",
"version": "0.2.0", "version": "0.2.1",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev --port 3002", "dev": "next dev --port 3002",

4
project/frontend/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "frontend", "name": "frontend",
"version": "0.2.0", "version": "0.2.1",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "frontend", "name": "frontend",
"version": "0.2.0", "version": "0.2.1",
"dependencies": { "dependencies": {
"next": "16.3.1", "next": "16.3.1",
"react": "19.2.8", "react": "19.2.8",

2
project/frontend/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "frontend", "name": "frontend",
"version": "0.2.0", "version": "0.2.1",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",

4
project/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "mercadodevida-backend", "name": "mercadodevida-backend",
"version": "0.2.0", "version": "0.2.1",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "mercadodevida-backend", "name": "mercadodevida-backend",
"version": "0.2.0", "version": "0.2.1",
"dependencies": { "dependencies": {
"@fastify/cookie": "^11.1.2", "@fastify/cookie": "^11.1.2",
"@fastify/cors": "^11.3.0", "@fastify/cors": "^11.3.0",

2
project/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "mercadodevida-backend", "name": "mercadodevida-backend",
"version": "0.2.0", "version": "0.2.1",
"private": true, "private": true,
"type": "module", "type": "module",
"description": "mercadodevida vNext backend - modular monolith skeleton", "description": "mercadodevida vNext backend - modular monolith skeleton",

1
project/src/modules/orders/api/orders.routes.ts
View File

@@ -547,7 +547,6 @@ export async function registerOrdersRoutes(
FROM orders_orders o FROM orders_orders o
LEFT JOIN identity_users u ON u.id = o.user_id LEFT JOIN identity_users u ON u.id = o.user_id
WHERE o.state = 'AWAITING_PAYMENT' WHERE o.state = 'AWAITING_PAYMENT'
AND o.deleted_at IS NULL
ORDER BY o.created_at ASC ORDER BY o.created_at ASC
LIMIT 20`, LIMIT 20`,
); );

12
project/src/modules/pos/api/pos.routes.ts
View File

@@ -698,15 +698,15 @@ export async function registerPosRoutes(app: FastifyInstance, deps: PosRouteDeps
[id], [id],
), ),
pool.query<{ method_code: string; method_name: string; total: string; count: string }>( pool.query<{ method_code: string; method_name: string; total: string; count: string }>(
`SELECT pm.code AS method_code, pm.name AS method_name, `SELECT pm.code AS method_code, pm.label AS method_name,
COALESCE(SUM(pt.amount_cents), 0)::bigint AS total, COALESCE(SUM(pt.amount_cents), 0)::bigint AS total,
COUNT(*)::int AS count COUNT(*)::int AS count
FROM payments_transactions pt FROM payments_transactions pt
JOIN orders_orders o ON o.id = pt.order_id JOIN orders_orders o ON o.id = pt.order_id
LEFT JOIN pos_payment_methods pm ON pm.id = pt.provider_event_id LEFT JOIN pos_payment_methods pm ON pm.id::text = pt.provider_event_id
AND pm.store_id = o.store_id AND pm.store_id = o.store_id
WHERE o.cash_session_id = $1 AND o.source = 'pos' AND pt.status = 'succeeded' WHERE o.cash_session_id = $1 AND o.source = 'pos' AND pt.status = 'succeeded'
GROUP BY pm.code, pm.name`, GROUP BY pm.code, pm.label`,
[id], [id],
), ),
pool.query<{ items_count: string; unique_products: string }>( pool.query<{ items_count: string; unique_products: string }>(
@@ -770,15 +770,15 @@ export async function registerPosRoutes(app: FastifyInstance, deps: PosRouteDeps
[id], [id],
), ),
pool.query<{ method_code: string; method_name: string; total: string; count: string }>( pool.query<{ method_code: string; method_name: string; total: string; count: string }>(
`SELECT pm.code AS method_code, pm.name AS method_name, `SELECT pm.code AS method_code, pm.label AS method_name,
COALESCE(SUM(pt.amount_cents), 0)::bigint AS total, COALESCE(SUM(pt.amount_cents), 0)::bigint AS total,
COUNT(*)::int AS count COUNT(*)::int AS count
FROM payments_transactions pt FROM payments_transactions pt
JOIN orders_orders o ON o.id = pt.order_id JOIN orders_orders o ON o.id = pt.order_id
LEFT JOIN pos_payment_methods pm ON pm.id = pt.provider_event_id LEFT JOIN pos_payment_methods pm ON pm.id::text = pt.provider_event_id
AND pm.store_id = o.store_id AND pm.store_id = o.store_id
WHERE o.cash_session_id = $1 AND o.source = 'pos' AND pt.status = 'succeeded' WHERE o.cash_session_id = $1 AND o.source = 'pos' AND pt.status = 'succeeded'
GROUP BY pm.code, pm.name`, GROUP BY pm.code, pm.label`,
[id], [id],
), ),
pool.query<{ items_count: string; unique_products: string }>( pool.query<{ items_count: string; unique_products: string }>(

4
project/storefront/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "mercadodevida-storefront", "name": "mercadodevida-storefront",
"version": "0.2.0", "version": "0.2.1",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "mercadodevida-storefront", "name": "mercadodevida-storefront",
"version": "0.2.0", "version": "0.2.1",
"dependencies": { "dependencies": {
"@tailwindcss/postcss": "^4.1.17", "@tailwindcss/postcss": "^4.1.17",
"next": "^16.0.5", "next": "^16.0.5",

2
project/storefront/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "mercadodevida-storefront", "name": "mercadodevida-storefront",
"version": "0.2.0", "version": "0.2.1",
"private": true, "private": true,
"type": "module", "type": "module",
"description": "mercadodevida customer storefront shell", "description": "mercadodevida customer storefront shell",