ShanmugaKrishnanSM/RIT-nexus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(backend): make BusLocationController ultra-resilient to accept both JSON payloads and query parameters
Some checks failed
Deploy RIT Freshers Hub to VPS / Deploy to Live VPS (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Shanmuga Krishnan S M
2026-08-06 11:01:34 +05:30
parent c99bd5580d
commit 2be0c04b80
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
backend/src/main/java/com/rit/portal/controller/BusLocationController.java
View File

@@ -23,27 +23,35 @@ public class BusLocationController {
@PostMapping("/{routeNumber}") @PostMapping("/{routeNumber}")
public ResponseEntity<Map<String, String>> updateLocation( public ResponseEntity<Map<String, String>> updateLocation(
@PathVariable String routeNumber, @PathVariable String routeNumber,
@RequestBody DriverLocationUpdate update) { @RequestBody(required = false) DriverLocationUpdate update,
@RequestParam(required = false) Double lat,
@RequestParam(required = false) Double lng,
@RequestParam(required = false) String pin) {
if (update == null || update.getLatitude() == null || update.getLongitude() == null) { Double finalLat = (update != null && update.getLatitude() != null) ? update.getLatitude() : lat;
Double finalLng = (update != null && update.getLongitude() != null) ? update.getLongitude() : lng;
String finalPin = (update != null && update.getPin() != null) ? update.getPin() : pin;
if (finalLat == null || finalLng == null) {
return ResponseEntity.badRequest().body(Map.of("error", "Invalid coordinates")); return ResponseEntity.badRequest().body(Map.of("error", "Invalid coordinates"));
} }
if (!REQUIRED_PIN.equals(update.getPin())) { if (!REQUIRED_PIN.equalsIgnoreCase(finalPin)) {
return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(Map.of("error", "Invalid driver PIN")); return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(Map.of("error", "Invalid driver PIN"));
} }
busLocationService.updateLocation(routeNumber, update.getLatitude(), update.getLongitude()); busLocationService.updateLocation(routeNumber, finalLat, finalLng);
return ResponseEntity.ok(Map.of("status", "success", "message", "Location updated successfully")); return ResponseEntity.ok(Map.of("status", "success", "message", "Location updated successfully"));
} }
@PostMapping("/{routeNumber}/stop") @PostMapping("/{routeNumber}/stop")
public ResponseEntity<Map<String, String>> stopLocation( public ResponseEntity<Map<String, String>> stopLocation(
@PathVariable String routeNumber, @PathVariable String routeNumber,
@RequestBody Map<String, String> body) { @RequestBody(required = false) Map<String, String> body,
@RequestParam(required = false) String pin) {
String pin = body != null ? body.get("pin") : null; String finalPin = body != null ? body.get("pin") : pin;
if (!REQUIRED_PIN.equals(pin)) { if (!REQUIRED_PIN.equalsIgnoreCase(finalPin)) {
return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(Map.of("error", "Invalid driver PIN")); return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(Map.of("error", "Invalid driver PIN"));
} }