yaml-admin-api 0.0.74 → 0.0.76

package/package.json

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

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

@@ -253,15 +253,12 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
         let aggregate = await makeApiGenerateAggregate(db, entity_name, yml_entity, yml, options)
 
         if(aggregate?.length > 0) {
-            aggregate = [{$match: f}, ...aggregate]
-
+            aggregate = [...aggregate, {$match: f}]
             const countResult = await db.collection(entity_name).aggregate([...aggregate, { $count: 'count' }]).toArray()
             count = countResult.length > 0 ? countResult[0].count : 0
 
-            list = await db.collection(entity_name).aggregate(aggregate)
-                .sort(s)
-                .skip(parseInt(_start))
-                .limit(l).toArray()
+            aggregate = [...aggregate, { $sort: s }, { $skip: parseInt(_start) }, { $limit: l }]
+            list = await db.collection(entity_name).aggregate(aggregate).toArray()
         } else 
         {
             count = await db.collection(entity_name).find(f).project(projection).sort(s).count()
@@ -707,6 +704,12 @@ const makeApiGenerateAggregate = async (db, entity_name, yml_entity, yml, option
             { $match: { $expr: { $eq: ['$' + match, '$$local_key'] } } }
         ]
 
+        // single일 때 max _id로 하나만 선택 ($match 바로 다음에)
+        if(single) {
+            innerPipeline.push({ $sort: { _id: -1 } })
+            innerPipeline.push({ $limit: 1 })
+        }
+
         // projection 구성
         const projection = { _id: 0, [match]: 1 }
         if(field) {
@@ -726,8 +729,8 @@ const makeApiGenerateAggregate = async (db, entity_name, yml_entity, yml, option
             })
         }
 
-        // projection을 innerPipeline 맨 앞에 추가 (match 다음)
-        innerPipeline.splice(1, 0, { $project: projection })
+        // projection을 innerPipeline에 추가
+        innerPipeline.push({ $project: projection })
 
         // 기본 $lookup 추가
         aggregate.push({