feat: Implementar sistema de disponibilidad y corregir errores de kiosko

- Agregar API routes de disponibilidad (blocks, staff, time-slots, staff-unavailable)
- Corregir autenticación en availability routes (reemplazar get_current_user_role con validación Bearer)
- Corregir DELETE en blocks/route.ts para usar query parameters
- Corregir errores de tipos en kiosk routes (supabase → supabaseAdmin)
- Agregar layout raíz de Next.js y estilos globales
- Agregar componente Badge UI
- Corregir tipos TypeScript en WalkInFlow
- Instalar dependencias necesarias (@radix-ui/*, class-variance-authority, etc)
- Agregar migraciones de disponibilidad
This commit is contained in:
Marco Gallegos
2026-01-16 15:12:57 -06:00
parent 631e60376c
commit accf0e81e1
23 changed files with 8263 additions and 152 deletions

View File

@@ -552,18 +552,18 @@ CREATE OR REPLACE FUNCTION generate_short_id()
RETURNS VARCHAR(6) AS $$
DECLARE
chars VARCHAR(36) := '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ';
short_id VARCHAR(6);
v_short_id VARCHAR(6);
attempts INT := 0;
max_attempts INT := 10;
BEGIN
LOOP
short_id := '';
v_short_id := '';
FOR i IN 1..6 LOOP
short_id := short_id || substr(chars, floor(random() * 36 + 1)::INT, 1);
v_short_id := v_short_id || substr(chars, floor(random() * 36 + 1)::INT, 1);
END LOOP;
IF NOT EXISTS (SELECT 1 FROM bookings WHERE short_id = short_id) THEN
RETURN short_id;
IF NOT EXISTS (SELECT 1 FROM bookings WHERE short_id = v_short_id) THEN
RETURN v_short_id;
END IF;
attempts := attempts + 1;

View File

@@ -55,18 +55,18 @@ CREATE OR REPLACE FUNCTION generate_kiosk_api_key()
RETURNS VARCHAR(64) AS $$
DECLARE
chars VARCHAR(62) := 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
api_key VARCHAR(64);
v_api_key VARCHAR(64);
attempts INT := 0;
max_attempts INT := 10;
BEGIN
LOOP
api_key := '';
v_api_key := '';
FOR i IN 1..64 LOOP
api_key := api_key || substr(chars, floor(random() * 62 + 1)::INT, 1);
v_api_key := v_api_key || substr(chars, floor(random() * 62 + 1)::INT, 1);
END LOOP;
IF NOT EXISTS (SELECT 1 FROM kiosks WHERE api_key = api_key) THEN
RETURN api_key;
IF NOT EXISTS (SELECT 1 FROM kiosks WHERE api_key = v_api_key) THEN
RETURN v_api_key;
END IF;
attempts := attempts + 1;

View File

@@ -0,0 +1,52 @@
-- ============================================
-- FASE 2.1 - DISPONIBILIDAD DOBLE CAPA (SIMPLIFICADA)
-- Horarios de staff y validación básica
-- ============================================
-- ============================================
-- AGREGAR CAMPOS DE HORARIO A STAFF
-- ============================================
DO $$
BEGIN
IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'staff' AND column_name = 'work_hours_start') THEN
ALTER TABLE staff ADD COLUMN work_hours_start TIME;
RAISE NOTICE 'Added work_hours_start to staff';
END IF;
IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'staff' AND column_name = 'work_hours_end') THEN
ALTER TABLE staff ADD COLUMN work_hours_end TIME;
RAISE NOTICE 'Added work_hours_end to staff';
END IF;
IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'staff' AND column_name = 'work_days') THEN
ALTER TABLE staff ADD COLUMN work_days TEXT DEFAULT 'MON,TUE,WED,THU,FRI,SAT';
RAISE NOTICE 'Added work_days to staff';
END IF;
IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'staff' AND column_name = 'is_available_for_booking') THEN
ALTER TABLE staff ADD COLUMN is_available_for_booking BOOLEAN DEFAULT true;
RAISE NOTICE 'Added is_available_for_booking to staff';
END IF;
END
$$;
-- ============================================
-- VERIFICACIÓN
-- ============================================
DO $$
BEGIN
RAISE NOTICE '==========================================';
RAISE NOTICE 'FASE 2.1 - DISPONIBILIDAD COMPLETADA';
RAISE NOTICE '==========================================';
RAISE NOTICE 'Campos agregados a staff:';
RAISE NOTICE ' - work_hours_start';
RAISE NOTICE ' - work_hours_end';
RAISE NOTICE ' - work_days';
RAISE NOTICE ' - is_available_for_booking';
RAISE NOTICE '==========================================';
RAISE NOTICE 'Est listo para la Fase 2.2 - Servicios Express';
RAISE NOTICE '==========================================';
END
$$;

View File

@@ -0,0 +1,29 @@
-- Fix short_id variable name collision to avoid ambiguous column reference
-- This migration fixes the issue where the variable name in generate_short_id()
-- conflicts with the column name in the bookings table
CREATE OR REPLACE FUNCTION generate_short_id()
RETURNS VARCHAR(6) AS $$
DECLARE
chars VARCHAR(36) := '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ';
v_short_id VARCHAR(6);
attempts INT := 0;
max_attempts INT := 10;
BEGIN
LOOP
v_short_id := '';
FOR i IN 1..6 LOOP
v_short_id := v_short_id || substr(chars, floor(random() * 36 + 1)::INT, 1);
END LOOP;
IF NOT EXISTS (SELECT 1 FROM bookings WHERE short_id = v_short_id) THEN
RETURN v_short_id;
END IF;
attempts := attempts + 1;
IF attempts >= max_attempts THEN
RAISE EXCEPTION 'Failed to generate unique short_id after % attempts', max_attempts;
END IF;
END LOOP;
END;
$$ LANGUAGE plpgsql SECURITY DEFINER;

View File

@@ -0,0 +1,183 @@
-- ============================================
-- FIX: Corregir funciones de disponibilidad para considerar zona horaria
-- ============================================
-- Eliminar funciones antiguas que no consideran zona horaria
DROP FUNCTION IF EXISTS check_staff_work_hours(UUID, TIMESTAMPTZ, TIMESTAMPTZ);
DROP FUNCTION IF EXISTS check_staff_availability(UUID, TIMESTAMPTZ, TIMESTAMPTZ, UUID);
DROP FUNCTION IF EXISTS check_resource_availability(UUID, TIMESTAMPTZ, TIMESTAMPTZ, UUID);
DROP FUNCTION IF EXISTS get_available_staff(UUID, TIMESTAMPTZ, TIMESTAMPTZ, UUID, UUID);
-- Recrear check_staff_work_hours con soporte de zona horaria
CREATE OR REPLACE FUNCTION check_staff_work_hours(
p_staff_id UUID,
p_start_time_utc TIMESTAMPTZ,
p_end_time_utc TIMESTAMPTZ,
p_location_timezone TEXT
)
RETURNS BOOLEAN AS $$
DECLARE
v_staff_record RECORD;
v_start_time TIME;
v_end_time TIME;
v_work_days TEXT;
v_day_of_week INTEGER;
v_start_local TIMESTAMPTZ;
v_end_local TIMESTAMPTZ;
BEGIN
SELECT * INTO v_staff_record
FROM staff
WHERE id = p_staff_id;
IF NOT FOUND THEN
RETURN false;
END IF;
IF NOT v_staff_record.is_active THEN
RETURN false;
END IF;
IF NOT v_staff_record.is_available_for_booking THEN
RETURN false;
END IF;
-- Convertir UTC a hora local de la ubicación
v_start_local := p_start_time_utc AT TIME ZONE p_location_timezone;
v_end_local := p_end_time_utc AT TIME ZONE p_location_timezone;
v_start_time := v_start_local::TIME;
v_end_time := v_end_local::TIME;
v_work_days := v_staff_record.work_days;
v_day_of_week := EXTRACT(ISODOW FROM v_start_local);
IF v_work_days IS NULL THEN
RETURN true;
END IF;
IF v_day_of_week = 1 AND v_work_days LIKE '%MON%' THEN RETURN true; END IF;
IF v_day_of_week = 2 AND v_work_days LIKE '%TUE%' THEN RETURN true; END IF;
IF v_day_of_week = 3 AND v_work_days LIKE '%WED%' THEN RETURN true; END IF;
IF v_day_of_week = 4 AND v_work_days LIKE '%THU%' THEN RETURN true; END IF;
IF v_day_of_week = 5 AND v_work_days LIKE '%FRI%' THEN RETURN true; END IF;
IF v_day_of_week = 6 AND v_work_days LIKE '%SAT%' THEN RETURN true; END IF;
IF v_day_of_week = 7 AND v_work_days LIKE '%SUN%' THEN RETURN true; END IF;
-- Verificar que el tiempo esté dentro del horario laboral
IF v_start_time < v_staff_record.work_hours_start OR
v_end_time > v_staff_record.work_hours_end THEN
RETURN false;
END IF;
RETURN true;
END;
$$ LANGUAGE plpgsql SECURITY DEFINER;
-- Recrear check_staff_availability con soporte de zona horaria
CREATE OR REPLACE FUNCTION check_staff_availability(
p_staff_id UUID,
p_start_time_utc TIMESTAMPTZ,
p_end_time_utc TIMESTAMPTZ,
p_exclude_booking_id UUID DEFAULT NULL
)
RETURNS BOOLEAN AS $$
DECLARE
v_is_work_hours BOOLEAN;
v_has_booking_conflict BOOLEAN;
v_has_manual_block BOOLEAN;
v_location_timezone TEXT;
BEGIN
-- Obtener zona horaria de la ubicación del staff
SELECT timezone INTO v_location_timezone
FROM locations
WHERE id = (SELECT location_id FROM staff WHERE id = p_staff_id);
v_is_work_hours := check_staff_work_hours(p_staff_id, p_start_time_utc, p_end_time_utc, v_location_timezone);
IF NOT v_is_work_hours THEN
RETURN false;
END IF;
-- Verificar conflictos con eventos de calendario
SELECT EXISTS(
SELECT 1
FROM google_calendar_events
WHERE staff_id = p_staff_id
AND is_blocking = true
AND NOT (p_end_time_utc <= start_time_utc OR p_start_time_utc >= end_time_utc)
) INTO v_has_booking_conflict;
IF v_has_booking_conflict THEN
RETURN false;
END IF;
-- Verificar conflictos con otras reservas
SELECT EXISTS(
SELECT 1
FROM bookings
WHERE staff_id = p_staff_id
AND status NOT IN ('cancelled', 'no_show')
AND (p_exclude_booking_id IS NULL OR id != p_exclude_booking_id)
AND NOT (p_end_time_utc <= start_time_utc OR p_start_time_utc >= end_time_utc)
) INTO v_has_manual_block;
IF v_has_manual_block THEN
RETURN false;
END IF;
-- Verificar bloques manuales de disponibilidad
SELECT EXISTS(
SELECT 1
FROM staff_availability
WHERE staff_id = p_staff_id
AND date = (p_start_time_utc AT TIME ZONE v_location_timezone)::DATE
AND is_available = false
AND NOT (p_end_time_utc AT TIME ZONE v_location_timezone::TIME <= start_time
OR p_start_time_utc AT TIME ZONE v_location_timezone::TIME >= end_time)
) INTO v_has_manual_block;
IF v_has_manual_block THEN
RETURN false;
END IF;
RETURN true;
END;
$$ LANGUAGE plpgsql SECURITY DEFINER;
-- Recrear get_available_staff simplificado
CREATE OR REPLACE FUNCTION get_available_staff(
p_location_id UUID,
p_start_time_utc TIMESTAMPTZ,
p_end_time_utc TIMESTAMPTZ
)
RETURNS TABLE (
staff_id UUID,
staff_name TEXT,
role TEXT,
work_hours_start TIME,
work_hours_end TIME,
work_days TEXT
) AS $$
BEGIN
RETURN QUERY
SELECT
s.id::UUID,
s.display_name::TEXT,
s.role::TEXT,
s.work_hours_start::TIME,
s.work_hours_end::TIME,
s.work_days::TEXT
FROM staff s
WHERE s.location_id = p_location_id
AND s.is_active = true
AND s.is_available_for_booking = true
AND s.role IN ('artist', 'staff', 'manager')
AND check_staff_availability(s.id, p_start_time_utc, p_end_time_utc)
ORDER BY
CASE s.role
WHEN 'manager' THEN 1
WHEN 'staff' THEN 2
WHEN 'artist' THEN 3
END;
END;
$$ LANGUAGE plpgsql SECURITY DEFINER;

View File

@@ -0,0 +1,42 @@
-- ============================================
-- FIX: Corregir función get_available_staff con tipos correctos
-- ============================================
DROP FUNCTION IF EXISTS get_available_staff(UUID, TIMESTAMPTZ, TIMESTAMPTZ);
CREATE OR REPLACE FUNCTION get_available_staff(
p_location_id UUID,
p_start_time_utc TIMESTAMPTZ,
p_end_time_utc TIMESTAMPTZ
)
RETURNS TABLE (
staff_id UUID,
staff_name TEXT,
role TEXT,
work_hours_start TIME,
work_hours_end TIME,
work_days TEXT
) AS $$
BEGIN
RETURN QUERY
SELECT
s.id::UUID,
s.display_name::TEXT,
s.role::TEXT,
s.work_hours_start::TIME,
s.work_hours_end::TIME,
s.work_days::TEXT
FROM staff s
WHERE s.location_id = p_location_id
AND s.is_active = true
AND s.is_available_for_booking = true
AND s.role IN ('artist', 'staff', 'manager')
AND check_staff_availability(s.id, p_start_time_utc, p_end_time_utc)
ORDER BY
CASE s.role
WHEN 'manager' THEN 1
WHEN 'staff' THEN 2
WHEN 'artist' THEN 3
END;
END;
$$ LANGUAGE plpgsql SECURITY DEFINER;

View File

@@ -0,0 +1,79 @@
-- ============================================
-- FIX: Actualizar check_staff_availability para ignorar google_calendar_events si no existe
-- ============================================
DROP FUNCTION IF EXISTS check_staff_availability(UUID, TIMESTAMPTZ, TIMESTAMPTZ, UUID);
CREATE OR REPLACE FUNCTION check_staff_availability(
p_staff_id UUID,
p_start_time_utc TIMESTAMPTZ,
p_end_time_utc TIMESTAMPTZ,
p_exclude_booking_id UUID DEFAULT NULL
)
RETURNS BOOLEAN AS $$
DECLARE
v_is_work_hours BOOLEAN;
v_has_booking_conflict BOOLEAN;
v_has_manual_block BOOLEAN;
v_location_timezone TEXT;
BEGIN
-- Obtener zona horaria de la ubicación del staff
SELECT timezone INTO v_location_timezone
FROM locations
WHERE id = (SELECT location_id FROM staff WHERE id = p_staff_id);
v_is_work_hours := check_staff_work_hours(p_staff_id, p_start_time_utc, p_end_time_utc, v_location_timezone);
IF NOT v_is_work_hours THEN
RETURN false;
END IF;
-- Verificar conflictos con eventos de calendario solo si la tabla existe
IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'google_calendar_events') THEN
SELECT EXISTS(
SELECT 1
FROM google_calendar_events
WHERE staff_id = p_staff_id
AND is_blocking = true
AND NOT (p_end_time_utc <= start_time_utc OR p_start_time_utc >= end_time_utc)
) INTO v_has_booking_conflict;
IF v_has_booking_conflict THEN
RETURN false;
END IF;
END IF;
-- Verificar conflictos con otras reservas
SELECT EXISTS(
SELECT 1
FROM bookings
WHERE staff_id = p_staff_id
AND status NOT IN ('cancelled', 'no_show')
AND (p_exclude_booking_id IS NULL OR id != p_exclude_booking_id)
AND NOT (p_end_time_utc <= start_time_utc OR p_start_time_utc >= end_time_utc)
) INTO v_has_manual_block;
IF v_has_manual_block THEN
RETURN false;
END IF;
-- Verificar bloques manuales de disponibilidad
IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'staff_availability') THEN
SELECT EXISTS(
SELECT 1
FROM staff_availability
WHERE staff_id = p_staff_id
AND date = (p_start_time_utc AT TIME ZONE v_location_timezone)::DATE
AND is_available = false
AND NOT (p_end_time_utc AT TIME ZONE v_location_timezone::TIME <= start_time
OR p_start_time_utc AT TIME ZONE v_location_timezone::TIME >= end_time)
) INTO v_has_manual_block;
IF v_has_manual_block THEN
RETURN false;
END IF;
END IF;
RETURN true;
END;
$$ LANGUAGE plpgsql SECURITY DEFINER;

View File

@@ -0,0 +1,73 @@
-- ============================================
-- Crear función get_detailed_availability para obtener slots de tiempo
-- ============================================
CREATE OR REPLACE FUNCTION get_detailed_availability(
p_location_id UUID,
p_service_id UUID,
p_date DATE,
p_time_slot_duration_minutes INTEGER DEFAULT 60
)
RETURNS JSONB AS $$
DECLARE
v_service_duration INTEGER;
v_location_timezone TEXT;
v_start_time TIME := '09:00'::TIME;
v_end_time TIME := '21:00'::TIME;
v_time_slots JSONB := '[]'::JSONB;
v_slot_start TIMESTAMPTZ;
v_slot_end TIMESTAMPTZ;
v_available_staff_count INTEGER;
BEGIN
-- Obtener duración del servicio
SELECT duration_minutes INTO v_service_duration
FROM services
WHERE id = p_service_id;
IF v_service_duration IS NULL THEN
RETURN '[]'::JSONB;
END IF;
-- Obtener zona horaria de la ubicación
SELECT timezone INTO v_location_timezone
FROM locations
WHERE id = p_location_id;
-- Generar slots de tiempo para el día
v_slot_start := (p_date || ' ' || v_start_time::TEXT)::TIMESTAMPTZ
AT TIME ZONE v_location_timezone;
v_slot_end := (p_date || ' ' || v_end_time::TEXT)::TIMESTAMPTZ
AT TIME ZONE v_location_timezone;
-- Iterar por cada slot
WHILE v_slot_start < v_slot_end LOOP
-- Verificar staff disponible para este slot
SELECT COUNT(*) INTO v_available_staff_count
FROM (
SELECT 1
FROM staff s
WHERE s.location_id = p_location_id
AND s.is_active = true
AND s.is_available_for_booking = true
AND s.role IN ('artist', 'staff', 'manager')
AND check_staff_availability(s.id, v_slot_start, v_slot_start + (v_service_duration || ' minutes')::INTERVAL)
) AS available_staff;
-- Agregar slot al resultado
IF v_available_staff_count > 0 THEN
v_time_slots := v_time_slots || jsonb_build_object(
'start_time', v_slot_start::TEXT,
'end_time', (v_slot_start + (p_time_slot_duration_minutes || ' minutes')::INTERVAL)::TEXT,
'available', true,
'available_staff_count', v_available_staff_count
);
END IF;
-- Avanzar al siguiente slot
v_slot_start := v_slot_start + (p_time_slot_duration_minutes || ' minutes')::INTERVAL;
END LOOP;
RETURN v_time_slots;
END;
$$ LANGUAGE plpgsql SECURITY DEFINER;