Merge pull request #305 from gwynndp/grower-ref-id

Add reference_id as a valid field for growers query
Greenstand · Apr 25, 2023 · d5112c2 · d5112c2
2 parents f6c33bf + 3a8b1cc
commit d5112c2
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 1 deletion.
diff --git a/server/infra/database/CaptureRepository.ts b/server/infra/database/CaptureRepository.ts
@@ -91,6 +91,15 @@ export default class CaptureRepository extends BaseRepository<Capture> {
       delete filterObject.reference_id;
     }
 
+    if (filterObject.grower_reference_id) {
+      result.where(
+        `treetracker.grower_account.reference_id`,
+        '=',
+        filterObject.grower_reference_id,
+      );
+      delete filterObject.grower_reference_id;
+    }
+
     if (filterObject.organization_id) {
       result.where(`${this.tableName}.planting_organization_id`, 'in', [
         ...filterObject.organization_id,

diff --git a/server/infra/database/GrowerAccountRepository.ts b/server/infra/database/GrowerAccountRepository.ts
@@ -40,6 +40,15 @@ export default class GrowerAccountRepository extends BaseRepository<GrowerAccoun
       delete filterObject.id;
     }
 
+    if (filterObject.reference_id) {
+      result.where(
+        `${this.tableName}.reference_id`,
+        '=',
+        filterObject.reference_id,
+      );
+      delete filterObject.reference_id;
+    }
+
     if (filterObject.first_name) {
       result.where(
         `${this.tableName}.first_name`,
@@ -357,7 +366,7 @@ export default class GrowerAccountRepository extends BaseRepository<GrowerAccoun
       .select(
         knex.raw(`
         COUNT(${this.tableName}.id) AS count
-        FROM ${this.tableName}        
+        FROM ${this.tableName}
     `),
       )
       .where((builder) => this.filterWhereBuilder(filter, builder))

diff --git a/server/infra/database/RawCaptureRepository.ts b/server/infra/database/RawCaptureRepository.ts
@@ -100,6 +100,15 @@ export default class RawCaptureRepository extends BaseRepository<RawCapture> {
       delete filterObject.reference_id;
     }
 
+    if (filterObject.grower_reference_id) {
+      result.where(
+        `treetracker.grower_account.reference_id`,
+        '=',
+        filterObject.grower_reference_id,
+      );
+      delete filterObject.grower_reference_id;
+    }
+
     if (filterObject.organization_id) {
       result.where(`field_data.session.organization_id`, 'in', [
         ...filterObject.organization_id,
@@ -152,6 +161,12 @@ export default class RawCaptureRepository extends BaseRepository<RawCapture> {
         '=',
         'field_data.wallet_registration.id',
       )
+      .leftJoin(
+        'treetracker.grower_account',
+        'field_data.wallet_registration.grower_account_id',
+        '=',
+        'treetracker.grower_account.id',
+      )
       .leftJoin(
         'field_data.device_configuration',
         'field_data.session.device_configuration_id',
@@ -202,6 +217,12 @@ export default class RawCaptureRepository extends BaseRepository<RawCapture> {
         '=',
         'field_data.wallet_registration.id',
       )
+      .leftJoin(
+        'treetracker.grower_account',
+        'field_data.wallet_registration.grower_account_id',
+        '=',
+        'treetracker.grower_account.id',
+      )
       .leftJoin(
         'field_data.device_configuration',
         'field_data.session.device_configuration_id',

diff --git a/server/routers/capturesRouter.ts b/server/routers/capturesRouter.ts
@@ -17,6 +17,7 @@ router.get(
       query,
       Joi.object().keys({
         grower_account_id: Joi.string().uuid(),
+        grower_reference_id: Joi.number(),
         organization_id: Joi.array(),
         limit: Joi.number().integer().min(1).max(20000),
         offset: Joi.number().integer().min(0),
@@ -71,6 +72,7 @@ router.get(
       query,
       Joi.object().keys({
         grower_account_id: Joi.string().uuid(),
+        grower_reference_id: Joi.number(),
         organization_id: Joi.array(),
         limit: Joi.number().integer().min(1).max(20000),
         offset: Joi.number().integer().min(0),

diff --git a/server/routers/growerAccountsRouter.ts b/server/routers/growerAccountsRouter.ts
@@ -22,6 +22,7 @@ router.get(
         keyword: Joi.string(),
         organization_id: Joi.array(),
         id: Joi.string().uuid(),
+        reference_id: Joi.number(),
         person_id: Joi.string().uuid(),
         device_identifier: Joi.string(),
         first_name: Joi.string(),
@@ -139,6 +140,7 @@ router.get(
         keyword: Joi.string(),
         organization_id: Joi.array(),
         id: Joi.string().uuid(),
+        reference_id: Joi.number(),
         person_id: Joi.string().uuid(),
         device_identifier: Joi.string(),
         first_name: Joi.string(),

diff --git a/server/routers/rawCapturesRouter.ts b/server/routers/rawCapturesRouter.ts
@@ -21,6 +21,7 @@ router.get(
         status: Joi.string().allow('unprocessed', 'approved', 'rejected'),
         bulk_pack_file_name: Joi.string(),
         grower_account_id: Joi.string().uuid(),
+        grower_reference_id: Joi.number(),
         organization_id: Joi.array(),
         startDate: Joi.string().regex(/^\d{4}-\d{2}-\d{2}$/),
         endDate: Joi.string().regex(/^\d{4}-\d{2}-\d{2}$/),
@@ -76,6 +77,7 @@ router.get(
         status: Joi.string().allow('unprocessed', 'approved', 'rejected'),
         bulk_pack_file_name: Joi.string(),
         grower_account_id: Joi.string().uuid(),
+        grower_reference_id: Joi.number(),
         organization_id: Joi.array(),
         startDate: Joi.string().regex(/^\d{4}-\d{2}-\d{2}$/),
         endDate: Joi.string().regex(/^\d{4}-\d{2}-\d{2}$/),