adminmate-express-mongoose 1.3.3 → 1.3.4

package/src/controllers/chart-time.js

@@ -2,136 +2,152 @@
 const Joi = require('joi');
 const _ = require('lodash');
 const moment = require('moment');
-const fnHelper = require('../helpers/functions');
-
-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(),
-    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: error.details[0].message
-    };
-  }
-
-  const toSum = data.field && data.operation === 'sum' ? `$${data.field}` : 1;
-
-  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') {
-    groupFormat = '%Y-%m-%d 00:00:00';
-  }
-  // Week timeframe
-  else if (data.timeframe === 'week') {
-    groupFormat = '%Y-%V';
-  }
-  // Month timeframe
-  else if (data.timeframe === 'month') {
-    groupFormat = '%Y-%m-01 00:00:00';
-  }
-  // Year timeframe
-  else if (data.timeframe === 'year') {
-    groupFormat = '%Y-01-01 00:00:00';
-  }
-
-  if (!groupFormat) {
-    return {
-      success: false,
-      message: 'Invalid request'
-    };
-  }
-
-  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
+
+module.exports = _conf => {
+  const fnHelper = require('../helpers/functions')(_conf);
+
+  const chartTime = async (currentModel, data) => {
+    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(),
+      filters: Joi.object({
+        operator: Joi.string().valid('and', 'or').required(),
+        list: Joi.array().required()
+      })
+    });
+
+    // Validate params
+    const { error } = paramsSchema.validate(data);
+    if (error) {
+      return {
+        success: false,
+        message: error.details[0].message
+      };
+    }
+
+    const toSum = data.field && data.operation === 'sum' ? `$${data.field}` : 1;
+
+    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') {
+      groupFormat = '%Y-%m-%d 00:00:00';
+    }
+    // Week timeframe
+    else if (data.timeframe === 'week') {
+      groupFormat = '%Y-%V';
+    }
+    // Month timeframe
+    else if (data.timeframe === 'month') {
+      groupFormat = '%Y-%m-01 00:00:00';
+    }
+    // Year timeframe
+    else if (data.timeframe === 'year') {
+      groupFormat = '%Y-01-01 00:00:00';
+    }
+
+    if (!groupFormat) {
+      return {
+        success: false,
+        message: 'Invalid request'
+      };
+    }
+
+    // Filters
+    let findParams = Object.keys(matchReq).length > 0 ? { [data.group_by]: matchReq } : {};
+    if (data.filters) {
+      const filtersQuery = fnHelper.constructQuery(data.filters);
+      if (filtersQuery) {
+        findParams = { $and: [findParams, filtersQuery] };
+      }
+    }
+
+    let repartitionData;
+    try {
+      repartitionData = await currentModel
+        .aggregate([
+          {
+            $match: findParams
+          },
+          {
+            $group: {
+              _id: { $dateToString: { format: groupFormat, date: `$${data.group_by}` } },
+              count: { $sum: toSum }
+            }
+          },
+          {
+            $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();
-
-    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: currentDate.format('YYYY-MM-DD'),
-        value
-      });
-      currentDate.add(1, data.timeframe).startOf('day');
+        ]);
     }
-  }
-
-  const chartConfig = {
-    xaxis: [
-      { dataKey: 'key' }
-    ],
-    yaxis: [
-      { dataKey: 'value' }
-    ]
-  };
+    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();
 
-  return {
-    success: true,
-    data: {
-      config: chartConfig,
-      data: formattedData
+      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: currentDate.format('YYYY-MM-DD'),
+          value
+        });
+        currentDate.add(1, data.timeframe).startOf('day');
+      }
     }
+
+    const chartConfig = {
+      xaxis: [
+        { dataKey: 'key' }
+      ],
+      yaxis: [
+        { dataKey: 'value' }
+      ]
+    };
+
+    return {
+      success: true,
+      data: {
+        config: chartConfig,
+        data: formattedData
+      }
+    };
   };
+
+  return chartTime;
 };

package/src/controllers/chart-value.js

@@ -1,89 +1,124 @@
 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(),
-    field: Joi.alternatives().conditional('operation', {
-      not: 'count',
-      then: Joi.string().required(),
-      otherwise: Joi.string()
-    })
-  });
+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
-    };
-  }
-
-  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();
-      }
+  const chartValue = 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()
+      }),
+      filters: Joi.object({
+        operator: Joi.string().valid('and', 'or').required(),
+        list: Joi.array().required()
+      })
+    });
 
+    // 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}`
+
+    // Filters
+    let findParams = {};
+    if (data.filters) {
+      const filtersQuery = fnHelper.constructQuery(data.filters);
+      if (filtersQuery) {
+        findParams = filtersQuery;
+      }
+    }
+
+    try {
+      if (data.operation === 'sum') {
+        const sumData = await currentModel
+          .aggregate([
+            {
+              $match: findParams
+            },
+            {
+              $group: {
+                _id: null,
+                count: {
+                  $sum: `$${data.field}`
+                }
+              }
             }
+          ]);
+
+        if (!sumData || !sumData[0] || typeof sumData[0].count !== 'number') {
+          return {
+            success: false,
+            message: 'An error occurred'
+          };
+        }
+
+        return {
+          success: true,
+          data: {
+            config: null,
+            data: sumData[0].count
           }
-        }]);
+        };
+      }
+      else if (data.operation === 'avg') {
+        const avgData = await currentModel
+          .aggregate([
+            {
+              $match: findParams
+            },
+            {
+              $group: {
+                _id: null,
+                avg: {
+                  $avg: `$${data.field}`
+                }
+              }
+            }
+          ]);
 
-      if (!avgData || !avgData[0] || typeof avgData[0].avg !== 'number') {
-        return res.status(403).json();
+        if (!avgData || !avgData[0] || typeof avgData[0].avg !== 'number') {
+          return {
+            success: false,
+            message: 'An error occurred'
+          };
+        }
+
+        return {
+          success: true,
+          data: {
+            config: null,
+            data: avgData[0].avg
+          }
+        };
       }
 
+      // Simple count
+      const dataCount = await currentModel.countDocuments(findParams);
+
       return {
         success: true,
         data: {
           config: null,
-          data: avgData[0].avg
+          data: dataCount
         }
       };
     }
+    catch(e) {
+      return {
+        success: false,
+        message: e.message
+      };
+    }
+  };
 
-    // Simple count
-    const dataCount = await currentModel.countDocuments({});
-
-    return {
-      success: true,
-      data: {
-        config: null,
-        data: dataCount
-      }
-    };
-  }
-  catch(e) {
-    return {
-      success: false,
-      message: e.message
-    };
-  }
-};
+  return chartValue;
+};

package/src/controllers/model-autocomplete.js

@@ -1,48 +1,53 @@
 const _ = require('lodash');
-const fnHelper = require('../helpers/functions');
-
-module.exports.getAutocomplete = async (req, res) => {
-  const modelName = req.params.model;
-  const search = (req.query.s || '').trim();
-  const refFields = req.headers['am-ref-fields'] || {};
-  const maxItem = 10;
-
-  const currentModel = fnHelper.getModelObject(modelName);
-  if (!currentModel || !search) {
-    return res.status(403).json({ message: 'Invalid request' });
-  }
-
-  const keys = fnHelper.getModelProperties(currentModel);
-  const defaultFieldsToSearchIn = keys.filter(key => ['String'].includes(key.type)).map(key => key.path);
-  const defaultFieldsToFetch = keys.filter(key => !key.path.includes('.')).map(key => key.path);
-
-  const fieldsToSearchIn = refFields[modelName] ? refFields[modelName].split(' ') : defaultFieldsToSearchIn;
-  const fieldsToFetch = refFields[modelName] ? refFields[modelName].split(' ') : defaultFieldsToFetch;
-  const params = fnHelper.constructSearch(search, fieldsToSearchIn);
-
-  const data = await currentModel
-    .find(params)
-    .select(fieldsToFetch)
-    // .sort()
-    .limit(maxItem)
-    .lean()
-    .catch(e => {
-      res.status(403).json({ message: e.message });
-    });
-
-  if (!data) {
-    return res.status(403).json();
-  }
-
-  let formattedData = [];
-  if (data.length) {
-    // Field to be used for the item label
-    const fieldsToDisplay = refFields[modelName] ? refFields[modelName] : '_id';
-    formattedData = data.map(d => {
-      const label = fieldsToDisplay.replace(/[a-z._]+/gi, word => _.get(d, word));
-      return { label, value: d._id };
-    });
-  }
-
-  res.json({ data: formattedData });
-};
+
+module.exports = _conf => {
+  const fnHelper = require('../helpers/functions')(_conf);
+
+  const getAutocomplete = async (req, res) => {
+    const modelName = req.params.model;
+    const search = (req.query.s || '').trim();
+    const refFields = req.headers['am-ref-fields'] || {};
+    const maxItem = 10;
+
+    const currentModel = fnHelper.getModelObject(modelName);
+    if (!currentModel || !search) {
+      return res.status(403).json({ message: 'Invalid request' });
+    }
+
+    const keys = fnHelper.getModelProperties(currentModel);
+    const defaultFieldsToSearchIn = keys.filter(key => ['String'].includes(key.type)).map(key => key.path);
+    const defaultFieldsToFetch = keys.filter(key => !key.path.includes('.')).map(key => key.path);
+
+    const fieldsToSearchIn = refFields[modelName] ? refFields[modelName].split(' ') : defaultFieldsToSearchIn;
+    const fieldsToFetch = refFields[modelName] ? refFields[modelName].split(' ') : defaultFieldsToFetch;
+    const params = fnHelper.constructSearch(search, fieldsToSearchIn);
+
+    const data = await currentModel
+      .find(params)
+      .select(fieldsToFetch)
+      // .sort()
+      .limit(maxItem)
+      .lean()
+      .catch(e => {
+        res.status(403).json({ message: e.message });
+      });
+
+    if (!data) {
+      return res.status(403).json();
+    }
+
+    let formattedData = [];
+    if (data.length) {
+      // Field to be used for the item label
+      const fieldsToDisplay = refFields[modelName] ? refFields[modelName] : '_id';
+      formattedData = data.map(d => {
+        const label = fieldsToDisplay.replace(/[a-z._]+/gi, word => _.get(d, word));
+        return { label, value: d._id };
+      });
+    }
+
+    res.json({ data: formattedData });
+  };
+
+  return getAutocomplete;
+};

package/src/controllers/model-deletesome.js

@@ -1,23 +1,26 @@
-const _ = require('lodash');
-const fnHelper = require('../helpers/functions');
+module.exports = _conf => {
+  const fnHelper = require('../helpers/functions')(_conf);
 
-module.exports.deleteSome = async (req, res) => {
-  const modelName = req.params.model;
-  const itemIds = req.body.ids;
+  const deleteSome = async (req, res) => {
+    const modelName = req.params.model;
+    const itemIds = req.body.ids;
 
-  if (!itemIds || !itemIds.length) {
-    return res.status(403).json({ message: 'Invalid request' });
-  }
+    if (!itemIds || !itemIds.length) {
+      return res.status(403).json({ message: 'Invalid request' });
+    }
 
-  const currentModel = fnHelper.getModelObject(modelName);
-  if (!currentModel) {
-    return res.status(403).json({ message: 'Invalid request' });
-  }
+    const currentModel = fnHelper.getModelObject(modelName);
+    if (!currentModel) {
+      return res.status(403).json({ message: 'Invalid request' });
+    }
 
-  const deleteReq = await currentModel.deleteMany({ _id: { $in: itemIds }})
-    .catch(e => {
-      res.status(403).json({ message: 'Unable to delete the model items' });
-    });
+    const deleteReq = await currentModel.deleteMany({ _id: { $in: itemIds }})
+      .catch(e => {
+        res.status(403).json({ message: 'Unable to delete the model items' });
+      });
 
-  res.json({ deletedCount: deleteReq.deletedCount });
-};
+    res.json({ deletedCount: deleteReq.deletedCount });
+  };
+
+  return deleteSome;
+};