Merge pull request #339 from aayushgauba/main

Filter by grower_id
Greenstand · Jul 1, 2023 · 8ad771a · 8ad771a
2 parents cc30af6 + 03df388
commit 8ad771a
Show file tree

Hide file tree

Showing 4 changed files with 103 additions and 4 deletions.
diff --git a/server/infra/database/OrganizationRepositoryV2.ts b/server/infra/database/OrganizationRepositoryV2.ts
@@ -32,6 +32,28 @@ export default class OrganizationRepositoryV2 extends BaseRepository<Organizatio
     return objectPatched;
   }
 
+  async getByGrower(grower_id: string, options: FilterOptions) {
+    const { limit, offset } = options;
+    const sql = `
+      SELECT
+      entity.*,
+      l.country_id, l.country_name, l.continent_id, l.continent_name
+      FROM entity
+      LEFT JOIN webmap.organization_location l ON l.id = entity.id
+      LEFT JOIN planter ON planter.organization_id = entity.id
+      WHERE planter.grower_account_uuid = '${grower_id}'
+      LIMIT ${limit}
+      OFFSET ${offset}
+    `;
+    const object = await this.session.getDB().raw(sql);
+    const objectPatched = await patch(
+      object.rows,
+      PATCH_TYPE.EXTRA_ORG,
+      this.session,
+    );
+    return objectPatched;
+  }
+
   async getById(id: string | number) {
     const object = await this.session
       .getDB()
@@ -51,6 +73,25 @@ export default class OrganizationRepositoryV2 extends BaseRepository<Organizatio
     return objectPatched;
   }
 
+  // async getByGrowerId(id: string | number) {
+  //   const object = await this.session
+  //     .getDB()
+  //     .select()
+  //     .from(this.tableName)
+  //     .where('grower_account_', id)
+  //     .first();
+
+  //   if (!object) {
+  //     throw new HttpError(404, `Can not find ${this.tableName} by id:${id}`);
+  //   }
+  //   const objectPatched = await patch(
+  //     object,
+  //     PATCH_TYPE.EXTRA_ORG,
+  //     this.session,
+  //   );
+  //   return objectPatched;
+  // }
+
   async getByMapName(mapName: string) {
     const object = await this.session
       .getDB()

diff --git a/server/models/Organization.ts b/server/models/Organization.ts
@@ -4,7 +4,7 @@ import Organization from 'interfaces/Organization';
 import { delegateRepository } from '../infra/database/delegateRepository';
 import OrganizationRepository from '../infra/database/OrganizationRepository';
 
-type Filter = Partial<{ planter_id: number; organization_id: number }>;
+type Filter = Partial<{ planter_id: number; organization_id: number}>;
 
 function getByFilter(
   organizationRepository: OrganizationRepository,
@@ -18,6 +18,7 @@ function getByFilter(
       );
       return trees;
     }
+
     const trees = await organizationRepository.getByFilter(filter, options);
     return trees;
   };

diff --git a/server/models/OrganizationV2.ts b/server/models/OrganizationV2.ts
@@ -0,0 +1,54 @@
+import log from 'loglevel';
+import OrganizationRepositoryV2 from 'infra/database/OrganizationRepositoryV2';
+import FilterOptions from 'interfaces/FilterOptions';
+import Organization from 'interfaces/Organization';
+import { delegateRepository } from '../infra/database/delegateRepository';
+
+type Filter = Partial<{ planter_id: number; organization_id: number, grower_id:string }>;
+
+function getByFilter(
+  organizationRepository: OrganizationRepositoryV2,
+): (filter: Filter, options: FilterOptions) => Promise<Organization[]> {
+  return async function (filter: Filter, options: FilterOptions) {
+    if (filter.planter_id) {
+      log.warn('using planter filter...');
+      const trees = await organizationRepository.getByPlanter(
+        filter.planter_id,
+        options,
+      );
+      return trees;
+    }
+    if (filter.grower_id){
+      log.warn('using planter filter...');
+      const trees = await organizationRepository.getByGrower(
+        filter.grower_id,
+        options,
+      );
+      return trees;
+    }
+    const trees = await organizationRepository.getByFilter(filter, options);
+    return trees;
+  };
+}
+
+function getOrganizationLinks(organization) {
+  const links = {
+    featured_trees: `/trees?organization_id=${organization.id}&limit=20&offset=0`,
+    associated_planters: `/planters?organization_id=${organization.id}&limit=20&offset=0`,
+    species: `/species?organization_id=${organization.id}&limit=20&offset=0`,
+  };
+  return links;
+}
+
+export default {
+  getById: delegateRepository<OrganizationRepositoryV2, Organization>('getById'),
+  getByMapName: delegateRepository<OrganizationRepositoryV2, Organization>(
+    'getByMapName',
+  ),
+  getByFilter,
+  getOrganizationLinks,
+  getFeaturedOrganizations: delegateRepository<
+  OrganizationRepositoryV2,
+    Organization
+  >('getFeaturedOrganizations'),
+};
diff --git a/server/routers/organizationsRouterV2.ts b/server/routers/organizationsRouterV2.ts
@@ -3,9 +3,9 @@ import Joi from 'joi';
 import { handlerWrapper } from './utils';
 import OrganizationRepositoryV2 from '../infra/database/OrganizationRepositoryV2';
 import Session from '../infra/database/Session';
-import OrganizationModel from '../models/Organization';
+import OrganizationModel from '../models/OrganizationV2';
 
-type Filter = Partial<{ planter_id: number; organization_id: number }>;
+type Filter = Partial<{ planter_id: number; organization_id: number, grower_id:string }>;
 
 const router = express.Router();
 
@@ -51,15 +51,18 @@ router.get(
       req.query,
       Joi.object().keys({
         planter_id: Joi.number().integer().min(0),
+        grower_id:Joi.string(),
         limit: Joi.number().integer().min(1).max(1000),
         offset: Joi.number().integer().min(0),
       }),
     );
-    const { limit = 20, offset = 0, planter_id } = req.query;
+    const { limit = 20, offset = 0, planter_id, grower_id } = req.query;
     const repo = new OrganizationRepositoryV2(new Session());
     const filter: Filter = {};
     if (planter_id) {
       filter.planter_id = planter_id;
+    } else if(grower_id){
+      filter.grower_id = grower_id;
     }
     const result = await OrganizationModel.getByFilter(repo)(filter, {
       limit,