yaml-admin-api 0.0.32 → 0.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml-admin-api",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "license": "MIT",
   "description": "YAML Admin API package",
   "type": "commonjs",

package/src/crud/entity-api-generator.js

@@ -164,13 +164,15 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
      * @param {*} entity_name 
      */
     const recalcurateAutoGenerateIndex = async (db, entity_name) => {
-        const list = await db.collection(entity_name).find({}).sort({ [key_field.name]: -1 }).limit(1).toArray()
-        const counter = await db.collection('counters').findOne({ _id: key_field.name })
-        if(list.length > 0) {
+        const list = await db.collection(entity_name).find({})
+            .project({ [key_field.name]: 1, _id: 0 })
+            .sort({ [key_field.name]: -1 }).limit(1).toArray()
+        const counter = await db.collection('counters').findOne({ _id: entity_name })
+        if(list.length > 0 && counter) {
             let seq = counter?.seq || 0
             let maxKey = list[0][key_field.name]
-            if(maxKey <= seq)
-                await db.collection('counters').updateOne({ _id: key_field.name }, { $set: { seq: maxKey + 1 } })
+            if(maxKey >= seq)
+                await db.collection('counters').updateOne({ _id: entity_name }, { $set: { seq: maxKey + 1 } })
         }
     }
 
@@ -223,14 +225,17 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
         //Custom f list End
 
         const projection = (key_field.name == '_id' ? {} : { _id: false })
+        if(yml.debug)
+            console.log('list', entity_name, f)
         var count = await db.collection(entity_name).find(f).project(projection).sort(s).count();
         let list = await db.collection(entity_name).find(f).project(projection).sort(s).skip(parseInt(_start)).limit(l).toArray()
         list.map(m => {
             m.id = getKeyFromEntity(m)
         })
-        //Custom list Start
-
-        //Custom list End
+        
+        if(yml.debug)
+            console.log('list', entity_name, 'found', count)
+        
         await addInfo(db, list)
 
         res.header('X-Total-Count', count);