P1: drivers + trips(★state machine) + matching(Redis GEO) + tariff engine + maps + realtime + seed

- drivers: apply/approve/status/location (+Redis GEO presence) - trips: request→accept→status transitions + trip_events audit + offers via socket - matching: Redis GEO nearby drivers - tariff: JSON-rule engine (time_or_distance/window/rounding) + quote endpoint - maps: straight-line routing seam (انطلق later) - realtime: Socket.IO gateway (JWT auth, tenant rooms) - seed: demo tenant siro + default tariff on boot - migration InitP1 (drivers/tariffs/trips/trip_events) Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-07-16 16:41:58 +03:00
parent 4397b07d2f
commit 00870a8cc3
26 changed files with 1358 additions and 1 deletions
@@ -0,0 +1,53 @@
+import { Body, Controller, Get, Param, Patch, Post, UseGuards } from '@nestjs/common';
+import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
+import { TripsService, RequestTripDto } from './trips.service';
+import { TripStatus } from './entities/trip.entity';
+import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard';
+import { CurrentUser, AuthUser } from '../auth/decorators/current-user.decorator';
+
+@ApiTags('trips')
+@ApiBearerAuth()
+@UseGuards(JwtAuthGuard)
+@Controller('trips')
+export class TripsController {
+  constructor(private readonly trips: TripsService) {}
+
+  // الراكب يطلب رحلة
+  @Post()
+  request(@CurrentUser() user: AuthUser, @Body() body: RequestTripDto) {
+    return this.trips.request(user.tenantId, user.userId, body);
+  }
+
+  @Get('mine')
+  mine(@CurrentUser() user: AuthUser) {
+    return this.trips.listForRider(user.tenantId, user.userId);
+  }
+
+  @Get(':id')
+  get(@CurrentUser() user: AuthUser, @Param('id') id: string) {
+    return this.trips.get(user.tenantId, id);
+  }
+
+  // السائق يقبل الرحلة
+  @Post(':id/accept')
+  accept(@CurrentUser() user: AuthUser, @Param('id') id: string) {
+    return this.trips.accept(user.tenantId, id, user.userId);
+  }
+
+  // تحديث الحالة (driver_arriving / driver_arrived / in_progress / completed / paid)
+  @Patch(':id/status')
+  status(
+    @CurrentUser() user: AuthUser,
+    @Param('id') id: string,
+    @Body('status') status: TripStatus,
+  ) {
+    const actor = user.role === 'driver' ? 'driver' : 'rider';
+    return this.trips.updateStatus(user.tenantId, id, status, actor);
+  }
+
+  @Post(':id/cancel')
+  cancel(@CurrentUser() user: AuthUser, @Param('id') id: string) {
+    const actor = user.role === 'driver' ? 'driver' : 'rider';
+    return this.trips.cancel(user.tenantId, id, actor);
+  }
+}