fix: consistently normalize entity UUIDs

Author: brontolosone

lib/model/query/entities.js

@@ -598,7 +598,7 @@ const _processEntityData = (sourceId, entityData, event, form, submissionDef, fo
       // If it is a uuid collision, check if the entity was created via an update
       // in which case its ok to apply this create as an update
       if (err.problemCode === 409.3 && err.problemDetails?.fields[0] === 'uuid') {
-        const rootDef = await Entities.getDef(dataset.id, entityData.system.id, new QueryOptions().withCondition({ root: true })).then(o => o.orNull());
+        const rootDef = await Entities.getDef(dataset.id, normalizeUuid(entityData.system.id), new QueryOptions().withCondition({ root: true })).then(o => o.orNull());
         if (rootDef && rootDef.aux.source.forceProcessed) {
           maybeEntity = await Entities._updateEntity(sourceId, dataset, entityData, submissionDef, event, forceOutOfOrderProcessing, true);
         } else {
@@ -793,7 +793,8 @@ const assignCurrentVersionCreator = (entity) => {
   return new Entity(entity, { currentVersion, creator: entity.aux.creator });
 };
 
-const getById = (datasetId, uuid, options = QueryOptions.none) => async ({ maybeOne }) => {
+const getById = (datasetId, wildtypeUuid, options = QueryOptions.none) => async ({ maybeOne }) => {
+  const uuid = normalizeUuid(wildtypeUuid);
   if (options.forUpdate) {
     await _lockEntity(maybeOne, uuid);
   }