Removes unnecessary ANDs

Ed-Fi-Exchange-OSS · Oct 31, 2023 · 84b9642 · 84b9642
1 parent d867e8c
commit 84b9642
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 35 deletions.
diff --git a/Meadowlark-js/backends/meadowlark-mongodb-backend/src/repository/Db.ts b/Meadowlark-js/backends/meadowlark-mongodb-backend/src/repository/Db.ts
@@ -143,13 +143,9 @@ export async function lockDocuments(
 
   await concurrencyCollection.deleteMany(
     {
-      $and: [
-        {
-          _id: {
-            $in: documentUuids,
-          },
-        },
-      ],
+      _id: {
+        $in: documentUuids,
+      },
     },
     { session },
   );

diff --git a/Meadowlark-js/backends/meadowlark-mongodb-backend/src/repository/Update.ts b/Meadowlark-js/backends/meadowlark-mongodb-backend/src/repository/Update.ts
@@ -154,14 +154,11 @@ async function updateAllowingIdentityChange(
   const referringDocumentUuids: WithId<MeadowlarkDocument>[] = await mongoCollection
     .find(
       {
-        $and: [
-          {
-            aliasMeadowlarkIds: {
-              $in: document.outboundRefs,
-            },
-          },
-        ],
+        aliasMeadowlarkIds: {
+          $in: document.outboundRefs,
+        },
       },
+
       { projection: { documentUuid: 1 } },
     )
     .toArray();
@@ -265,13 +262,9 @@ async function updateDisallowingIdentityChange(
   const referringDocumentUuids: WithId<MeadowlarkDocument>[] = await mongoCollection
     .find(
       {
-        $and: [
-          {
-            aliasMeadowlarkIds: {
-              $in: document.outboundRefs,
-            },
-          },
-        ],
+        aliasMeadowlarkIds: {
+          $in: document.outboundRefs,
+        },
       },
       { projection: { documentUuid: 1 } },
     )

diff --git a/Meadowlark-js/backends/meadowlark-mongodb-backend/src/repository/Upsert.ts b/Meadowlark-js/backends/meadowlark-mongodb-backend/src/repository/Upsert.ts
@@ -141,13 +141,9 @@ export async function upsertDocumentTransaction(
   const referringDocumentUuids: WithId<MeadowlarkDocument>[] = await mongoCollection
     .find(
       {
-        $and: [
-          {
-            aliasMeadowlarkIds: {
-              $in: document.outboundRefs,
-            },
-          },
-        ],
+        aliasMeadowlarkIds: {
+          $in: document.outboundRefs,
+        },
       },
       { projection: { documentUuid: 1 } },
     )

diff --git a/Meadowlark-js/backends/meadowlark-mongodb-backend/test/integration/Db.test.ts b/Meadowlark-js/backends/meadowlark-mongodb-backend/test/integration/Db.test.ts
@@ -32,13 +32,9 @@ describe('when lockDocuments is called with a given number of documents', () =>
 
   it('concurrencyCollection should be empty after the function is called', async () => {
     const documents = await getConcurrencyCollection(client).countDocuments({
-      $and: [
-        {
-          meadowlarkId: {
-            $in: ['123', '456'],
-          },
-        },
-      ],
+      meadowlarkId: {
+        $in: ['123', '456'],
+      },
     });
 
     expect(documents).toBe(0);