@mixd-id/web-scaffold 0.1.230406020 → 0.1.230406021

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mixd-id/web-scaffold",
   "private": false,
-  "version": "0.1.230406020",
+  "version": "0.1.230406021",
   "scripts": {
     "dev": "vite serve",
     "build": "vite build",

package/src/utils/helpers.js

@@ -228,6 +228,35 @@ const getPresetSortWhereParams = (order, afterItem) => {
   return sortWhere
 }
 
+const unflatten = (flatObject) => {
+  const nestedObject = {};
+
+  for (const key in flatObject) {
+    if (Object.prototype.hasOwnProperty.call(flatObject, key)) {
+      const value = flatObject[key];
+      const keys = key.split('.');
+
+      let currentObj = nestedObject;
+      for (let i = 0; i < keys.length; i++) {
+        const currentKey = keys[i];
+
+        if (!currentObj[currentKey]) {
+          currentObj[currentKey] = {};
+        }
+
+        if (i === keys.length - 1) {
+          currentObj[currentKey] = value;
+        } else {
+          currentObj = currentObj[currentKey];
+        }
+      }
+    }
+  }
+
+  return nestedObject;
+}
+
+
 module.exports = {
   ceil,
   floor,
@@ -244,5 +273,6 @@ module.exports = {
   writeStorage,
   bufferToStream,
   sequelizeChunk,
-  getPresetSortWhereParams
+  getPresetSortWhereParams,
+  unflatten
 }

package/src/utils/importer.js

@@ -3,7 +3,7 @@ const fs = require("fs");
 const AdmZip = require("adm-zip");
 const glob = require("glob");
 const Exceljs = require("exceljs")
-const { saveBuffer } = require('./helpers.js')
+const { saveBuffer, unflatten } = require('./helpers.js')
 
 const analyseRequest = async(req) => {
 
@@ -64,10 +64,17 @@ const analyseRequest = async(req) => {
 
   const columns = []
   const header = worksheet.getRow(1)
+
   if(!header)
     throw new Error('Invalid file')
   header.eachCell((cell) => {
-    columns.push(cell.value)
+    if(cell.isMerged){
+      const sub = worksheet.getCell(cell.address.replace(/\d/g, '') + '2').value
+      columns.push(cell.value + '>' + sub)
+    }
+    else{
+      columns.push(cell.value)
+    }
   })
 
   return {
@@ -87,8 +94,7 @@ const importRequest = async(req) => {
       throw new Error({name: ['Kolom ' + key.text + ' harus diisi']})
   })
 
-  const rows = []
-  const cols = {}
+  let rows = []
   const workbook = new Exceljs.Workbook();
   switch(xlsxFileType){
 
@@ -106,37 +112,35 @@ const importRequest = async(req) => {
   }
 
   const worksheet = workbook.worksheets[0]
-  worksheet.eachRow((row, index) => {
-    if(index === 1){
-      row.eachCell((cell, index) => {
-
-        let mapped = false
-        keys.forEach((key) => {
-          if(key.value === cell.value){
-            cols[key.key] = index
-            mapped = true
-          }
-        })
-
-        if(!mapped){
-          cols[cell.value] = index
-        }
-      })
+
+  let rowStart = 2
+  const header = worksheet.getRow(1)
+  const columnAddress = {}
+  header.eachCell((cell, index) => {
+    if(cell.isMerged){
+      const sub = worksheet.getCell(cell.address.replace(/\d/g, '') + '2').value
+      columnAddress[cell.value + '>' + sub] = index
+      rowStart = 3
     }
     else{
+      columnAddress[cell.value] = index
+    }
+  })
+
+  worksheet.eachRow((row, index) => {
+    if(index >= rowStart){
       const obj = {}
 
-      for(let key in cols){
-        const cell = row.getCell(cols[key])
-        obj[key] = cell.formulaType === 1 ? cell.result : cell.value
+      for(let idx in keys){
+        const key = keys[idx]
+        const cell = row.getCell(columnAddress[key.value])
+        obj[key.key] = cell.formulaType === 1 ? cell.result : cell.value
       }
 
-      rows.push(obj)
+      rows.push(unflatten(obj))
     }
   })
 
-  //console.log(JSON.stringify(rows, null, 2))
-
   const images = glob.sync(process.env.ROOT_PATH + '/storage/files/temp/' + folderName +
       '/**/*(*.jpg|*.jpeg|*.png|*.webp)')