refactor(tel-server): Implement Arjun's suggestions

:)

telemetry/packages/constants/src/pods/states.ts

@@ -40,15 +40,9 @@ export const ALL_POD_STATE_TYPES = [
 export const getStateType = (
   state: string,
 ): (typeof ALL_POD_STATE_TYPES)[number] => {
-  if (FAILURE_STATES[state as keyof typeof FAILURE_STATES]) {
-    return 'FAILURE';
-  } else if (PASSIVE_STATES[state as keyof typeof PASSIVE_STATES]) {
-    return 'PASSIVE';
-  } else if (ACTIVE_STATES[state as keyof typeof ACTIVE_STATES]) {
-    return 'ACTIVE';
-  } else if (NULL_STATES[state as keyof typeof NULL_STATES]) {
-    return 'NULL';
-  } else {
-    throw new Error(`Unknown state: ${state}`);
-  }
+  if (FAILURE_STATES[state as keyof typeof FAILURE_STATES]) return 'FAILURE';
+  if (PASSIVE_STATES[state as keyof typeof PASSIVE_STATES]) return 'PASSIVE';
+  if (ACTIVE_STATES[state as keyof typeof ACTIVE_STATES]) return 'ACTIVE';
+  if (NULL_STATES[state as keyof typeof NULL_STATES]) return 'NULL';
+  throw new Error(`Unknown state: ${state}`);
 };

telemetry/packages/server/src/modules/common/types/InfluxRow.ts

@@ -0,0 +1,5 @@
+export interface InfluxRow {
+  _time: string;
+  _value: string;
+  podId: string;
+}

telemetry/packages/server/src/modules/measurement/Measurement.service.ts

@@ -47,6 +47,7 @@ export class MeasurementService {
       if (breachLevel) {
         this.logger.debug(
           `Measurement breached limits {${props.podId}/${props.measurementKey}}: ${breachLevel} with value ${props.value}`,
+          MeasurementService.name,
         );
         await this.faultService.addLimitBreachFault({
           level: breachLevel,

telemetry/packages/server/src/modules/measurement/MeasurementReading.types.ts

@@ -1,5 +1,5 @@
 import { pods } from '@hyped/telemetry-constants';
-import { zodEnumFromObjKeys } from 'src/utils/zodEnumFromObjKeys';
+import { zodEnumFromObjKeys } from '@/modules/common/utils/zodEnumFromObjKeys';
 import { z } from 'zod';
 
 export const MeasurementReadingSchema = z
@@ -18,6 +18,7 @@ export const MeasurementReadingSchema = z
         return false;
       }
 
+      // Validate enum values
       if (measurement.format === 'enum') {
         const enumValue = measurement.enumerations.find(
           (e) => e.value === value,
@@ -28,6 +29,14 @@ export const MeasurementReadingSchema = z
         }
       }
 
+      // Validate integers and floats
+      if (
+        (measurement.format === 'float' && isNaN(value)) ||
+        (measurement.format === 'integer' && !Number.isInteger(value))
+      ) {
+        return false;
+      }
+
       return true;
     },
     {

telemetry/packages/server/src/modules/openmct/data/historical/HistoricalTelemetryData.service.ts

@@ -3,14 +3,12 @@ import { HttpException, Injectable, LoggerService } from '@nestjs/common';
 import { INFLUX_TELEMETRY_BUCKET } from '@/core/config';
 import { InfluxService } from '@/modules/influx/Influx.service';
 import { Logger } from '@/modules/logger/Logger.decorator';
+import { InfluxRow } from '@/modules/common/types/InfluxRow';
 
-type InfluxRow = {
-  _time: string;
-  _value: string;
+interface InfluxHistoricalRow extends InfluxRow {
   measurementKey: string;
-  podId: string;
   format: string;
-};
+}
 
 @Injectable()
 export class HistoricalTelemetryDataService {
@@ -40,7 +38,8 @@ export class HistoricalTelemetryDataService {
         |> filter(fn: (r) => r["podId"] == "${podId}")`;
 
     try {
-      const data = await this.influxService.query.collectRows<InfluxRow>(query);
+      const data =
+        await this.influxService.query.collectRows<InfluxHistoricalRow>(query);
 
       return data.map((row) => ({
         id: row['measurementKey'],

telemetry/packages/server/src/modules/openmct/faults/data/historical/HistoricalFaultData.service.ts

@@ -1,21 +1,14 @@
 import { INFLUX_FAULTS_BUCKET } from '@/core/config';
+import { InfluxRow } from '@/modules/common/types/InfluxRow';
 import { InfluxService } from '@/modules/influx/Influx.service';
 import { Logger } from '@/modules/logger/Logger.decorator';
 import { OpenMctFault } from '@hyped/telemetry-types';
-import {
-  flux,
-  fluxBool,
-  fluxExpression,
-  fluxString,
-} from '@influxdata/influxdb-client';
+import { fluxExpression, fluxString } from '@influxdata/influxdb-client';
 import { Injectable, LoggerService } from '@nestjs/common';
 
-type InfluxRow = {
-  _time: string;
-  _value: string;
-  podId: string;
+interface InfluxFaultRow extends InfluxRow {
   fault: string;
-};
+}
 
 type GetHistoricalFaultsInput = {
   podId: string;
@@ -67,7 +60,9 @@ export class HistoricalFaultDataService {
       |> last()`;
 
     try {
-      const data = await this.influxService.query.collectRows<InfluxRow>(query);
+      const data = await this.influxService.query.collectRows<InfluxFaultRow>(
+        query,
+      );
       return data.map((row) => ({
         timestamp: new Date(row['_time']).getTime(),
         fault: JSON.parse(row['_value']) as OpenMctFault,

telemetry/packages/server/src/modules/public-data/PublicData.service.ts

@@ -1,16 +1,14 @@
 import { HttpException, Injectable, LoggerService } from '@nestjs/common';
-import { Logger } from '../logger/Logger.decorator';
+import { Logger } from '@/modules/logger/Logger.decorator';
 import { INFLUX_TELEMETRY_BUCKET } from '../core/config';
 import { flux } from '@influxdata/influxdb-client';
-import { InfluxService } from '../influx/Influx.service';
+import { InfluxService } from '@/modules/influx/Influx.service';
 import { ACTIVE_STATES } from '@hyped/telemetry-constants';
+import { InfluxRow } from '@/modules/common/types/InfluxRow';
 
-type InfluxRow = {
-  _time: string;
-  _value: string;
-  podId: string;
+interface InfluxStateRow extends InfluxRow {
   stateType: string;
-};
+}
 
 @Injectable()
 export class PublicDataService {
@@ -38,7 +36,9 @@ export class PublicDataService {
     `;
 
     try {
-      const data = await this.influxService.query.collectRows<InfluxRow>(query);
+      const data = await this.influxService.query.collectRows<InfluxStateRow>(
+        query,
+      );
 
       return {
         currentState: data[0]
@@ -101,7 +101,9 @@ export class PublicDataService {
     `;
 
     try {
-      const data = await this.influxService.query.collectRows<InfluxRow>(query);
+      const data = await this.influxService.query.collectRows<InfluxStateRow>(
+        query,
+      );
       const launchTime = new Date(data[0]['_time']).getTime();
 
       return {

telemetry/packages/server/src/modules/state/StateUpdate.types.ts

@@ -1,5 +1,5 @@
 import { ALL_POD_STATES, pods } from '@hyped/telemetry-constants';
-import { zodEnumFromObjKeys } from 'src/utils/zodEnumFromObjKeys';
+import { zodEnumFromObjKeys } from '@/modules/common/utils/zodEnumFromObjKeys';
 import { z } from 'zod';
 
 export const StateUpdateSchema = z.object({