fix x-headers

Author: ThomasKranitsas

src/common/helper.js

@@ -256,6 +256,23 @@ async function scan (modelName, scanParams) {
   })
 }
 
+/**
+ * Get all data collection (avoid default page limit of DynamoDB) by scan parameters
+ * @param {Object} modelName The dynamoose model name
+ * @param {Object} scanParams The scan parameters object
+ * @returns {Array}
+ */
+async function scanAll (modelName, scanParams) {
+  let results = await models[modelName].scan(scanParams).exec()
+  let lastKey = results.lastKey
+  while (!_.isUndefined(results.lastKey)) {
+    const newResult = await models[modelName].scan(scanParams).startAt(lastKey).exec()
+    results = [...results, ...newResult]
+    lastKey = newResult.lastKey
+  }
+  return results
+}
+
 /**
  * Get data collection by query parameters
  * @param {Object} modelName The dynamoose model name
@@ -455,6 +472,7 @@ module.exports = {
   update,
   query,
   scan,
+  scanAll,
   validateDuplicate,
   getRequest,
   postEvent,

src/controllers/ResourceRoleController.js

@@ -3,6 +3,7 @@
  */
 
 const service = require('../services/ResourceRoleService')
+const helper = require('../common/helper')
 
 /**
  * Get resource roles.
@@ -11,7 +12,8 @@ const service = require('../services/ResourceRoleService')
  */
 async function getResourceRoles (req, res) {
   const result = await service.getResourceRoles(req.query)
-  res.send(result)
+  helper.setResHeaders(req, res, result)
+  res.send(result.data)
 }
 
 /**

src/controllers/ResourceRolePhaseDependencyController.js

@@ -3,6 +3,7 @@
  */
 
 const service = require('../services/ResourceRolePhaseDependencyService')
+const helper = require('../common/helper')
 
 /**
  * Get dependencies.
@@ -11,7 +12,8 @@ const service = require('../services/ResourceRolePhaseDependencyService')
  */
 async function getDependencies (req, res) {
   const result = await service.getDependencies(req.query)
-  res.send(result)
+  helper.setResHeaders(req, res, result)
+  res.send(result.data)
 }
 
 /**

src/services/ResourceRolePhaseDependencyService.js

@@ -24,10 +24,15 @@ async function getDependencies (criteria) {
     options.resourceRoleId = { eq: criteria.resourceRoleId }
   }
   if (!_.isNil(criteria.phaseState)) {
-    options.phaseState = { eq: criteria.phaseState }
+    options.phaseState = { eq: criteria.phaseState === 'true' }
+  }
+  const list = await helper.scanAll('ResourceRolePhaseDependency', options)
+  return {
+    data: list,
+    total: list.length,
+    page: 1,
+    perPage: Math.max(10, list.length)
   }
-  const list = await helper.scan('ResourceRolePhaseDependency', options)
-  return list
 }
 
 getDependencies.schema = {

src/services/ResourceRoleService.js

@@ -17,7 +17,7 @@ const payloadFields = ['id', 'name', 'legacyId', 'fullReadAccess', 'fullWriteAcc
  * @returns {Array} the search result
  */
 async function getResourceRoles (criteria) {
-  let records = await helper.scan('ResourceRole')
+  let records = await helper.scanAll('ResourceRole')
   if (criteria.name) records = _.filter(records, e => (criteria.name === e.name))
   if (criteria.id) records = _.filter(records, e => (criteria.id === e.id))
   if (criteria.legacyId) records = _.filter(records, e => (_.toNumber(criteria.legacyId) === _.toNumber(e.legacyId)))
@@ -26,7 +26,13 @@ async function getResourceRoles (criteria) {
   if (!_.isUndefined(criteria.fullReadAccess)) records = _.filter(records, e => (e.fullReadAccess === (criteria.fullReadAccess === 'true')))
   if (!_.isUndefined(criteria.fullWriteAccess)) records = _.filter(records, e => (e.fullWriteAccess === (criteria.fullWriteAccess === 'true')))
 
-  return _.map(records, e => _.pick(e, payloadFields))
+  const result = _.map(records, e => _.pick(e, payloadFields))
+  return {
+    data: result,
+    total: result.length,
+    page: 1,
+    perPage: Math.max(10, result.length)
+  }
 }
 
 getResourceRoles.schema = {