yaml-admin-api 0.0.31 → 0.0.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml-admin-api",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "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);
@@ -594,19 +599,47 @@ const makeApiGenerateFields = async (db, entity_name, yml_entity, yml, options,
         limit = limit || 1000
         
         let match_from_list = data_list.map(m=>matchPathInObject(m, match_from))
-
         match_from_list = match_from_list.filter(m=>m)
         const f = { [match]: {$in:match_from_list} }
         const projection = {[match]:1}
 
+        const aggregate = [
+            { $match: { [match]: {$in:match_from_list} } },
+        ]
+
         if(field)
             projection[field] = 1
-        else
+        else {
             fields.map(m=>{
                 projection[m.name] = 1
             })
 
-        const result = await db.collection(entity).find(f).project(projection).sort(sort).limit(limit).toArray()
+            fields.map(m=>{
+                if(m.type == 'reference') {
+                    let project = { _id: 0 }
+                    m.fields.map(f=>{
+                        project[f.name] = 1
+                    })
+
+                    aggregate.push({ $lookup: {
+                        from: m.reference_entity,
+                        let: { local_key: '$'+m.reference_from },
+                        pipeline: [
+                            { $match: { $expr: { $eq: ["$"+m.reference_match, "$$local_key"] } } },
+                            { $project: project }
+                        ],
+                        as: m.name
+                    } })
+                    if(m.single)
+                        aggregate.push({ $unwind: `$${m.name}` })
+                }
+            })
+        }
+
+        const result = await db.collection(entity)
+            .aggregate(aggregate)
+            .project(projection)
+            .toArray()
         data_list.map(m=>{
             let found = result.filter(f=>matchPathInObject(f, match) === matchPathInObject(m, match_from))
             if(single) {