feat: add city/state/country to complex, new settings page with sidebar, and Biome linting

- Added city, state, and country optional fields to Complex model
- Updated onboarding to include optional location fields
- Created new settings page with sidebar navigation (Datos del Complejo, Canchas)
- Replaced ESLint with Biome for frontend and backend linting
- Added parallel dev script with concurrently
- Migrated register-routes to use direct app.route() pattern
This commit is contained in:
Jose Selesan
2026-04-10 15:36:15 -03:00
parent 77004b14b0
commit 9ee98a4cb4
129 changed files with 2929 additions and 3186 deletions

View File

@@ -1,40 +1,40 @@
import { zValidator } from '@hono/zod-validator'
import { requireAuth } from '@/middlewares/require-auth.middleware';
import { createAdminBookingHandler } from '@/modules/admin-booking/handlers/create-admin-booking.handler';
import { listAdminBookingsHandler } from '@/modules/admin-booking/handlers/list-admin-bookings.handler';
import { updateAdminBookingStatusHandler } from '@/modules/admin-booking/handlers/update-admin-booking-status.handler';
import type { AppEnv } from '@/types/hono';
import { zValidator } from '@hono/zod-validator';
import {
createAdminBookingSchema,
listAdminBookingsQuerySchema,
updateAdminBookingStatusSchema,
} from '@repo/api-contract'
import { Hono } from 'hono'
import { z } from 'zod'
import { requireAuth } from '@/middlewares/require-auth.middleware'
import { createAdminBookingHandler } from '@/modules/admin-booking/handlers/create-admin-booking.handler'
import { listAdminBookingsHandler } from '@/modules/admin-booking/handlers/list-admin-bookings.handler'
import { updateAdminBookingStatusHandler } from '@/modules/admin-booking/handlers/update-admin-booking-status.handler'
import type { AppEnv } from '@/types/hono'
} from '@repo/api-contract';
import { Hono } from 'hono';
import { z } from 'zod';
export const adminBookingRoutes = new Hono<AppEnv>()
const complexIdParamsSchema = z.object({ complexId: z.uuid() })
const bookingIdParamsSchema = z.object({ id: z.uuid() })
export const adminBookingRoutes = new Hono<AppEnv>();
const complexIdParamsSchema = z.object({ complexId: z.uuid() });
const bookingIdParamsSchema = z.object({ id: z.uuid() });
adminBookingRoutes.use('*', requireAuth)
adminBookingRoutes.use('*', requireAuth);
adminBookingRoutes.get(
'/complex/:complexId',
zValidator('param', complexIdParamsSchema),
zValidator('query', listAdminBookingsQuerySchema),
listAdminBookingsHandler,
)
listAdminBookingsHandler
);
adminBookingRoutes.post(
'/complex/:complexId',
zValidator('param', complexIdParamsSchema),
zValidator('json', createAdminBookingSchema),
createAdminBookingHandler,
)
createAdminBookingHandler
);
adminBookingRoutes.patch(
'/:id/status',
zValidator('param', bookingIdParamsSchema),
zValidator('json', updateAdminBookingStatusSchema),
updateAdminBookingStatusHandler,
)
updateAdminBookingStatusHandler
);

View File

@@ -1,24 +1,24 @@
import type { CreateAdminBookingInput } from '@repo/api-contract'
import {
AdminBookingServiceError,
createAdminBooking,
} from '@/modules/admin-booking/services/admin-booking.service'
import type { AppContext } from '@/types/hono'
} from '@/modules/admin-booking/services/admin-booking.service';
import type { AppContext } from '@/types/hono';
import type { CreateAdminBookingInput } from '@repo/api-contract';
type ComplexIdParams = { complexId: string }
type ComplexIdParams = { complexId: string };
export async function createAdminBookingHandler(c: AppContext) {
const { complexId } = c.req.valid('param' as never) as ComplexIdParams
const payload = c.req.valid('json' as never) as CreateAdminBookingInput
const appUserId = c.get('appUserId')
const { complexId } = c.req.valid('param' as never) as ComplexIdParams;
const payload = c.req.valid('json' as never) as CreateAdminBookingInput;
const appUserId = c.get('appUserId');
try {
const booking = await createAdminBooking(appUserId, complexId, payload)
return c.json(booking, 201)
const booking = await createAdminBooking(appUserId, complexId, payload);
return c.json(booking, 201);
} catch (error) {
if (error instanceof AdminBookingServiceError) {
return c.json({ message: error.message }, error.status)
return c.json({ message: error.message }, error.status);
}
throw error
throw error;
}
}

View File

@@ -1,24 +1,24 @@
import type { ListAdminBookingsQuery } from '@repo/api-contract'
import {
AdminBookingServiceError,
listAdminBookings,
} from '@/modules/admin-booking/services/admin-booking.service'
import type { AppContext } from '@/types/hono'
} from '@/modules/admin-booking/services/admin-booking.service';
import type { AppContext } from '@/types/hono';
import type { ListAdminBookingsQuery } from '@repo/api-contract';
type ComplexIdParams = { complexId: string }
type ComplexIdParams = { complexId: string };
export async function listAdminBookingsHandler(c: AppContext) {
const { complexId } = c.req.valid('param' as never) as ComplexIdParams
const query = c.req.valid('query' as never) as ListAdminBookingsQuery
const appUserId = c.get('appUserId')
const { complexId } = c.req.valid('param' as never) as ComplexIdParams;
const query = c.req.valid('query' as never) as ListAdminBookingsQuery;
const appUserId = c.get('appUserId');
try {
const response = await listAdminBookings(appUserId, complexId, query)
return c.json(response)
const response = await listAdminBookings(appUserId, complexId, query);
return c.json(response);
} catch (error) {
if (error instanceof AdminBookingServiceError) {
return c.json({ message: error.message }, error.status)
return c.json({ message: error.message }, error.status);
}
throw error
throw error;
}
}

View File

@@ -1,24 +1,24 @@
import type { UpdateAdminBookingStatusInput } from '@repo/api-contract'
import {
AdminBookingServiceError,
updateAdminBookingStatus,
} from '@/modules/admin-booking/services/admin-booking.service'
import type { AppContext } from '@/types/hono'
} from '@/modules/admin-booking/services/admin-booking.service';
import type { AppContext } from '@/types/hono';
import type { UpdateAdminBookingStatusInput } from '@repo/api-contract';
type BookingIdParams = { id: string }
type BookingIdParams = { id: string };
export async function updateAdminBookingStatusHandler(c: AppContext) {
const { id } = c.req.valid('param' as never) as BookingIdParams
const payload = c.req.valid('json' as never) as UpdateAdminBookingStatusInput
const appUserId = c.get('appUserId')
const { id } = c.req.valid('param' as never) as BookingIdParams;
const payload = c.req.valid('json' as never) as UpdateAdminBookingStatusInput;
const appUserId = c.get('appUserId');
try {
const booking = await updateAdminBookingStatus(appUserId, id, payload)
return c.json(booking)
const booking = await updateAdminBookingStatus(appUserId, id, payload);
return c.json(booking);
} catch (error) {
if (error instanceof AdminBookingServiceError) {
return c.json({ message: error.message }, error.status)
return c.json({ message: error.message }, error.status);
}
throw error
throw error;
}
}

View File

@@ -1,19 +1,19 @@
import { randomInt } from 'node:crypto';
import { CourtBookingStatus } from '@/generated/prisma/enums';
import { db } from '@/lib/prisma';
import { evaluatePlanUsage, parsePlanRules } from '@/modules/plan/services/plan-rules.service';
import type {
AdminBooking,
CreateAdminBookingInput,
ListAdminBookingsQuery,
UpdateAdminBookingStatusInput,
} from '@repo/api-contract'
import { randomInt } from 'node:crypto'
import { v7 as uuidv7 } from 'uuid'
import { CourtBookingStatus } from '@/generated/prisma/enums'
import { db } from '@/lib/prisma'
import { evaluatePlanUsage, parsePlanRules } from '@/modules/plan/services/plan-rules.service'
} from '@repo/api-contract';
import { v7 as uuidv7 } from 'uuid';
type Slot = {
startTime: string
endTime: string
}
startTime: string;
endTime: string;
};
const DAY_OF_WEEK_BY_INDEX = [
'SUNDAY',
@@ -23,44 +23,44 @@ const DAY_OF_WEEK_BY_INDEX = [
'THURSDAY',
'FRIDAY',
'SATURDAY',
] as const
const BOOKING_CODE_ALPHABET = 'ABCDEFGHJKLMNPQRSTUVWXYZ23456789'
const BOOKING_CODE_LENGTH = 6
] as const;
const BOOKING_CODE_ALPHABET = 'ABCDEFGHJKLMNPQRSTUVWXYZ23456789';
const BOOKING_CODE_LENGTH = 6;
export class AdminBookingServiceError extends Error {
status: 400 | 403 | 404 | 409
status: 400 | 403 | 404 | 409;
constructor(message: string, status: 400 | 403 | 404 | 409) {
super(message)
this.name = 'AdminBookingServiceError'
this.status = status
super(message);
this.name = 'AdminBookingServiceError';
this.status = status;
}
}
function toMinutes(value: string): number {
const [hours, minutes] = value.split(':').map((part) => Number(part))
return hours * 60 + minutes
const [hours, minutes] = value.split(':').map((part) => Number(part));
return hours * 60 + minutes;
}
function minutesToTime(minutes: number): string {
const safeMinutes = Math.max(0, minutes)
const hours = Math.floor(safeMinutes / 60)
const mins = safeMinutes % 60
return `${String(hours).padStart(2, '0')}:${String(mins).padStart(2, '0')}`
const safeMinutes = Math.max(0, minutes);
const hours = Math.floor(safeMinutes / 60);
const mins = safeMinutes % 60;
return `${String(hours).padStart(2, '0')}:${String(mins).padStart(2, '0')}`;
}
function parseIsoDate(date: string): Date {
const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(date)
const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(date);
if (!match) {
throw new AdminBookingServiceError('La fecha debe tener formato YYYY-MM-DD.', 400)
throw new AdminBookingServiceError('La fecha debe tener formato YYYY-MM-DD.', 400);
}
const year = Number(match[1])
const month = Number(match[2])
const day = Number(match[3])
const year = Number(match[1]);
const month = Number(match[2]);
const day = Number(match[3]);
const bookingDate = new Date(Date.UTC(year, month - 1, day))
const bookingDate = new Date(Date.UTC(year, month - 1, day));
if (
Number.isNaN(bookingDate.getTime()) ||
@@ -68,48 +68,48 @@ function parseIsoDate(date: string): Date {
bookingDate.getUTCMonth() + 1 !== month ||
bookingDate.getUTCDate() !== day
) {
throw new AdminBookingServiceError('La fecha enviada no es valida.', 400)
throw new AdminBookingServiceError('La fecha enviada no es valida.', 400);
}
return bookingDate
return bookingDate;
}
function getDayOfWeek(date: Date) {
const dayOfWeek = DAY_OF_WEEK_BY_INDEX[date.getUTCDay()]
const dayOfWeek = DAY_OF_WEEK_BY_INDEX[date.getUTCDay()];
if (!dayOfWeek) {
throw new AdminBookingServiceError('No se pudo resolver el dia de la semana.', 400)
throw new AdminBookingServiceError('No se pudo resolver el dia de la semana.', 400);
}
return dayOfWeek
return dayOfWeek;
}
function formatIsoDate(date: Date): string {
return date.toISOString().slice(0, 10)
return date.toISOString().slice(0, 10);
}
function generateBookingCode(): string {
let code = ''
let code = '';
for (let index = 0; index < BOOKING_CODE_LENGTH; index += 1) {
code += BOOKING_CODE_ALPHABET[randomInt(0, BOOKING_CODE_ALPHABET.length)]
code += BOOKING_CODE_ALPHABET[randomInt(0, BOOKING_CODE_ALPHABET.length)];
}
return code
return code;
}
function buildSlots(
availability: Array<{
startTime: string
endTime: string
startTime: string;
endTime: string;
}>,
slotDurationMinutes: number,
slotDurationMinutes: number
): Slot[] {
const slots: Slot[] = []
const slots: Slot[] = [];
for (const range of availability) {
const start = toMinutes(range.startTime)
const end = toMinutes(range.endTime)
const start = toMinutes(range.startTime);
const end = toMinutes(range.endTime);
for (
let current = start;
@@ -119,11 +119,11 @@ function buildSlots(
slots.push({
startTime: minutesToTime(current),
endTime: minutesToTime(current + slotDurationMinutes),
})
});
}
}
return slots
return slots;
}
async function ensureComplexAccess(complexId: string, appUserId: string) {
@@ -147,39 +147,39 @@ async function ensureComplexAccess(complexId: string, appUserId: string) {
},
},
},
})
});
if (!complexUser) {
throw new AdminBookingServiceError('No tienes permisos para administrar este complejo.', 403)
throw new AdminBookingServiceError('No tienes permisos para administrar este complejo.', 403);
}
return complexUser.complex
return complexUser.complex;
}
function mapBookingResponse(booking: {
id: string
bookingCode: string
bookingDate: Date
startTime: string
endTime: string
customerName: string
customerPhone: string
status: 'CONFIRMED' | 'CANCELLED' | 'COMPLETED'
createdAt: Date
updatedAt: Date
id: string;
bookingCode: string;
bookingDate: Date;
startTime: string;
endTime: string;
customerName: string;
customerPhone: string;
status: 'CONFIRMED' | 'CANCELLED' | 'COMPLETED';
createdAt: Date;
updatedAt: Date;
court: {
id: string
name: string
id: string;
name: string;
complex: {
id: string
complexName: string
}
id: string;
complexName: string;
};
sport: {
id: string
name: string
slug: string
}
}
id: string;
name: string;
slug: string;
};
};
}): AdminBooking {
return {
id: booking.id,
@@ -201,16 +201,16 @@ function mapBookingResponse(booking: {
status: booking.status,
createdAt: booking.createdAt.toISOString(),
updatedAt: booking.updatedAt.toISOString(),
}
};
}
export async function listAdminBookings(
appUserId: string,
complexId: string,
query: ListAdminBookingsQuery,
query: ListAdminBookingsQuery
) {
await ensureComplexAccess(complexId, appUserId)
const fromDate = parseIsoDate(query.fromDate)
await ensureComplexAccess(complexId, appUserId);
const fromDate = parseIsoDate(query.fromDate);
const bookings = await db.courtBooking.findMany({
where: {
@@ -243,21 +243,21 @@ export async function listAdminBookings(
},
},
orderBy: [{ bookingDate: 'asc' }, { startTime: 'asc' }, { createdAt: 'asc' }],
})
});
return {
bookings: bookings.map((booking) => mapBookingResponse(booking)),
}
};
}
export async function createAdminBooking(
appUserId: string,
complexId: string,
input: CreateAdminBookingInput,
input: CreateAdminBookingInput
) {
const complex = await ensureComplexAccess(complexId, appUserId)
const bookingDate = parseIsoDate(input.date)
const dayOfWeek = getDayOfWeek(bookingDate)
const complex = await ensureComplexAccess(complexId, appUserId);
const bookingDate = parseIsoDate(input.date);
const dayOfWeek = getDayOfWeek(bookingDate);
const court = await db.court.findFirst({
where: {
@@ -281,36 +281,36 @@ export async function createAdminBooking(
},
},
},
})
});
if (!court) {
throw new AdminBookingServiceError('La cancha seleccionada no existe en el complejo.', 404)
throw new AdminBookingServiceError('La cancha seleccionada no existe en el complejo.', 404);
}
const validSlots = buildSlots(court.availabilities, court.slotDurationMinutes)
const selectedStartMinutes = toMinutes(input.startTime)
const selectedEndMinutes = selectedStartMinutes + court.slotDurationMinutes
const validSlots = buildSlots(court.availabilities, court.slotDurationMinutes);
const selectedStartMinutes = toMinutes(input.startTime);
const selectedEndMinutes = selectedStartMinutes + court.slotDurationMinutes;
const selectedSlot = {
startTime: input.startTime,
endTime: minutesToTime(selectedEndMinutes),
}
};
const slotExists = validSlots.some(
(slot) => slot.startTime === selectedSlot.startTime && slot.endTime === selectedSlot.endTime,
)
(slot) => slot.startTime === selectedSlot.startTime && slot.endTime === selectedSlot.endTime
);
if (!slotExists) {
throw new AdminBookingServiceError(
'El horario seleccionado no esta disponible para esa cancha.',
409,
)
409
);
}
for (let attempt = 0; attempt < 5; attempt += 1) {
try {
const booking = await db.$transaction(async (tx) => {
if (complex.plan) {
const rules = parsePlanRules(complex.plan.rules)
const rules = parsePlanRules(complex.plan.rules);
const bookingsForDate = await tx.courtBooking.count({
where: {
bookingDate,
@@ -319,25 +319,25 @@ export async function createAdminBooking(
complexId,
},
},
})
});
const courtsCount = await tx.court.count({
where: {
complexId,
},
})
});
const violations = evaluatePlanUsage(rules, {
courtsCount,
bookingsToday: bookingsForDate,
})
});
const maxBookingsViolation = violations.find(
(violation) => violation.code === 'MAX_BOOKINGS_PER_DAY_REACHED',
)
(violation) => violation.code === 'MAX_BOOKINGS_PER_DAY_REACHED'
);
if (maxBookingsViolation) {
throw new AdminBookingServiceError(maxBookingsViolation.message, 409)
throw new AdminBookingServiceError(maxBookingsViolation.message, 409);
}
}
@@ -353,10 +353,10 @@ export async function createAdminBooking(
gt: selectedSlot.startTime,
},
},
})
});
if (overlappingBooking) {
throw new AdminBookingServiceError('El horario seleccionado ya fue reservado.', 409)
throw new AdminBookingServiceError('El horario seleccionado ya fue reservado.', 409);
}
return tx.courtBooking.create({
@@ -392,51 +392,51 @@ export async function createAdminBooking(
},
},
},
})
})
});
});
return mapBookingResponse(booking)
return mapBookingResponse(booking);
} catch (error) {
if (error instanceof AdminBookingServiceError) {
throw error
throw error;
}
const prismaError = error as {
code?: string
code?: string;
meta?: {
target?: string[] | string
}
}
target?: string[] | string;
};
};
if (prismaError.code === 'P2002') {
const targets = Array.isArray(prismaError.meta?.target)
? prismaError.meta?.target
: [prismaError.meta?.target]
: [prismaError.meta?.target];
const isBookingCodeCollision = targets.some((target) =>
String(target).includes('booking_code'),
)
String(target).includes('booking_code')
);
if (isBookingCodeCollision) {
continue
continue;
}
throw new AdminBookingServiceError('El horario seleccionado ya fue reservado.', 409)
throw new AdminBookingServiceError('El horario seleccionado ya fue reservado.', 409);
}
throw error
throw error;
}
}
throw new AdminBookingServiceError(
'No se pudo generar un codigo de reserva unico. Intenta nuevamente.',
409,
)
409
);
}
export async function updateAdminBookingStatus(
appUserId: string,
bookingId: string,
input: UpdateAdminBookingStatusInput,
input: UpdateAdminBookingStatusInput
) {
const booking = await db.courtBooking.findFirst({
where: {
@@ -472,33 +472,31 @@ export async function updateAdminBookingStatus(
},
},
},
})
});
if (!booking) {
throw new AdminBookingServiceError('Reserva no encontrada.', 404)
throw new AdminBookingServiceError('Reserva no encontrada.', 404);
}
if (input.status === 'CANCELLED' && booking.status !== 'CONFIRMED') {
throw new AdminBookingServiceError(
'Solo se pueden cancelar reservas en estado confirmada.',
409,
)
409
);
}
if (input.status === 'COMPLETED' && booking.status !== 'CONFIRMED') {
throw new AdminBookingServiceError(
'Solo se pueden marcar como cumplidas las reservas confirmadas.',
409,
)
409
);
}
const updated = await db.courtBooking.update({
where: { id: booking.id },
data: {
status:
input.status === 'COMPLETED'
? CourtBookingStatus.COMPLETED
: CourtBookingStatus.CANCELLED,
input.status === 'COMPLETED' ? CourtBookingStatus.COMPLETED : CourtBookingStatus.CANCELLED,
},
include: {
court: {
@@ -521,7 +519,7 @@ export async function updateAdminBookingStatus(
},
},
},
})
});
return mapBookingResponse(updated)
return mapBookingResponse(updated);
}