adapt geo-extracts to entity UUIDs, and "uuid:"-prefixed entity UUIDs

Author: brontolosone

lib/model/query/geo-extracts.js

@@ -186,7 +186,7 @@ const getSubmissionFeatureCollectionGeoJson = (formPK, IDs, fieldPaths, submitte
 
 const getEntityFeatureCollectionGeoJson = (datasetPK, IDs, creatorIds, TSTZRange, conflictStates, deleted, limit, search) => ({ db }) => {
 
-  const idFilter = arrayHasElements(IDs) ? sql`AND e.uuid = ANY(${sql.array(IDs, 'text')})` : sql``; // TODO: this should be a uuid[] array once/if the entities."uuid" column is converted from varchar(255) to uuid
+  const idFilter = arrayHasElements(IDs) ? sql`AND e.uuid = ANY(${sql.array(IDs, 'uuid')})` : sql``;
   const creatorFilter = arrayHasElements(creatorIds) ? sql`AND e."creatorId" = ANY(${sql.array(creatorIds, 'int4')})` : sql``;
   const TSTZRangeFilter = arrayHasElements(TSTZRange) ? sql`AND e."createdAt" <@ tstzrange(${TSTZRange[0]}, ${TSTZRange[1]}, ${TSTZRange[2]})` : sql``;
   const conflictStatusFilter = arrayHasElements(conflictStates) ? sql`AND ${stateFilterToQueryFragments(['e', 'conflict'], conflictStates, 'conflictType')}` : sql``;

lib/resources/entities.js

@@ -13,7 +13,7 @@ const { Entity } = require('../model/frames');
 const Problem = require('../util/problem');
 const { diffEntityData, extractBulkSource, getWithConflictDetails } = require('../data/entity');
 const { QueryOptions } = require('../util/db');
-const { Constants } = require('../constants');
+const { normalizeUuid } = require('../data/entity');
 
 module.exports = (service, endpoint) => {
 
@@ -92,22 +92,16 @@ module.exports = (service, endpoint) => {
   service.get('/projects/:projectId/datasets/:name/entities/:uuid/geojson', endpoint.plain(async ({ Datasets, Entities, GeoExtracts }, { params, auth }) => {
 
     // Saves a query and gives informative feedback if we do this straight away
-    if (!Constants.UUIDRegex.test(params.uuid)) {
-      throw Problem.user.unexpectedValue({
-        field: 'URL UUID path component',
-        value: params.uuid,
-        reason: `is not interpretable as a UUID: ${params.uuid}`,
-      });
-    }
+    const entityUuid = normalizeUuid(params.uuid);
 
     const dataset = await Datasets.get(params.projectId, params.name, true).then(getOrNotFound);
     await auth.canOrReject('entity.read', dataset);
 
     // We need to get the entity itself to see if it exists (and if not, return a 404).
     // That's because when getting the geodata, we can't distinguish between the entity not having any geodata (or having invalid geodata)
     // and the entity itself not existing.
-    await Entities.getById(dataset.id, params.uuid).then(getOrNotFound);
-    return GeoExtracts.getEntityFeatureCollectionGeoJson(dataset.id, [params.uuid]).then(json);
+    await Entities.getById(dataset.id, entityUuid).then(getOrNotFound);
+    return GeoExtracts.getEntityFeatureCollectionGeoJson(dataset.id, [entityUuid]).then(json);
   }));
 
 

lib/resources/geo-extracts.js

@@ -63,7 +63,7 @@ module.exports = (service, endpoint) => {
 
     return GeoExtracts.getEntityFeatureCollectionGeoJson(
       foundDataset.id,
-      Sanitize.queryParamToUuidArray(query.entityUUID, 'entityUUID'),
+      Sanitize.queryParamToUuidArray(query.entityUUID, 'entityUUID', true),
       Sanitize.queryParamToIntArray(query.creatorId, 'creatorId'),
       Sanitize.getTSTZRangeFromQueryParams(query),
       Sanitize.getEntityConflictStates(query.conflict, 'conflict'),

lib/util/param-sanitize.js

@@ -57,9 +57,9 @@ class Sanitize {
   }
 
 
-  static queryParamToUuidArray(queryParam, queryParamName) {
+  static queryParamToUuidArray(queryParam, queryParamName, stripUuidColonPrefix=false) {
     return this.queryParamToArray(queryParam).map(el => {
-      const trimmed = el.trim();
+      const trimmed = stripUuidColonPrefix ? el.trim().replace(/^uuid:/, '') : el.trim();
       if (!Constants.UUIDRegex.test(trimmed)) {
         throw Problem.user.unexpectedValue({
           field: `query parameter '${queryParamName}'`,