adminmate-express-mongoose 1.3.3 → 1.3.4

package/index.js

@@ -1,23 +1,39 @@
-const { init, isAuthorized } = require(global.AM_DEV_MODE ? '../adminmate-express-core' : 'adminmate-express-core');
-
-// Helpers
-const fnHelper = require('./src/helpers/functions');
-
-// CRUD
-const { getAll } = require('./src/controllers/model-getall');
-const { getIn } = require('./src/controllers/model-getin');
-const { getOne } = require('./src/controllers/model-getone');
-const { getRefs } = require('./src/controllers/model-getrefs');
-const { postOne } = require('./src/controllers/model-postone');
-const { putOne } = require('./src/controllers/model-putone');
-const { deleteSome } = require('./src/controllers/model-deletesome');
-const { getAutocomplete } = require('./src/controllers/model-autocomplete');
-const { customQuery } = require('./src/controllers/model-query');
-
-const Adminmate = ({ projectId, secretKey, authKey, masterPassword, models, charts, authorizedIps }) => {
+const Adminmate = ({ projectId, secretKey, authKey, masterPassword, models, charts, authorizedIps, devMode = false, testMode = false }) => {
+  const _conf = {};
+  _conf.projectId = projectId;
+  _conf.secretKey = secretKey;
+  _conf.authKey = authKey;
+  _conf.masterPassword = masterPassword;
+  _conf.models = models || [];
+  _conf.charts = charts || [];
+  _conf.authorizedIps = authorizedIps || null;
+  _conf.devMode = devMode;
+  _conf.testMode = testMode;
+
+  const amCore = require(_conf.devMode ? '../adminmate-express-core' : 'adminmate-express-core');
+
+  // Helpers
+  const fnHelper = require('./src/helpers/functions')(_conf);
+
+  // CRUD
+  const getAll = require('./src/controllers/model-getall')(_conf);
+  const getIn = require('./src/controllers/model-getin')(_conf);
+  const getOne = require('./src/controllers/model-getone')(_conf);
+  const getRefs = require('./src/controllers/model-getrefs')(_conf);
+  const postOne = require('./src/controllers/model-postone')(_conf);
+  const putOne = require('./src/controllers/model-putone')(_conf);
+  const deleteSome = require('./src/controllers/model-deletesome')(_conf);
+  const getAutocomplete = require('./src/controllers/model-autocomplete')(_conf);
+  const customQuery = require('./src/controllers/model-query')(_conf);
+
   const api = {
     // App config
     getAppConfig: fnHelper.getAppConfig,
+    getAvailableFeatures: () => {
+      return {
+        charts: ['single_value', 'pie', 'bar', 'line', 'objective', 'ranking']
+      };
+    },
 
     // General
     getModelProperties: fnHelper.getModelProperties,
@@ -38,19 +54,16 @@ const Adminmate = ({ projectId, secretKey, authKey, masterPassword, models, char
     modelCustomQuery: customQuery
   };
 
-  return init({
-    projectId,
-    secretKey,
-    authKey,
-    masterPassword,
-    models,
-    charts,
-    authorizedIps,
+  if (testMode === true) {
+    return api;
+  }
+
+  return amCore.init({
+    config: _conf,
     api
   });
 };
 
 module.exports = {
-  init: Adminmate,
-  isAuthorized,
-};
+  init: Adminmate
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminmate-express-mongoose",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "Adminmate Express/Mongoose connector",
   "author": "Marc Delalonde",
   "homepage": "http://adminmate.io",
@@ -23,8 +23,8 @@
     "url": "https://github.com/Adminmate/adminmate-express-mongoose.git"
   },
   "dependencies": {
+    "adminmate-express-core": "~1.2.1",
     "joi": "^17.6.0",
-    "adminmate-express-core": "~1.2.0",
     "lodash": "^4.17.21",
     "moment": "^2.29.1",
     "mongoose": "~5.9.7",

package/src/controllers/chart-pie.js

@@ -1,64 +1,86 @@
 const Joi = require('joi');
 
-module.exports = async (currentModel, data) => {
-  const paramsSchema = Joi.object({
-    type: Joi.string().required(),
-    model: Joi.string().required(),
-    operation: Joi.string().required(),
-    group_by: Joi.string().required(),
-    field: Joi.alternatives().conditional('operation', {
-      not: 'count',
-      then: Joi.string().required(),
-      otherwise: Joi.string().optional()
-    }),
-    limit: Joi.number().optional()
-  });
+module.exports = _conf => {
+  const fnHelper = require('../helpers/functions')(_conf);
 
-  // Validate params
-  const { error } = paramsSchema.validate(data);
-  if (error) {
-    return {
-      success: false,
-      message: error.details[0].message
-    };
-  }
+  const chartPie = async (currentModel, data) => {
+    const paramsSchema = Joi.object({
+      type: Joi.string().required(),
+      model: Joi.string().required(),
+      operation: Joi.string().required(),
+      group_by: Joi.string().required(),
+      field: Joi.alternatives().conditional('operation', {
+        not: 'count',
+        then: Joi.string().required(),
+        otherwise: Joi.string().optional()
+      }),
+      limit: Joi.number().optional(),
+      filters: Joi.object({
+        operator: Joi.string().valid('and', 'or').required(),
+        list: Joi.array().required()
+      })
+    });
 
-  let _value = 1;
-  if (data.field && ['sum', 'avg'].includes(data.operation)) {
-    _value = `$${data.field}`;
-  }
+    // Validate params
+    const { error } = paramsSchema.validate(data);
+    if (error) {
+      return {
+        success: false,
+        message: error.details[0].message
+      };
+    }
 
-  try {
-    const repartitionData = await currentModel
-      .aggregate([
-        {
-          $group: {
-            _id: `$${data.group_by}`,
-            count: data.operation === 'avg' ? { $avg: _value } : { $sum: _value },
-          }
-        },
-        {
-          $project: {
-            key: '$_id',
-            value: '$count',
-            _id: false
+    let _value = 1;
+    if (data.field && ['sum', 'avg'].includes(data.operation)) {
+      _value = `$${data.field}`;
+    }
+
+    // Filters
+    let findParams = {};
+    if (data.filters) {
+      const filtersQuery = fnHelper.constructQuery(data.filters);
+      if (filtersQuery) {
+        findParams = filtersQuery;
+      }
+    }
+
+    try {
+      const repartitionData = await currentModel
+        .aggregate([
+          {
+            $match: findParams
+          },
+          {
+            $group: {
+              _id: `$${data.group_by}`,
+              count: data.operation === 'avg' ? { $avg: _value } : { $sum: _value },
+            }
+          },
+          {
+            $project: {
+              key: '$_id',
+              value: '$count',
+              _id: false
+            }
           }
+        ])
+        .sort({ key: 1 });
+
+      return {
+        success: true,
+        data: {
+          config: null,
+          data: repartitionData
         }
-      ])
-      .sort({ key: 1 });
+      };
+    }
+    catch(e) {
+      return {
+        success: false,
+        message: e.message
+      };
+    }
+  };
 
-    return {
-      success: true,
-      data: {
-        config: null,
-        data: repartitionData
-      }
-    };
-  }
-  catch(e) {
-    return {
-      success: false,
-      message: e.message
-    };
-  }
-};
+  return chartPie;
+};

package/src/controllers/chart-ranking.js

@@ -1,89 +1,110 @@
 const Joi = require('joi');
-const fnHelper = require('../helpers/functions');
 
-module.exports = async (currentModel, data) => {
-  const paramsSchema = Joi.object({
-    type: Joi.string().required(),
-    model: Joi.string().required(),
-    field: Joi.string().required(),
-    relationship_model: Joi.string().required(),
-    relationship_model_ref_field: Joi.string().required(),
-    relationship_operation: Joi.string().required(),
-    relationship_field: Joi.alternatives().conditional('relationship_operation', {
-      not: 'count',
-      then: Joi.string().required(),
-      otherwise: Joi.string()
-    }),
-    limit: Joi.number().optional(),
-  });
+module.exports = _conf => {
+  const fnHelper = require('../helpers/functions')(_conf);
 
-  // Validate params
-  const { error } = paramsSchema.validate(data);
-  if (error) {
-    return {
-      success: false,
-      message: error.details[0].message
-    };
-  }
+  const chartRanking = async (currentModel, data) => {
+    const paramsSchema = Joi.object({
+      type: Joi.string().required(),
+      model: Joi.string().required(),
+      field: Joi.string().required(),
+      relationship_model: Joi.string().required(),
+      relationship_model_ref_field: Joi.string().required(),
+      relationship_operation: Joi.string().required(),
+      relationship_field: Joi.alternatives().conditional('relationship_operation', {
+        not: 'count',
+        then: Joi.string().required(),
+        otherwise: Joi.string()
+      }),
+      limit: Joi.number().optional(),
+      filters: Joi.object({
+        operator: Joi.string().valid('and', 'or').required(),
+        list: Joi.array().required()
+      })
+    });
 
-  // Get relationship model
-  const relationshipModel = fnHelper.getModelObject(data.relationship_model);
-  if (!relationshipModel) {
-    return res.status(403).json({ message: 'Invalid request' });
-  }
+    // Validate params
+    const { error } = paramsSchema.validate(data);
+    if (error) {
+      return {
+        success: false,
+        message: error.details[0].message
+      };
+    }
 
-  // Default limit
-  let limit = data.limit || 10;
+    // Get relationship model
+    const relationshipModel = fnHelper.getModelObject(data.relationship_model);
+    if (!relationshipModel) {
+      return res.status(403).json({ message: 'Invalid request' });
+    }
 
-  let _value = 1;
-  if (data.relationship_field && ['sum', 'avg'].includes(data.relationship_operation)) {
-    _value = `$${data.relationship_field}`;
-  }
+    // Default limit
+    let limit = data.limit || 10;
 
-  try {
-    const repartitionData = await relationshipModel
-      .aggregate([
-        {
-          $group: {
-            _id: `$${data.relationship_model_ref_field}`,
-            count: data.operation === 'avg' ? { $avg: _value } : { $sum: _value },
-          }
-        },
-        {
-          $project: {
-            key: '$_id',
-            value: '$count',
-            _id: false
+    let _value = 1;
+    if (data.relationship_field && ['sum', 'avg'].includes(data.relationship_operation)) {
+      _value = `$${data.relationship_field}`;
+    }
+
+    // Filters
+    let findParams = {};
+    if (data.filters) {
+      const filtersQuery = fnHelper.constructQuery(data.filters);
+      if (filtersQuery) {
+        findParams = filtersQuery;
+      }
+    }
+
+    try {
+      const repartitionData = await relationshipModel
+        .aggregate([
+          {
+            $match: findParams
+          },
+          {
+            $group: {
+              _id: `$${data.relationship_model_ref_field}`,
+              count: data.operation === 'avg' ? { $avg: _value } : { $sum: _value },
+            }
+          },
+          {
+            $project: {
+              key: '$_id',
+              value: '$count',
+              _id: false
+            }
           }
-        }
-      ])
-      .limit(limit)
-      .sort({ value: -1 });
+        ])
+        .limit(limit)
+        .sort({ value: -1 });
 
-    const parentIds = repartitionData.map(d => d.key);
-    const parentData = await currentModel.find({ _id: parentIds }).select(data.field).lean();
+      const parentIds = repartitionData.map(d => d.key);
+      const parentData = await currentModel.find({ _id: parentIds }).select(data.field).lean();
 
-    repartitionData.forEach(d => {
-      d.item_model = data.model;
-      d.item_id = d.key;
-      const parent = parentData.find(p => p._id.toString() === d.key.toString());
-      if (parent) {
-        d.key = parent[data.field];
-      }
-    });
+      repartitionData.forEach(d => {
+        d.item_model = data.model;
+        d.item_id = d.key;
+        const parent = parentData.find(p => p._id.toString() === d.key.toString());
+        if (parent) {
+          d.key = parent[data.field];
+        }
+      });
 
-    return {
-      success: true,
-      data: {
-        config: null,
-        data: repartitionData
-      }
-    };
-  }
-  catch(e) {
-    return {
-      success: false,
-      message: e.message
-    };
-  }
-};
+      return {
+        success: true,
+        data: {
+          config: null,
+          data: repartitionData
+        }
+      };
+    }
+    catch(e) {
+      return {
+        success: false,
+        message: e.message
+      };
+    }
+  };
+
+  return chartRanking;
+};