fix: update types of fetched lap data

Author: alexwhelan12

packages/client/src/components/config/lapTableConfig.ts

@@ -9,7 +9,7 @@ import { createColumnHelper } from "@tanstack/react-table";
 const columnHelper = createColumnHelper<IFormattedLapData>();
 
 export const columns = [
-  columnHelper.accessor("data.timeStamp", {
+  columnHelper.accessor("TimeStamp", {
     cell: (info) => info.getValue(),
     header: "Time Stamp",
     sortingFn: (rowA, rowB, columnId) => {
@@ -36,44 +36,44 @@ export const columns = [
       return dateB - dateA;
     },
   }),
-  columnHelper.accessor("data.ampHours", {
+  columnHelper.accessor("AmpHours", {
     cell: (info) => info.getValue(),
     header: "Amp Hours",
   }),
-  columnHelper.accessor("data.averagePackCurrent", {
+  columnHelper.accessor("AveragePackCurrent", {
     cell: (info) => info.getValue(),
     header: "Average Pack Current",
   }),
-  columnHelper.accessor("data.averageSpeed", {
+  columnHelper.accessor("AverageSpeed", {
     cell: (info) => info.getValue(),
     header: "Average Speed",
   }),
-  columnHelper.accessor("data.batterySecondsRemaining", {
+  columnHelper.accessor("BatterySecondsRemaining", {
     cell: (info) => info.getValue(),
     header: "Battery Seconds Remaining",
   }),
-  columnHelper.accessor("data.distance", {
+  columnHelper.accessor("Distance", {
     cell: (info) => info.getValue(),
     header: "Distance",
   }),
-  columnHelper.accessor("data.energyConsumed", {
+  columnHelper.accessor("EnergyConsumed", {
     cell: (info) => info.getValue(),
     header: "Energy Consumed",
   }),
-  columnHelper.accessor("data.lapTime", {
+  columnHelper.accessor("LapTime", {
     cell: (info) => info.getValue(),
     header: "Lap Time",
   }),
-  columnHelper.accessor("data.netPowerOut", {
+  columnHelper.accessor("NetPowerOut", {
     cell: (info) => info.getValue(),
     header: "Net Power Out",
   }),
 
-  columnHelper.accessor("data.totalPowerIn", {
+  columnHelper.accessor("TotalPowerIn", {
     cell: (info) => info.getValue(),
     header: "Total Power In",
   }),
-  columnHelper.accessor("data.totalPowerOut", {
+  columnHelper.accessor("TotalPowerOut", {
     cell: (info) => info.getValue(),
     header: "Total Power Out",
   }),

packages/client/src/components/molecules/RaceTabMolecules/RaceTabTable.tsx

@@ -17,7 +17,7 @@ export default function RaceTabTable({
             <tr key={headerGroup.id}>
               {headerGroup.headers.map((header) => (
                 <th
-                  className={`sticky top-0 z-10 w-24 border-b-2 border-r-2 border-t-2 border-helios bg-slate px-4 py-2 text-center text-xs font-medium uppercase text-helios first:border-l-2 dark:bg-lightergrey ${header.id === "data_timeStamp" ? "left-0 z-50" : ""}`}
+                  className={`sticky top-0 z-10 w-24 border-b-2 border-r-2 border-t-2 border-helios bg-slate px-4 py-2 text-center text-xs font-medium uppercase text-helios first:border-l-2 dark:bg-lightergrey ${header.id === "TimeStamp" ? "left-0 z-50" : ""}`}
                   key={header.id}
                 >
                   {header.isPlaceholder
@@ -50,7 +50,7 @@ export default function RaceTabTable({
             >
               {row.getVisibleCells().map((cell) => (
                 <td
-                  className={`text-gray-900 w-fullpx-4 sticky w-24 border-b-2 border-r-2 border-helios py-2 text-center text-sm first:border-l-2 dark:text-white ${cell.id.includes("data_timeStamp") ? "left-0 z-10" : ""}`}
+                  className={`text-gray-900 w-fullpx-4 sticky w-24 border-b-2 border-r-2 border-helios py-2 text-center text-sm first:border-l-2 dark:text-white ${cell.id.includes("TimeStamp") ? "left-0 z-10" : ""}`}
                   key={cell.id}
                 >
                   {flexRender(cell.column.columnDef.cell, cell.getContext())}

packages/client/src/components/tabs/RaceTab.tsx

@@ -36,11 +36,11 @@ function RaceTab() {
   const [Rfid, setDriverRFID] = useState<number | string>("");
   const [driverData, setDriverData] = useState<IDriverData[]>([]);
   const [copy, setCopy] = useState<number>(0);
-  const { fetchLapData, formatLapData, lapData } = useLapDataStore();
+  const { formatLapData, lapData } = useLapDataStore();
   const [filteredLaps, setFilteredLaps] =
     useState<IFormattedLapData[]>(lapData);
   const [sorting, setSorting] = useState<SortingState>([
-    { desc: false, id: "data_timeStamp" },
+    { desc: false, id: "TimeStamp" },
   ]);
 
   const table = useReactTable({
@@ -50,7 +50,7 @@ function RaceTab() {
     getCoreRowModel: getCoreRowModel(),
     getSortedRowModel: getSortedRowModel(),
     initialState: {
-      sorting: [{ desc: false, id: "data_timeStamp" }],
+      sorting: [{ desc: false, id: "TimeStamp" }],
     },
     onSortingChange: setSorting,
     state: { sorting },
@@ -120,7 +120,6 @@ function RaceTab() {
 
   // fetching driver names when component mounts
   useEffect(() => {
-    fetchLapData();
     fetchDriverNames()
       .then((response) => {
         const driverData = response.data.map((driver: IDriverData) => ({

packages/client/src/stores/useLapData.ts

@@ -5,31 +5,25 @@ import { notifications } from "@mantine/notifications";
 import { IFormattedLapData, ILapData, prodURL } from "@shared/helios-types";
 
 export const formatLapData = (lapPacket: ILapData): IFormattedLapData => ({
+  AmpHours: parseFloat(lapPacket.AmpHours.toFixed(2)),
+  AveragePackCurrent: parseFloat(lapPacket.AveragePackCurrent.toFixed(2)),
+  AverageSpeed: parseFloat(lapPacket.AverageSpeed.toFixed(2)),
+  BatterySecondsRemaining: parseFloat(
+    lapPacket.BatterySecondsRemaining.toFixed(2),
+  ),
+  Distance: parseFloat(lapPacket.Distance.toFixed(2)),
+  EnergyConsumed: parseFloat(lapPacket.EnergyConsumed.toFixed(2)),
+  LapTime: parseFloat(lapPacket.LapTime.toFixed(2)),
+  NetPowerOut: parseFloat(lapPacket.NetPowerOut.toFixed(2)),
   Rfid: lapPacket.Rfid,
-  data: {
-    ampHours: parseFloat(lapPacket.data.ampHours.toFixed(2)),
-    averagePackCurrent: parseFloat(
-      lapPacket.data.averagePackCurrent.toFixed(2),
-    ),
-    averageSpeed: parseFloat(lapPacket.data.averageSpeed.toFixed(2)),
-    batterySecondsRemaining: parseFloat(
-      lapPacket.data.batterySecondsRemaining.toFixed(2),
-    ),
-    distance: parseFloat(lapPacket.data.distance.toFixed(2)),
-    energyConsumed: parseFloat(lapPacket.data.energyConsumed.toFixed(2)),
-    lapTime: parseFloat(lapPacket.data.lapTime.toFixed(2)),
-    netPowerOut: parseFloat(lapPacket.data.netPowerOut.toFixed(2)),
-    timeStamp: new Date(lapPacket.data.timeStamp).toLocaleString("en-US"),
-    totalPowerIn: parseFloat(lapPacket.data.totalPowerIn.toFixed(2)),
-    totalPowerOut: parseFloat(lapPacket.data.totalPowerOut.toFixed(2)),
-  },
-  timestamp: lapPacket.timestamp,
+  TimeStamp: new Date(lapPacket.TimeStamp).toLocaleString("en-US"),
+  TotalPowerIn: parseFloat(lapPacket.TotalPowerIn.toFixed(2)),
+  TotalPowerOut: parseFloat(lapPacket.TotalPowerOut.toFixed(2)),
 });
 
 interface LapDataState {
   formatLapData: (lapPacket: ILapData) => IFormattedLapData;
   lapData: IFormattedLapData[];
-  setLapData: (data: IFormattedLapData[]) => void;
   addLapData: (data: IFormattedLapData) => void;
   clearLapData: () => void;
   fetchLapData: () => Promise<void>;
@@ -51,9 +45,9 @@ export const useLapDataStore = create<LapDataState>((set) => ({
         throw new Error("Invalid API response format");
       }
 
-      set({
-        lapData: response.data.data.map(formatLapData),
-      });
+      const formattedLaps: IFormattedLapData[] =
+        response.data.data.map(formatLapData);
+      set({ lapData: formattedLaps });
     } catch (error) {
       notifications.show({
         color: "red",
@@ -64,5 +58,4 @@ export const useLapDataStore = create<LapDataState>((set) => ({
   },
   formatLapData: formatLapData,
   lapData: [],
-  setLapData: (data) => set({ lapData: data }),
 }));

packages/server/src/controllers/LapController/LapController.ts

@@ -28,14 +28,14 @@ const logger = createLightweightApplicationLogger("LapController.ts");
  *
  * this controller is responsible for handling lap data, including:
  * - setting the finish line location (do we even do this anymore)
- * - handling sending lap data to dynamo based on if a lap has been finished or not
+ * - handling sending lap data to timescale based on if a lap has been finished or not
  * - also has other helper functions that are used to calculate the lap data
  *
  * basically the main thing function is handlePacket() which creates a lapData object
- * and sends it to dynamo only when a lap has been completed
+ * and sends it to timescale only when a lap has been completed
  *
  * then handleLapData() is called to broadcast the lap data to the frontend for real time changes
- * as well as to insert the lap data into the dynamo database
+ * as well as to insert the lap data into the timescale database
  */
 export class LapController implements LapControllerType {
   public lastLapPackets: ITelemetryData[] = [] as ITelemetryData[];
@@ -208,25 +208,21 @@ export class LapController implements LapControllerType {
       );
 
       const lapData: ILapData = {
+        AmpHours: amphoursValue, // NOTE THIS IS THE LATEST BATTERY PACK AMPHOURS
+        AveragePackCurrent: averagePackCurrent,
+        AverageSpeed: this.calculateAverageLapSpeed(this.lastLapPackets),
+        BatterySecondsRemaining: this.getSecondsRemainingUntilChargedOrDepleted(
+          amphoursValue,
+          averagePackCurrent,
+        ),
+        Distance: this.getDistanceTravelled(this.lastLapPackets), // CHANGE THIS BASED ON ODOMETER/MOTOR INDEX OR CHANGE TO ITERATE
+        EnergyConsumed: this.getEnergyConsumption(this.lastLapPackets),
+        LapTime: this.calculateLapTime(this.lastLapPackets),
+        NetPowerOut: this.netPower(this.lastLapPackets),
         Rfid: packet.Pi.Rfid,
-        data: {
-          ampHours: amphoursValue, // NOTE THIS IS THE LATEST BATTERY PACK AMPHOURS
-          averagePackCurrent: averagePackCurrent,
-          averageSpeed: this.calculateAverageLapSpeed(this.lastLapPackets),
-          batterySecondsRemaining:
-            this.getSecondsRemainingUntilChargedOrDepleted(
-              amphoursValue,
-              averagePackCurrent,
-            ),
-          distance: this.getDistanceTravelled(this.lastLapPackets), // CHANGE THIS BASED ON ODOMETER/MOTOR INDEX OR CHANGE TO ITERATE
-          energyConsumed: this.getEnergyConsumption(this.lastLapPackets),
-          lapTime: this.calculateLapTime(this.lastLapPackets),
-          netPowerOut: this.netPower(this.lastLapPackets),
-          timeStamp: packet.TimeStamp,
-          totalPowerIn: this.getAveragePowerIn(this.lastLapPackets),
-          totalPowerOut: this.getAveragePowerOut(this.lastLapPackets),
-        },
-        timestamp: packet.TimeStamp,
+        TimeStamp: packet.TimeStamp,
+        TotalPowerIn: this.getAveragePowerIn(this.lastLapPackets),
+        TotalPowerOut: this.getAveragePowerOut(this.lastLapPackets),
       };
 
       logger.info("Lap data inserted into database: ", lapData);

packages/shared/src/types.ts

@@ -419,21 +419,18 @@ export interface IDriverData {
 }
 
 export interface ILapData {
-  data: {
-    ampHours: number;
-    averagePackCurrent: number;
-    averageSpeed: number;
-    batterySecondsRemaining: number;
-    distance: number;
-    energyConsumed: number;
-    lapTime: number;
-    netPowerOut: number;
-    timeStamp: number;
-    totalPowerIn: number;
-    totalPowerOut: number;
-  };
+  AmpHours: number;
+  AveragePackCurrent: number;
+  AverageSpeed: number;
+  BatterySecondsRemaining: number;
+  Distance: number;
+  EnergyConsumed: number;
+  LapTime: number;
+  NetPowerOut: number;
+  TimeStamp: number;
+  TotalPowerIn: number;
+  TotalPowerOut: number;
   Rfid: string;
-  timestamp: number;
 }
 
 export class LapData {
@@ -494,19 +491,16 @@ export interface IPlaybackDynamoResponse {
 }
 
 export interface IFormattedLapData {
-  data: {
-    ampHours: number;
-    averagePackCurrent: number;
-    averageSpeed: number;
-    batterySecondsRemaining: number;
-    distance: number;
-    energyConsumed: number;
-    lapTime: number;
-    netPowerOut: number;
-    timeStamp: string;
-    totalPowerIn: number;
-    totalPowerOut: number;
-  };
-  timestamp: number;
+  AmpHours: number;
+  AveragePackCurrent: number;
+  AverageSpeed: number;
+  BatterySecondsRemaining: number;
+  Distance: number;
+  EnergyConsumed: number;
+  LapTime: number;
+  NetPowerOut: number;
+  TimeStamp: string;
+  TotalPowerIn: number;
+  TotalPowerOut: number;
   Rfid: string;
 }