zet-lib 1.2.22 → 1.2.23

package/lib/zRoute.js

@@ -501,7 +501,7 @@ zRoute.relations = async (req, res, table) => {
           select: widget.fields.join(',') + ' as zname ',
           table: widget.table,
           where: { company_id: company_id },
-          orderBy: ['zname', 'asc'],
+          order_by: widget.hasOwnProperty('order_by') && widget.order_by ? [`${widget.order_by}`] : ['zname asc'],
         }
         if (Util.in_array(widget.table, zRoute.tableHasNoCompanyId)) {
           delete obj.where
@@ -559,7 +559,7 @@ zRoute.relations = async (req, res, table) => {
           select: select,
           table: widget.table,
           where: { company_id: company_id },
-          orderBy: ['zname', 'asc'],
+          order_by: widget.hasOwnProperty('order_by') && widget.order_by ? [`${widget.order_by}`] : ['zname asc'],
         }
         if (Util.in_array(widget.table, zRoute.tableHasNoCompanyId)) {
           delete obj.where
@@ -618,7 +618,7 @@ zRoute.relations = async (req, res, table) => {
           select: select,
           table: widget.table,
           where: { company_id: company_id },
-          orderBy: ['zname', 'asc'],
+          order_by: widget.hasOwnProperty('order_by') && widget.order_by ? [`${widget.order_by}`] : ['zname asc'],
         }
         if (Util.in_array(widget.table, zRoute.tableHasNoCompanyId)) {
           delete obj.where
@@ -3667,6 +3667,7 @@ cache models in so it's no need call database repeatly
 
 zRoute.modelsCache = async () => {
   let obj = {}
+  let orderBy = {}
   if (process.env.APP_IS_CACHE == 1) {
     let models = zRoute.MYMODELS() || {}
     delete models.zrole
@@ -3686,6 +3687,13 @@ zRoute.modelsCache = async () => {
             }
             if (!Util.in_array(key, nots)) {
               obj[table][`${keys}___${key}`] = `${widgets[key].fields[1]} as ${key}`
+              if (Object.prototype.hasOwnProperty.call(models[keys].widgets, key)) {
+                if (Object.prototype.hasOwnProperty.call(models[keys].widgets[key], 'order_by')) {
+                  if (models[keys].widgets[key].order_by) {
+                    orderBy[table] = models[keys].widgets[key].order_by
+                  }
+                }
+              }
             }
           }
         }
@@ -3699,7 +3707,9 @@ zRoute.modelsCache = async () => {
       created_by: 'fullname as created_by',
       updated_by: 'fullname as updated_by',
     }
-
+    //set order by to cache
+    myCache.set(`Z___ORDER_BY`, orderBy)
+    //console.log(JSON.stringify(obj))
     try {
       for (let keys in obj) {
         let checks = await connection.query(`SELECT EXISTS ( SELECT 1 FROM pg_tables WHERE tablename = '${keys}') AS oke;`)
@@ -3711,22 +3721,32 @@ zRoute.modelsCache = async () => {
             }
             selects += `id, company_id`
             for (const company of companies) {
-              const results = await connection.results({
+              //console.log('selects : '+ selects + ' table : '+keys + ' ')
+              let objectSQL = {
                 table: keys,
                 select: selects,
                 where: {
                   company_id: company.id,
                 },
-              })
+              }
+              if (orderBy[keys]) {
+                objectSQL.order_by = [`${orderBy[keys]}`]
+              }
+              const results = await connection.results(objectSQL)
               for (let key in obj[keys]) {
+                //console.log('key : '+ key + ' obj[keys] : '+ JSON.stringify(obj[keys]) + ' ')
                 const splits = key.split('___') || []
                 let item = splits.length > 1 ? splits[1] : key
                 let arr = []
                 for (const result of results) {
                   arr.push({ id: result.id, zname: result[item] })
                 }
-                const myarray = Util.sortArray(arr, 'zname')
-                myCache.set(`${keys}_${key}_${company.id}`, myarray)
+                if (orderBy[keys]) {
+                  myCache.set(`${keys}_${key}_${company.id}`, arr)
+                } else {
+                  const myarray = Util.sortArray(arr, 'zname')
+                  myCache.set(`${keys}_${key}_${company.id}`, myarray)
+                }
               }
             }
           }
@@ -3735,32 +3755,36 @@ zRoute.modelsCache = async () => {
     } catch (e) {
       //debug(req,res,e.toString());
       console.log('modelsCache :', e + '')
+      console.log(e)
     }
   }
   return obj
 }
 
 zRoute.modelsCacheRenew = (table, companyId) => {
-  if (process.env.APP_IS_CACHE == 1) {
-    if (myCache.has('MODELS_RELATIONS')) {
-      let MODELS = myCache.get('MODELS_RELATIONS')
-      let arr = Object.keys(MODELS) || []
-      let obj = MODELS[table] || {}
-      if (Util.in_array(table, arr)) {
-        let selects = ''
-        for (let key in obj) {
-          selects += `${obj[key]},`
-        }
-        selects += `id`
-        connection
-          .results({
+  try {
+    if (process.env.APP_IS_CACHE == 1) {
+      if (myCache.has('MODELS_RELATIONS')) {
+        let MODELS = myCache.get('MODELS_RELATIONS')
+        let arr = Object.keys(MODELS) || []
+        let obj = MODELS[table] || {}
+        let orderBy = myCache.get('Z___ORDER_BY') || {}
+        if (Util.in_array(table, arr)) {
+          let selects = ''
+          for (let key in obj) {
+            selects += `${obj[key]},`
+          }
+          selects += `id`
+
+          let objectSQL = {
             select: selects,
             table: table,
-            where: {
-              company_id: companyId,
-            },
-          })
-          .then(function (results) {
+            where: { company_id: companyId },
+          }
+          if (orderBy[table]) {
+            objectSQL.order_by = [`${orderBy[table]}`]
+          }
+          connection.results(objectSQL).then(function (results) {
             for (let key in obj) {
               const splits = key.split('___') || []
               let item = splits.length > 1 ? splits[1] : key
@@ -3768,43 +3792,54 @@ zRoute.modelsCacheRenew = (table, companyId) => {
               for (const result of results) {
                 arr.push({ id: result.id, zname: result[item] })
               }
-              const myarray = Util.sortArray(arr, 'zname')
-              myCache.set(`${table}_${key}_${companyId}`, myarray)
+              if (orderBy[table]) {
+                myCache.set(`${table}_${key}_${companyId}`, arr)
+              } else {
+                const myarray = Util.sortArray(arr, 'zname')
+                myCache.set(`${table}_${key}_${companyId}`, myarray)
+              }
             }
           })
+        }
       }
     }
+  } catch (err) {
+    console.log(err)
   }
 }
 
 zRoute.makeFunctionsSystem = () => {
-  let obj = myCache.get('ZFUNCTIONS')
-  let content = ``
-  for (let key in obj) {
-    if (obj[key].systems == 1) {
-      content += obj[key].code
-      content += Util.newLine
+  try {
+    let obj = myCache.get('ZFUNCTIONS')
+    let content = ``
+    for (let key in obj) {
+      if (obj[key].systems == 1) {
+        content += obj[key].code
+        content += Util.newLine
+      }
     }
-  }
-  let templateSystem = `const { connection, Util, io, zCache, myCache, zDebug, zDataTable, moduleLib, zFunction, zFn, zMail, zRoute, zRole} = require('zet-lib');
+    let templateSystem = `const { connection, Util, io, zCache, myCache, zDebug, zDataTable, moduleLib, zFunction, zFn, zMail, zRoute, zRole} = require('zet-lib');
 module.exports = (req, res, next) => {`
-  let fileSystem = `${dirRoot}/components/zFunctionsSystem.js`
-  templateSystem += content
-  templateSystem += `  next();
+    let fileSystem = `${dirRoot}/components/zFunctionsSystem.js`
+    templateSystem += content
+    templateSystem += `  next();
 };
 `
-  Util.writeFile(fileSystem, templateSystem)
-  if (process.env.NODE_ENV === 'production') {
-    setTimeout(function () {
-      pm2.connect(function (err) {
-        if (err) {
-          console.log(err.toString())
-        }
-        pm2.restart(process.env.PM2_NAME, (err, proc) => {
-          //io.to(room).emit("message","Restart done")
+    Util.writeFile(fileSystem, templateSystem)
+    if (process.env.NODE_ENV === 'production') {
+      setTimeout(function () {
+        pm2.connect(function (err) {
+          if (err) {
+            console.log(err.toString())
+          }
+          pm2.restart(process.env.PM2_NAME, (err, proc) => {
+            //io.to(room).emit("message","Restart done")
+          })
         })
-      })
-    }, 3000)
+      }, 3000)
+    }
+  } catch (err) {
+    console.log(err)
   }
 }
 

package/package.json

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