feat: fix merge errors

server/infra/database/OrganizationRepository.ts

@@ -107,4 +107,18 @@ export default class OrganizationRepository extends BaseRepository<Organization>
     );
     return objectPatched;
   }
+
+  async getByIds(ids: Array<number>, options: FilterOptions) {
+    const { limit, offset } = options;
+    const sql = `
+      SELECT
+        *
+      FROM entity
+      WHERE id IN (${ids})
+      LIMIT ${limit}
+      OFFSET ${offset}
+    `;
+    const object = await this.session.getDB().raw(sql);
+    return object.rows;
+  }
 }

server/infra/database/OrganizationRepositoryV2.ts

@@ -73,6 +73,20 @@ export default class OrganizationRepositoryV2 extends BaseRepository<Organizatio
     return objectPatched;
   }
 
+  async getByIds(ids: Array<string>, options: FilterOptions) {
+    const { limit = 20, offset = 0 } = options;
+
+    const result = await this.session
+      .getDB()
+      .select('*')
+      .from(this.tableName)
+      .whereIn('id', ids)
+      .offset(offset)
+      .limit(limit);
+
+    return result;
+  }
+
   // async getByGrowerId(id: string | number) {
   //   const object = await this.session
   //     .getDB()

server/models/Organization.ts

@@ -4,7 +4,11 @@ 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;
+  ids: Array<number>;
+}>;
 
 function getByFilter(
   organizationRepository: OrganizationRepository,
@@ -18,7 +22,11 @@ function getByFilter(
       );
       return trees;
     }
-
+    if (filter?.ids?.length) {
+      log.warn('using ids filter...');
+      const trees = await organizationRepository.getByIds(filter.ids, options);
+      return trees;
+    }
     const trees = await organizationRepository.getByFilter(filter, options);
     return trees;
   };

server/models/OrganizationV2.ts

@@ -8,6 +8,7 @@ type Filter = Partial<{
   planter_id: number;
   organization_id: number;
   grower_id: string;
+  ids: Array<string>;
 }>;
 
 function getByFilter(
@@ -30,6 +31,11 @@ function getByFilter(
       );
       return trees;
     }
+    if (filter?.ids?.length) {
+      log.warn('using ids filter...');
+      const trees = await organizationRepository.getByIds(filter.ids, options);
+      return trees;
+    }
     const trees = await organizationRepository.getByFilter(filter, options);
     return trees;
   };

server/routers/organizationsRouter.ts

@@ -5,7 +5,12 @@ import OrganizationRepository from '../infra/database/OrganizationRepository';
 import Session from '../infra/database/Session';
 import OrganizationModel from '../models/Organization';
 
-type Filter = Partial<{ planter_id: number; organization_id: number }>;
+type Filter = Partial<{
+  planter_id: number;
+  organization_id: number;
+  ids: Array<number>;
+  stakeholder_uuid: string;
+}>;
 
 const router = express.Router();
 
@@ -47,20 +52,36 @@ router.get(
 router.get(
   '/',
   handlerWrapper(async (req, res) => {
+    const query = { ...req.query };
+    query.ids = JSON.parse(req.query.ids);
     Joi.assert(
-      req.query,
+      query,
       Joi.object().keys({
         planter_id: Joi.number().integer().min(0),
+        ids: Joi.array(),
+        stakeholder_uuid: Joi.string().uuid(),
         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,
+      ids = [],
+      stakeholder_uuid,
+    } = query;
     const repo = new OrganizationRepository(new Session());
     const filter: Filter = {};
     if (planter_id) {
       filter.planter_id = planter_id;
     }
+    if (stakeholder_uuid) {
+      filter.stakeholder_uuid = stakeholder_uuid;
+    }
+    if (ids.length) {
+      filter.ids = ids;
+    }
     const result = await OrganizationModel.getByFilter(repo)(filter, {
       limit,
       offset,

server/routers/organizationsRouterV2.ts

@@ -9,6 +9,7 @@ type Filter = Partial<{
   planter_id: number;
   organization_id: number;
   grower_id: string;
+  ids: Array<string>;
 }>;
 
 const router = express.Router();
@@ -51,23 +52,29 @@ router.get(
 router.get(
   '/',
   handlerWrapper(async (req, res) => {
+    const query = { ...req.query };
+    query.ids = JSON.parse(req.query.ids);
     Joi.assert(
-      req.query,
+      query,
       Joi.object().keys({
         planter_id: Joi.number().integer().min(0),
         grower_id: Joi.string().guid(),
+        ids: Joi.array().items(Joi.string().uuid()),
         limit: Joi.number().integer().min(1).max(1000),
         offset: Joi.number().integer().min(0),
       }),
     );
-    const { limit = 20, offset = 0, planter_id, grower_id } = req.query;
+    const { limit = 20, offset = 0, planter_id, grower_id, ids = [] } = 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;
     }
+    if (ids.length) {
+      filter.ids = ids;
+    }
     const result = await OrganizationModel.getByFilter(repo)(filter, {
       limit,
       offset,