Lf 3281 handle and convert as needed incoming temperature readings from ensemble

packages/api/src/controllers/sensorController.js

@@ -33,8 +33,9 @@ import {
   registerOrganizationWebhook,
   bulkSensorClaim,
   unclaimSensor,
+  ENSEMBLE_UNITS_MAPPING,
 } from '../util/ensemble.js';
-
+import { databaseUnit } from '../util/unit.js';
 import { sensorErrors, parseSensorCsv } from '../../../shared/validation/sensorCSV.js';
 import syncAsyncResponse from '../util/syncAsyncResponse.js';
 import knex from '../util/knex.js';
@@ -446,11 +447,18 @@ const sensorController = {
             );
             continue;
           }
-          const unit = sensorInfo.unit;
+          // Reconcile incoming units with stored as units and conversion function keys
+          const system = ENSEMBLE_UNITS_MAPPING[sensorInfo.unit]?.system;
+          const unit = ENSEMBLE_UNITS_MAPPING[sensorInfo.unit]?.conversionKey;
+          const readingTypeStoredAsUnit = databaseUnit[readingType] ?? undefined;
+          const isStoredAsUnit = unit == readingTypeStoredAsUnit;
 
-          if (sensorInfo.values.length < sensorInfo.timestamps.length)
+          if (sensorInfo.values.length < sensorInfo.timestamps.length) {
             return res.status(400).send('sensor values and timestamps are not in sync');
-
+          }
+          if (!system || !unit || !readingTypeStoredAsUnit || !isStoredAsUnit) {
+            return res.status(400).send('provided units are not supported');
+          }
           for (let k = 0; k < sensorInfo.values.length; ++k) {
             infoBody.push({
               read_time: sensorInfo.timestamps[k] || '',
@@ -463,6 +471,7 @@ const sensorController = {
           }
         }
       }
+
       if (infoBody.length === 0) {
         return res.status(200).json({
           error: 'No records of sensor readings added to the Litefarm.',

packages/api/src/util/ensemble.js

@@ -45,6 +45,22 @@ if (process.env.NODE_ENV === 'integration') {
   baseUrl = 'http://localhost:' + process.env.PORT;
 }
 
+//Known aliases for units from ensemble mapping to convert-units representation
+const ENSEMBLE_UNITS_MAPPING = {
+  Celsius: {
+    conversionKey: 'C',
+    system: 'metric',
+  },
+  kPa: {
+    conversionKey: 'kPa',
+    system: 'metric',
+  },
+  Percent: {
+    conversionKey: '%',
+    system: 'all',
+  },
+};
+
 /**
  * Sends a request to the Ensemble API for an organization to claim sensors
  * @param {String} accessToken - a JWT token for accessing the Ensemble API
@@ -313,4 +329,10 @@ async function unclaimSensor(org_id, external_id, access_token) {
   }
 }
 
-export { bulkSensorClaim, registerOrganizationWebhook, createOrganization, unclaimSensor };
+export {
+  bulkSensorClaim,
+  registerOrganizationWebhook,
+  createOrganization,
+  unclaimSensor,
+  ENSEMBLE_UNITS_MAPPING,
+};

packages/api/src/util/unit.js

@@ -0,0 +1,9 @@
+// DO NOT CHANGE!
+// Any change to this will lead to need for database backfilling.
+// This is how we are storing INCOMING EXTERNAL data
+// Please see sister file on frontend for internal database units
+export const databaseUnit = {
+  temperature: 'C',
+  soil_water_potential: 'kPa',
+  soil_water_content: '%',
+};