Merge pull request #363 from SuspenseFallback/fix-organisation-error

fix: added new type allowance for organization_id
Greenstand · Oct 21, 2023 · e258ec9 · e258ec9
2 parents 0db3a50 + 494e17b
commit e258ec9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/server/infra/database/BoundsRepository.ts b/server/infra/database/BoundsRepository.ts
@@ -47,7 +47,9 @@ export default class BoundsRepository {
     return BoundsRepository.convertStringToBounds(bounds);
   }
 
-  async filterByOrganisation(organisationId: string): Promise<Bounds> {
+  async filterByOrganisation(
+    organisationId: string[] | string,
+  ): Promise<Bounds> {
     const organisationBoundsSql = `
 			select  
 				ST_EXTENT(ST_GeomFromText('POINT(' || t.lon || ' ' || t.lat || ')', 4326)) as bounds

diff --git a/server/interfaces/GrowerAccountFilter.ts b/server/interfaces/GrowerAccountFilter.ts
@@ -7,7 +7,7 @@ interface GrowerAccountFilter extends DbModel {
   limit?: number;
   offset?: number;
   keyword?: string;
-  organization_id?: string;
+  organization_id?: string[] | string;
   person_id?: string;
   device_identifier?: string;
   wallet?: string;

diff --git a/server/models/Bounds.ts b/server/models/Bounds.ts
@@ -5,7 +5,7 @@ import Bounds from 'interfaces/Bounds';
 type BoundsFilter = Partial<{
   planter_id: string;
   wallet_id: string;
-  organisation_id: string;
+  organisation_id: string[] | string;
 }>;
 
 function getByFilter(