Driver side (was a stub): - In-app driver onboarding: a driver-role user creates their own linked drivers profile (driver/profile+api GET/POST/PATCH). - Driver dashboard: online/offline toggle, today's earnings, incoming request cards (accept/decline), active ride panel (start/complete trip). Polls /driver/rides every 4s while online. - Location heartbeat (use-driver-location): watchPositionAsync pings /driver/location every ~5s; restarts the watch on app foreground so a backgrounded driver doesn't go permanently stale and miss requests. Dispatch (auto-match nearest, Uber-style): - Ride state machine: requested -> accepted -> en_route -> completed/cancelled with a nullable driver_id until matched (lib/dispatch.matchNextDriver). - matchNextDriver locks the ride (SELECT FOR UPDATE), expires 15s-stale offers, picks the nearest eligible driver of the matching service by haversine, offers one at a time. Called from ride/create, ride/[id] GET (lazy match on the rider's poll), and ride/[id]/respond (on decline). - ride/create is now a request endpoint (driver_id NULL, status=requested, service); drops the pre-match driver_id payment reconciliation. - ride/[id] GET returns status/service/nullable driver; PATCH handles rider cancel + driver en_route/completed. ride/list backs the history tabs. Rider flow (best experience): - confirm-ride is now a request screen: single trip fare + nearest-driver ETA + cash/card + Request Ride -> live status. Periodically polls online drivers of the selected service and disables Request when none are online (prevents the "stuck searching forever" state). - book-ride is the live ride-status screen (searching -> accepted -> en_route -> completed/cancelled + Cancel), polling every 3s. - lib/request-ride unifies the Areeba card flow + cash path. - Map reads /driver/nearby (real positions, service-filtered); lib/map adds calculateTripFare + service-aware fares. POI suggestions: - lib/places (Google Nearby Search) + nearby-suggestions chips for mall/hospital/pharmacy/restaurant on the home screen. Service categories now drive both matching and a per-service fare multiplier (car 1.0 / moto 0.7 / courier 0.85 / chauffeur 1.5). Map tiles: react-native-maps rendered blank on Android because no Google Maps key was set. Switched app.json -> app.config.js so android.config.googleMaps.apiKey is injected from EXPO_PUBLIC_GOOGLE_API_KEY at build time (keeps the key out of git). Requires a native rebuild (expo run:android) to take effect. Also includes the prior payment/auth hardening (server-authoritative payment_orders ledger with double-spend guards, peppered OTP, register TOCTOU fix, stats cents fix) that was left uncommitted. Co-Authored-By: Claude <noreply@anthropic.com>
148 lines
4.8 KiB
TypeScript
148 lines
4.8 KiB
TypeScript
import { requireAuth } from "@/lib/jwt";
|
|
import { sql, query } from "@/lib/db";
|
|
import { matchNextDriver } from "@/lib/dispatch";
|
|
import { requireDriverProfile } from "@/lib/driver";
|
|
|
|
// GET — single ride by id, the rider's status-poll endpoint. If the ride is
|
|
// still 'requested' with no offer in flight, kick auto-match before reading
|
|
// so the rider's poll itself drives matching forward (no background worker).
|
|
export async function GET(request: Request, { id }: { id: string }) {
|
|
const auth = requireAuth(request);
|
|
if ("error" in auth) return auth.error;
|
|
|
|
const rideId = Number(id);
|
|
if (!Number.isInteger(rideId)) {
|
|
return Response.json({ error: "Invalid ride id." }, { status: 400 });
|
|
}
|
|
|
|
try {
|
|
const ride = await sql`
|
|
SELECT status FROM rides WHERE ride_id = ${rideId} AND user_id = ${auth.userId}
|
|
`;
|
|
if (!ride[0]) {
|
|
return Response.json({ error: "Ride not found." }, { status: 404 });
|
|
}
|
|
|
|
// Lazy match: try to offer the ride to a driver if it's still requested.
|
|
if (ride[0].status === "requested") {
|
|
void matchNextDriver(rideId);
|
|
}
|
|
|
|
const rows = await sql`
|
|
SELECT
|
|
r.ride_id,
|
|
r.origin_address,
|
|
r.destination_address,
|
|
r.origin_latitude,
|
|
r.origin_longitude,
|
|
r.destination_latitude,
|
|
r.destination_longitude,
|
|
r.ride_time,
|
|
r.fare_price,
|
|
r.payment_status,
|
|
r.status,
|
|
r.service,
|
|
r.created_at,
|
|
r.completed_at,
|
|
r.cancelled_at,
|
|
json_build_object(
|
|
'id', d.id,
|
|
'first_name', d.first_name,
|
|
'last_name', d.last_name,
|
|
'car_seats', d.car_seats,
|
|
'profile_image_url', d.profile_image_url,
|
|
'car_image_url', d.car_image_url,
|
|
'rating', d.rating,
|
|
'service', d.service,
|
|
'car_model', d.car_model,
|
|
'latitude', d.latitude,
|
|
'longitude', d.longitude
|
|
) AS driver
|
|
FROM rides r
|
|
LEFT JOIN drivers d ON d.id = r.driver_id
|
|
WHERE r.ride_id = ${rideId}
|
|
`;
|
|
|
|
return Response.json({ data: rows[0] });
|
|
} catch (error) {
|
|
console.error("[GET_RIDE]: ", error);
|
|
return Response.json({ error: "Internal Server Error" }, { status: 500 });
|
|
}
|
|
}
|
|
|
|
// PATCH — ride lifecycle transitions.
|
|
// Rider: { status: 'cancelled' } — only from 'requested' or 'accepted', and
|
|
// only on their own ride.
|
|
// Driver: { status: 'en_route' | 'completed' } — only on the ride they own
|
|
// (driver_id = their profile), from the right prior state.
|
|
export async function PATCH(request: Request, { id }: { id: string }) {
|
|
const rideId = Number(id);
|
|
if (!Number.isInteger(rideId)) {
|
|
return Response.json({ error: "Invalid ride id." }, { status: 400 });
|
|
}
|
|
|
|
let body: { status?: string };
|
|
try {
|
|
body = await request.json();
|
|
} catch {
|
|
return Response.json({ error: "Invalid JSON body." }, { status: 400 });
|
|
}
|
|
|
|
const next = body.status;
|
|
|
|
try {
|
|
// Rider cancel — authenticate by ownership of the ride.
|
|
if (next === "cancelled") {
|
|
const auth = requireAuth(request);
|
|
if ("error" in auth) return auth.error;
|
|
|
|
const rows = await sql<{ status: string }>`
|
|
UPDATE rides
|
|
SET status = 'cancelled', cancelled_at = CURRENT_TIMESTAMP
|
|
WHERE ride_id = ${rideId}
|
|
AND user_id = ${auth.userId}
|
|
AND status IN ('requested', 'accepted')
|
|
RETURNING status
|
|
`;
|
|
if (!rows[0]) {
|
|
return Response.json(
|
|
{ error: "Ride cannot be cancelled." },
|
|
{ status: 409 },
|
|
);
|
|
}
|
|
return Response.json({ data: { status: rows[0].status } });
|
|
}
|
|
|
|
// Driver transitions — must be the driver assigned to the ride.
|
|
if (next === "en_route" || next === "completed") {
|
|
const result = await requireDriverProfile(request);
|
|
if ("error" in result) return result.error;
|
|
|
|
const { driverId } = result;
|
|
const priorStatus = next === "en_route" ? "accepted" : "en_route";
|
|
const setClause =
|
|
next === "completed"
|
|
? "status = $1, completed_at = CURRENT_TIMESTAMP, driver_id = $2"
|
|
: "status = $1, driver_id = $2";
|
|
|
|
const rows = await query<{ status: string }>(
|
|
`UPDATE rides SET ${setClause}
|
|
WHERE ride_id = $3 AND driver_id = $2 AND status = $4
|
|
RETURNING status`,
|
|
[next, driverId, rideId, priorStatus],
|
|
);
|
|
if (!rows[0]) {
|
|
return Response.json(
|
|
{ error: "Ride cannot transition to that state." },
|
|
{ status: 409 },
|
|
);
|
|
}
|
|
return Response.json({ data: { status: rows[0].status } });
|
|
}
|
|
|
|
return Response.json({ error: "Unknown status transition." }, { status: 400 });
|
|
} catch (error) {
|
|
console.error("[PATCH_RIDE]: ", error);
|
|
return Response.json({ error: "Internal Server Error" }, { status: 500 });
|
|
}
|
|
} |