adminmate-express-mongoose 1.3.2 → 1.3.4

package/src/controllers/model-getall.js

@@ -1,105 +1,118 @@
-const _ = require('lodash');
-const fnHelper = require('../helpers/functions');
-
-module.exports.getAll = async (req, res) => {
-  const modelName = req.params.model;
-  const segment = req.query.segment;
-  const search = (req.query.search || '').trim();
-  const filters = req.query.filters;
-  const fieldsToFetch = req.headers['am-model-fields'] || [];
-  const refFields = req.headers['am-ref-fields'] || {};
-  const fieldsToSearchIn = req.query.search_in_fields || [];
-  const page = parseInt(req.query.page || 1);
-  const nbItemPerPage = 10;
-  const defaultOrdering = [ ['_id', 'DESC'] ];
-  const order = req.query.order || null;
-
-  const currentModel = fnHelper.getModelObject(modelName);
-  if (!currentModel) {
-    return res.status(403).json({ message: 'Invalid request' });
-  }
-
-  // Get model properties
-  const keys = fnHelper.getModelProperties(currentModel);
-
-  // Ordering config
-  const orderConfig = fnHelper.validateOrderStructure(order) ? order : defaultOrdering;
-  const orderSafe = fnHelper.getCleanOrderStructure(orderConfig);
-
-  // Construct default fields to fetch
-  const defaultFieldsToFetch = keys
-    .filter(key => !key.path.includes('.'))
-    .map(key => key.path);
-  const fieldsToFetchSafe = Array.isArray(fieldsToFetch) && fieldsToFetch.length ? fieldsToFetch : defaultFieldsToFetch;
-
-  // Construct default fields to search in (only String type)
-  const defaultFieldsToSearchIn = keys
-    .filter(key => ['String'].includes(key.type))
-    .map(key => key.path);
-  const fieldsToSearchInSafe = Array.isArray(fieldsToSearchIn) && fieldsToSearchIn.length ? fieldsToSearchIn : defaultFieldsToSearchIn;
-
-  // Build ref fields for the model (for mongoose population purpose)
-  const fieldsToPopulate = fnHelper.getFieldsToPopulate(keys, fieldsToFetchSafe, refFields);
-
-  const queriesArray = [];
-
-  // Search -----------------------------------------------------------------------------
-
-  if (search) {
-    const searchQuery = fnHelper.constructSearch(search, fieldsToSearchInSafe, fieldsToPopulate);
-    queriesArray.push(searchQuery);
-  }
-
-  // Filters ----------------------------------------------------------------------------
-
-  if (filters) {
-    const filtersQuery = fnHelper.constructQuery(filters);
-    if (filtersQuery) {
-      queriesArray.push(filtersQuery);
+const { intersection } = require('lodash');
+
+module.exports = _conf => {
+  const fnHelper = require('../helpers/functions')(_conf);
+
+  const getAll = async (req, res) => {
+    const modelName = req.params.model;
+    const segment = req.query.segment;
+    const search = (req.query.search || '').trim();
+    const filters = req.query.filters;
+    const fieldsToFetch = req.headers['am-model-fields'] || [];
+    const refFields = req.headers['am-ref-fields'] || {};
+    const fieldsToSearchIn = req.query.search_in_fields || [];
+    const page = parseInt(req.query.page || 1);
+    const nbItemPerPage = 10;
+    const defaultOrdering = [ ['_id', 'DESC'] ];
+    const order = req.query.order || null;
+
+    const currentModel = fnHelper.getModelObject(modelName);
+    if (!currentModel) {
+      return res.status(403).json({ message: 'Invalid request' });
     }
-  }
 
-  // Segments ---------------------------------------------------------------------------
+    // Get model properties
+    const keys = fnHelper.getModelProperties(currentModel);
+
+    // Ordering config
+    const orderConfig = fnHelper.validateOrderStructure(order) ? order : defaultOrdering;
+    const orderSafe = fnHelper.getCleanOrderStructure(orderConfig);
+
+    // Construct default fields to fetch
+    let fieldsToFetchSafe = keys
+      .filter(key => !key.path.includes('.'))
+      .map(key => key.path);
+
+    // If we get specific fields to display
+    if (Array.isArray(fieldsToFetch) && fieldsToFetch.length > 0) {
+      const flatKeys = keys.map(key => key.path);
+      const validKeys = intersection(fieldsToFetch, flatKeys);
+      if (validKeys.length > 0) {
+        fieldsToFetchSafe = validKeys;
+      }
+    }
+
+    // Construct default fields to search in (only String type)
+    const defaultFieldsToSearchIn = keys
+      .filter(key => ['String'].includes(key.type))
+      .map(key => key.path);
+    const fieldsToSearchInSafe = Array.isArray(fieldsToSearchIn) && fieldsToSearchIn.length ? fieldsToSearchIn : defaultFieldsToSearchIn;
+
+    // Build ref fields for the model (for mongoose population purpose)
+    const fieldsToPopulate = fnHelper.getFieldsToPopulate(keys, fieldsToFetchSafe, refFields);
+
+    const queriesArray = [];
 
-  if (segment && segment.type === 'code' && segment.data) {
-    const modelSegment = fnHelper.getModelSegment(modelName, segment.data);
-    if (modelSegment) {
-      queriesArray.push(modelSegment.query);
+    // Search -----------------------------------------------------------------------------
+
+    if (search) {
+      const searchQuery = fnHelper.constructSearch(search, fieldsToSearchInSafe, fieldsToPopulate);
+      queriesArray.push(searchQuery);
     }
-  }
-
-  const findParams = queriesArray.length ? { $and: queriesArray } : {};
-
-  const data = await currentModel
-    .find(findParams)
-    .select(fieldsToFetchSafe)
-    .populate(fieldsToPopulate)
-    .sort(orderSafe)
-    .skip(nbItemPerPage * (page - 1))
-    .limit(nbItemPerPage)
-    .lean()
-    .catch(e => {
-      res.status(403).json({ message: e.message });
-    });
 
-  if (!data) {
-    return res.status(403).json();
-  }
+    // Filters ----------------------------------------------------------------------------
 
-  const dataCount = await currentModel.countDocuments(findParams);
-  const nbPage = Math.ceil(dataCount / nbItemPerPage);
+    if (filters) {
+      const filtersQuery = fnHelper.constructQuery(filters);
+      if (filtersQuery) {
+        queriesArray.push(filtersQuery);
+      }
+    }
 
-  // Make ref fields appeared as link in the dashboard
-  const formattedData = data.map(item => {
-    return fnHelper.refFields(item, fieldsToPopulate);
-  });
+    // Segments ---------------------------------------------------------------------------
 
-  res.json({
-    data: formattedData,
-    count: dataCount,
-    pagination: {
-      current: page,
-      count: nbPage
+    if (segment && segment.type === 'code' && segment.data) {
+      const modelSegment = fnHelper.getModelSegment(modelName, segment.data);
+      if (modelSegment) {
+        queriesArray.push(modelSegment.query);
+      }
     }
-  });
-};
+
+    const findParams = queriesArray.length ? { $and: queriesArray } : {};
+
+    const data = await currentModel
+      .find(findParams)
+      .select(fieldsToFetchSafe)
+      .populate(fieldsToPopulate)
+      .sort(orderSafe)
+      .skip(nbItemPerPage * (page - 1))
+      .limit(nbItemPerPage)
+      .lean()
+      .catch(e => {
+        res.status(403).json({ message: e.message });
+      });
+
+    if (!data) {
+      return res.status(403).json();
+    }
+
+    const dataCount = await currentModel.countDocuments(findParams);
+    const nbPage = Math.ceil(dataCount / nbItemPerPage);
+
+    // Make ref fields appeared as link in the dashboard
+    const formattedData = data.map(item => {
+      return fnHelper.refFields(item, fieldsToPopulate);
+    });
+
+    res.json({
+      data: formattedData,
+      count: dataCount,
+      pagination: {
+        current: page,
+        count: nbPage
+      }
+    });
+  };
+
+  return getAll;
+};

package/src/controllers/model-getin.js

@@ -1,15 +1,19 @@
-const fnHelper = require('../helpers/functions');
+module.exports = _conf => {
+  const fnHelper = require('../helpers/functions')(_conf);
 
-module.exports.getIn = async (modelName, ids) => {
-  const currentModel = fnHelper.getModelObject(modelName);
-  if (!currentModel) {
-    return null;
-  }
+  const getIn = async (modelName, ids) => {
+    const currentModel = fnHelper.getModelObject(modelName);
+    if (!currentModel) {
+      return null;
+    }
 
-  // Get corresponding items
-  const items = await currentModel
-    .find({ _id: { $in: ids } })
-    .lean();
+    // Get corresponding items
+    const items = await currentModel
+      .find({ _id: { $in: ids } })
+      .lean();
 
-  return items;
-};
+    return items;
+  };
+
+  return getIn;
+};

package/src/controllers/model-getone.js

@@ -1,40 +1,43 @@
-const _ = require('lodash');
-const fnHelper = require('../helpers/functions');
-
-module.exports.getOne = async (req, res) => {
-  const modelName = req.params.model;
-  const modelItemId = req.params.id;
-  const fieldsToFetch = req.headers['am-model-fields'] || [];
-  const refFields = req.headers['am-ref-fields'] || {};
-
-  const currentModel = fnHelper.getModelObject(modelName);
-  if (!currentModel) {
-    return res.status(403).json({ message: 'Invalid request' });
-  }
-
-  const keys = fnHelper.getModelProperties(currentModel);
-  const defaultFieldsToFetch = keys.map(key => key.path);
-  const fieldsToFetchSafe = Array.isArray(fieldsToFetch) && fieldsToFetch.length ? fieldsToFetch : defaultFieldsToFetch;
-
-  // Build ref fields for the model (for mongoose population purpose)
-  const fieldsToPopulate = fnHelper.getFieldsToPopulate(keys, fieldsToFetchSafe, refFields);
-
-  let data = await currentModel
-    .findById(modelItemId)
-    .select(fieldsToFetchSafe)
-    .populate(fieldsToPopulate)
-    .lean()
-    .catch(e => {
-      res.status(403).json({ message: e.message });
+module.exports = _conf => {
+  const fnHelper = require('../helpers/functions')(_conf);
+
+  const getOne = async (req, res) => {
+    const modelName = req.params.model;
+    const modelItemId = req.params.id;
+    const fieldsToFetch = req.headers['am-model-fields'] || [];
+    const refFields = req.headers['am-ref-fields'] || {};
+
+    const currentModel = fnHelper.getModelObject(modelName);
+    if (!currentModel) {
+      return res.status(403).json({ message: 'Invalid request' });
+    }
+
+    const keys = fnHelper.getModelProperties(currentModel);
+    const defaultFieldsToFetch = keys.map(key => key.path);
+    const fieldsToFetchSafe = Array.isArray(fieldsToFetch) && fieldsToFetch.length ? fieldsToFetch : defaultFieldsToFetch;
+
+    // Build ref fields for the model (for mongoose population purpose)
+    const fieldsToPopulate = fnHelper.getFieldsToPopulate(keys, fieldsToFetchSafe, refFields);
+
+    let data = await currentModel
+      .findById(modelItemId)
+      .select(fieldsToFetchSafe)
+      .populate(fieldsToPopulate)
+      .lean()
+      .catch(e => {
+        res.status(403).json({ message: e.message });
+      });
+
+    if (!data) {
+      return res.status(403).json();
+    }
+
+    data = fnHelper.refFields(data, fieldsToPopulate);
+
+    res.json({
+      data
     });
+  };
 
-  if (!data) {
-    return res.status(403).json();
-  }
-
-  data = fnHelper.refFields(data, fieldsToPopulate);
-
-  res.json({
-    data
-  });
-};
+  return getOne;
+};

package/src/controllers/model-getrefs.js

@@ -1,53 +1,57 @@
-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 }))
+module.exports = _conf => {
+  const fnHelper = require('../helpers/functions')(_conf);
+
+  const 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 };
     });
-  }
-
-  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 });
+
+    res.json({
+      data: formattedData
     });
+  };
 
-  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
-  });
-};
+  return getRefs;
+};

package/src/controllers/model-postone.js

@@ -1,26 +1,29 @@
-const _ = require('lodash');
-const fnHelper = require('../helpers/functions');
+module.exports = _conf => {
+  const fnHelper = require('../helpers/functions')(_conf);
 
-module.exports.postOne = async (req, res) => {
-  const modelName = req.params.model;
-  const data = req.body.data;
+  const postOne = async (req, res) => {
+    const modelName = req.params.model;
+    const data = req.body.data;
 
-  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 newItem = new currentModel(data);
-  const newSavedItem = await newItem.save().catch(e => {
-    const errorObject = fnHelper.buildError(e, 'An error occured when saving the item');
-    res.status(403).json(errorObject);
-  });
-
-  if (newSavedItem) {
-    res.json({
-      data: {
-        id: newSavedItem._id // id and not _id to be generic
-      }
+    const newItem = new currentModel(data);
+    const newSavedItem = await newItem.save().catch(e => {
+      const errorObject = fnHelper.buildError(e, 'An error occured when saving the item');
+      res.status(403).json(errorObject);
     });
-  }
-};
+
+    if (newSavedItem) {
+      res.json({
+        data: {
+          id: newSavedItem._id // id and not _id to be generic
+        }
+      });
+    }
+  };
+
+  return postOne;
+};

package/src/controllers/model-putone.js

@@ -1,40 +1,45 @@
-const _ = require('lodash');
-const fnHelper = require('../helpers/functions');
-
-module.exports.putOne = async (req, res) => {
-  const modelName = req.params.model;
-  const modelItemId = req.params.id;
-  const data = req.body.data;
-
-  const currentModel = fnHelper.getModelObject(modelName);
-  if (!currentModel) {
-    return res.status(403).json({ message: 'Invalid request' });
-  }
-
-  // const { model, itemEditableKeys } = models[modelName];
-
-  // Only keep authorized keys
-  // const cleanData = {};
-  // updatableFields.forEach(updatableField => {
-  //   const fieldValue = _.get(data, updatableField);
-  //   if (fieldValue) {
-  //     _.set(cleanData, updatableField, fieldValue)
-  //   }
-  // });
-
-  const cleanData = data;
-
-  if (Object.keys(cleanData).length) {
-    try {
-      await currentModel.findByIdAndUpdate(modelItemId, cleanData, { runValidators: true });
-      res.json({ data: cleanData });
+// const _ = require('lodash');
+
+module.exports = _conf => {
+  const fnHelper = require('../helpers/functions')(_conf);
+
+  const putOne = async (req, res) => {
+    const modelName = req.params.model;
+    const modelItemId = req.params.id;
+    const data = req.body.data;
+
+    const currentModel = fnHelper.getModelObject(modelName);
+    if (!currentModel) {
+      return res.status(403).json({ message: 'Invalid request' });
     }
-    catch(e) {
-      const errorObject = fnHelper.buildError(e, 'Unable to update the model');
-      res.status(403).json(errorObject);
+
+    // const { model, itemEditableKeys } = models[modelName];
+
+    // Only keep authorized keys
+    // const cleanData = {};
+    // updatableFields.forEach(updatableField => {
+    //   const fieldValue = _.get(data, updatableField);
+    //   if (fieldValue) {
+    //     _.set(cleanData, updatableField, fieldValue)
+    //   }
+    // });
+
+    const cleanData = data;
+
+    if (Object.keys(cleanData).length) {
+      try {
+        await currentModel.findByIdAndUpdate(modelItemId, cleanData, { runValidators: true });
+        res.json({ data: cleanData });
+      }
+      catch(e) {
+        const errorObject = fnHelper.buildError(e, 'Unable to update the model');
+        res.status(403).json(errorObject);
+      }
     }
-  }
-  else {
-    res.json({});
-  }
-};
+    else {
+      res.json({});
+    }
+  };
+
+  return putOne;
+};