Merge pull request #351 from aayushgauba/main

fix:organization_filter for growerV2
Greenstand · Jul 27, 2023 · b66ad9f · b66ad9f
2 parents 91f70d1 + 513eba6
commit b66ad9f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/server/infra/database/GrowerAccountRepository.ts b/server/infra/database/GrowerAccountRepository.ts
@@ -100,9 +100,7 @@ export default class GrowerAccountRepository extends BaseRepository<GrowerAccoun
     }
 
     if (filterObject.organization_id) {
-      result.where(`${this.tableName}.organization_id`, 'in', [
-        ...filterObject.organization_id,
-      ]);
+      result.where(`${this.tableName}.organization_id`, '=',`${filterObject.organization_id}`);
       delete filterObject.organization_id;
     }
 

diff --git a/server/routers/growerAccountsRouter.ts b/server/routers/growerAccountsRouter.ts
@@ -20,7 +20,7 @@ router.get(
         limit: Joi.number().integer().min(1).max(1000),
         offset: Joi.number().integer().min(0),
         keyword: Joi.string(),
-        organization_id: Joi.array(),
+        organization_id: Joi.string().uuid(),
         id: Joi.string().uuid(),
         reference_id: Joi.number(),
         person_id: Joi.string().uuid(),
@@ -138,7 +138,7 @@ router.get(
         limit: Joi.number().integer().min(1).max(1000),
         offset: Joi.number().integer().min(0),
         keyword: Joi.string(),
-        organization_id: Joi.array(),
+        organization_id: Joi.string().uuid(),
         id: Joi.string().uuid(),
         reference_id: Joi.number(),
         person_id: Joi.string().uuid(),

diff --git a/server/routers/utils.ts b/server/routers/utils.ts
@@ -64,9 +64,8 @@ const queryFormatter = (req) => {
     whereIns: whereIns?.length ? JSON.parse(whereIns) : [],
     ...others,
   };
-
-  if (organization_id) {
-    query.organization_id = JSON.parse(organization_id);
+  if (req.query.organization_id) {
+    query.organization_id = req.query.organization_id;  
   }
 
   if (req.query.captures_amount_min) {