Compare commits

5 Commits

4 changed files with 22 additions and 24 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
docker-compose.yml

3
server/.gitignore vendored
View File

@ -309,6 +309,3 @@ cython_debug/
*.vsix *.vsix
config.py config.py
#docker
docker-compose.yml

View File

@ -56,24 +56,24 @@ router.post(
timestamp: latitudeData?.timestamp timestamp: latitudeData?.timestamp
? new Date(latitudeData.timestamp) ? new Date(latitudeData.timestamp)
: longitudeData?.timestamp : longitudeData?.timestamp
? new Date(longitudeData.timestamp) ? new Date(longitudeData.timestamp)
: undefined, : undefined,
}; };
const wifiTimestamp = (() => {
const messages = message.uplink_message.decoded_payload?.messages?.[0]; const wifiMessage =
const wifiScan = messages?.find((e: { type: string }) => e.type === "Wi-Fi Scan"); message.uplink_message.decoded_payload?.messages[0].find(
return wifiScan?.timestamp ? new Date(wifiScan.timestamp) : undefined; (e) => e.type === "Wi-Fi Scan"
})(); );
const wifiScans = const wifiScans =
message.uplink_message.decoded_payload?.messages[0] wifiMessage?.measurementValue?.map((w) => ({
.find((e) => e.type === "Wi-Fi Scan") lp_ttn_end_device_uplinks_id,
?.measurementValue?.map((w) => ({ mac: w.mac,
lp_ttn_end_device_uplinks_id, rssi: w.rssi,
mac: w.mac, scanned_at_utc: wifiMessage?.timestamp
rssi: w.rssi, ? new Date(wifiMessage.timestamp)
scanned_at_timestamp: wifiTimestamp, : undefined,
})) ?? []; })) ?? [];
const ttnGatewayReceptions = message.uplink_message.rx_metadata.map( const ttnGatewayReceptions = message.uplink_message.rx_metadata.map(
(g) => ({ (g) => ({
@ -109,9 +109,9 @@ router.post(
gnss: gnss:
gnnsLocation.latitude && gnnsLocation.longitude gnnsLocation.latitude && gnnsLocation.longitude
? { ? {
latitude: gnnsLocation.latitude, latitude: gnnsLocation.latitude,
longitude: gnnsLocation.longitude, longitude: gnnsLocation.longitude,
} }
: undefined, : undefined,
gnss_timestamp: gnssTimestamp.timestamp, gnss_timestamp: gnssTimestamp.timestamp,
}); });

View File

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