ADCS JSON issues fixed.

Author: ApplePy39

server/controllers/adcsController.js

@@ -1,6 +1,7 @@
 const { logInfoMsgPrefix, logWarnMsgPrefix, logErrorMsgPrefix } = require('../utils/utils');
-const { magFieldMeasurements, angVelocityMeasurements, adcsTags, magFieldMeasurementsTag, magFieldMeasurementsFields, angVelocityMeasurementsTag, angVelocityMeasurementsFields } = require('../measurements/adcsMeasurements');
-
+const { adcsTags, magFieldMeasurementsTag, magFieldMeasurementsFields, angVelocityMeasurementsTag, angVelocityMeasurementsFields } = require('../measurements/adcsMeasurements');
+const angVelocityMeasurements = require('../measurements/adcsMeasurements');
+const magFieldMeasurements = require('../measurements/adcsMeasurements');
 /**
  * adcs.js
  * @brief This file contains the controller functions for the ADCS API
@@ -53,22 +54,42 @@ const getMagFieldData = async (req, res) => {
     }
 
     try {
-        const data = await magFieldMeasurements(variant, start, end);
-        console.log(logInfoMsgPrefix('ADCS magnetic field data fetched successfully'));
-        res.status(200).json({
-            variant: variant,
-            start: start,
-            end: end,
-            data: data
+        const queryResult = await magFieldMeasurements.magFieldMeasurements(variant, start, end);
+        
+        const merged = {};
+
+        queryResult.forEach(item => {
+            const time = item._time;
+            
+            if (!merged[time]) {
+                merged[time] = {
+                variant: item.variant,
+                timestamp: time,
+                LSB: null,
+                X: null,
+                Y: null,
+                Z: null
+            };
+        }
+
+        const axis = item._field.toUpperCase();
+        merged[time][axis] = item._value;
+        
         });
+
+        const finalOutput = Object.values(merged);
+        console.log(logInfoMsgPrefix('ADCS magnetic field data fetched successfully'));
+
+        res.status(200).json(finalOutput);
+
     } catch (error) {
         console.error(logErrorMsgPrefix('Error fetching ADCS magnetic field data'), error);
         res.status(500).json({ error: 'Internal server error' });
     }
 };
 
 const getAngVelocityData = async (req, res) => {
-    console.log(logInfoMsgPrefix('ADCS angular velocityy check'), 'request_body:', req.body);
+    console.log(logInfoMsgPrefix('ADCS angular velocity check'), 'request_body:', req.body);
     const variant = req.params.variant;
     let { start, end } = req.query; // extract query parameters
 
@@ -114,14 +135,33 @@ const getAngVelocityData = async (req, res) => {
     }
 
     try {
-        const data = await angVelocityMeasurements(variant, start, end);
-        console.log(logInfoMsgPrefix('ADCS angular velocity data fetched successfully'));
-        res.status(200).json({
-            variant: variant,
-            start: start,
-            end: end,
-            data: data
+        const queryResult = await angVelocityMeasurements.angVelocityMeasurements(variant, start, end);
+        
+        const merged = {};
+
+        queryResult.forEach(item => {
+            const time = item._time;
+
+            if (!merged[time]) {
+                merged[time] = {
+                variant: item.variant,
+                timestamp: time,
+                X: null,
+                Y: null,
+                Z: null
+            };
+        }
+
+        const axis = item._field.toUpperCase();
+        merged[time][axis] = item._value;
+       
         });
+
+        const finalOutput = Object.values(merged);
+        console.log(logInfoMsgPrefix('ADCS angular velocity data fetched successfully'));
+
+        res.status(200).json(finalOutput);
+
     } catch (error) {
         console.error(logErrorMsgPrefix('Error fetching ADCS angular velocity data'), error);
         res.status(500).json({ error: 'Internal server error' });

server/controllers/payloadController.js

@@ -66,7 +66,7 @@ const getWellData = async (req, res, field) => {
             timestamp: item._time,
             [field]: item._value
         }));
-
+            
         res.status(200).json(formattedResult);
         console.log(logInfoMsgPrefix(`Well ${field} data fetched successfully: ${wellNum}`));
     } catch (error) {

server/measurements/adcsMeasurements.js

@@ -33,8 +33,8 @@ async function magFieldMeasurements(variant_num, start, end) {
         |> filter(fn: (r) => r["_measurement"] == "${magFieldMeasurementsTag}")
         |> filter(fn: (r) => r["host"] == "${adcsTags}")
         |> filter(fn: (r) => r["variant"] == "${variant_num}")
-        |> keep(columns: ["_time", "_value", "variant", _field])
-        |> group(columns: ["_time])`;
+        |> keep(columns: ["_time", "_value", "variant", "_field"])
+        `;
     return new Promise((resolve, reject) => {
         let result = [];
         queryApi.queryRows(query, {

tools/telemetryInputCli/.gitignore

@@ -3,3 +3,4 @@
 !examples/data_temp.csv
 !examples/data_lumin.csv
 !examples/data_angvel.csv
+!examples/data_magField.csv

tools/telemetryInputCli/examples/data_magField.csv

@@ -0,0 +1,4 @@
+variant,timestamp,LSB,X,Y,Z
+1,1756749600,65536,4,6,7
+1,1756836000,65536,4,7,9
+2,1756922400,65536,5,9,2