zet-lib 1.2.85 → 1.2.87

package/lib/Util.js

@@ -822,7 +822,7 @@ Util.virtualHelper = function (obj) {
   return str
 }
 
-Util.nots = ['id', 'createdAt', 'updatedAt', 'createdBy', 'updatedBy', 'companyId', 'created_at', 'updated_at', 'updated_by', 'created_by', 'modified_by', 'company_id', 'token', 'version', 'signin_method', 'lastLogin', 'last_login', 'forgotPassword', 'forgot_password', 'no', 'actionColumn']
+Util.nots = ['id', 'createdAt', 'updatedAt', 'createdBy', 'updatedBy', 'companyId', 'created_at', 'updated_at', 'updated_by', 'created_by', 'modified_by', 'company_id', 'token', 'version', 'signin_method', 'lastLogin', 'last_login', 'forgotPassword', 'forgot_password', 'no', 'actionColumn', 'lock', 'approval_status', 'approval_history']
 
 Util.requiredFields = function (obj = {}) {
   var nots = Util.nots

package/lib/zAppRouter.js

@@ -1593,7 +1593,18 @@ router.post('/zhistory-data', async (req, res) => {
       order_by: ['id asc'],
     })
     if (results.length > 0) {
-      let users = myCache.get('users')
+      let users = {}
+      if (myCache.has('users')) {
+        users = myCache.get('users')
+      } else {
+        users = Util.arrayToObject(
+          await connection.results({
+            table: 'zuser',
+          }),
+          'id'
+        )
+        myCache.set('users', users)
+      }
       html = await zRoute.history(req, res, relations, id, MYMODEL, users, results)
     }
     res.json(html)

package/lib/zRoute.js

@@ -2314,8 +2314,11 @@ zRoute.forms = (req, res, MYMODEL, relations, data = {}) => {
           if (obj.value.length > 0) {
             obj.value.map((item) => {
               let filename = `${dirRoot}/public/uploads/${MYMODEL.table}/${key}/${item}`
-              var stats = fs.statSync(filename)
-              var fileSizeInBytes = stats.size
+              var fileSizeInBytes = 12345
+              if (Util.fileExist(filename)) {
+                var stats = fs.statSync(filename)
+                fileSizeInBytes = stats.size
+              }
               dropzone_data_arr.push({ fileName: item, size: fileSizeInBytes })
             })
             myCache.set(`dropzone__${res.locals.userId}__${MYMODEL.table}__${key}__${data.id}`, obj.value)
@@ -3555,160 +3558,168 @@ ${keys}.forEach(function (myobj, index) {
  MySQL CRUD with context
  */
 zRoute.insertSQL = async (req, res, table, data) => {
-  const MYMODELS = myCache.get('MYMODELS')
-  let MYMODEL = MYMODELS[table]
-  let fields = MYMODEL.keys
-  let userId = res.locals.userId || 1
-  if (fields.includes('company_id')) data.company_id = res.locals.companyId || 1
-  if (fields.includes('updated_at')) data.updated_at = Util.now()
-  if (fields.includes('created_at')) data.created_at = Util.now()
-  if (fields.includes('updated_by')) data.updated_by = userId
-  if (fields.includes('created_by')) data.created_by = userId
-  delete data.lock
-  delete data.approval_status
-  delete data.approval_history
-
-  //check dropzone
-  let hasDropzone = false
-  for (let key in MYMODEL.widgets) {
-    if (MYMODEL.widgets[key].name === 'dropzone') {
-      //console.log('has dropzone')
-      let path_src = dirRoot + '/public/zdropzone/' + userId + '/'
-      let path_dest = dirRoot + '/public/uploads/' + MYMODEL.routeName + '/' + key + '/'
-      if (!fs.existsSync(path_dest)) {
-        fs.mkdirSync(path_dest, { recursive: true })
-      }
-      let name = `dropzone__${res.locals.userId}__${table}__${key}__create`
-      if (myCache.has(name)) {
-        let arr = myCache.get(name)
-        let newArr = []
-        if (arr.length > 0) {
-          let time = new Date().getTime()
-          arr.map((item) => {
-            let newItem = time + item
-            newArr.push(newItem)
-            fs.rename(path_src + item, path_dest + newItem)
-          })
+  try {
+    const MYMODELS = myCache.get('MYMODELS')
+    let MYMODEL = MYMODELS[table]
+    let fields = MYMODEL.keys
+    let userId = res.locals.userId || 1
+    if (fields.includes('company_id')) data.company_id = res.locals.companyId || 1
+    if (fields.includes('updated_at')) data.updated_at = Util.now()
+    if (fields.includes('created_at')) data.created_at = Util.now()
+    if (fields.includes('updated_by')) data.updated_by = userId
+    if (fields.includes('created_by')) data.created_by = userId
+    delete data.lock
+    delete data.approval_status
+    delete data.approval_history
+
+    //check dropzone
+    let hasDropzone = false
+    for (let key in MYMODEL.widgets) {
+      if (MYMODEL.widgets[key].name === 'dropzone') {
+        //console.log('has dropzone')
+        let path_src = dirRoot + '/public/zdropzone/' + userId + '/'
+        let path_dest = dirRoot + '/public/uploads/' + MYMODEL.routeName + '/' + key + '/'
+        if (!fs.existsSync(path_dest)) {
+          fs.mkdirSync(path_dest, { recursive: true })
+        }
+        let name = `dropzone__${res.locals.userId}__${table}__${key}__create`
+        if (myCache.has(name)) {
+          let arr = myCache.get(name)
+          let newArr = []
+          if (arr.length > 0) {
+            let time = new Date().getTime()
+            arr.map((item) => {
+              let newItem = time + item
+              newArr.push(newItem)
+              fs.rename(path_src + item, path_dest + newItem)
+            })
 
-          data[key] = Util.array_to_jsonb(newArr)
+            data[key] = Util.array_to_jsonb(newArr)
+          }
         }
       }
     }
+    const result = await connection.insert({ table: table, data: data })
+    zRoute.modelsCacheRenew(table, res.locals.companyId)
+    return result
+  } catch (e) {
+    console.log(e)
   }
-  const result = await connection.insert({ table: table, data: data })
-  zRoute.modelsCacheRenew(table, res.locals.companyId)
-  return result
 }
 
 zRoute.updateSQL = async (req, res, table, data, whereData) => {
-  const MYMODELS = myCache.get('MYMODELS')
-  let MYMODEL = MYMODELS[table]
-  let fields = MYMODEL.keys
-  const userId = res.locals.userId
-  if (fields.includes('updated_at')) {
-    data.updated_at = Util.now()
-  }
-  if (fields.includes('updated_by')) {
-    data.updated_by = userId
-  }
-  //check if has table and image/file
-  let hasImages = false
-  let tables = []
-  let tableFields = {}
-  for (let key in MYMODEL.widgets) {
-    if (MYMODEL.widgets[key].name == 'table') {
-      tableFields[key] = []
-      const MYMODEL_TABLE = MYMODELS[MYMODEL.widgets[key].table]
-      for (let q in MYMODEL_TABLE.widgets) {
-        if (MYMODEL_TABLE.widgets[q].name == 'file' || MYMODEL_TABLE.widgets[q].name == 'image') {
-          hasImages = true
-          tables.push(key)
-          tableFields[key].push(q)
-        }
-      }
+  try {
+    const MYMODELS = myCache.get('MYMODELS')
+    let MYMODEL = MYMODELS[table]
+    let fields = MYMODEL.keys
+    const userId = res.locals.userId
+    if (fields.includes('updated_at')) {
+      data.updated_at = Util.now()
+    }
+    if (fields.includes('updated_by')) {
+      data.updated_by = userId
     }
-    if (MYMODEL.widgets[key].name === 'dropzone') {
-      //console.log('has dropzone')
-      let path_src = dirRoot + '/public/zdropzone/' + userId + '/'
-      let path_dest = dirRoot + '/public/uploads/' + MYMODEL.table + '/' + key + '/'
-      if (!fs.existsSync(path_dest)) {
-        fs.mkdirSync(path_dest, { recursive: true })
+    //check if has table and image/file
+    let hasImages = false
+    let tables = []
+    let tableFields = {}
+    for (let key in MYMODEL.widgets) {
+      if (MYMODEL.widgets[key].name == 'table') {
+        tableFields[key] = []
+        const MYMODEL_TABLE = MYMODELS[MYMODEL.widgets[key].table]
+        for (let q in MYMODEL_TABLE.widgets) {
+          if (MYMODEL_TABLE.widgets[q].name == 'file' || MYMODEL_TABLE.widgets[q].name == 'image') {
+            hasImages = true
+            tables.push(key)
+            tableFields[key].push(q)
+          }
+        }
       }
-      let name = `dropzone__${userId}__${MYMODEL.table}__${key}__${whereData.id}`
-      if (myCache.has(name)) {
-        let arr = myCache.get(name)
-        let newArr = []
-        if (arr.length > 0) {
-          let time = new Date().getTime()
-          arr.map((item) => {
-            if (!Util.fileExist(path_dest + item)) {
-              let newItem = time + item
-              newArr.push(newItem)
-              fs.rename(path_src + item, path_dest + newItem)
-            } else {
-              newArr.push(item)
-            }
-          })
-          data[key] = Util.array_to_jsonb(newArr)
+      if (MYMODEL.widgets[key].name === 'dropzone') {
+        //console.log('has dropzone')
+        let path_src = dirRoot + '/public/zdropzone/' + userId + '/'
+        let path_dest = dirRoot + '/public/uploads/' + MYMODEL.table + '/' + key + '/'
+        if (!fs.existsSync(path_dest)) {
+          fs.mkdirSync(path_dest, { recursive: true })
+        }
+        let name = `dropzone__${userId}__${MYMODEL.table}__${key}__${whereData.id}`
+        if (myCache.has(name)) {
+          let arr = myCache.get(name)
+          let newArr = []
+          if (arr.length > 0) {
+            let time = new Date().getTime()
+            arr.map((item) => {
+              if (!Util.fileExist(path_dest + item)) {
+                let newItem = time + item
+                newArr.push(newItem)
+                fs.rename(path_src + item, path_dest + newItem)
+              } else {
+                newArr.push(item)
+              }
+            })
+            data[key] = Util.array_to_jsonb(newArr)
+          }
         }
       }
     }
-  }
-  let result = await connection.result({
-    table: MYMODEL.table,
-    where: whereData,
-  })
-  if (hasImages) {
-    tables.forEach((item) => {
-      let dataTables = data[item] ? JSON.parse(data[item]) : []
-      let temp = []
-      if (dataTables.length) {
-        dataTables.forEach((obj, index) => {
-          tableFields[item].forEach((key) => {
-            if (!obj[key]) {
-              let resultItem = result[item]
-              if (resultItem && Object.prototype.hasOwnProperty.call(resultItem, index)) {
-                let resultItemIndex = resultItem[index]
-                if (resultItemIndex && Object.prototype.hasOwnProperty.call(resultItemIndex, key)) {
-                  obj[key] = !result[item][index] ? '' : result[item][index][key]
+    let result = await connection.result({
+      table: MYMODEL.table,
+      where: whereData,
+    })
+    if (hasImages) {
+      tables.forEach((item) => {
+        let dataTables = data[item] ? JSON.parse(data[item]) : []
+        let temp = []
+        if (dataTables.length) {
+          dataTables.forEach((obj, index) => {
+            tableFields[item].forEach((key) => {
+              if (!obj[key]) {
+                let resultItem = result[item]
+                if (resultItem && Object.prototype.hasOwnProperty.call(resultItem, index)) {
+                  let resultItemIndex = resultItem[index]
+                  if (resultItemIndex && Object.prototype.hasOwnProperty.call(resultItemIndex, key)) {
+                    obj[key] = !result[item][index] ? '' : result[item][index][key]
+                  }
                 }
               }
-            }
+            })
+            temp.push(obj)
           })
-          temp.push(obj)
-        })
-        data[item] = JSON.stringify(temp)
-      }
-    })
-  }
-  delete data.created_at
-  delete data.created_by
-  delete data.lock
-  delete data.approval_status
-  delete data.approval_history
-  if (result.lock != 1) {
-    const myresult = await connection.update({ table: table, where: whereData, data: data })
-    //save to history
-    connection.insert({
-      table: 'zhistory',
-      data: {
-        module_id: result.id,
-        module: MYMODEL.table,
-        data_1: JSON.stringify(result),
-        data_2: JSON.stringify(myresult),
-        data_1_date: result.updated_at,
-        data_2_date: data.updated_at,
-        created_by: userId,
-        updated_by: userId,
-        created_at: Util.now(),
-        updated_at: Util.now(),
-        company_id: res.locals.companyId,
-      },
-    })
-    zRoute.modelsCacheRenew(table, res.locals.companyId)
-    return myresult
-  } else {
-    return result
+          data[item] = JSON.stringify(temp)
+        }
+      })
+    }
+    delete data.created_at
+    delete data.created_by
+    delete data.lock
+    delete data.approval_status
+    delete data.approval_history
+    if (result.lock != 1) {
+      const myresult = await connection.update({ table: table, where: whereData, data: data })
+      //save to history
+      connection.insert({
+        table: 'zhistory',
+        data: {
+          module_id: result.id,
+          module: MYMODEL.table,
+          data_1: JSON.stringify(result),
+          data_2: JSON.stringify(myresult),
+          data_1_date: result.updated_at,
+          data_2_date: data.updated_at,
+          created_by: userId,
+          updated_by: userId,
+          created_at: Util.now(),
+          updated_at: Util.now(),
+          company_id: res.locals.companyId,
+        },
+      })
+      zRoute.modelsCacheRenew(table, res.locals.companyId)
+      return myresult
+    } else {
+      return result
+    }
+  } catch (e) {
+    console.log(e)
   }
 }
 
@@ -3746,7 +3757,8 @@ zRoute.import = async (req, res, MYMODEL) => {
     res.json('no access')
     return false
   }
-
+  const dateTime = Util.now()
+  const companyId = res.locals.companyId
   const userId = res.locals.userId
   const room = res.locals.token
   let progress = 0
@@ -3864,20 +3876,20 @@ zRoute.import = async (req, res, MYMODEL) => {
       delete data.approval_status
       delete data.approval_history
       if (isInsert) {
-        if (Util.in_array('company_id', fields)) data.company_id = res.locals.companyId
-        if (Util.in_array('created_at', fields)) data.created_at = Util.now()
-        if (Util.in_array('created_by', fields)) data.created_by = res.locals.userId
-        if (Util.in_array('updated_at', fields)) data.updated_at = Util.now()
-        if (Util.in_array('updated_by', fields)) data.updated_by = res.locals.userId
+        if (Util.in_array('company_id', fields)) data.company_id = companyId
+        if (Util.in_array('created_at', fields)) data.created_at = dateTime
+        if (Util.in_array('created_by', fields)) data.created_by = userId
+        if (Util.in_array('updated_at', fields)) data.updated_at = dateTime
+        if (Util.in_array('updated_by', fields)) data.updated_by = userId
 
         await connection.insert({ table: MYMODEL.table, data: data })
         hd += `<td class='text text-success'>${LANGUAGE['success']}</td>`
       } else {
-        if (Util.in_array('updated_at', fields)) data.updated_at = Util.now()
-        if (Util.in_array('updated_by', fields)) data.updated_by = res.locals.userId
+        if (Util.in_array('updated_at', fields)) data.updated_at = dateTime
+        if (Util.in_array('updated_by', fields)) data.updated_by = userId
         //check data is lock
         let mydatas = await connection.result({
-          select: 'id,lock',
+          //select: 'id,lock',
           table: MYMODEL.table,
           where: {
             id: data.id,
@@ -3886,7 +3898,7 @@ zRoute.import = async (req, res, MYMODEL) => {
         if (mydatas.lock == 1) {
           hd += `<td class='text text-success'>Data is locked</td>`
         } else {
-          await connection.update({
+          let myupdate = await connection.update({
             table: MYMODEL.table,
             data: data,
             where: {
@@ -3894,6 +3906,25 @@ zRoute.import = async (req, res, MYMODEL) => {
             },
           })
           hd += `<td class='text text-success'>${LANGUAGE['success']}</td>`
+
+          //save to history
+          await connection.insert({
+            table: 'zhistory',
+            data: {
+              data_1: JSON.stringify(mydatas),
+              data_2: JSON.stringify(myupdate),
+              data_1_date: mydatas.updated_at,
+              data_2_date: dateTime,
+              module_id: mydatas.id,
+              module: MYMODEL.table,
+              company_id: companyId,
+              created_at: dateTime,
+              created_by: userId,
+              updated_at: dateTime,
+              updated_by: userId,
+            },
+          })
+          //end history
         }
       }
     } catch (err) {
@@ -4357,7 +4388,7 @@ zRoute.history = async (req, res, relations, id, MYMODEL, users, results = []) =
         arrDataAttributes.push({
           date1: result.data_1_date,
           date2: result.data_2_date,
-          by1: result.data_1.created_by,
+          by1: result.data_1.updated_by,
           by2: result.created_by,
         })
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.2.85",
+  "version": "1.2.87",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"