feat: add more detail to Joi validation of organization_id array

Greenstand · Nov 13, 2023 · 5e1f29c · 5e1f29c
1 parent cf1f03b
commit 5e1f29c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/server/infra/database/GrowerAccountRepository.ts b/server/infra/database/GrowerAccountRepository.ts
@@ -100,10 +100,9 @@ export default class GrowerAccountRepository extends BaseRepository<GrowerAccoun
     }
 
     if (filterObject.organization_id) {
-      result.where(
+      result.whereIn(
         `${this.tableName}.organization_id`,
-        '=',
-        `${filterObject.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.string().uuid(),
+        organization_id: Joi.array().items(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.string().uuid(),
+        organization_id: Joi.array().items(Joi.string().uuid()),
         id: Joi.string().uuid(),
         reference_id: Joi.number(),
         person_id: Joi.string().uuid(),