mirror of
https://github.com/marcogll/AnchorOS.git
synced 2026-03-15 21:24:35 +00:00
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:
@@ -1,10 +1,12 @@
|
||||
import { NextRequest, NextResponse } from 'next/server'
|
||||
import { supabase } from '@/lib/supabase/client'
|
||||
import { supabaseAdmin } from '@/lib/supabase/client'
|
||||
import { Kiosk } from '@/lib/db/types'
|
||||
|
||||
export async function POST(request: NextRequest) {
|
||||
try {
|
||||
const { api_key } = await request.json()
|
||||
const body = await request.json()
|
||||
console.log('Auth request body:', body)
|
||||
const { api_key } = body
|
||||
|
||||
if (!api_key || typeof api_key !== 'string') {
|
||||
return NextResponse.json(
|
||||
@@ -13,7 +15,8 @@ export async function POST(request: NextRequest) {
|
||||
)
|
||||
}
|
||||
|
||||
const { data: kiosk, error } = await supabase
|
||||
console.log('Querying kiosk with api_key:', api_key)
|
||||
const { data: kiosk, error } = await supabaseAdmin
|
||||
.from('kiosks')
|
||||
.select(`
|
||||
id,
|
||||
@@ -21,7 +24,7 @@ export async function POST(request: NextRequest) {
|
||||
device_name,
|
||||
display_name,
|
||||
is_active,
|
||||
location (
|
||||
locations (
|
||||
id,
|
||||
name,
|
||||
timezone
|
||||
@@ -31,7 +34,10 @@ export async function POST(request: NextRequest) {
|
||||
.eq('is_active', true)
|
||||
.single()
|
||||
|
||||
console.log('Kiosk query result:', { error, kiosk })
|
||||
|
||||
if (error || !kiosk) {
|
||||
console.log('Authentication failed:', error || 'Kiosk not found')
|
||||
return NextResponse.json(
|
||||
{ error: 'Invalid API key or kiosk not active' },
|
||||
{ status: 401 }
|
||||
@@ -46,7 +52,7 @@ export async function POST(request: NextRequest) {
|
||||
device_name: kiosk.device_name,
|
||||
display_name: kiosk.display_name,
|
||||
is_active: kiosk.is_active,
|
||||
location: kiosk.location
|
||||
location: kiosk.locations
|
||||
}
|
||||
})
|
||||
} catch (error) {
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
import { NextRequest, NextResponse } from 'next/server'
|
||||
import { supabase } from '@/lib/supabase/client'
|
||||
import { supabaseAdmin } from '@/lib/supabase/client'
|
||||
|
||||
async function validateKiosk(request: NextRequest) {
|
||||
const apiKey = request.headers.get('x-kiosk-api-key')
|
||||
|
||||
|
||||
if (!apiKey) {
|
||||
return null
|
||||
}
|
||||
|
||||
const { data: kiosk } = await supabase
|
||||
const { data: kiosk } = await supabaseAdmin
|
||||
.from('kiosks')
|
||||
.select('id, location_id, is_active')
|
||||
.eq('api_key', apiKey)
|
||||
@@ -34,7 +34,7 @@ export async function POST(
|
||||
|
||||
const shortId = params.shortId
|
||||
|
||||
const { data: booking, error: fetchError } = await supabase
|
||||
const { data: booking, error: fetchError } = await supabaseAdmin
|
||||
.from('bookings')
|
||||
.select('id, status, location_id')
|
||||
.eq('short_id', shortId)
|
||||
@@ -61,31 +61,11 @@ export async function POST(
|
||||
)
|
||||
}
|
||||
|
||||
const { data: updatedBooking, error: updateError } = await supabase
|
||||
const { data: updatedBooking, error: updateError } = await supabaseAdmin
|
||||
.from('bookings')
|
||||
.update({ status: 'confirmed' })
|
||||
.eq('id', booking.id)
|
||||
.select(`
|
||||
id,
|
||||
short_id,
|
||||
status,
|
||||
start_time_utc,
|
||||
end_time_utc,
|
||||
service (
|
||||
id,
|
||||
name,
|
||||
duration_minutes
|
||||
),
|
||||
resource (
|
||||
id,
|
||||
name,
|
||||
type
|
||||
),
|
||||
staff (
|
||||
id,
|
||||
display_name
|
||||
)
|
||||
`)
|
||||
.select('id, short_id, status, start_time_utc, end_time_utc')
|
||||
.single()
|
||||
|
||||
if (updateError || !updatedBooking) {
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
import { NextRequest, NextResponse } from 'next/server'
|
||||
import { supabase } from '@/lib/supabase/client'
|
||||
import { supabaseAdmin } from '@/lib/supabase/client'
|
||||
|
||||
async function validateKiosk(request: NextRequest) {
|
||||
const apiKey = request.headers.get('x-kiosk-api-key')
|
||||
|
||||
|
||||
if (!apiKey) {
|
||||
return null
|
||||
}
|
||||
|
||||
const { data: kiosk } = await supabase
|
||||
const { data: kiosk } = await supabaseAdmin
|
||||
.from('kiosks')
|
||||
.select('id, location_id, is_active')
|
||||
.eq('api_key', apiKey)
|
||||
@@ -33,29 +33,9 @@ export async function GET(request: NextRequest) {
|
||||
const short_id = searchParams.get('short_id')
|
||||
const date = searchParams.get('date')
|
||||
|
||||
let query = supabase
|
||||
let query = supabaseAdmin
|
||||
.from('bookings')
|
||||
.select(`
|
||||
id,
|
||||
short_id,
|
||||
status,
|
||||
start_time_utc,
|
||||
end_time_utc,
|
||||
service (
|
||||
id,
|
||||
name,
|
||||
duration_minutes
|
||||
),
|
||||
resource (
|
||||
id,
|
||||
name,
|
||||
type
|
||||
),
|
||||
staff (
|
||||
id,
|
||||
display_name
|
||||
)
|
||||
`)
|
||||
.select()
|
||||
.eq('location_id', kiosk.location_id)
|
||||
.in('status', ['pending', 'confirmed'])
|
||||
|
||||
@@ -121,7 +101,7 @@ export async function POST(request: NextRequest) {
|
||||
)
|
||||
}
|
||||
|
||||
const { data: service, error: serviceError } = await supabase
|
||||
const { data: service, error: serviceError } = await supabaseAdmin
|
||||
.from('services')
|
||||
.select('*')
|
||||
.eq('id', service_id)
|
||||
@@ -139,7 +119,7 @@ export async function POST(request: NextRequest) {
|
||||
const endTime = new Date(startTime)
|
||||
endTime.setMinutes(endTime.getMinutes() + service.duration_minutes)
|
||||
|
||||
const { data: availableResources } = await supabase
|
||||
const { data: availableResources } = await supabaseAdmin
|
||||
.rpc('get_available_resources_with_priority', {
|
||||
p_location_id: kiosk.location_id,
|
||||
p_start_time: startTime.toISOString(),
|
||||
@@ -155,7 +135,7 @@ export async function POST(request: NextRequest) {
|
||||
|
||||
const assignedResource = availableResources[0]
|
||||
|
||||
const { data: customer, error: customerError } = await supabase
|
||||
const { data: customer, error: customerError } = await supabaseAdmin
|
||||
.from('customers')
|
||||
.upsert({
|
||||
email: customer_email,
|
||||
@@ -175,7 +155,7 @@ export async function POST(request: NextRequest) {
|
||||
)
|
||||
}
|
||||
|
||||
const { data: booking, error: bookingError } = await supabase
|
||||
const { data: booking, error: bookingError } = await supabaseAdmin
|
||||
.from('bookings')
|
||||
.insert({
|
||||
customer_id: customer.id,
|
||||
@@ -191,28 +171,7 @@ export async function POST(request: NextRequest) {
|
||||
is_paid: false,
|
||||
notes
|
||||
})
|
||||
.select(`
|
||||
id,
|
||||
short_id,
|
||||
status,
|
||||
start_time_utc,
|
||||
end_time_utc,
|
||||
service (
|
||||
id,
|
||||
name,
|
||||
duration_minutes,
|
||||
base_price
|
||||
),
|
||||
resource (
|
||||
id,
|
||||
name,
|
||||
type
|
||||
),
|
||||
staff (
|
||||
id,
|
||||
display_name
|
||||
)
|
||||
`)
|
||||
.select('id, short_id, status, start_time_utc, end_time_utc')
|
||||
.single()
|
||||
|
||||
if (bookingError || !booking) {
|
||||
@@ -224,11 +183,10 @@ export async function POST(request: NextRequest) {
|
||||
|
||||
return NextResponse.json({
|
||||
success: true,
|
||||
booking: {
|
||||
...booking,
|
||||
resource_name: assignedResource.resource_name,
|
||||
resource_type: assignedResource.resource_type
|
||||
}
|
||||
booking,
|
||||
service_name: service.name,
|
||||
resource_name: assignedResource.resource_name,
|
||||
resource_type: assignedResource.resource_type
|
||||
}, { status: 201 })
|
||||
} catch (error) {
|
||||
console.error('Kiosk bookings POST error:', error)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { NextRequest, NextResponse } from 'next/server'
|
||||
import { supabase } from '@/lib/supabase/client'
|
||||
import { supabaseAdmin } from '@/lib/supabase/client'
|
||||
|
||||
async function validateKiosk(request: NextRequest) {
|
||||
const apiKey = request.headers.get('x-kiosk-api-key')
|
||||
@@ -8,7 +8,7 @@ async function validateKiosk(request: NextRequest) {
|
||||
return null
|
||||
}
|
||||
|
||||
const { data: kiosk } = await supabase
|
||||
const { data: kiosk } = await supabaseAdmin
|
||||
.from('kiosks')
|
||||
.select('id, location_id, is_active')
|
||||
.eq('api_key', apiKey)
|
||||
@@ -51,7 +51,7 @@ export async function GET(request: NextRequest) {
|
||||
)
|
||||
}
|
||||
|
||||
let resourceQuery = supabase
|
||||
let resourceQuery = supabaseAdmin
|
||||
.rpc('get_available_resources_with_priority', {
|
||||
p_location_id: kiosk.location_id,
|
||||
p_start_time: startTime.toISOString(),
|
||||
@@ -70,14 +70,14 @@ export async function GET(request: NextRequest) {
|
||||
let availableResources = resources || []
|
||||
|
||||
if (service_id) {
|
||||
const { data: service } = await supabase
|
||||
const { data: service } = await supabaseAdmin
|
||||
.from('services')
|
||||
.select('requires_dual_artist')
|
||||
.eq('id', service_id)
|
||||
.single()
|
||||
|
||||
if (service?.requires_dual_artist) {
|
||||
availableResources = availableResources.filter(r => r.resource_type === 'room')
|
||||
availableResources = availableResources.filter((r: any) => r.resource_type === 'room')
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { NextRequest, NextResponse } from 'next/server'
|
||||
import { supabase } from '@/lib/supabase/client'
|
||||
import { supabaseAdmin } from '@/lib/supabase/client'
|
||||
|
||||
async function validateKiosk(request: NextRequest) {
|
||||
const apiKey = request.headers.get('x-kiosk-api-key')
|
||||
@@ -8,7 +8,7 @@ async function validateKiosk(request: NextRequest) {
|
||||
return null
|
||||
}
|
||||
|
||||
const { data: kiosk } = await supabase
|
||||
const { data: kiosk } = await supabaseAdmin
|
||||
.from('kiosks')
|
||||
.select('id, location_id, is_active')
|
||||
.eq('api_key', apiKey)
|
||||
@@ -45,7 +45,7 @@ export async function POST(request: NextRequest) {
|
||||
)
|
||||
}
|
||||
|
||||
const { data: service, error: serviceError } = await supabase
|
||||
const { data: service, error: serviceError } = await supabaseAdmin
|
||||
.from('services')
|
||||
.select('*')
|
||||
.eq('id', service_id)
|
||||
@@ -59,7 +59,7 @@ export async function POST(request: NextRequest) {
|
||||
)
|
||||
}
|
||||
|
||||
const { data: availableStaff } = await supabase
|
||||
const { data: availableStaff } = await supabaseAdmin
|
||||
.from('staff')
|
||||
.select('id, display_name, role')
|
||||
.eq('location_id', kiosk.location_id)
|
||||
@@ -79,7 +79,7 @@ export async function POST(request: NextRequest) {
|
||||
const endTime = new Date(startTime)
|
||||
endTime.setMinutes(endTime.getMinutes() + service.duration_minutes)
|
||||
|
||||
const { data: availableResources } = await supabase
|
||||
const { data: availableResources } = await supabaseAdmin
|
||||
.rpc('get_available_resources_with_priority', {
|
||||
p_location_id: kiosk.location_id,
|
||||
p_start_time: startTime.toISOString(),
|
||||
@@ -95,7 +95,7 @@ export async function POST(request: NextRequest) {
|
||||
|
||||
const assignedResource = availableResources[0]
|
||||
|
||||
const { data: customer, error: customerError } = await supabase
|
||||
const { data: customer, error: customerError } = await supabaseAdmin
|
||||
.from('customers')
|
||||
.upsert({
|
||||
email: customer_email,
|
||||
@@ -115,7 +115,7 @@ export async function POST(request: NextRequest) {
|
||||
)
|
||||
}
|
||||
|
||||
const { data: booking, error: bookingError } = await supabase
|
||||
const { data: booking, error: bookingError } = await supabaseAdmin
|
||||
.from('bookings')
|
||||
.insert({
|
||||
customer_id: customer.id,
|
||||
@@ -131,28 +131,7 @@ export async function POST(request: NextRequest) {
|
||||
is_paid: false,
|
||||
notes: notes ? `${notes} [Walk-in]` : '[Walk-in]'
|
||||
})
|
||||
.select(`
|
||||
id,
|
||||
short_id,
|
||||
status,
|
||||
start_time_utc,
|
||||
end_time_utc,
|
||||
service (
|
||||
id,
|
||||
name,
|
||||
duration_minutes,
|
||||
base_price
|
||||
),
|
||||
resource (
|
||||
id,
|
||||
name,
|
||||
type
|
||||
),
|
||||
staff (
|
||||
id,
|
||||
display_name
|
||||
)
|
||||
`)
|
||||
.select('id, status, start_time_utc, end_time_utc, total_amount, is_paid')
|
||||
.single()
|
||||
|
||||
if (bookingError || !booking) {
|
||||
@@ -164,12 +143,11 @@ export async function POST(request: NextRequest) {
|
||||
|
||||
return NextResponse.json({
|
||||
success: true,
|
||||
booking: {
|
||||
...booking,
|
||||
resource_name: assignedResource.resource_name,
|
||||
resource_type: assignedResource.resource_type,
|
||||
staff_name: assignedStaff.display_name
|
||||
},
|
||||
booking,
|
||||
service_name: service.name,
|
||||
resource_name: assignedResource.resource_name,
|
||||
resource_type: assignedResource.resource_type,
|
||||
staff_name: assignedStaff.display_name,
|
||||
message: 'Walk-in booking created successfully'
|
||||
}, { status: 201 })
|
||||
} catch (error) {
|
||||
|
||||
Reference in New Issue
Block a user