yaml-admin-api 0.0.67 → 0.0.69

package/package.json

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

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

@@ -20,7 +20,7 @@ const generateChartApi = async (app, db, yml, api_prefix) => {
 
     const auth = withConfig({ db, jwt_secret: yml.login["jwt-secret"] });
 
-    const createChartDataTypeDate = async (chart, {from_date}) => {
+    const createChartDataTypeDate = async (chart, {from_date, filter}) => {
         const r = {
             options: {
                 chart: { id: chart.id },
@@ -92,19 +92,26 @@ const generateChartApi = async (app, db, yml, api_prefix) => {
                 }
             })
 
-            let a = [
-                { $match: {server_id:148, parent_id:null}},
+            let a = []
+            if(filter && Object.keys(filter).length > 0) 
+                a.push({ $match: filter })
+
+            a.push(...[
                 ...lookup_list,
                 { $match: match},
                 ...group_list,
                 { $sort: { _id: -1 } },
-            ]
+            ])
 
             if(limit)
                 a.push({ $limit: limit })
 
+            //debug
+            if(yml.debug)
+                console.log('chart', chart.label, entity_x, JSON.stringify(a, null, 2))
+
             const list = await db.collection(entity_x).aggregate(a).toArray();
-            
+
             list.map(m => {
                 if (format)
                     return moment.tz(m._id, timezone).format(format);
@@ -131,7 +138,7 @@ const generateChartApi = async (app, db, yml, api_prefix) => {
         return r
     }
 
-    const createChartDataTypeField = async (chart) => {
+    const createChartDataTypeField = async (chart, {filter}) => {
         const r = {
             options: {
                 chart: { id: chart.id },
@@ -154,10 +161,6 @@ const generateChartApi = async (app, db, yml, api_prefix) => {
         for (const s of y.series) {
             const { label } = s;
             
-            let match_list = []
-            if(s['if'] && !relation)
-                match_list.push({ $match: evaluateIfToMatch(s['if'])})
-
             let lookup_list = []
             if (relation) {
                 if(!relation.chain)
@@ -169,7 +172,7 @@ const generateChartApi = async (app, db, yml, api_prefix) => {
                     from: entity_y,
                     let: { root_x_key: `$${relation.match.x}` },
                     pipeline: [],
-                      as: entity_y,
+                    as: entity_y,
                 }
 
                 for(let i=0;i<relation.chain.length;i++) {
@@ -185,7 +188,6 @@ const generateChartApi = async (app, db, yml, api_prefix) => {
                     lookup.pipeline.push({ $unwind: `$${m.entity}` })
                 }
 
-                
                 if(s['if'])
                     lookup.pipeline.push({ $match: evaluateIfToMatch(s['if'])})
 
@@ -226,11 +228,12 @@ const generateChartApi = async (app, db, yml, api_prefix) => {
                 })
             }
 
-            let a = [
-                { $match: {server_id:148, parent_id:null}},
-                ...lookup_list,
-            ]
+            let a = []
 
+            if(filter && Object.keys(filter).length > 0)
+                a.push({ $match: filter })
+
+            a.push(...lookup_list)
             a.push(...group_list)
             
             if(sort)
@@ -240,8 +243,8 @@ const generateChartApi = async (app, db, yml, api_prefix) => {
                 a.push({ $limit: limit })
 
             //debug
-            if(chart.debug)
-                console.log('a', entity_x, JSON.stringify(a, null, 2))
+            if(yml.debug)
+                console.log('chart', chart.label, entity_x, JSON.stringify(a, null, 2))
 
             const list = await db.collection(entity_x).aggregate(a).toArray();
 
@@ -285,11 +288,25 @@ const generateChartApi = async (app, db, yml, api_prefix) => {
             try {
                 const { x } = chart;
                 let r
+
+                let filter = {};
+                chart.filter?.forEach(s => {
+                    let value = req.query[s.name];
+                    if(value == 'null')
+                        filter[s.name] = null;
+                    else if(value == 'not null')
+                        filter[s.name] = { $ne: null };
+                    else if(s.type == 'integer')
+                        filter[s.name] = parseInt(value);
+                    else
+                        filter[s.name] = value;
+                });
+                
                 if (x.type == 'date') {
                     let {from_date} = req.query //YYYYMMDD
-                    r = await createChartDataTypeDate(chart, {from_date});
+                    r = await createChartDataTypeDate(chart, {from_date, filter});
                 } else if(x.type == 'field') {
-                    r = await createChartDataTypeField(chart);
+                    r = await createChartDataTypeField(chart, {filter});
                 } else {
                     throw new Error('x.type is not date or field');
                 }

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

@@ -78,6 +78,10 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
 
     const parseValueByType = (value, field) => {
         const { type, reference_entity, reference_match } = field
+        if(value == 'not null')
+            return { $ne: null }
+        else if(value == 'null')
+            return null
         if (type == 'reference') {
             const referenceEntity = yml.entity[reference_entity]
             const referenceField = referenceEntity.fields.find(f => f.name == reference_match)
@@ -240,9 +244,6 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
             m.id = getKeyFromEntity(m)
         })
         
-        if(yml.debug)
-            console.log('list', entity_name, 'found', count)
-        
         await addInfo(db, list)
         if(options?.listener?.entityListed)
             await options.listener.entityListed(db, entity_name, list)

package/src/login/auth.js

@@ -77,14 +77,15 @@ const withConfig = (config) => {
         next);
     }
     else {
-      const memberProjection = { projection: { _id: false, name: true, email: true, password: true, super: true, id: true } };
+      const memberProjection = { projection: { _id: false } };
       if (type === 'email') {
         memberProjection['password'] = true;
-        let member = await db.collection('admin').findOne({ email: email }, memberProjection)
+        let entity = 'admin';
+        let member = await db.collection(entity).findOne({ email: email }, memberProjection)
         if (member != null) {
           let isPasswordMatch = await comparePassword(password, member.password)
           if (isPasswordMatch) {
-            await db.collection('admin').updateOne({ email: email }, { $set: { login_date: new Date() } }, { upsert: false })
+            await db.collection(entity).updateOne({ email: email }, { $set: { login_date: new Date() } }, { upsert: false })
             delete member.password;
             authenticateSuccess(req, res, member, next);
           } else