train

apps/edr-freight-api/src/modules/wagons/wagon-transfer-requests.controller.ts

@@ -16,6 +16,7 @@ import {
   FleetManage,
   FleetView,
   WagonTransferFulfill,
+  WagonTransferHistoryAll,
   WagonTransferRequest,
 } from '../../common/booking-guards';
 import { CreateTransferRequestDto } from './dto/create-transfer-request.dto';
@@ -50,6 +51,30 @@ export class WagonTransferRequestsController {
     return this.service.listRequests(status);
   }
 
+  // NOTE: the two `history` routes MUST stay above `@Get(':id')` — Express
+  // matches in declaration order, so `/history` would otherwise be captured by
+  // the `:id` param route (and rejected by ParseUUIDPipe).
+  @Get('history')
+  @ApiOperation({
+    summary: "Caller's own transfer history (requests filed/fulfilled + wagons moved)",
+  })
+  myHistory(@CurrentUser() user: TCurrentUser) {
+    // Never fall through to the all-staff view: getHistory(undefined) means
+    // "everyone", so a missing caller id must return empty, not leak scope.
+    if (!user?.id) return { requests: [], movements: [] };
+    return this.service.getHistory(user.id);
+  }
+
+  @Get('history/all')
+  @WagonTransferHistoryAll()
+  @ApiQuery({ name: 'userId', required: false })
+  @ApiOperation({
+    summary: "Admin: any/all staff's transfer history (optional ?userId filter)",
+  })
+  allHistory(@Query('userId') userId?: string) {
+    return this.service.getHistory(userId);
+  }
+
   @Get(':id')
   @ApiOperation({ summary: 'Get one transfer request' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {