av6-core 1.6.9 → 1.7.1

package/dist/index.d.mts

@@ -323,7 +323,7 @@ interface Col {
 }
 interface ColValue {
     value: string[] | number[];
-    type: "string" | "number" | "date" | "range" | "gt" | "lt";
+    type: "string" | "number" | "date" | "range" | "gt" | "lt" | "null";
 }
 interface NewFixedSearchRequest extends NewSearchRequest {
     fixedSearch?: Record<string, ColValue>;

package/dist/index.d.ts

@@ -323,7 +323,7 @@ interface Col {
 }
 interface ColValue {
     value: string[] | number[];
-    type: "string" | "number" | "date" | "range" | "gt" | "lt";
+    type: "string" | "number" | "date" | "range" | "gt" | "lt" | "null";
 }
 interface NewFixedSearchRequest extends NewSearchRequest {
     fixedSearch?: Record<string, ColValue>;

package/dist/index.js

@@ -205,6 +205,8 @@ function buildFieldCondition(fieldPath, fieldType, values, isNot = false) {
         break;
       }
     }
+  } else if (fieldType === "null") {
+    finalLeaf = isNot ? { [lastKey]: { not: null } } : { [lastKey]: null };
   } else {
     finalLeaf = buildSingleValueCondition(lastKey, fieldType, values[0], isNot);
   }
@@ -1981,12 +1983,13 @@ var commonService = (serviceDeps) => {
     },
     async commonExcelImport(searchParams) {
       logger.info("entering::commonExcelImport::service");
-      const absolutePath = searchParams.file?.path;
-      if (!absolutePath) {
-        throw new Error("No file path provided for Excel import");
+      const file = searchParams.file;
+      if (!file?.buffer) {
+        throw new Error("No file buffer provided for Excel import");
       }
       const workbook = new import_exceljs.default.Workbook();
-      await workbook.xlsx.readFile(absolutePath);
+      const buffer = searchParams.file.buffer;
+      await workbook.xlsx.load(buffer);
       const worksheet = workbook.worksheets[0];
       if (!worksheet) {
         throw new Error("No worksheet found in Excel file");
@@ -3062,7 +3065,7 @@ var getStaffInfoFromStaffIds = async (args) => {
           select: { id: true, email: true, contactNo: true }
         });
         staffById = new Map(
-          staffRows.map((s) => [s.id, { email: s.email ?? null, contactNo: s.contactNo ?? null, userId: null }])
+          staffRows.map((s) => [s.id, { email: s.email ?? null, contactNo: s.contactNo ?? null, userId: s.id }])
         );
         break;
       case "LEVEL2": {
@@ -3080,7 +3083,7 @@ var getStaffInfoFromStaffIds = async (args) => {
           }
         });
         staffById = new Map(
-          result2.map((s) => [s.id, { email: s.email ?? null, contactNo: s.phoneNumber ?? null, userId: null }])
+          result2.map((s) => [s.id, { email: s.email ?? null, contactNo: s.phoneNumber ?? null, userId: s.id }])
         );
         break;
       }
@@ -3099,7 +3102,7 @@ var getStaffInfoFromStaffIds = async (args) => {
           }
         });
         staffById = new Map(
-          result.map((s) => [s.id, { email: s.email ?? null, contactNo: s.phoneNumber ?? null, userId: null }])
+          result.map((s) => [s.id, { email: s.email ?? null, contactNo: s.phoneNumber ?? null, userId: s.id }])
         );
         break;
     }

package/dist/index.mjs

@@ -154,6 +154,8 @@ function buildFieldCondition(fieldPath, fieldType, values, isNot = false) {
         break;
       }
     }
+  } else if (fieldType === "null") {
+    finalLeaf = isNot ? { [lastKey]: { not: null } } : { [lastKey]: null };
   } else {
     finalLeaf = buildSingleValueCondition(lastKey, fieldType, values[0], isNot);
   }
@@ -1930,12 +1932,13 @@ var commonService = (serviceDeps) => {
     },
     async commonExcelImport(searchParams) {
       logger.info("entering::commonExcelImport::service");
-      const absolutePath = searchParams.file?.path;
-      if (!absolutePath) {
-        throw new Error("No file path provided for Excel import");
+      const file = searchParams.file;
+      if (!file?.buffer) {
+        throw new Error("No file buffer provided for Excel import");
       }
       const workbook = new ExcelJs.Workbook();
-      await workbook.xlsx.readFile(absolutePath);
+      const buffer = searchParams.file.buffer;
+      await workbook.xlsx.load(buffer);
       const worksheet = workbook.worksheets[0];
       if (!worksheet) {
         throw new Error("No worksheet found in Excel file");
@@ -3011,7 +3014,7 @@ var getStaffInfoFromStaffIds = async (args) => {
           select: { id: true, email: true, contactNo: true }
         });
         staffById = new Map(
-          staffRows.map((s) => [s.id, { email: s.email ?? null, contactNo: s.contactNo ?? null, userId: null }])
+          staffRows.map((s) => [s.id, { email: s.email ?? null, contactNo: s.contactNo ?? null, userId: s.id }])
         );
         break;
       case "LEVEL2": {
@@ -3029,7 +3032,7 @@ var getStaffInfoFromStaffIds = async (args) => {
           }
         });
         staffById = new Map(
-          result2.map((s) => [s.id, { email: s.email ?? null, contactNo: s.phoneNumber ?? null, userId: null }])
+          result2.map((s) => [s.id, { email: s.email ?? null, contactNo: s.phoneNumber ?? null, userId: s.id }])
         );
         break;
       }
@@ -3048,7 +3051,7 @@ var getStaffInfoFromStaffIds = async (args) => {
           }
         });
         staffById = new Map(
-          result.map((s) => [s.id, { email: s.email ?? null, contactNo: s.phoneNumber ?? null, userId: null }])
+          result.map((s) => [s.id, { email: s.email ?? null, contactNo: s.phoneNumber ?? null, userId: s.id }])
         );
         break;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "av6-core",
-  "version": "1.6.9",
+  "version": "1.7.1",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",