apply creation time filter to submissions rather than submission_defs, fixes #1458

Author: brontolosone

lib/model/query/geo-extracts.js

@@ -35,7 +35,7 @@ const getSubmissionFeatureCollectionGeoJson = (formPK, IDs, fieldPaths, submitte
   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 TSTZRangeFilter = arrayHasElements(TSTZRange) ? sql`AND sdef."createdAt" <@ tstzrange(${TSTZRange[0]}, ${TSTZRange[1]}, ${TSTZRange[2]})` : 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`;
   const queryLimit = limit ? sql`LIMIT ${limit}` : sql``;
@@ -63,13 +63,13 @@ const getSubmissionFeatureCollectionGeoJson = (formPK, IDs, fieldPaths, submitte
                     ${submissionDefIdFilter}
                     ${onlyCurrentFilter}
                     ${submitterFilter}
-                    ${TSTZRangeFilter}
                 )
                 INNER JOIN submissions sub ON (
                     sdef."submissionId" = sub.id
                     ${submissionIdFilter}
                     ${deletedFilter}
                     ${reviewStateFilter}
+                    ${TSTZRangeFilter}
                 )
                 INNER JOIN form_field_geo ffgeo ON (
                     ffgeo.formschema_id = fdef."schemaId"