update boxes PUT requests and tests

Author: freds-dev

packages/models/src/box/box.js

@@ -181,6 +181,8 @@ const DEVICE_COLUMNS_FOR_RETURNING = {
   createdAt: true,
   updatedAt: true,
   location: true,
+  latitude: true,
+  longitude: true,
   status: true
 };
 

packages/models/src/device/index.js

@@ -8,6 +8,7 @@ const ModelError = require('../modelError');
 const { inArray, arrayContains, sql, eq, asc, ilike } = require('drizzle-orm');
 const { insertMeasurement, insertMeasurements } = require('../measurement');
 const SketchTemplater = require('@sensebox/sketch-templater');
+const { utcNow } = require('../utils');
 
 const { max_boxes: pagination_max_boxes } = require('config').get('openSenseMap-API-models.pagination');
 
@@ -274,41 +275,6 @@ const saveMeasurements = async function saveMeasurements (device, measurements)
   await insertMeasurements(measurements);
 };
 
-async function updateLocation(deviceId, coords, timestamp = utcNow()) {
-  if (!coords || coords.length !== 2) {
-    throw new Error('Invalid coordinates provided');
-  }
-
-  const [longitude, latitude] = coords;
-
-  // Check if the location already exists
-  let existingLocation = await db.query.location.findFirst({
-    where: eq(location.location, `POINT(${longitude} ${latitude})`),
-  });
-
-  if (!existingLocation) {
-    // Insert new location if not found
-    const newLocation = await db.insert(location).values({
-      location: `POINT(${longitude} ${latitude})`,
-    }).returning();
-    existingLocation = newLocation[0];
-  }
-
-  // Insert into device_to_location linking table
-  await db.insert(deviceToLocation).values({
-    deviceId,
-    locationId: existingLocation.id,
-    time: timestamp,
-  });
-
-  // Update the device's current location
-  await db.update(device)
-    .set({ latitude, longitude, updatedAt: timestamp })
-    .where(eq(device.id, deviceId));
-
-  return existingLocation;
-}
-
 const updateDevice = async function updateDevice (deviceId, args) {
   const {
     mqtt: {
@@ -410,15 +376,43 @@ const updateDevice = async function updateDevice (deviceId, args) {
   //   box.addAddon(addonToAdd);
   // }
 
-  // TODO: run location update logic, if a location was provided.
-  // const locPromise = location
-  //   ? box
-  //       .updateLocation(location)
-  //       .then((loc) => box.set({ currentLocation: loc }))
-  //   : Promise.resolve();
-  // update location
+  // run location update logic, if a location was provided.
+  // if the provided location already exists, just update the relation
+  // if the location does not exist, create it and update
   if (location) {
-    await updateLocation(deviceId, location);
+    const [geometry] = await db
+      .insert(locationTable)
+      .values({
+        location: sql`ST_SetSRID(ST_MakePoint(${location[1]}, ${location[0]}), 4326)`
+      })
+      .onConflictDoNothing()
+      .returning({ id: locationTable.id });
+
+    if (geometry) {
+      // update location relation (update location id of device)
+      await db
+        .update(deviceToLocationTable)
+        .set({ locationId: geometry.id })
+        .where(eq(deviceToLocationTable.deviceId, deviceId));
+    } else {
+      // Get location id
+      const geom = await db.query.locationTable.findFirst({
+        columns: {
+          id: true
+        },
+        where: sql`ST_Equals(${locationTable.location}, ST_SetSRID(ST_MakePoint(${location[1]}, ${location[0]}), 4326))`
+      });
+
+      // update location relation (update location id of device)
+      await db
+        .update(deviceToLocationTable)
+        .set({ locationId: geom.id })
+        .where(eq(deviceToLocationTable.deviceId, deviceId));
+    }
+
+    // also set latitude and longitude of device
+    setColumns['longitude'] = location[0];
+    setColumns['latitude'] = location[1];
   }
 
   const device = await db

tests/tests/002-location_tests.js

@@ -182,12 +182,15 @@ describe('openSenseMap API locations tests', function () {
         .then(logResponseIfError)
         .then(function (response) {
           expect(response).to.have.status(200);
-          expect(response.body.data.currentLocation).to.exist;
-          expect(response.body.data.currentLocation.coordinates).to.deep.equal(loc);
-          expect(response.body.data.currentLocation.timestamp).to.exist;
-          expect(moment().diff(response.body.data.currentLocation.timestamp)).to.be.below(300);
+          expect(response.body.data.latitude).to.exist;
+          expect(response.body.data.longitude).to.exist;
+          expect(response.body.data.longitude).to.deep.equal(loc[0]);
+          expect(response.body.data.latitude).to.deep.equal(loc[1]);
 
-          submitTimeLoc1 = response.body.data.currentLocation.timestamp;
+          expect(response.body.data.updatedAt).to.exist;
+          expect(moment().diff(response.body.data.updatedAt)).to.be.below(300);
+
+          submitTimeLoc1 = response.body.data.updatedAt;
 
           return chakram.wait();
         });
@@ -200,14 +203,12 @@ describe('openSenseMap API locations tests', function () {
         .then(logResponseIfError)
         .then(function (response) {
           expect(response).to.have.status(200);
-          expect(response.body.data.currentLocation).to.exist;
-          expect(response.body.data.currentLocation.coordinates).to.deep.equal([
-            loc.lng,
-            loc.lat,
-            loc.height,
-          ]);
-          expect(response.body.data.currentLocation.timestamp).to.exist;
-          expect(moment().diff(response.body.data.currentLocation.timestamp)).to.be.below(300);
+          expect(response.body.data.latitude).to.exist;
+          expect(response.body.data.longitude).to.exist;
+          expect(response.body.data.longitude).to.deep.equal(loc.lng);
+          expect(response.body.data.latitude).to.deep.equal(loc.lat);
+          expect(response.body.data.updatedAt).to.exist;
+          expect(moment().diff(response.body.data.updatedAt)).to.be.below(300);
 
           box = response.body.data;
 
@@ -236,8 +237,9 @@ describe('openSenseMap API locations tests', function () {
     });
 
     it('should return the current location in box.currentLocation', function () {
-      expect(result.currentLocation).to.exist;
-      expect(result.currentLocation).to.deep.equal(box.currentLocation);
+      expect(result.latitude).to.exist;
+      expect(result.longitude).to.exist;
+      expect([result.longitude, result.latitude]).to.deep.equal([box.longitude, box.latitude]);
     });
 
     it('should NOT return the whole location history in box.locations', function () {