yaml-admin-api 0.0.21 → 0.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml-admin-api",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "license": "MIT",
   "description": "YAML Admin API package",
   "type": "commonjs",
@@ -8,9 +8,7 @@
   "files": [
     "src"
   ],
-  "scripts": {
-    "pub": "npm publish -w yaml-admin-api --access public"
-  },
+  "scripts": {},
   "dependencies": {
     "@aws-sdk/client-s3": "^3.596.0",
     "@aws-sdk/client-ses": "^3.855.0",

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

@@ -158,6 +158,22 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
     }
     
 
+    /**
+     * check entity max key and update counter to max+1
+     * @param {*} db 
+     * @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) {
+            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 } })
+        }
+    }
+
     //list
     app.get(`/${entity_name}`, auth.isAuthenticated, asyncErrorHandler(async (req, res) => {
         //검색 파라미터
@@ -261,6 +277,9 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
 
     //create
     app.post(`/${entity_name}`, auth.isAuthenticated, asyncErrorHandler(async (req, res) => {
+        
+        await recalcurateAutoGenerateIndex(db, entity_name)
+        
         let entityId
         if (key_field.autogenerate)
             entityId = await generateKey()
@@ -428,6 +447,8 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
             let header = list[0]
             list.shift();
 
+            await recalcurateAutoGenerateIndex(db, entity_name)
+            
             let upsert = yml_entity.crud.import.upsert || true
             let fields = yml_entity.crud.import.fields.map(m => m)
             fields = fields.map(field => {

package/src/login/auth.js

@@ -60,6 +60,7 @@ const withConfig = (config) => {
     else
       jwt.verify(token, jwt_secret, (err, decoded) => {
         if (err) {
+          console.log('err', err)
           res.json({ r: false, err: { code: 666 }, msg: 'No authentication' });
           return;
         }