From 16d49c99406d48330d10a0d4771269d59ad4c4294ddaf6692df4de0d9962387b Mon Sep 17 00:00:00 2001
From: localhorst <localhorst@mosad.xyz>
Date: Wed, 1 Jan 2025 18:40:58 +0100
Subject: [PATCH] fix event sending

---
 server/src/controller/ttnController.ts              |  6 +++---
 server/src/event/ttnMessageReceivedEvent.ts         |  4 ++--
 .../eventHandler/ttnMessageReceivedEventHandler.ts  | 13 +++++++------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/server/src/controller/ttnController.ts b/server/src/controller/ttnController.ts
index d785888..4c68393 100644
--- a/server/src/controller/ttnController.ts
+++ b/server/src/controller/ttnController.ts
@@ -28,7 +28,8 @@ router.post(
   async (req: Request, res: Response) => {
     try {
       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({
           device_id: message.end_device_ids.device_id,
           application_ids:
@@ -78,8 +79,7 @@ router.post(
           latitude: g.latitude,
           longitude: g.longitude,
         })),
-        gnssLocation: 
-
+        gnssLocation: { latitude, longitude }
       };
 
       domainEventEmitter.emit(TtnMessageReceivedEventName, event);
diff --git a/server/src/event/ttnMessageReceivedEvent.ts b/server/src/event/ttnMessageReceivedEvent.ts
index 811c664..f92d05a 100644
--- a/server/src/event/ttnMessageReceivedEvent.ts
+++ b/server/src/event/ttnMessageReceivedEvent.ts
@@ -12,7 +12,7 @@ export type TtnMessageReceivedEvent = {
     altitude: number;
   }[];
   gnssLocation: {
-    longitude: number;
-    altitude: number;
+    latitude: number | undefined;
+    longitude: number | undefined;
   }
 };
diff --git a/server/src/eventHandler/ttnMessageReceivedEventHandler.ts b/server/src/eventHandler/ttnMessageReceivedEventHandler.ts
index 57c67c2..66a880f 100644
--- a/server/src/eventHandler/ttnMessageReceivedEventHandler.ts
+++ b/server/src/eventHandler/ttnMessageReceivedEventHandler.ts
@@ -13,12 +13,12 @@ domainEventEmitter.on(
   async (event: TtnMessageReceivedEvent) => {
     console.log(event);
 
-    var wifi_based_latitude!: number;
-    var wifi_based_longitude!: number;
-    var gnss_based_latitude!: number; // Should this be set here?
-    var gnss_based_longitude!: number; // Should this be set here?
-    var ttn_gw_based_latitude!: number;
-    var ttn_gw_based_longitude!: number;
+    var wifi_based_latitude: number;
+    var wifi_based_longitude: number;
+    var gnss_based_latitude: number;
+    var gnss_based_longitude: number;
+    var ttn_gw_based_latitude: number | undefined = undefined;
+    var ttn_gw_based_longitude: number | undefined = undefined;
 
     if (!event.ttnGateways || event.ttnGateways.length === 0) {
       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,
       ttn_gw_latitude: ttn_gw_based_latitude,
       ttn_gw_longitude: ttn_gw_based_longitude,
+      //TODO: Add gnss location
     });