chore(data-service): promisify all find* methods COMPASS-6620 (#4261)

gribnoysup · web-flow · commit 00526bfc9e5e · 2023-04-18T17:35:44.000+02:00
chore(data-service): promisify all find* methods
diff --git a/packages/compass-crud/src/stores/crud-store.spec.ts b/packages/compass-crud/src/stores/crud-store.spec.ts
@@ -653,7 +653,7 @@ describe('store', function () {
       beforeEach(function () {
         sinon
           .stub(dataService, 'findOneAndUpdate')
-          .yields({ message: 'error happened' });
+          .throws({ message: 'error happened' });
       });
 
       it('sets the error for the document', function (done) {
@@ -676,7 +676,7 @@ describe('store', function () {
         hadronDoc.elements.at(1).rename('new name');
         sinon
           .stub(dataService, 'findOneAndUpdate')
-          .yields({ message: 'error happened' });
+          .throws({ message: 'error happened' });
       });
 
       it('sets the error for the document', function (done) {
@@ -695,7 +695,7 @@ describe('store', function () {
 
       beforeEach(function () {
         hadronDoc.elements.at(1).rename('new name');
-        sinon.stub(dataService, 'findOneAndUpdate').yields(null, null);
+        sinon.stub(dataService, 'findOneAndUpdate').resolves(null);
       });
 
       it('sets the update blocked for the document', function (done) {
@@ -714,7 +714,7 @@ describe('store', function () {
 
       beforeEach(function () {
         hadronDoc.get('name').edit('Desert Sand');
-        stub = sinon.stub(dataService, 'findOneAndUpdate').yields(null, {});
+        stub = sinon.stub(dataService, 'findOneAndUpdate').resolves({});
       });
 
       it('has the original value for the edited value in the query', async function () {
@@ -742,7 +742,7 @@ describe('store', function () {
         beforeEach(function () {
           store.state.shardKeys = { yes: 1 };
           hadronDoc.get('name').edit('Desert Sand');
-          stub = sinon.stub(dataService, 'findOneAndUpdate').yields(null, {});
+          stub = sinon.stub(dataService, 'findOneAndUpdate').resolves({});
         });
 
         afterEach(function () {
@@ -797,10 +797,10 @@ describe('store', function () {
           hadronDoc.get('name').edit('Desert Sand');
           findOneAndReplaceStub = sinon
             .stub(dataService, 'findOneAndReplace')
-            .yields(null, {});
+            .resolves({});
           findOneAndUpdateStub = sinon
             .stub(dataService, 'findOneAndUpdate')
-            .yields(null, {});
+            .resolves({});
           isUpdateAllowedStub = sinon.stub().resolves(false);
           sinon.stub(dataService, 'getCSFLEMode').returns('enabled');
           sinon
@@ -869,7 +869,7 @@ describe('store', function () {
       beforeEach(function () {
         sinon
           .stub(dataService, 'findOneAndReplace')
-          .yields({ message: 'error happened' });
+          .rejects({ message: 'error happened' });
       });
 
       it('sets the error for the document', function (done) {
@@ -889,7 +889,7 @@ describe('store', function () {
 
       beforeEach(function () {
         hadronDoc.get('name').edit('Desert Sand');
-        stub = sinon.stub(dataService, 'findOneAndReplace').yields(null, {});
+        stub = sinon.stub(dataService, 'findOneAndReplace').resolves({});
       });
 
       it('has the original value for the edited value in the query', async function () {
@@ -912,7 +912,7 @@ describe('store', function () {
         beforeEach(function () {
           store.state.shardKeys = { yes: 1 };
           hadronDoc.get('name').edit('Desert Sand');
-          stub = sinon.stub(dataService, 'findOneAndReplace').yields(null, {});
+          stub = sinon.stub(dataService, 'findOneAndReplace').resolves({});
         });
 
         afterEach(function () {
@@ -948,10 +948,10 @@ describe('store', function () {
           hadronDoc.get('name').edit('Desert Sand');
           findOneAndReplaceStub = sinon
             .stub(dataService, 'findOneAndReplace')
-            .yields(null, {});
+            .resolves({});
           findOneAndUpdateStub = sinon
             .stub(dataService, 'findOneAndUpdate')
-            .yields(null, {});
+            .resolves({});
           isUpdateAllowedStub = sinon.stub().resolves(false);
           sinon.stub(dataService, 'getCSFLEMode').returns('enabled');
           sinon
@@ -2066,8 +2066,8 @@ describe('store', function () {
 
     it('does the original findAndModify operation and nothing more if it succeeds', async function () {
       const document = { _id: 1234 };
-      const stub = sinon.stub().callsFake((ds, ns, opts, cb) => {
-        cb(undefined, document);
+      const stub = sinon.stub().callsFake(() => {
+        return [undefined, document];
       });
       const [error, d] = await findAndModifyWithFLEFallback(
         dataServiceStub,
@@ -2087,8 +2087,8 @@ describe('store', function () {
 
     it('does the original findAndModify operation and nothing more if it fails with a non-FLE error', async function () {
       const err = new Error('failed');
-      const stub = sinon.stub().callsFake((ds, ns, opts, cb) => {
-        cb(err);
+      const stub = sinon.stub().callsFake(() => {
+        return [err];
       });
       const [error, d] = await findAndModifyWithFLEFallback(
         dataServiceStub,
@@ -2110,11 +2110,11 @@ describe('store', function () {
       const document = { _id: 1234 };
       const err = Object.assign(new Error('failed'), { code: 6371402 });
       const stub = sinon.stub();
-      stub.onFirstCall().callsFake((ds, ns, opts, cb) => {
-        cb(err);
+      stub.onFirstCall().callsFake(() => {
+        return [err];
       });
-      stub.onSecondCall().callsFake((ds, ns, opts, cb) => {
-        cb(undefined, document);
+      stub.onSecondCall().callsFake(() => {
+        return [undefined, document];
       });
       const [error, d] = await findAndModifyWithFLEFallback(
         dataServiceStub,
@@ -2150,11 +2150,11 @@ describe('store', function () {
       const document = { _id: 1234 };
       const err = Object.assign(new Error('failed'), { code: 6371402 });
       const stub = sinon.stub();
-      stub.onFirstCall().callsFake((ds, ns, opts, cb) => {
-        cb(err);
+      stub.onFirstCall().callsFake(() => {
+        return [err];
       });
-      stub.onSecondCall().callsFake((ds, ns, opts, cb) => {
-        cb(undefined, document);
+      stub.onSecondCall().callsFake(() => {
+        return [undefined, document];
       });
       const [error, d] = await findAndModifyWithFLEFallback(
         dataServiceStub,
diff --git a/packages/compass-crud/src/stores/crud-store.ts b/packages/compass-crud/src/stores/crud-store.ts
@@ -634,8 +634,15 @@ class CrudStoreImpl
       const [error, d] = await findAndModifyWithFLEFallback(
         this.dataService,
         this.state.ns,
-        (ds, ns, opts, cb) => {
-          ds.findOneAndUpdate(ns, query, updateDoc, opts, cb);
+        async (ds, ns, opts) => {
+          try {
+            return [
+              undefined,
+              await ds.findOneAndUpdate(ns, query, updateDoc, opts),
+            ] as ErrorOrResult;
+          } catch (error) {
+            return [error, undefined] as ErrorOrResult;
+          }
         }
       );
 
@@ -732,12 +739,18 @@ class CrudStoreImpl
       );
       debug('Performing findOneAndReplace', { query, object });
 
-      // eslint-disable-next-line no-shadow
       const [error, d] = await findAndModifyWithFLEFallback(
         this.dataService,
         this.state.ns,
-        (ds, ns, opts, cb) => {
-          ds.findOneAndReplace(ns, query, object, opts, cb);
+        async (ds, ns, opts) => {
+          try {
+            return [
+              undefined,
+              await ds.findOneAndReplace(ns, query, object, opts),
+            ] as ErrorOrResult;
+          } catch (error) {
+            return [error, undefined] as ErrorOrResult;
+          }
         }
       );
       if (error) {
@@ -1575,14 +1588,12 @@ export async function findAndModifyWithFLEFallback(
   doFindAndModify: (
     ds: DataService,
     ns: string,
-    opts: { returnDocument: 'before' | 'after'; promoteValues: false },
-    cb: (error: { message: string } | undefined | null, doc: BSONObject) => void
-  ) => void
+    opts: { returnDocument: 'before' | 'after'; promoteValues: false }
+  ) => Promise<ErrorOrResult>
 ): Promise<ErrorOrResult> {
   const opts = { returnDocument: 'after', promoteValues: false } as const;
-  let [error, d] = await new Promise<ErrorOrResult>((resolve) => {
-    doFindAndModify(ds, ns, opts, (...cbArgs) => resolve(cbArgs as any));
-  });
+
+  let [error, d] = await doFindAndModify(ds, ns, opts);
   const originalError = error;
 
   // 6371402 is "'findAndModify with encryption only supports new: false'"
@@ -1592,9 +1603,7 @@ export async function findAndModifyWithFLEFallback(
       returnDocument: 'before',
       promoteValues: false,
     } as const;
-    [error, d] = await new Promise((resolve) => {
-      doFindAndModify(ds, ns, fallbackOpts, (...cbArgs) => resolve(cbArgs));
-    });
+    [error, d] = await doFindAndModify(ds, ns, fallbackOpts);
 
     if (!error) {
       let docs;
diff --git a/packages/compass-crud/test/aggrid-helper.ts b/packages/compass-crud/test/aggrid-helper.ts
@@ -92,39 +92,6 @@ export const getContext = function (path) {
   };
 };
 
-export const getDataService = function (done) {
-  const foarSpy = sinon.spy();
-  const foauSpy = sinon.spy();
-  const iSpy = sinon.spy();
-  const dSpy = sinon.spy();
-  return {
-    foarSpy: foarSpy,
-    findOneAndReplace: (ns, filter, obj, prefs, handleResult) => {
-      foarSpy(filter, obj);
-      handleResult(null, obj);
-      done();
-    },
-    foauSpy: foauSpy,
-    findOneAndUpdate: (ns, filter, obj, prefs, handleResult) => {
-      foauSpy(filter, obj);
-      handleResult(null, obj);
-      done();
-    },
-    iSpy: iSpy,
-    insertOne: (ns, obj, prefs, handleResult) => {
-      iSpy(obj);
-      handleResult(null);
-      done();
-    },
-    dSpy: dSpy,
-    deleteOne: (ns, filter, prefs, handleResult) => {
-      dSpy(filter);
-      handleResult(null, 1);
-      done();
-    },
-  };
-};
-
 export const checkPageRange = function (
   error: any,
   documents: any[],
@@ -184,7 +151,6 @@ export default {
   getActions: getActions,
   getColumnApi: getColumnApi,
   getContext: getContext,
-  getDataService: getDataService,
   notCalledExcept: notCalledExcept,
   NUM_DOCS: NUM_DOCS,
   expectedDocs: expectedDocs,
diff --git a/packages/data-service/src/csfle-collection-tracker.spec.ts b/packages/data-service/src/csfle-collection-tracker.spec.ts
@@ -446,15 +446,16 @@ describe('CSFLECollectionTracker', function () {
 
       it('ensures that writes fail when server validation has been removed in the background', async function () {
         //await metadataClient.db(dbName).collection('test2').insertOne({ a: 1 });
-        const err = await new Promise<{ message: string }>((resolve) => {
-          dataService.findOneAndUpdate(
+        let err;
+        try {
+          await dataService.findOneAndUpdate(
             `${dbName}.test2`,
             {},
-            { $set: { a: '2' } },
-            {},
-            resolve
+            { $set: { a: '2' } }
           );
-        });
+        } catch (error) {
+          err = error;
+        }
         expect(err).to.be.instanceOf(Error);
         expect(err.message).to.match(
           /\[Compass\] Missing encrypted field information of collection/
@@ -470,15 +471,16 @@ describe('CSFLECollectionTracker', function () {
             fields: [{ path: 'b', keyId: SOME_UUID1, bsonType: 'string' }],
           },
         });
-        const err = await new Promise<{ message: string }>((resolve) => {
-          dataService.findOneAndUpdate(
+        let err;
+        try {
+          await dataService.findOneAndUpdate(
             `${dbName}.test2`,
             {},
-            { $set: { a: '2' } },
-            {},
-            resolve
+            { $set: { a: '2' } }
           );
-        });
+        } catch (error) {
+          err = error;
+        }
         expect(err).to.be.instanceOf(Error);
         expect(err.message).to.match(
           /\[Compass\] Missing encrypted field 'a' of collection/
@@ -490,15 +492,11 @@ describe('CSFLECollectionTracker', function () {
           'CRUD'
         );
         await crudClient.db(dbName).collection('test4').insertOne({ a: 1 });
-        await new Promise((resolve) => {
-          dataService.findOneAndUpdate(
-            `${dbName}.test4`,
-            {},
-            { $set: { a: 2 } },
-            {},
-            resolve
-          );
-        });
+        await dataService.findOneAndUpdate(
+          `${dbName}.test4`,
+          {},
+          { $set: { a: 2 } }
+        );
         const result = await crudClient
           .db(dbName)
           .collection('test4')
diff --git a/packages/data-service/src/data-service.spec.ts b/packages/data-service/src/data-service.spec.ts
diff --git a/packages/data-service/src/data-service.ts b/packages/data-service/src/data-service.ts
