server/sql/tables.sql

@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS lp_ttn_end_device_uplinks (
     dev_eui VARCHAR(255),
     join_eui VARCHAR(255),
     dev_addr VARCHAR(255),
-    received_at_utc DATE NOT NULL,
+    received_at_utc DATE,
     battery NUMERIC,
     created_at_utc TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     updated_at_utc TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
@@ -16,7 +16,6 @@ CREATE TABLE IF NOT EXISTS wifi_scan (
     lp_ttn_end_device_uplinks_id UUID,
     mac VARCHAR(255),
     rssi NUMERIC,
-    scanned_at_utc TIMESTAMP NOT NULL,
     created_at_utc TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     updated_at_utc TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     FOREIGN KEY (lp_ttn_end_device_uplinks_id) REFERENCES lp_ttn_end_device_uplinks(lp_ttn_end_device_uplinks_id)
@@ -64,7 +63,6 @@ CREATE TABLE IF NOT EXISTS location (
     gnss_longitude DOUBLE,
     ttn_gw_latitude DOUBLE,
     ttn_gw_longitude DOUBLE,
-    gnss_location_at_utc TIMESTAMP,
     created_at_utc TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     updated_at_utc TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     FOREIGN KEY (lp_ttn_end_device_uplinks_id) REFERENCES lp_ttn_end_device_uplinks(lp_ttn_end_device_uplinks_id)

server/src/controller/ttnController.ts

@@ -42,38 +42,23 @@ router.post(
           )?.measurementValue,
         });
 
-      const messageData = message.uplink_message.decoded_payload?.messages[0];
-
-      const latitudeData = messageData?.find((e) => e.type === "Latitude");
-      const longitudeData = messageData?.find((e) => e.type === "Longitude");
-
       const gnnsLocation = {
-        latitude: latitudeData?.measurementValue,
+        latitude: message.uplink_message.decoded_payload?.messages[0].find(
-        longitude: longitudeData?.measurementValue,
+          (e) => e.type === "Latitude"
+        )?.measurementValue,
+        longitude: message.uplink_message.decoded_payload?.messages[0].find(
+          (e) => e.type === "Longitude"
+        )?.measurementValue,
       };
 
-      const gnssTimestamp = {
-        timestamp: latitudeData?.timestamp
-          ? new Date(latitudeData.timestamp)
-          : longitudeData?.timestamp
-          ? new Date(longitudeData.timestamp)
-          : undefined,
-      };
-
-      const wifiMessage =
-        message.uplink_message.decoded_payload?.messages[0].find(
-          (e) => e.type === "Wi-Fi Scan"
-        );
-
       const wifiScans =
-        wifiMessage?.measurementValue?.map((w) => ({
+        message.uplink_message.decoded_payload?.messages[0]
-          lp_ttn_end_device_uplinks_id,
+          .find((e) => e.type === "Wi-Fi Scan")
-          mac: w.mac,
+          ?.measurementValue?.map((w) => ({
-          rssi: w.rssi,
+            lp_ttn_end_device_uplinks_id,
-          scanned_at_utc: wifiMessage?.timestamp
+            mac: w.mac,
-            ? new Date(wifiMessage.timestamp)
+            rssi: w.rssi,
-            : undefined,
+          })) ?? [];
-        })) ?? [];
 
       const ttnGatewayReceptions = message.uplink_message.rx_metadata.map(
         (g) => ({
@@ -113,7 +98,6 @@ router.post(
                   longitude: gnnsLocation.longitude,
                 }
               : undefined,
-          gnss_timestamp: gnssTimestamp.timestamp,
         });
       };
       createDatabaseEntries().then();

server/src/models/location.ts

@@ -10,7 +10,6 @@ export class Location extends Model {
   public gnss_longitude!: number;
   public ttn_gw_latitude!: number;
   public ttn_gw_longitude!: number;
-  public gnss_location_at_utc!: Date;
   public created_at_utc!: Date;
   public updated_at_utc!: Date;
 }
@@ -43,9 +42,6 @@ Location.init(
     ttn_gw_longitude: {
       type: DataTypes.NUMBER,
     },
-    gnss_location_at_utc: {
-      type: DataTypes.DATE,
-    },
     created_at_utc: {
       type: DataTypes.DATE,
       defaultValue: DataTypes.NOW,

server/src/models/wifiScan.ts

@@ -6,7 +6,6 @@ export class WifiScan extends Model {
   public wifi_scan_id!: string;
   public mac!: string;
   public rssi!: number;
-  public scanned_at_utc!: Date;
   public created_at_utc!: Date;
   public updated_at_utc!: Date;
 }
@@ -31,11 +30,6 @@ WifiScan.init(
       type: DataTypes.NUMBER,
       allowNull: false,
     },
-    scanned_at_utc: {
-      type: DataTypes.DATE,
-      defaultValue: DataTypes.NOW,
-      allowNull: false,
-    },
     created_at_utc: {
       type: DataTypes.DATE,
       defaultValue: DataTypes.NOW,

server/src/services/locationService.ts

@@ -9,7 +9,6 @@ interface CreateLocationParams {
   wifi?: Coordinates;
   gnss?: Coordinates;
   ttn_gw?: Coordinates;
-  gnss_timestamp?: Date;
 }
 
 interface CreateLocationTriangulationParams {
@@ -20,7 +19,6 @@ interface CreateLocationTriangulationParams {
   }[];
   ttn_gw: LocationSignal[];
   gnss?: Coordinates;
-  gnss_timestamp?: Date;
 }
 
 interface LocationSignal extends Coordinates {
@@ -77,7 +75,6 @@ export class LocationService {
       ttn_gw_longitude: data.ttn_gw?.longitude,
       gnss_latitude: data.gnss?.latitude,
       gnss_longitude: data.gnss?.longitude,
-      gnss_location_at_utc: data.gnss_timestamp,
     });
   }
 
@@ -94,7 +91,6 @@ export class LocationService {
       wifi: wifi_location,
       ttn_gw: gateway_location,
       gnss: data.gnss,
-      gnss_timestamp: data.gnss_timestamp,
     });
   }
 

server/src/services/wifiScanService.ts

@@ -5,14 +5,12 @@ interface CreateWifiScanParams {
   lp_ttn_end_device_uplinks_id: string;
   mac: string;
   rssi: number;
-  scanned_at_utc?: Date;
 }
 
 interface UpdateWifiScanParams {
   wifi_scan_id: string;
   mac?: string;
   rssi?: number;
-  scanned_at_utc?: Date;
 }
 
 @injectable()