Merge pull request #4 from divamtech/ishika-add-country-code

added country code column in excel with vlookup formula for auto selection

Author: sujoygaur

src/index.js

@@ -15,12 +15,12 @@ app.use(express.json({ limit: '50mb' }))
 
 const router = express.Router()
 router.use((req, res, next) => {
-  const token = req.get('x-auth-token')
-  if (!!token && token === AUTH_TOKEN) {
+const token = req.get('x-auth-token')
+if (!!token && token === AUTH_TOKEN) {
   next()
-  } else {
-    res.status(401).json({ message: 'Invalid auth token' })
-  }
+ } else {
+res.status(401).json({ message: 'Invalid auth token' })
+}
 })
 
 router.post('/lambda/json-to-excel/from-link', async (req, res) => {
@@ -81,19 +81,19 @@ router.post('/lambda/json-to-excel/common-styled', async (req, res) => {
 })
 
 router.post('/lambda/json-to-excel/client-styled', async (req, res) => {
-  console.log('styled working')
+  console.log('client styled working')
   try {
     const jsonData = req.body.excel
     const excelData = await convertJsonToStyledExcel(jsonData)
     let finalBuffer = excelData
-    if (jsonData.Countries.data?.length) {
-    const sheetName =  'Clients'
+    if (jsonData.Lookups.data?.length) {
       const wb=new ExcelJS.Workbook()
        await wb.xlsx.load(excelData)
-      await injectClientTemplateColumnsIntoSheet(wb, sheetName, jsonData.Countries.data)
+       const config=req.body.lookupConfig || {}
+      await injectFormulasIntoSheet(wb, jsonData.Lookups.data,config)
      finalBuffer = await wb.xlsx.writeBuffer()
      } else {
-      console.log('❌ No countries found, skipping injection')
+      console.log('No countries found, skipping injection')
      }
     const url = await uploadToAWS(req.body.config, finalBuffer)
     return res.json({ url })  
@@ -136,74 +136,121 @@ const uploadToAWS = async (config, excelData) => {
   const response = await s3.upload(dataset).promise()
   return response.Location
 }
-async function injectClientTemplateColumnsIntoSheet(workbook, sheetName, data) {
+
+async function injectFormulasIntoSheet(workbook, data, config) {
+  const sheetName = config.dependentSheet
   const sheet = workbook.getWorksheet(sheetName) || workbook.worksheets[0]
   if (!sheet) throw new Error('Target sheet not found')
-  // Create (or reuse) a hidden sheet "Countries"
-  const countrySheet = workbook.getWorksheet('Countries') || workbook.addWorksheet('Countries')
-  countrySheet.state = 'veryHidden'
-  // Headers
-  countrySheet.getCell('A1').value = 'Country'
-  countrySheet.getCell('B1').value = 'Currency'
-  // find max nob length
-  const maxNobs = Math.max(...data.map(c => (c.nob || []).length))
-  for (let j = 0; j < maxNobs; j++) {
-    countrySheet.getCell(1, 3 + j).value = `NOB${j + 1}`
-  }
-  // Fill rows
-  data.forEach((c, i) => {
-    const r = i + 2
-    countrySheet.getCell(r, 1).value = c.country || ''
-    countrySheet.getCell(r, 2).value = c.currency || ''
-    ;(c.nob || []).forEach((n, j) => {
-      countrySheet.getCell(r, 3 + j).value = n
+  const lookupSheet = config.lookupSheet
+  const hiddenSheet = workbook.getWorksheet(lookupSheet) || workbook.addWorksheet(lookupSheet)
+  hiddenSheet.state = 'veryHidden'
+  const { primaryKey, dependentKeys = [], lookupKeys = [] } = config
+  if (!primaryKey) throw new Error("Config must specify primaryKey")
+  const allGroups = [primaryKey, ...lookupKeys, ...dependentKeys].map(k => Array.isArray(k) ? k : [k])
+  const canonicalKeys = allGroups.map(g => g[0]) // always first alias = canonical key
+  const arrayLengths = {}
+  data.forEach((row) => {
+    Object.keys(row).forEach((k) => {
+      if (Array.isArray(row[k])) {
+        const norm = k.toLowerCase()
+        arrayLengths[norm] = Math.max(arrayLengths[norm] || 0, row[k].length)
+      }
     })
-    // Named range for each country NOBs
-    const fromCol = 3
-    const toCol = 2 + maxNobs
-    const range = `${countrySheet.name}!$${String.fromCharCode(65 + fromCol - 1)}${r}:$${String.fromCharCode(65 + toCol - 1)}${r}`
-    // countrySheet.workbook.definedNames.addName(c.country.replace(/\s+/g, "_"), range)
+  })
+  // --- Build expanded headers ---
+  let expandedKeys = []
+  canonicalKeys.forEach((key) => {
+    if (arrayLengths[key]) {
+      for (let i = 0; i < arrayLengths[key]; i++) {
+        expandedKeys.push(i === 0 ? key : `${key}_${i + 1}`)
+      }
+    } else {
+      expandedKeys.push(key)
+    }
+  })
+  hiddenSheet.getRows(1, hiddenSheet.rowCount).forEach(r => {
+    r.eachCell(c => { c.value = null })
+  })
+  hiddenSheet.getRow(1).values = expandedKeys
+  data.forEach((row, i) => {
+    const baseRow = {}
+    Object.keys(row).forEach(k => {
+      baseRow[k.toLowerCase()] = row[k]
+    })
+    const rowValues = []
+    canonicalKeys.forEach((key) => {
+      const val = baseRow[key]
+      if (Array.isArray(val)) {
+        for (let j = 0; j < arrayLengths[key]; j++) {
+          rowValues.push(val[j] || "")
+        }
+      } else {
+        rowValues.push(val || "")
+      }
+    })
+    hiddenSheet.getRow(i + 2).values = rowValues
   })
   const lastRow = data.length + 1
-  const countryList = `Countries!$A$2:$A$${lastRow}`
-  // Find target columns in client sheet
-  const findHeaderCol = (names) => {
+  const primaryRange = `Lookups!$A$2:$A$${lastRow}`
+
+  const findCol = (aliases) => {
     const headerRow = sheet.getRow(1)
+    const lookupNames = Array.isArray(aliases) ? aliases : [aliases]
+
     for (let col = 1; col <= sheet.columnCount; col++) {
       const val = headerRow.getCell(col)?.value
       const text = typeof val === 'object'
         ? (val?.richText?.map(rt => rt.text).join('') || val?.result || '')
         : (val || '')
-      if (names.includes(String(text).trim())) return col
+      const normalized = String(text).trim().toLowerCase()
+
+      for (const alias of lookupNames) {
+        const normAlias = alias.trim().toLowerCase()
+        if (normalized === normAlias) return col
+        if (normalized.replace(/\s+/g, "_") === normAlias) return col // "Country Code" -> country_code
+        if (normalized.replace(/[^a-z0-9]/gi, "") === normAlias.replace(/[^a-z0-9]/gi, "")) return col // remove *, etc.
+      }
     }
     return null
   }
-  let colCountry = findHeaderCol(['Country*', 'country'])
-  let colNob = findHeaderCol(['Nature of Business*', 'category', 'NoB'])
-  let colCurrency = findHeaderCol(['Currency*', 'currency'])
-  // Apply validations row-wise
+  // --- Primary key col ---
+  const colPrimary = findCol(primaryKey)
+  if (!colPrimary) throw new Error(`Primary key column ${primaryKey} not found in sheet`)
+
   const maxRow = Math.max(sheet.rowCount, 200)
   for (let row = 2; row <= maxRow; row++) {
-    const countryCell = sheet.getRow(row).getCell(colCountry)
-    // Country dropdown
-    countryCell.dataValidation = {
+    const primaryCell = sheet.getRow(row).getCell(colPrimary)
+    //primary dropdown
+    primaryCell.dataValidation = {
       type: 'list',
       allowBlank: true,
-      formulae: [countryList],
+      formulae: [primaryRange],
     }
-    // Nob dropdown (dependent on country)
-    const nobCell = sheet.getRow(row).getCell(colNob)
-    const nobFormula = `=OFFSET(Countries!$C$2,MATCH(${countryCell.address},Countries!$A$2:$A$${lastRow},0)-1,0,1,COUNTA(OFFSET(Countries!$C$2,MATCH(${countryCell.address},Countries!$A$2:$A$${lastRow},0)-1,0,1,200)))`
-    nobCell.dataValidation = {
-      type: 'list',
-      allowBlank: true,
-      formulae: [nobFormula],
+    //Dependent dropdowns
+    for (const depGroup of dependentKeys) {
+      const colDep = findCol(depGroup)
+      if (!colDep) continue
+      const depKey = Array.isArray(depGroup) ? depGroup[0] : depGroup
+      const depCell = sheet.getRow(row).getCell(colDep)
+      depCell.dataValidation = {
+        type: 'list',
+        allowBlank: true,
+        formulae: [`OFFSET(Lookups!$${String.fromCharCode(65 + canonicalKeys.indexOf(depKey))}$2,MATCH(${primaryCell.address},Lookups!$A$2:$A$${lastRow},0)-1,0,1,
+      COUNTA(OFFSET(Lookups!$${String.fromCharCode(65 + canonicalKeys.indexOf(depKey))}$2,MATCH(${primaryCell.address},Lookups!$A$2:$A$${lastRow},0)-1,0,1,50)))`
+          .replace(/\s+/g, ' ')],
+      }
     }
-    // Currency autofill
-    const currencyCell = sheet.getRow(row).getCell(colCurrency)
-    currencyCell.value = {
-      formula: `=IF(${countryCell.address}="","",VLOOKUP(${countryCell.address},Countries!$A$2:$B$${lastRow},2,FALSE))`
+    //Lookup autofill
+    for (const lookupGroup of lookupKeys) {
+      const colLookup = findCol(lookupGroup)
+      if (!colLookup) continue
+      const lookupKey = Array.isArray(lookupGroup) ? lookupGroup[0] : lookupGroup
+      const lookupCell = sheet.getRow(row).getCell(colLookup)
+      lookupCell.value = {
+        formula: `IF(${primaryCell.address}="","",VLOOKUP(${primaryCell.address},Lookups!$A$2:$Z$${lastRow},${canonicalKeys.indexOf(lookupKey) + 1},FALSE))`
+      }
     }
+
   }
 }