[service] fix device id null reference in geopackage and csv exports

ngageoint · Feb 19, 2024 · 7635e9d · 7635e9d
1 parent 5ef8375
commit 7635e9d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/service/src/export/csv.ts b/service/src/export/csv.ts
@@ -245,8 +245,8 @@ export class Csv extends Exporter {
     if (!cache.user || cache.user._id.toString() !== location.userId.toString()) {
       cache.user = await User.getUserById(location.userId)
     }
-    if (!cache.device || cache.device._id.toString() !== flat.deviceId.toString()) {
-      cache.device = await Device.getDeviceById(flat.deviceId)
+    if (!cache.device || cache.device._id.toString() !== flat.deviceId?.toString()) {
+      cache.device = flat.deviceId ? await Device.getDeviceById(flat.deviceId) : undefined
     }
     if (cache.user) {
       flat.user = cache.user.username

diff --git a/service/src/export/geopackage.ts b/service/src/export/geopackage.ts
@@ -232,14 +232,15 @@ export class GeoPackage extends Exporter {
       zoomToEnvelope = calculateBounds(location.geometry, zoomToEnvelope);
       userLastLocation = location;
 
+      const properties = location.properties || {}
       const feature: geojson.Feature<geojson.Point, any> = {
         type: 'Feature',
         geometry: location.geometry,
-        properties: location.properties
+        properties
       };
-      feature.properties.mageId = location._id.toString();
-      feature.properties.userId = location.userId.toString();
-      feature.properties.deviceId = location.properties.deviceId.toString();
+      feature.properties.mageId = location._id.toString()
+      feature.properties.userId = location.userId?.toString()
+      feature.properties.deviceId = properties.deviceId ? properties.deviceId.toString() : undefined
 
       if (feature.properties.id) {
         delete feature.properties.id;