Merge branch 'master' into cleanup-helper-fns

Greenstand · Nov 7, 2021 · 8c20ed1 · 8c20ed1
2 parents 1ccda9b + 2cebcaf
commit 8c20ed1
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [2.21.0](https://github.com/Greenstand/treetracker-admin/compare/v2.20.3...v2.21.0) (2021-11-06)
+
+
+### Features
+
+* **growers:** filter growers by deviceIdentifier ([#598](https://github.com/Greenstand/treetracker-admin/issues/598)) ([cea9d24](https://github.com/Greenstand/treetracker-admin/commit/cea9d240a9cf9b6b29d325172870a1f3fb399554))
+
 ## [2.20.3](https://github.com/Greenstand/treetracker-admin/compare/v2.20.2...v2.20.3) (2021-10-27)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "treetracker-admin-api",
-  "version": "2.20.3",
+  "version": "2.21.0",
   "private": true,
   "description": "Treetracker Admin API Server",
   "keywords": [

diff --git a/src/controllers/planter.controller.ts b/src/controllers/planter.controller.ts
@@ -20,8 +20,10 @@ import { Planter, Trees } from '../models';
 import { TreesFilter } from './trees.controller';
 import { PlanterRepository, TreesRepository } from '../repositories';
 
-// Extend the LoopBack filter types for the Planter model to include organizationId
-type PlanterWhere = (Where<Planter> & { organizationId?: number }) | undefined;
+// Extend the LoopBack filter types for the Planter model to include organizationId and deviceIdentifier
+type PlanterWhere =
+  | (Where<Planter> & { deviceIdentifier?: string; organizationId?: number })
+  | undefined;
 export type PlanterFilter = Filter<Planter> & { where: PlanterWhere };
 
 export class PlanterController {
@@ -44,6 +46,8 @@ export class PlanterController {
     @param.query.object('where', getWhereSchemaFor(Planter))
     where?: PlanterWhere,
   ): Promise<Count> {
+    const deviceIdentifier = where?.deviceIdentifier;
+
     // Replace organizationId with full entity tree and planter
     if (where) {
       const { organizationId, ...whereWithoutOrganizationId } = where;
@@ -55,7 +59,7 @@ export class PlanterController {
     }
     // console.log('get /planter/count where -->', where);
 
-    return await this.planterRepository.countWithOrg(where);
+    return await this.planterRepository.countWithOrg(where, deviceIdentifier);
   }
 
   @get('/planter', {
@@ -74,6 +78,8 @@ export class PlanterController {
     @param.query.object('filter', getFilterSchemaFor(Planter))
     filter?: PlanterFilter,
   ): Promise<Planter[]> {
+    const deviceIdentifier = filter?.where?.deviceIdentifier;
+
     // Replace organizationId with full entity tree and planter
     if (filter?.where) {
       const { organizationId, ...whereWithoutOrganizationId } = filter.where;
@@ -84,7 +90,7 @@ export class PlanterController {
       );
     }
 
-    return await this.planterRepository.findWithOrg(filter);
+    return await this.planterRepository.findWithOrg(filter, deviceIdentifier);
   }
 
   @get('/planter/{id}', {

diff --git a/src/controllers/planterRegistration.controller.ts b/src/controllers/planterRegistration.controller.ts
@@ -33,9 +33,13 @@ export class PlanterRegistrationController {
 
     const sql = `SELECT * FROM planter_registrations
         LEFT JOIN (
-        SELECT region.name AS country, region.geom FROM region, region_type
-        WHERE region_type.type='country' AND region.type_id=region_type.id
-    ) AS region ON ST_DWithin(region.geom, planter_registrations.geom, 0.01)`;
+          SELECT
+            region.name AS country,
+            region.geom FROM region, region_type
+          WHERE region_type.type='country'
+          AND region.type_id=region_type.id
+        ) AS region
+        ON ST_DWithin(region.geom, planter_registrations.geom, 0.01)`;
 
     const params = {
       filter,

diff --git a/src/models/planter.model.ts b/src/models/planter.model.ts
@@ -1,4 +1,5 @@
-import { Entity, model, property } from '@loopback/repository';
+import { Entity, model, property, hasMany } from '@loopback/repository';
+import { PlanterRegistration } from './planterRegistration.model';
 
 /* eslint-disable @typescript-eslint/no-empty-interface */
 
@@ -183,6 +184,9 @@ export class Planter extends Entity {
   })
   imageRotation?: Number;
 
+  @hasMany(() => PlanterRegistration, { keyTo: 'planterId' })
+  planterRegs: PlanterRegistration[];
+
   // Define well-known properties here
 
   // Indexer property to allow additional data

diff --git a/src/repositories/planter.repository.ts b/src/repositories/planter.repository.ts
@@ -1,7 +1,10 @@
 import { Constructor, inject } from '@loopback/core';
 import {
   DefaultCrudRepository,
+  repository,
+  HasManyRepositoryFactory,
   Filter,
+  Options,
   Where,
   Count,
 } from '@loopback/repository';
@@ -23,16 +26,29 @@ export class PlanterRepository extends UtilsRepositoryMixin<
 >(DefaultCrudRepository) {
   constructor(
     @inject('datasources.treetracker') dataSource: TreetrackerDataSource,
+    @repository.getter('PlanterRegistrationRepository')
+    protected planterRegistrationRepositoryGetter: Getter<PlanterRegistrationRepository>,
   ) {
     super(Planter, dataSource);
+    this.planterRegs = this.createHasManyRepositoryFactoryFor(
+      'planterRegs',
+      planterRegistrationRepositoryGetter,
+    );
+    this.registerInclusionResolver(
+      'planterRegs',
+      this.planterRegs.inclusionResolver,
+    );
   }
 
   // default .find() wasn't applying the org filters
+
   async findWithOrg(
     filter?: Filter<Planter>,
+    deviceIdentifier?: string,
+    options?: Options,
   ): Promise<(Planter & PlanterRelations)[]> {
-    if (!filter) {
-      return await this.find(filter);
+    if (!filter || deviceIdentifier === null) {
+      return await this.find(filter, options);
     }
 
     try {
@@ -42,7 +58,14 @@ export class PlanterRepository extends UtilsRepositoryMixin<
           filter,
         );
 
-        const selectStmt = `SELECT ${columnNames} FROM planter `;
+        let selectStmt;
+        if (deviceIdentifier) {
+          selectStmt = `SELECT planter.* FROM planter ${this.getPlanterRegistrationJoinClause(
+            deviceIdentifier,
+          )}`;
+        } else {
+          selectStmt = `SELECT ${columnNames} FROM planter`;
+        }
 
         const params = {
           filter,
@@ -51,25 +74,37 @@ export class PlanterRepository extends UtilsRepositoryMixin<
         };
 
         const query = buildFilterQuery(selectStmt, params);
+        // console.log('query ---------', query);
 
-        const result = await this.execute(query.sql, query.params);
+        const result = await this.execute(query.sql, query.params, options);
         return <Planter[]>result.map((planter) => utils.convertCamel(planter));
       } else {
         throw 'Connector not defined';
       }
     } catch (e) {
       console.log(e);
-      return await this.find(filter);
+      return await this.find(filter, options);
     }
   }
 
-  async countWithOrg(where?: Where<Planter>): Promise<Count> {
-    if (!where) {
-      return await this.count(where);
+  async countWithOrg(
+    where?: Where<Planter>,
+    deviceIdentifier?: string,
+    options?: Options,
+  ): Promise<Count> {
+    if (!where || deviceIdentifier === null) {
+      return await this.count(where, options);
     }
 
     try {
-      const selectStmt = `SELECT COUNT(*) FROM planter `;
+      let selectStmt;
+      if (deviceIdentifier) {
+        selectStmt = `SELECT COUNT(*) FROM planter ${this.getPlanterRegistrationJoinClause(
+          deviceIdentifier,
+        )}`;
+      } else {
+        selectStmt = `SELECT COUNT(*) FROM planter`;
+      }
 
       const params = {
         filter: { where },