adminmate-express-mongoose 1.2.7 → 1.3.1

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.7",
+  "version": "1.3.1",
   "description": "Adminmate Express/Mongoose connector",
   "author": "Marc Delalonde",
   "homepage": "http://adminmate.io",
@@ -23,11 +23,10 @@
     "url": "https://github.com/Adminmate/adminmate-express-mongoose.git"
   },
   "dependencies": {
-    "adminmate-express-core": "^1.1.6",
+    "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-ranking.js

@@ -1,9 +1,56 @@
+const fnHelper = require('../helpers/functions');
+
 module.exports = async (currentModel, data) => {
+  // Get relationship model
+  const relationshipModel = fnHelper.getModelObject(data.relationship_model);
+  if (!relationshipModel) {
+    return res.status(403).json({ message: 'Invalid request' });
+  }
+
+  // Default limit
+  let limit = data.limit || 10;
+
+  let _value = 1;
+  if (data.relationship_field && ['sum', 'avg'].includes(data.relationship_operation)) {
+    _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
+        }
+      }
+    ])
+    .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: false,
+    success: true,
     data: {
       config: null,
-      data: {}
+      data: repartitionData
     }
   };
 };

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 };
@@ -224,6 +227,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 => {

package/docker-compose.yml

@@ -1,12 +0,0 @@
-version: '3'
-
-services:
-  mongo:
-    container_name: adminmate-express-mongoose
-    environment:
-      - MONGO_INITDB_DATABASE=demo
-      - MONGO_DATA_DIR=/data/db
-      - MONGO_LOG_DIR=/dev/null
-    image: mongo
-    ports:
-      - '27017:27017'