feat: origin_stop_id y destination_stop_id en routes - motor de llegadas ahora usa parada de inicio explicita como referencia, admin puede configurar inicio/fin por ruta

This commit is contained in:
2026-03-05 19:48:45 -05:00
parent 0e06fec1ae
commit f2e96c4cdf
3 changed files with 99 additions and 15 deletions

View File

@ -68,17 +68,17 @@ export const busStopsService = {
* Real-time bus arrival calculator for a specific stop.
*
* Logic:
* 1. Get all routes passing through this stop + their travel_time_minutes to the stop
* 2. Get today's published schedules for those routes
* 3. For each schedule: arrivalAtStop = departure_time + travel_time_minutes
* 4. With GPS: filter to buses not yet passed, calculate wait minutes
* Without GPS: show all future arrivals as raw times for today (option A)
* 5. Return sorted by arrivalTime asc, max 8 results within next 2 hours
* 1. Get all routes through this stop + their travel_time_minutes
* 2. Get route's origin_stop_id → get its travel_time_minutes as the "base"
* 3. Effective travel time = stop.travel_time - origin.travel_time (always >= 0)
* 4. arrivalAtStop = departure_time + effective_travel_time
* 5. With GPS: filter to future buses, return wait minutes
* Without GPS (option A): show raw schedule times for today
*/
async getNextBusesForStop(stopId: string, userLat?: number, userLng?: number): Promise<BusArrival[]> {
const hasGps = userLat !== undefined && userLng !== undefined
// ── STEP 1: Get route_stops entries for this stop (includes travel_time_minutes) ──
// ── STEP 1: Get route_stops entry for THIS stop on every route it belongs to ──
const { data: routeStopsData, error: rsError } = await supabase
.from('route_stops')
.select('route_id, travel_time_minutes, stop_delay_minutes')
@ -89,24 +89,59 @@ export const busStopsService = {
const routeIds = routeStopsData.map((rs: any) => rs.route_id)
// Build a lookup: routeId → travel_time_minutes to THIS stop
const travelTimeMap: Record<string, number> = {}
// Build a lookup: routeId → raw travel_time_minutes of THIS stop
const rawTravelTimeMap: Record<string, number> = {}
for (const rs of routeStopsData as any[]) {
travelTimeMap[rs.route_id] = (rs.travel_time_minutes || 0) + (rs.stop_delay_minutes || 0)
rawTravelTimeMap[rs.route_id] = (rs.travel_time_minutes || 0) + (rs.stop_delay_minutes || 0)
}
// ── STEP 2: Get routes metadata (name) ──
// ── STEP 2: Get route metadata including origin_stop_id ──
const { data: routesData, error: routesError } = await supabase
.from('routes')
.select('id, name')
.select('id, name, origin_stop_id')
.in('id', routeIds)
if (routesError) throw new Error(routesError.message)
const routeNameMap: Record<string, string> = {}
const originStopIdMap: Record<string, string | null> = {} // routeId → origin_stop_id
for (const r of (routesData || []) as any[]) {
routeNameMap[r.id] = r.name
originStopIdMap[r.id] = r.origin_stop_id || null
}
// ── STEP 3: Get travel_time_minutes of the origin stop for each route ──
// This gives us the "base offset" so we can normalize travel times correctly.
// If origin_stop has travel_time=5 and user's stop has travel_time=30, effective = 25 min.
const originStopIds = [...new Set(Object.values(originStopIdMap).filter(Boolean))] as string[]
const originTravelTimeMap: Record<string, number> = {} // routeId → origin stop travel_time
if (originStopIds.length > 0) {
// Fetch travel_time_minutes for origin stops across all relevant routes
const { data: originRsData } = await supabase
.from('route_stops')
.select('route_id, stop_id, travel_time_minutes')
.in('route_id', routeIds)
.in('stop_id', originStopIds)
for (const ors of (originRsData || []) as any[]) {
// Match route to its origin stop
if (originStopIdMap[ors.route_id] === ors.stop_id) {
originTravelTimeMap[ors.route_id] = ors.travel_time_minutes || 0
}
}
}
// Compute EFFECTIVE travel time = user's stop travel_time - origin stop travel_time
// This is always >= 0 if the data is correct (origin is before the user's stop)
const effectiveTravelTimeMap: Record<string, number> = {}
for (const routeId of routeIds) {
const rawTime = rawTravelTimeMap[routeId] ?? 0
const originTime = originTravelTimeMap[routeId] ?? 0
effectiveTravelTimeMap[routeId] = Math.max(0, rawTime - originTime)
}
// ── STEP 3: Get today's schedules ──
const now = new Date()
const todayDay = DAY_MAP[now.getDay()]
@ -132,9 +167,10 @@ export const busStopsService = {
const depMinutes = timeToMinutes(sched.departure_time)
const travelMins = travelTimeMap[sched.route_id] ?? 0
const travelMins = effectiveTravelTimeMap[sched.route_id] ?? 0
const arrivalMinutes = depMinutes + travelMins
// Handle midnight crossover (e.g. departure 23:50 + 20min travel = 00:10 next day)
const arrivalMinutesNormalized = arrivalMinutes % 1440