removed device_id from all entities except car. Replaced with car_id . Car -> device_id

server/cmd/poc-server/main.go

@@ -199,7 +199,7 @@ func main() {
 	driversSvc := drivers.NewService(drivers.NewPgStore(pool))
 
 	// WebRTC 1-to-1 driver-car proxy service
-	webrtcSvc := NewWebRTCService(logger, engine, lobbySvc, videoSvc)
+	webrtcSvc := NewWebRTCService(logger, engine, lobbySvc, videoSvc, cat)
 
 	// Persist finished races so the /api/races list and keyset pagination
 	// can serve historical data across restarts. The snapshot is best-
@@ -577,7 +577,7 @@ func readPump(cfg *config.Config, c *realtime.Client, conn *websocket.Conn, e *c
 		case transport.TypeClientHello:
 			handleClientHello(c, e, cfg, lobbySvc, driversSvc, env)
 		case transport.TypeJoinRace:
-			handleJoinRace(c, e, lobbySvc, env)
+			handleJoinRace(c, e, lobbySvc, cat, env)
 		case transport.TypeLeaveRace:
 			handleLeaveRace(c, e, env)
 		case transport.TypeInputState:
@@ -635,7 +635,7 @@ func handleClientHello(c *realtime.Client, e *control.Engine, cfg *config.Config
 	c.Send <- mustEncode(transport.TypeServerHello, hello)
 }
 
-func handleJoinRace(c *realtime.Client, e *control.Engine, lobbySvc *lobby.Service, env *transport.Envelope) {
+func handleJoinRace(c *realtime.Client, e *control.Engine, lobbySvc *lobby.Service, cat *catalog.Service, env *transport.Envelope) {
 	payload, _ := env.Payload.(map[string]any)
 	slot := 0
 	name := "anon"
@@ -654,8 +654,10 @@ func handleJoinRace(c *realtime.Client, e *control.Engine, lobbySvc *lobby.Servi
 		driverID = c.ID
 	}
 	var deviceID *int
-	if d, err := lobbySvc.GetDriver(driverID); err == nil {
-		deviceID = d.DeviceID
+	if d, err := lobbySvc.GetDriver(driverID); err == nil && d.CarID != nil && *d.CarID != "" {
+		if carMeta, ok := cat.GetCar(*d.CarID); ok {
+			deviceID = carMeta.DeviceID
+		}
 	}
 
 	car, err := e.AddCar(c.ID, name, slot, deviceID)