Merge pull request #259 from mV22110702/task/th-257-geolocation-service-use-truckId-instead-of-driverId

th-257: GeolocationCacheService use truckId for key instead of driverId

Author: kalinkaaaa14

backend/src/libs/packages/socket/socket.service.ts

@@ -34,12 +34,12 @@ class SocketService {
         logger.info(`${socket.id} disconnected`);
       });
       socket.on(
-        ServerSocketEvent.DRIVER_LOCATION_UPDATE,
+        ServerSocketEvent.TRUCK_LOCATION_UPDATE,
         (
-          payload: ServerSocketEventParameter[typeof ServerSocketEvent.DRIVER_LOCATION_UPDATE],
+          payload: ServerSocketEventParameter[typeof ServerSocketEvent.TRUCK_LOCATION_UPDATE],
         ): void => {
-          const { driverId, latLng } = payload;
-          this.geolocationCacheService.setCache(driverId, latLng);
+          const { truckId, latLng } = payload;
+          this.geolocationCacheService.setCache(truckId, latLng);
         },
       );
     });

frontend/src/libs/packages/geolocation/helpers/helpers.ts

@@ -1 +1 @@
-export { sendDriverGeolocation } from './send-driver-geolocation/send-driver-geolocation.helper.js';
+export { sendTruckGeolocation } from './send-truck-geolocation/send-truck-geolocation.helper.js';

frontend/src/libs/packages/geolocation/helpers/send-driver-geolocation/send-driver-geolocation.helper.ts renamed to frontend/src/libs/packages/geolocation/helpers/send-truck-geolocation/send-truck-geolocation.helper.ts

@@ -1,17 +1,17 @@
 import { ServerSocketEvent } from '~/libs/packages/socket/libs/enums/enums.js';
 import { socket as socketService } from '~/libs/packages/socket/socket.js';
 
-const sendDriverGeolocation = (
-  driverId: number,
+const sendTruckGeolocation = (
+  truckId: number,
   { coords }: GeolocationPosition,
 ): void => {
   socketService.emit({
-    event: ServerSocketEvent.DRIVER_LOCATION_UPDATE,
+    event: ServerSocketEvent.TRUCK_LOCATION_UPDATE,
     eventPayload: {
-      driverId,
+      truckId,
       latLng: { latitude: coords.latitude, longitude: coords.longitude },
     },
   });
 };
 
-export { sendDriverGeolocation };
+export { sendTruckGeolocation };

package-lock.json

@@ -1,7 +1,7 @@
 const ServerSocketEvent = {
   CONNECTION: 'connection',
   DISCONNECT: 'disconnect',
-  DRIVER_LOCATION_UPDATE: 'driver_location_update',
+  TRUCK_LOCATION_UPDATE: 'truck_location_update',
 } as const;
 
 export { ServerSocketEvent };

shared/src/libs/packages/socket/libs/enums/server-socket-event.enum.ts

@@ -3,9 +3,9 @@ import { type GeolocationLatLng } from '~/libs/packages/geolocation/types/types.
 import { type ServerSocketEvent } from '../enums/enums.js';
 
 type ServerSocketEventParameter = {
-  [ServerSocketEvent.DRIVER_LOCATION_UPDATE]: {
+  [ServerSocketEvent.TRUCK_LOCATION_UPDATE]: {
     latLng: GeolocationLatLng;
-    driverId: number;
+    truckId: number;
   };
 };