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>
77 lines
2.7 KiB
TypeScript
77 lines
2.7 KiB
TypeScript
import { requireOwner, withCors, preflight } from "@/lib/admin";
|
|
import { sql } from "@/lib/db";
|
|
|
|
export async function OPTIONS() {
|
|
return preflight();
|
|
}
|
|
|
|
export async function GET(request: Request) {
|
|
const auth = await requireOwner(request);
|
|
if ("error" in auth) return withCors(auth.error);
|
|
|
|
try {
|
|
const [totals] = await sql<{
|
|
users: number;
|
|
drivers: number;
|
|
rides: number;
|
|
revenue: number;
|
|
rides_today: number;
|
|
avg_fare: number;
|
|
pending_count: number;
|
|
pending_revenue: number;
|
|
new_users_7d: number;
|
|
}>`
|
|
SELECT
|
|
(SELECT COUNT(*)::int FROM users) AS users,
|
|
(SELECT COUNT(*)::int FROM drivers) AS drivers,
|
|
(SELECT COUNT(*)::int FROM rides) AS rides,
|
|
(SELECT COALESCE(SUM(fare_price) / 100.0, 0)::float8 FROM rides WHERE payment_status = 'paid') AS revenue,
|
|
(SELECT COUNT(*)::int FROM rides WHERE created_at >= CURRENT_DATE) AS rides_today,
|
|
(SELECT COALESCE(ROUND(AVG(fare_price) / 100.0, 2), 0)::float8 FROM rides WHERE payment_status = 'paid') AS avg_fare,
|
|
(SELECT COUNT(*)::int FROM rides WHERE LOWER(payment_status) <> 'paid') AS pending_count,
|
|
(SELECT COALESCE(SUM(fare_price) / 100.0, 0)::float8 FROM rides WHERE LOWER(payment_status) <> 'paid') AS pending_revenue,
|
|
(SELECT COUNT(*)::int FROM users WHERE created_at >= CURRENT_DATE - INTERVAL '7 days') AS new_users_7d
|
|
`;
|
|
|
|
const trend = await sql<{ day: string; rides: number; revenue: number }>`
|
|
SELECT
|
|
TO_CHAR(DAY, 'YYYY-MM-DD') AS day,
|
|
COUNT(r.ride_id)::int AS rides,
|
|
COALESCE(SUM(r.fare_price) FILTER (WHERE r.payment_status = 'paid') / 100.0, 0)::float8 AS revenue
|
|
FROM generate_series(
|
|
CURRENT_DATE - INTERVAL '13 days',
|
|
CURRENT_DATE,
|
|
INTERVAL '1 day'
|
|
) AS DAY
|
|
LEFT JOIN rides r ON r.created_at >= DAY AND r.created_at < DAY + INTERVAL '1 day'
|
|
GROUP BY DAY
|
|
ORDER BY DAY
|
|
`;
|
|
|
|
const topDrivers = await sql<{
|
|
driver_id: number;
|
|
name: string;
|
|
rides: number;
|
|
revenue: number;
|
|
}>`
|
|
SELECT
|
|
d.id AS driver_id,
|
|
d.first_name || ' ' || d.last_name AS name,
|
|
COUNT(r.ride_id)::int AS rides,
|
|
COALESCE(SUM(r.fare_price) FILTER (WHERE r.payment_status = 'paid') / 100.0, 0)::float8 AS revenue
|
|
FROM drivers d
|
|
LEFT JOIN rides r ON r.driver_id = d.id
|
|
GROUP BY d.id, d.first_name, d.last_name
|
|
ORDER BY revenue DESC, rides DESC
|
|
LIMIT 5
|
|
`;
|
|
|
|
return withCors(Response.json({ data: { totals, trend, topDrivers } }));
|
|
} catch (error) {
|
|
console.error("[ADMIN_STATS]: ", error);
|
|
return withCors(
|
|
Response.json({ error: "Internal Server Error" }, { status: 500 }),
|
|
);
|
|
}
|
|
}
|