Added functions to sqlite

tago-io · Nov 7, 2024 · df20207 · df20207
1 parent fa9b565
commit df20207
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/packages/server/Helpers/removeNullValues.ts b/packages/server/Helpers/removeNullValues.ts
@@ -3,7 +3,7 @@
  */
 function removeNullValues<T>(value: T): T {
   for (const key in value) {
-    if (value[key] === null || value[key] === undefined) {
+    if (value[key] === null || value[key] === undefined || value[key] === "") {
       delete value[key];
     }
   }

diff --git a/packages/server/Services/DeviceData/DeviceData.ts b/packages/server/Services/DeviceData/DeviceData.ts
@@ -544,6 +544,7 @@ export const getDeviceDataByDevice = async (
     }
   }
 
+  removeNullValues(response);
   let items: any = await z.array(zDeviceData).parseAsync(response);
   items = await z.array(zDeviceData).parseAsync(items);
 
@@ -559,7 +560,8 @@ export const getDeviceData = async (
   query?: IDeviceDataQuery,
 ) => {
   const device = await getDeviceInfo(id);
-  return await getDeviceDataByDevice(device, query);
+  const data = await getDeviceDataByDevice(device, query);
+  return data;
 };
 
 /**

diff --git a/plugins/sqlite/src/Providers/DeviceData/importDeviceData.ts b/plugins/sqlite/src/Providers/DeviceData/importDeviceData.ts
@@ -1,14 +1,23 @@
 import fs from "node:fs";
-import type { TDeviceType, TGenericID } from "@tago-io/tcore-sdk/types";
+import {
+  type TDeviceType,
+  type TGenericID,
+  generateResourceID,
+} from "@tago-io/tcore-sdk/types";
 import { parse } from "csv";
+import type { Knex } from "knex";
 import { getDeviceConnection } from "../../Helpers/DeviceDatabase.ts";
 
-async function _insertData(client: any, data: any[]) {
-  return new Promise((resolve, reject) => {
-    client.batchInsert("data", data, 1000).catch((error) => {
-      reject(error);
+async function _insertData(client: Knex, data: any[]) {
+  client
+    .batchInsert("data", data, 1000)
+    .then(() => {
+      return;
+    })
+    .catch((error) => {
+      console.log(error);
+      Promise.reject(error);
     });
-  });
 }
 
 /**
@@ -23,21 +32,23 @@ async function importDeviceData(
   return new Promise((resolve, reject) => {
     const data: any[] = [];
     fs.createReadStream(fileName)
-      .pipe(parse())
-      .on("data", async (row) => {
+      .pipe(parse({ columns: true, encoding: "utf8" }))
+      .on("data", (row) => {
+        row.id = generateResourceID();
         data.push(row);
         if (data.length === 1000) {
-          await _insertData(client, data);
+          _insertData(client, data);
           data.length = 0;
         }
       })
-      .on("end", async () => {
+      .on("end", () => {
         if (data.length > 0) {
-          await _insertData(client, data);
+          _insertData(client, data);
         }
         resolve("Data imported successfully");
       })
       .on("error", (error) => {
+        console.log(error);
         reject(error);
       });
   });