apply submitter filter to submissions rather than submission_defs, fixes #1459

Author: brontolosone

lib/model/query/geo-extracts.js

@@ -34,7 +34,7 @@ const getSubmissionFeatureCollectionGeoJson = (formPK, IDs, fieldPaths, submitte
   const formFieldFilter = arrayHasElements(fieldPaths) ? (fieldPaths.includes('all') ? sql`` : sql`AND ffgeo.path = ANY (${sql.array(fieldPaths, 'text')})`) : sql`AND ffgeo.is_default`;
   const doPathInProperties = arrayHasElements(fieldPaths) ? sql`, 'properties', NULL` : sql`, 'properties', json_build_object('fieldpath', path)`;
   const doAggregateByPath = arrayHasElements(fieldPaths) ? sql`` : sql`, path`;
-  const submitterFilter = arrayHasElements(submitterIds) ? sql`AND sdef."submitterId" = ANY(${sql.array(submitterIds, 'int4')})` : sql``;
+  const submitterFilter = arrayHasElements(submitterIds) ? sql`AND sub."submitterId" = ANY(${sql.array(submitterIds, 'int4')})` : sql``;
   const TSTZRangeFilter = arrayHasElements(TSTZRange) ? sql`AND sub."createdAt" <@ tstzrange(${TSTZRange[0]}, ${TSTZRange[1]}, ${TSTZRange[2]})` : sql``;
   const reviewStateFilter = arrayHasElements(reviewStates) ? sql`AND ${stateFilterToQueryFragments(['sub', 'reviewState'], reviewStates)}` : sql``;
   const deletedFilter = deleted ? sql`AND sub."deletedAt" IS NOT NULL` : sql`AND sub."deletedAt" IS NULL`;
@@ -62,14 +62,14 @@ const getSubmissionFeatureCollectionGeoJson = (formPK, IDs, fieldPaths, submitte
                     sdef."formDefId" = fdef.id
                     ${submissionDefIdFilter}
                     ${onlyCurrentFilter}
-                    ${submitterFilter}
                 )
                 INNER JOIN submissions sub ON (
                     sdef."submissionId" = sub.id
                     ${submissionIdFilter}
                     ${deletedFilter}
                     ${reviewStateFilter}
                     ${TSTZRangeFilter}
+                    ${submitterFilter}
                 )
                 INNER JOIN form_field_geo ffgeo ON (
                     ffgeo.formschema_id = fdef."schemaId"