fix: legacy UUID treatments findable via $or fallback (#6923)

updateIdQuery() and upsertQueryFor() now use
  {$or: [{identifier: UUID}, {_id: UUID}]}
instead of only {identifier: UUID}. This matches both:
- New documents (UUID in identifier field, ObjectId in _id)
- Legacy documents (UUID directly in _id, no identifier field)

Gated behind env.uuidHandling (UUID_HANDLING env var, default true).

All 30 treatment tests pass:
- 3 legacy UUID tests (issue-6923): DELETE, PUT, GET all work
- 12 gap-treat-012 tests: new data paths unaffected
- 15 uuid-handling tests: edge cases, UUID_HANDLING=false still works

Fixes #6923 (unable to edit/save/delete overrides for legacy data)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: bewest

lib/server/query.js

@@ -100,8 +100,9 @@ function updateIdQuery (query, opts) {
   if (typeof query._id === 'string') {
     var result = normalizeIdValue(query._id, opts);
     if (result.searchByIdentifier) {
-      // UUID detected with uuidHandling enabled - search by identifier instead
-      query.identifier = result.value;
+      // UUID detected with uuidHandling enabled
+      // Use $or to match both new docs (identifier field) and legacy docs (UUID in _id)
+      query.$or = [{ identifier: result.value }, { _id: result.value }];
       delete query._id;
     } else {
       query._id = result.value;

lib/server/treatments.js

@@ -320,8 +320,13 @@ function storage (env, ctx) {
     if (obj.identifier) {
       // Remove _id from replacement - MongoDB will use existing _id on update,
       // or generate new one on insert
+      var identifierValue = obj.identifier;
       delete obj._id;
-      return { identifier: obj.identifier };
+      // Use $or to match both new docs (identifier field) and legacy docs (UUID in _id)
+      if (env.uuidHandling) {
+        return { $or: [{ identifier: identifierValue }, { _id: identifierValue }] };
+      }
+      return { identifier: identifierValue };
     }
     // 2. Fall back to _id if present and valid
     if (Object.prototype.hasOwnProperty.call(obj, '_id') && obj._id !== null && obj._id !== '') {

tests/issue-6923-legacy-uuid.test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 /**
- * Legacy UUID Data Test: Issue #6923 Reproduction
+ * Legacy UUID Data Test: Issue #6923 Regression
  * 
  * ISSUE: https://github.com/nightscout/cgm-remote-monitor/issues/6923
  * 
@@ -11,10 +11,11 @@
  * 
  * The test inserts a legacy-shaped document directly into MongoDB
  * (bypassing normalizeTreatmentId) and then exercises the API
- * DELETE and PUT paths that a user would trigger from Reports > Treatments.
+ * DELETE, PUT, and GET paths that a user would trigger from Reports > Treatments.
  * 
- * EXPECTED RESULT: These tests FAIL, proving the legacy data bug.
- * When all tests pass, the bug is fixed.
+ * FIX: updateIdQuery() and upsertQueryFor() now use $or to match both
+ * {identifier: UUID} (new docs) and {_id: UUID} (legacy docs).
+ * All 3 tests pass, confirming Loop can manage pre-existing overrides.
  */
 
 const request = require('supertest');