localhorst/LocationHub
SHA256
1
0
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix event sending

Browse Source
This commit is contained in:
Hendrik Schutter 2025-01-01 18:40:58 +01:00
parent 68e3121f41
commit 16d49c9940
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/controller/ttnController.ts
View File

@ -28,7 +28,8 @@ router.post(
async (req: Request, res: Response) => { async (req: Request, res: Response) => {
try { try {
const message = req.body as TtnMessage; const message = req.body as TtnMessage;
const { lp_ttn_end_device_uplinks_id } = // Create uplink record
const { lp_ttn_end_device_uplinks_id, latitude, longitude } =
await lpTtnEndDeviceUplinksService.createUplink({ await lpTtnEndDeviceUplinksService.createUplink({
device_id: message.end_device_ids.device_id, device_id: message.end_device_ids.device_id,
application_ids: application_ids:
@ -78,8 +79,7 @@ router.post(
latitude: g.latitude, latitude: g.latitude,
longitude: g.longitude, longitude: g.longitude,
})), })),
gnssLocation: gnssLocation: { latitude, longitude }
}; };
domainEventEmitter.emit(TtnMessageReceivedEventName, event); domainEventEmitter.emit(TtnMessageReceivedEventName, event);

4
server/src/event/ttnMessageReceivedEvent.ts
View File

@ -12,7 +12,7 @@ export type TtnMessageReceivedEvent = {
altitude: number; altitude: number;
}[]; }[];
gnssLocation: { gnssLocation: {
longitude: number; latitude: number | undefined;
altitude: number; longitude: number | undefined;
} }
}; };

13
server/src/eventHandler/ttnMessageReceivedEventHandler.ts
View File

@ -13,12 +13,12 @@ domainEventEmitter.on(
async (event: TtnMessageReceivedEvent) => { async (event: TtnMessageReceivedEvent) => {
console.log(event); console.log(event);
var wifi_based_latitude!: number; var wifi_based_latitude: number;
var wifi_based_longitude!: number; var wifi_based_longitude: number;
var gnss_based_latitude!: number; // Should this be set here? var gnss_based_latitude: number;
var gnss_based_longitude!: number; // Should this be set here? var gnss_based_longitude: number;
var ttn_gw_based_latitude!: number; var ttn_gw_based_latitude: number | undefined = undefined;
var ttn_gw_based_longitude!: number; var ttn_gw_based_longitude: number | undefined = undefined;
if (!event.ttnGateways || event.ttnGateways.length === 0) { if (!event.ttnGateways || event.ttnGateways.length === 0) {
console.log("No TTN Gateway location received!") console.log("No TTN Gateway location received!")
@ -54,6 +54,7 @@ domainEventEmitter.on(
lp_ttn_end_device_uplinks_id: event.lp_ttn_end_device_uplinks_id, lp_ttn_end_device_uplinks_id: event.lp_ttn_end_device_uplinks_id,
ttn_gw_latitude: ttn_gw_based_latitude, ttn_gw_latitude: ttn_gw_based_latitude,
ttn_gw_longitude: ttn_gw_based_longitude, ttn_gw_longitude: ttn_gw_based_longitude,
//TODO: Add gnss location
}); });