adminmate-express-mongoose 1.2.8 → 1.3.2

package/index.js

@@ -7,6 +7,7 @@ const fnHelper = require('./src/helpers/functions');
 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');
@@ -29,6 +30,7 @@ const Adminmate = ({ projectId, secretKey, authKey, masterPassword, models, char
     modelGetAll: getAll,
     modelGetIn: getIn,
     modelGetOne: getOne,
+    modelGetRefs: getRefs,
     modelPostOne: postOne,
     modelPutOne: putOne,
     modelDeleteSome: deleteSome,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminmate-express-mongoose",
-  "version": "1.2.8",
+  "version": "1.3.2",
   "description": "Adminmate Express/Mongoose connector",
   "author": "Marc Delalonde",
   "homepage": "http://adminmate.io",
@@ -23,11 +23,11 @@
     "url": "https://github.com/Adminmate/adminmate-express-mongoose.git"
   },
   "dependencies": {
-    "adminmate-express-core": "^1.1.7",
+    "@hapi/joi": "^17.1.1",
+    "adminmate-express-core": "~1.2.0",
     "lodash": "^4.17.21",
     "moment": "^2.29.1",
-    "mongoose": "^5.9.7",
-    "mongoose-legacy-pluralize": "^1.0.2",
+    "mongoose": "~5.9.7",
     "serialize-error": "^7.0.1"
   },
   "devDependencies": {

package/src/controllers/chart-pie.js

@@ -1,32 +1,64 @@
+const Joi = require('@hapi/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()
+  });
+
+  // Validate params
+  const { error } = paramsSchema.validate(data);
+  if (error) {
+    return {
+      success: false,
+      message: error.details[0].message
+    };
+  }
+
   let _value = 1;
   if (data.field && ['sum', 'avg'].includes(data.operation)) {
     _value = `$${data.field}`;
   }
 
-  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
+  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
+          }
         }
-      }
-    ])
-    .sort({ key: 1 });
+      ])
+      .sort({ key: 1 });
 
-  return {
-    success: true,
-    data: {
-      config: null,
-      data: repartitionData
-    }
-  };
+    return {
+      success: true,
+      data: {
+        config: null,
+        data: repartitionData
+      }
+    };
+  }
+  catch(e) {
+    return {
+      success: false,
+      message: e.message
+    };
+  }
 };

package/src/controllers/chart-ranking.js

@@ -1,6 +1,31 @@
+const Joi = require('@hapi/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(),
+  });
+
+  // Validate params
+  const { error } = paramsSchema.validate(data);
+  if (error) {
+    return {
+      success: false,
+      message: error.details[0].message
+    };
+  }
+
   // Get relationship model
   const relationshipModel = fnHelper.getModelObject(data.relationship_model);
   if (!relationshipModel) {
@@ -15,42 +40,50 @@ module.exports = async (currentModel, data) => {
     _value = `$${data.relationship_field}`;
   }
 
-  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
+  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
+          }
         }
+      ])
+      .limit(limit)
+      .sort({ value: -1 });
+
+    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];
       }
-    ])
-    .limit(limit)
-    .sort({ value: -1 });
-
-  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];
-    }
-  });
+    });
 
-  return {
-    success: true,
-    data: {
-      config: null,
-      data: repartitionData
-    }
-  };
+    return {
+      success: true,
+      data: {
+        config: null,
+        data: repartitionData
+      }
+    };
+  }
+  catch(e) {
+    return {
+      success: false,
+      message: e.message
+    };
+  }
 };

package/src/controllers/chart-time.js

@@ -1,142 +1,129 @@
 
+const Joi = require('@hapi/joi');
 const _ = require('lodash');
 const moment = require('moment');
+const fnHelper = require('../helpers/functions');
 
 module.exports = async (currentModel, data) => {
-  if (!['day', 'week', 'month', 'year'].includes(data.timeframe)) {
+  const paramsSchema = Joi.object({
+    type: Joi.string().required(),
+    model: Joi.string().required(),
+    operation: Joi.string().required(),
+    group_by: Joi.string().required(),
+    timeframe: Joi.string().required().valid('day', 'week', 'month', 'year'),
+    field: Joi.alternatives().conditional('operation', {
+      not: 'count',
+      then: Joi.string().required(),
+      otherwise: Joi.string()
+    }),
+    limit: Joi.number().optional(),
+    date_from: Joi.date().optional(),
+    date_to: Joi.date().optional()
+  });
+
+  // Validate params
+  const { error } = paramsSchema.validate(data);
+  if (error) {
     return {
       success: false,
-      message: 'Invalid timeframe'
+      message: error.details[0].message
     };
   }
 
   const toSum = data.field && data.operation === 'sum' ? `$${data.field}` : 1;
 
-  // To set the max date
-  const toDate = data.to ? moment(data.to) : moment();
-
   let matchReq = {};
   let groupFormat = '';
 
+  if (data.date_from) {
+    matchReq['$gte'] = new Date(moment(data.date_from));
+  }
+
+  if (data.date_to) {
+    matchReq['$lt'] = new Date(moment(data.date_to));
+  }
+
   // Day timeframe
   if (data.timeframe === 'day') {
-    const startOfCurrentDay = toDate.startOf('day');
-    matchReq = {
-      '$gte': new Date(startOfCurrentDay.clone().subtract(30, 'day').startOf('day').format()),
-      '$lt': new Date(startOfCurrentDay.format())
-    };
-    groupFormat = '%Y-%m-%d';
+    groupFormat = '%Y-%m-%d 00:00:00';
   }
   // Week timeframe
   else if (data.timeframe === 'week') {
-    const startOfCurrentWeek = toDate.startOf('week');
-    matchReq = {
-      '$gte': new Date(startOfCurrentWeek.clone().subtract(26, 'week').startOf('week').format()),
-      '$lt': new Date(startOfCurrentWeek.format())
-    };
-    groupFormat = '%V';
+    groupFormat = '%Y-%V';
   }
   // Month timeframe
   else if (data.timeframe === 'month') {
-    const startOfCurrentMonth = toDate.startOf('month');
-    matchReq = {
-      '$gte': new Date(startOfCurrentMonth.clone().subtract(12, 'month').startOf('month').format()),
-      '$lt': new Date(startOfCurrentMonth.format())
-    };
-    groupFormat = '%m';
+    groupFormat = '%Y-%m-01 00:00:00';
   }
   // Year timeframe
   else if (data.timeframe === 'year') {
-    const startOfCurrentYear = toDate.startOf('year');
-    matchReq = {
-      '$gte': new Date(startOfCurrentYear.clone().subtract(8, 'year').startOf('year').format()),
-      '$lt': new Date(startOfCurrentYear.format())
-    };
-    groupFormat = '%Y';
+    groupFormat = '%Y-01-01 00:00:00';
   }
 
   if (!groupFormat) {
-    return res.status(403).json({ message: 'Invalid request' });
+    return {
+      success: false,
+      message: 'Invalid request'
+    };
   }
 
-  const repartitionData = await currentModel
-    .aggregate([
-      {
-        $match: {
-          [data.group_by]: matchReq
-        }
-      },
-      {
-        $group: {
-          _id: { $dateToString: { format: groupFormat, date: `$${data.group_by}` } },
-          count: { $sum: toSum }
+  let repartitionData;
+  try {
+    repartitionData = await currentModel
+      .aggregate([
+        {
+          $match: Object.keys(matchReq).length > 0 ? {
+            [data.group_by]: matchReq
+          } : {}
+        },
+        {
+          $group: {
+            _id: { $dateToString: { format: groupFormat, date: `$${data.group_by}` } },
+            count: { $sum: toSum }
+          }
+        },
+        {
+          $project: {
+            key: '$_id',
+            value: '$count',
+            _id: false
+          }
         }
-      },
-      {
-        $project: {
-          key: '$_id',
-          value: '$count',
-          _id: false
-        }
-      }
-    ]);
+      ]);
+  }
+  catch(e) {
+    return {
+      success: false,
+      message: e.message
+    };
+  }
 
   const formattedData = [];
+  if (repartitionData && repartitionData.length > 0) {
+    // Get min & max date in the results
+    const momentFormat = data.timeframe === 'week' ? 'YYYY-WW' : 'YYYY-MM-DD HH:mm:ss';
+    const unixRange = repartitionData.map(data => moment(data.key, momentFormat));
+    const min = _.min(unixRange).clone();
+    const max = _.max(unixRange).clone();
 
-  // Day timeframe
-  if (data.timeframe === 'day') {
-    for (let i = 1; i <= 30; i++) {
-      const currentDate = toDate.clone().subtract(i, 'day').startOf('day');
-      const countForTheTimeframe = _.find(repartitionData, { key: currentDate.format('YYYY-MM-DD') });
-      formattedData.push({
-        key: currentDate.format('DD/MM'),
-        value: countForTheTimeframe ? countForTheTimeframe.value : 0
-      });
-    }
-  }
-  // Week timeframe
-  else if (data.timeframe === 'week') {
-    for (let i = 1; i <= 26; i++) {
-      const currentWeek = toDate.clone().subtract(i, 'week').startOf('week');
-      const countForTheTimeframe = _.find(repartitionData, { key: currentWeek.format('WW') });
-      formattedData.push({
-        key: currentWeek.startOf('week').format('DD/MM'),
-        value: countForTheTimeframe ? countForTheTimeframe.value : 0
-      });
-    }
-  }
-  // Month timeframe
-  else if (data.timeframe === 'month') {
-    for (let i = 1; i <= 12; i++) {
-      const currentMonth = toDate.clone().subtract(i, 'month').startOf('month');
-      const countForTheTimeframe = _.find(repartitionData, { key: currentMonth.format('MM') });
-      formattedData.push({
-        key: currentMonth.startOf('month').format('MMM'),
-        value: countForTheTimeframe ? countForTheTimeframe.value : 0
-      });
-    }
-  }
-  // Year timeframe
-  else if (data.timeframe === 'year') {
-    for (let i = 1; i <= 8; i++) {
-      const currentYear = toDate.clone().subtract(i, 'year').startOf('year');
-      const countForTheTimeframe = _.find(repartitionData, { key: currentYear.format('YYYY') });
+    let currentDate = min;
+    while (currentDate.isSameOrBefore(max)) {
+      const countForTheTimeframe = repartitionData.find(d => moment(d.key, momentFormat).isSame(currentDate, data.timeframe));
+      const value = countForTheTimeframe ? fnHelper.toFixedIfNecessary(countForTheTimeframe.value, 2) : 0;
       formattedData.push({
-        key: currentYear.startOf('year').format('YYYY'),
-        value: countForTheTimeframe ? countForTheTimeframe.value : 0
+        key: currentDate.format('YYYY-MM-DD'),
+        value
       });
+      currentDate.add(1, data.timeframe).startOf('day');
     }
   }
 
-  const formattedDataOrdered = formattedData.reverse();
-
   const chartConfig = {
     xaxis: [
       { dataKey: 'key' }
     ],
     yaxis: [
-      { dataKey: 'value' },
-      // { dataKey: 'test', orientation: 'right' }
+      { dataKey: 'value' }
     ]
   };
 
@@ -144,7 +131,7 @@ module.exports = async (currentModel, data) => {
     success: true,
     data: {
       config: chartConfig,
-      data: formattedDataOrdered
+      data: formattedData
     }
   };
-};
+};

package/src/controllers/chart-value.js

@@ -1,47 +1,75 @@
-module.exports = async (currentModel, data) => {
-  if (data.operation === 'sum') {
-    const sumData = await currentModel
-      .aggregate([{
-        $group: {
-          _id: `$${data.group_by}`,
-          count: { $sum: `$${data.field}` },
-        }
-      }]);
+const Joi = require('@hapi/joi');
 
-    if (!sumData || !sumData[0] || typeof sumData[0].count !== 'number') {
-      return res.status(403).json();
-    }
+module.exports = async (currentModel, data) => {
+  const paramsSchema = Joi.object({
+    type: Joi.string().required(),
+    model: Joi.string().required(),
+    operation: Joi.string().required(),
+    field: Joi.alternatives().conditional('operation', {
+      not: 'count',
+      then: Joi.string().required(),
+      otherwise: Joi.string()
+    })
+  });
 
+  // Validate params
+  const { error } = paramsSchema.validate(data);
+  if (error) {
     return {
-      success: true,
-      data: {
-        config: null,
-        data: sumData[0].count
-      }
+      success: false,
+      message: error.details[0].message
     };
   }
-  else if (data.operation === 'avg') {
-    const avgData = await currentModel
-      .aggregate([{
-        $group: {
-          _id: `$${data.group_by}`,
-          avg: { $avg: `$${data.field}` },
-        }
-      }]);
 
-    if (!avgData || !avgData[0] || typeof avgData[0].avg !== 'number') {
-      return res.status(403).json();
+  try {
+    if (data.operation === 'sum') {
+      const sumData = await currentModel
+        .aggregate([{
+          $group: {
+            _id: `$${data.group_by}`,
+            count: {
+              $sum: `$${data.field}`
+            }
+          }
+        }]);
+
+      if (!sumData || !sumData[0] || typeof sumData[0].count !== 'number') {
+        return res.status(403).json();
+      }
+
+      return {
+        success: true,
+        data: {
+          config: null,
+          data: sumData[0].count
+        }
+      };
     }
+    else if (data.operation === 'avg') {
+      const avgData = await currentModel
+        .aggregate([{
+          $group: {
+            _id: `$${data.group_by}`,
+            avg: {
+              $avg: `$${data.field}`
+            }
+          }
+        }]);
 
-    return {
-      success: true,
-      data: {
-        config: null,
-        data: avgData[0].avg
+      if (!avgData || !avgData[0] || typeof avgData[0].avg !== 'number') {
+        return res.status(403).json();
       }
-    };
-  }
-  else {
+
+      return {
+        success: true,
+        data: {
+          config: null,
+          data: avgData[0].avg
+        }
+      };
+    }
+
+    // Simple count
     const dataCount = await currentModel.countDocuments({});
 
     return {
@@ -52,4 +80,10 @@ module.exports = async (currentModel, data) => {
       }
     };
   }
+  catch(e) {
+    return {
+      success: false,
+      message: e.message
+    };
+  }
 };

package/src/controllers/model-getall.js

@@ -8,7 +8,7 @@ module.exports.getAll = async (req, res) => {
   const filters = req.query.filters;
   const fieldsToFetch = req.headers['am-model-fields'] || [];
   const refFields = req.headers['am-ref-fields'] || {};
-  const fieldsToSearchIn = req.query.fieldsToSearchIn || [];
+  const fieldsToSearchIn = req.query.search_in_fields || [];
   const page = parseInt(req.query.page || 1);
   const nbItemPerPage = 10;
   const defaultOrdering = [ ['_id', 'DESC'] ];

package/src/controllers/model-getrefs.js

@@ -0,0 +1,53 @@
+const fnHelper = require('../helpers/functions');
+
+module.exports.getRefs = async (req, res) => {
+  const modelName = req.params.model;
+  const ids = req.query.ids;
+  const refFields = req.headers['am-ref-fields'] || {};
+  const nbItemPerPage = 20;
+
+  if (!ids) {
+    return res.status(403).json({ message: 'Missing parameter ids' });
+  }
+
+  const fieldsToFetchSafe = refFields[modelName];
+
+  // If no ref fields, return default response
+  if (!fieldsToFetchSafe) {
+    return res.json({
+      data: ids.map(id => ({ value: id, label: id }))
+    });
+  }
+
+  const currentModel = fnHelper.getModelObject(modelName);
+  if (!currentModel) {
+    return res.status(403).json({ message: 'Invalid request' });
+  }
+
+  // Find parameters
+  const findParams = { _id: ids };
+
+  const data = await currentModel
+    .find(findParams)
+    .select(fieldsToFetchSafe)
+    .limit(nbItemPerPage)
+    .lean()
+    .catch(e => {
+      res.status(403).json({ message: e.message });
+    });
+
+  if (!data) {
+    return res.status(403).json();
+  }
+
+  // Format the response
+  const formattedData = ids.map(_id => {
+    const match = data.find(d => d._id.toString() === _id.toString());
+    const label = match ? fnHelper.fieldsToValues(fieldsToFetchSafe, match) : _id;
+    return { value: _id, label };
+  });
+
+  res.json({
+    data: formattedData
+  });
+};

package/src/helpers/functions.js

@@ -119,6 +119,9 @@ const cleanString = string => {
 module.exports.cleanString = cleanString;
 
 const queryRule = rule => {
+  if (rule.type === 'group') {
+    return queryRuleSet(rule);
+  }
   let q = {};
   if (rule.operator === 'is') {
     q[rule.field] = { $eq: rule.value };
@@ -217,6 +220,10 @@ const queryRuleSet = ruleSet => {
   }
 };
 
+module.exports.toFixedIfNecessary = (value, dp) => {
+  return +parseFloat(value).toFixed(dp);
+};
+
 module.exports.constructQuery = jsonQuery => {
   if (jsonQuery.operator && jsonQuery.list && jsonQuery.list.length) {
     return queryRuleSet(jsonQuery);
@@ -224,6 +231,12 @@ module.exports.constructQuery = jsonQuery => {
   return null;
 };
 
+module.exports.fieldsToValues = (string, values) => {
+  return string.replace(/[a-z._]+/gi, word => {
+    return _.get(values, word);
+  });
+};
+
 module.exports.refFields = (item, fieldsToPopulate) => {
   const attributes = Object.keys(item);
   attributes.forEach(attr => {