Merge branch 'develop'

Author: James Cori

docs/swagger.yaml

@@ -188,7 +188,7 @@ paths:
     get:
       description: >-
         Get all resource roles. If isActive parameter is provided, filter the
-        results by isActive property.
+        results by the set properties.
       tags:
         - Resource Roles
       security:
@@ -202,6 +202,18 @@ paths:
           type: string
           in: query
           description: Filters the results based on the `name` property
+        - name: legacyId
+          type: number
+          in: query
+          description: Filters the results based on the `legacyId` property
+        - name: selfObtainable
+          type: boolean
+          in: query
+          description: Filters the results based on the `selfObtainable` property
+        - name: fullAccess
+          type: boolean
+          in: query
+          description: Filters the results based on the `fullAccess` property
       responses:
         '200':
           description: OK - the request was successful

src/services/ResourceRoleService.js

@@ -20,6 +20,7 @@ async function getResourceRoles (criteria) {
   let records = await helper.scan('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)))
   if (!_.isUndefined(criteria.isActive)) records = _.filter(records, e => (e.isActive === (criteria.isActive === 'true')))
   if (!_.isUndefined(criteria.selfObtainable)) records = _.filter(records, e => (e.selfObtainable === (criteria.selfObtainable === 'true')))
   if (!_.isUndefined(criteria.fullAccess)) records = _.filter(records, e => (e.fullAccess === (criteria.fullAccess === 'true')))
@@ -33,6 +34,7 @@ getResourceRoles.schema = {
     selfObtainable: Joi.boolean(),
     fullAccess: Joi.boolean(),
     id: Joi.id(),
+    legacyId: Joi.number(),
     name: Joi.string()
   }).required()
 }