fix: add modelName to query to avoid ambiguous fields

Author: gwynndp

src/mixins/utils.repository-mixin.ts

@@ -80,13 +80,6 @@ export function UtilsRepositoryMixin<
         const planterIds = await this.getNonOrganizationPlanterIds();
         // if planter repository request
         if (model === 'planter') {
-          // return {
-          //   and: [
-          //     { organizationId: null },
-          //     { 'planter.id': { inq: planterIds } },
-          //   ],
-          // };
-          // could just do this if we didn't need to use 'planter.id' to avoid errors with adding other filters
           return { id: { inq: planterIds } };
         } else {
           // if trees or other repository request

src/repositories/planter.repository.ts

@@ -12,7 +12,6 @@ import { Planter, PlanterRelations, PlanterRegistration } from '../models';
 import { TreetrackerDataSource } from '../datasources';
 import { PlanterRegistrationRepository } from './planterRegistration.repository';
 import { UtilsRepositoryMixin } from '../mixins/utils.repository-mixin';
-// import expect from 'expect-runtime';
 import { buildFilterQuery } from '../js/buildFilterQuery';
 import { utils } from '../js/utils';
 
@@ -70,15 +69,6 @@ export class PlanterRepository extends UtilsRepositoryMixin<
 
     try {
       if (this.dataSource.connector) {
-        // const columnNames = this.dataSource.connector
-        //   .buildColumnNames('Planter', filter)
-        //   .replace('"id"', 'planter.id as "id"')
-        //   .replace('"first_name"', 'planter.first_name as "first_name"')
-        //   .replace('"last_name"', 'planter.last_name as "last_name"')
-        //   .replace('"email"', 'planter.email as "email"')
-        //   .replace('"organization"', 'planter.organization as "organization"')
-        //   .replace('"phone"', 'planter.phone as "phone"');
-
         let selectStmt;
         if (deviceIdentifier) {
           selectStmt = `SELECT planter.* FROM planter ${this.getPlanterRegistrationJoinClause(