Merge pull request #142 from Chia-Network/feat/orgId-filter

feat: orgId filtering in units & projects
Chia-Network · Jan 11, 2022 · b66f061 · b66f061
2 parents 8da5a8b + 48fb530
commit b66f061
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/src/controllers/project.controller.js b/src/controllers/project.controller.js
@@ -55,8 +55,9 @@ export const create = async (req, res) => {
 };
 
 export const findAll = async (req, res) => {
-  let { page, limit, search, orgUid, columns, useMock } = req.query;
-
+  let { page, limit, search, orgUid, columns } = req.query;
+  let where = orgUid ? { orgUid } : undefined;
+
   const includes = [
     ProjectLocation,
     Qualification,
@@ -97,9 +98,10 @@ export const findAll = async (req, res) => {
       ...columnsToInclude(columns, includes),
       ...paginationParams(page, limit),
     };
-
+    
     results = await Project.findAndCountAll({
       distinct: true,
+      where,
       ...query,
     });
   }

diff --git a/src/controllers/units.controller.js b/src/controllers/units.controller.js
@@ -56,8 +56,9 @@ export const create = async (req, res, next) => {
 };
 
 export const findAll = async (req, res) => {
-  let { page, limit, columns } = req.query;
-
+  let { page, limit, columns, orgUid } = req.query;
+  let where = orgUid ? { orgUid } : undefined;
+
   const includes = [Qualification];
 
   if (columns) {
@@ -79,6 +80,7 @@ export const findAll = async (req, res) => {
   res.json(
     optionallyPaginatedResponse(
       await Unit.findAndCountAll({
+        where,
         distinct: true,
         ...columnsToInclude(columns, includes),
         ...paginationParams(page, limit),

diff --git a/src/routes/v1/resources/projects.js b/src/routes/v1/resources/projects.js
@@ -14,6 +14,7 @@ const querySchema = Joi.object()
     limit: Joi.number(),
     search: Joi.string(),
     columns: Joi.array().items(Joi.string()).single(),
+    orgUid: Joi.string(),
   })
   .with('page', 'limit');
 

diff --git a/src/routes/v1/resources/units.js b/src/routes/v1/resources/units.js
@@ -15,6 +15,7 @@ const querySchema = Joi.object()
     search: Joi.string(),
     warehouseUnitId: Joi.string(),
     columns: Joi.array().items(Joi.string()).single(),
+    orgUid: Joi.string(),
   })
   .with('page', 'limit');