@cloudstrytech/validations 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudstrytech/validations",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "JavaScript utility functions for validation",
   "type": "module",
   "main": "src/index.js",

package/src/csv/csvValidator.js

@@ -3,62 +3,70 @@ import { isValidEmail } from "../validators/emailValidator.js";
 import { isValidIndianMobile } from "../validators/mobileValidator.js";
 import { isValidDate } from "../validators/dateValidator.js";
 
-const MANDATORY_FIELDS = [
-  "Name",
-  "Email",
-  "Mobile",
-  "BadgeId",
-  "IssueDate",
-  "Location",
-  "Company"
-];
+const MANDATORY_FIELDS = {
+  "First name": {
+    message: "First name is required",
+    validate: (v) => !!v
+  },
+
+  "Last name": {
+    message: "Last name is required",
+    validate: (v) => !!v
+  },
+
+  "email": {
+    message: "Email is required or invalid",
+    validate: (v) => !!v && isValidEmail(v)
+  },
+
+  "Mobile Number": {
+    message: "Mobile number is required or invalid",
+    validate: (v) => !!v && isValidIndianMobile(v)
+  },
+
+  "Company": {
+    message: "Company is required",
+    validate: (v) => !!v
+  },
+
+  "badge1": {
+    message: "Badge ID is required or must be a 5-digit number",
+    validate: (v) => !!v && /^\d{5}$/.test(String(v).trim())
+  },
+
+  "issuedate-b1": {
+    message: "Issue date is required or invalid",
+    validate: (v) => !!v && isValidDate(v)
+  },
+
+  "location-b1": {
+    message: "Location is required",
+    validate: (v) => !!v
+  }
+};
+
 
 export async function validateCSV(csvInput) {
   const rows = await parseCSV(csvInput);
-  const errors = [];
 
-  rows.forEach((row, index) => {
-    const rowNumber = index + 2; // header is row 1
+  const resultRows = rows.map((row) => {
+    const messages = [];
 
-    MANDATORY_FIELDS.forEach((field) => {
+    for (const field in MANDATORY_FIELDS) {
       const value = row[field];
+      const { validate, message } = MANDATORY_FIELDS[field];
 
-      // Empty check
-      if (!value || String(value).trim() === "") {
-        errors.push({
-          row: rowNumber,
-          column: field,
-          error: "Mandatory field is empty"
-        });
-        return;
-      }
-
-      // Field-specific validations
-      if (field === "Email" && !isValidEmail(value)) {
-        errors.push({
-          row: rowNumber,
-          column: field,
-          error: "Invalid email format"
-        });
+      if (!validate(value)) {
+        messages.push(message);
       }
+    }
 
-      if (field === "Mobile" && !isValidIndianMobile(value)) {
-        errors.push({
-          row: rowNumber,
-          column: field,
-          error: "Invalid Indian mobile number"
-        });
-      }
-
-      if (field === "IssueDate" && !isValidDate(value)) {
-        errors.push({
-          row: rowNumber,
-          column: field,
-          error: "Invalid date format"
-        });
-      }
-    });
+    return {
+      ...row,
+      __status: messages.length > 0 ? "ERROR" : "OK",
+      __message: messages.length > 0 ? messages.join(", ") : "N/A"
+    };
   });
 
-  return errors;
+  return { rows: resultRows };
 }