[131] update mongodb validation for the case schema to allow search

data-serving/data-service/src/controllers/case.ts

@@ -795,6 +795,13 @@ export class CasesController {
             res.status(201).json(result);
         } catch (e) {
             const err = e as Error;
+            if  (err.name === 'MongoServerError') {
+                logger.error((e as any).errInfo);
+                res.status(422).json({
+                    message: (err as any).errInfo,
+                });
+                return;
+            }
             if (err instanceof GeocodeNotFoundError) {
                 res.status(404).json({
                     message: err.message,

data-serving/scripts/setup-db/migrations/20210902121948-initial.js

@@ -1,57 +1,60 @@
 const fs = require('fs');
 
 module.exports = {
-  async up(db, client) {
-    await createCollectionValidationAndIndexes(
-      db,
-      'cases',
-      'schemas/cases.schema.json',
-      'schemas/cases.indexes.json'
-    );
-
-    await createCollectionValidationAndIndexes(
-      db,
-      'sources',
-      'schemas/sources.schema.json',
-      'schemas/sources.indexes.json'
-    );
-  },
-
-  async down(db, client) {
-    // initial migration has no rollback
-  }
+    async up(db, client) {
+        await createCollectionValidationAndIndexes(
+            db,
+            'day0cases',
+            'schemas/day0cases.schema.json',
+            'schemas/day0cases.indexes.json',
+        );
+
+        await createCollectionValidationAndIndexes(
+            db,
+            'sources',
+            'schemas/sources.schema.json',
+            'schemas/sources.indexes.json',
+        );
+    },
+
+    async down(db, client) {
+        // initial migration has no rollback
+    },
 };
 
-async function createCollectionValidationAndIndexes(db, collectionName, schemaPath, indexPath) {
-  const schemaFile = await fs.promises.readFile(schemaPath);
-  const schema = JSON.parse(schemaFile);
+async function createCollectionValidationAndIndexes(
+    db,
+    collectionName,
+    schemaPath,
+    indexPath,
+) {
+    const schemaFile = await fs.promises.readFile(schemaPath);
+    const schema = JSON.parse(schemaFile);
+
+    const indexFile = await fs.promises.readFile(indexPath);
+    const indexes = JSON.parse(indexFile);
+    /*
+     * because this migration might run against a DB from before we had the migrations infra,
+     * check whether the collection already exists. If it does, then modify its validation schema.
+     * If it doesn't, then create it.
+     */
+    try {
+        await db.collection(collectionName);
+        await db.command({
+            collMod: collectionName,
+            validator: schema,
+        });
+    } catch {
+        await db.createCollection(collectionName, {
+            validator: schema,
+        });
+    }
+
+    const collection = db.collection(collectionName);
+    await collection.dropIndexes();
 
-  const indexFile = await fs.promises.readFile(indexPath);
-  const indexes = JSON.parse(indexFile);
-  /*
-   * because this migration might run against a DB from before we had the migrations infra,
-   * check whether the collection already exists. If it does, then modify its validation schema.
-   * If it doesn't, then create it.
-   */
-  try {
-    await db.collection(collectionName);
     await db.command({
-      collMod: collectionName,
-      validator: schema,
-    });
-  }
-  catch {
-    await db.createCollection(collectionName, {
-      validator: schema,
+        createIndexes: collectionName,
+        indexes: indexes,
     });
-  }
-
-  const collection = db.collection(collectionName);
-  await collection.dropIndexes();
-
-  await db.command({
-    createIndexes: collectionName,
-    indexes: indexes,
-  });
 }
-

data-serving/scripts/setup-db/migrations/20210922082905-additional-case-indexes.js

@@ -1,29 +1,29 @@
 const indexes = [
-  {
-    name: 'byGenderAndCountry',
-    key: {
-      'demographics.gender': -1,
-      'location.countryISO3': -1
+    {
+        name: 'byGenderAndCountry',
+        key: {
+            'demographics.gender': -1,
+            'location.countryISO3': -1,
+        },
+        collation: {
+            locale: 'en_US',
+            strength: 2,
+        },
     },
-    collation: {
-      locale: 'en_US',
-      strength: 2,
-    },
-  }  
 ];
 
 module.exports = {
-  async up(db, client) {
-    await db.command({
-      createIndexes: 'cases',
-      indexes: indexes,
-    });
-  },
+    async up(db, client) {
+        await db.command({
+            createIndexes: 'day0cases',
+            indexes: indexes,
+        });
+    },
 
-  async down(db, client) {
-    await db.command({
-      dropIndexes: 'cases',
-      index: ['byGenderAndCountry']
-    });
-  }
+    async down(db, client) {
+        await db.command({
+            dropIndexes: 'day0cases',
+            index: ['byGenderAndCountry'],
+        });
+    },
 };

data-serving/scripts/setup-db/package.json

@@ -8,6 +8,7 @@
     "lint": "tsc --noEmit && eslint '*/**/*.{js,ts,tsx}' --quiet --fix",
     "import-sample-data": "python3 ./import-sample-data.py",
     "migrate": "npm ci && migrate-mongo up",
+    "migrate-down": "npm ci && migrate-mongo down",
     "delete-all-cases": "mongosh $CONN --eval 'db.cases.deleteMany({})'"
   },
   "repository": {

data-serving/scripts/setup-db/schemas/cases.indexes.json → data-serving/scripts/setup-db/schemas/day0cases.indexes.json

@@ -4,7 +4,9 @@
         "key": {
             "demographics.occupation": "text",
             "location.country": "text",
-            "location.city": "text",
+            "location.admin1": "text",
+            "location.admin2": "text",
+            "location.admin3": "text",
             "caseReference.sourceUrl": "text",
             "caseStatus": "text"
         }
@@ -74,9 +76,29 @@
         }
     },
     {
-        "name": "locationCityIdx",
+        "name": "locationAdmin1Idx",
         "key": {
-            "location.city": -1
+            "location.admin1": -1
+        },
+        "collation": {
+            "locale": "en_US",
+            "strength": 2
+        }
+    },
+    {
+        "name": "locationAdmin2Idx",
+        "key": {
+            "location.admin2": -1
+        },
+        "collation": {
+            "locale": "en_US",
+            "strength": 2
+        }
+    },
+    {
+        "name": "locationAdmin3Idx",
+        "key": {
+            "location.admin3": -1
         },
         "collation": {
             "locale": "en_US",