Merge pull request #42 from synapsestudios/find-endpoint

Find endpoint
synapsestudios · Apr 10, 2017 · 458e5ab · 458e5ab
2 parents fc8f3c9 + 52c8d84
commit 458e5ab
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/api/src/application/api/api-routes.js b/api/src/application/api/api-routes.js
@@ -67,7 +67,7 @@ module.exports = (userService, mixedValidation, rowNotExists, rowExists) => [
     method: 'GET',
     path: '/api/users',
     handler: (request, reply) => {
-      reply(userService.getUsers(request.query.ids));
+      reply(userService.getUsers(request.query));
     },
     config: {
       auth: {
@@ -77,6 +77,7 @@ module.exports = (userService, mixedValidation, rowNotExists, rowExists) => [
       validate: {
         query: {
           ids: Joi.array().items(Joi.string()).single(),
+          email: Joi.string().email()
         }
       }
     }

diff --git a/api/src/application/user/user-service.js b/api/src/application/user/user-service.js
@@ -17,8 +17,17 @@ module.exports = (bookshelf, emailService, renderTemplate) => {
       });
     },
 
-    getUsers(ids) {
-      return bookshelf.model('user').query(qb => qb.whereIn('id', ids)).fetchAll();
+    getUsers(query) {
+      let model = bookshelf.model('user');
+      if (query.ids) {
+        model = model.where('id', 'in', query.ids);
+      }
+
+      if (query.email) {
+        model = model.where('email', query.email);
+      }
+
+      return model.fetchAll();
     },
 
     sendInvite(user, appName, hoursTillExpiration) {