find

Author: baileympearson

src/operations/find.ts

@@ -2,18 +2,16 @@ import type { Document } from '../bson';
 import { CursorResponse, ExplainedCursorResponse } from '../cmap/wire_protocol/responses';
 import { type AbstractCursorOptions, type CursorTimeoutMode } from '../cursor/abstract_cursor';
 import { MongoInvalidArgumentError } from '../error';
-import {
-  decorateWithExplain,
-  type ExplainOptions,
-  validateExplainTimeoutOptions
-} from '../explain';
-import { ReadConcern } from '../read_concern';
-import type { Server } from '../sdam/server';
-import type { ClientSession } from '../sessions';
+import { type ExplainOptions } from '../explain';
+import type { ServerCommandOptions } from '../sdam/server';
 import { formatSort, type Sort } from '../sort';
 import { type TimeoutContext } from '../timeout';
 import { type MongoDBNamespace, normalizeHintField } from '../utils';
-import { type CollationOptions, CommandOperation, type CommandOperationOptions } from './command';
+import {
+  type CollationOptions,
+  type CommandOperationOptions,
+  ModernizedCommandOperation
+} from './command';
 import { Aspect, defineAspects, type Hint } from './operation';
 
 /**
@@ -92,7 +90,9 @@ export interface FindOneOptions extends FindOptions {
 }
 
 /** @internal */
-export class FindOperation extends CommandOperation<CursorResponse> {
+export class FindOperation extends ModernizedCommandOperation<CursorResponse> {
+  override SERVER_COMMAND_RESPONSE_TYPE = CursorResponse;
+
   /**
    * @remarks WriteConcern can still be present on the options because
    * we inherit options from the client/db/collection.  The
@@ -116,39 +116,32 @@ export class FindOperation extends CommandOperation<CursorResponse> {
 
     // special case passing in an ObjectId as a filter
     this.filter = filter != null && filter._bsontype === 'ObjectId' ? { _id: filter } : filter;
+
+    this.SERVER_COMMAND_RESPONSE_TYPE = this.explain ? ExplainedCursorResponse : CursorResponse;
   }
 
   override get commandName() {
     return 'find' as const;
   }
 
-  override async execute(
-    server: Server,
-    session: ClientSession | undefined,
-    timeoutContext: TimeoutContext
-  ): Promise<CursorResponse> {
-    this.server = server;
-
-    const options = this.options;
+  override buildOptions(timeoutContext: TimeoutContext): ServerCommandOptions {
+    return {
+      ...this.options,
+      ...this.bsonOptions,
+      documentsReturnedIn: 'firstBatch',
+      session: this.session,
+      timeoutContext
+    };
+  }
 
-    let findCommand = makeFindCommand(this.ns, this.filter, options);
-    if (this.explain) {
-      validateExplainTimeoutOptions(this.options, this.explain);
-      findCommand = decorateWithExplain(findCommand, this.explain);
-    }
+  override handleOk(
+    response: InstanceType<typeof this.SERVER_COMMAND_RESPONSE_TYPE>
+  ): CursorResponse {
+    return response;
+  }
 
-    return await server.command(
-      this.ns,
-      findCommand,
-      {
-        ...this.options,
-        ...this.bsonOptions,
-        documentsReturnedIn: 'firstBatch',
-        session,
-        timeoutContext
-      },
-      this.explain ? ExplainedCursorResponse : CursorResponse
-    );
+  override buildCommandDocument(): Document {
+    return makeFindCommand(this.ns, this.filter, this.options);
   }
 }
 
@@ -217,15 +210,6 @@ function makeFindCommand(ns: MongoDBNamespace, filter: Document, options: FindOp
     findCommand.comment = options.comment;
   }
 
-  if (typeof options.maxTimeMS === 'number') {
-    findCommand.maxTimeMS = options.maxTimeMS;
-  }
-
-  const readConcern = ReadConcern.fromOptions(options);
-  if (readConcern) {
-    findCommand.readConcern = readConcern.toJSON();
-  }
-
   if (options.max) {
     findCommand.max = options.max;
   }
@@ -263,11 +247,6 @@ function makeFindCommand(ns: MongoDBNamespace, filter: Document, options: FindOp
   if (typeof options.allowPartialResults === 'boolean') {
     findCommand.allowPartialResults = options.allowPartialResults;
   }
-
-  if (options.collation) {
-    findCommand.collation = options.collation;
-  }
-
   if (typeof options.allowDiskUse === 'boolean') {
     findCommand.allowDiskUse = options.allowDiskUse;
   }

test/integration/server-selection/operation_count.test.ts

@@ -70,7 +70,7 @@ describe('Server Operation Count Tests', function () {
     it('is zero after a successful command', loadBalancedTestMetadata, async function () {
       const server = Array.from(client.topology.s.servers.values())[0];
       expect(server.s.operationCount).to.equal(0);
-      const commandSpy = sinon.spy(server, 'command');
+      const commandSpy = sinon.spy(server, 'modernCommand');
 
       await collection.findOne({ count: 1 });
 
@@ -84,7 +84,7 @@ describe('Server Operation Count Tests', function () {
       const server = Array.from(client.topology.s.servers.values())[0];
       expect(server.s.operationCount).to.equal(0);
 
-      const commandSpy = sinon.spy(server, 'command');
+      const commandSpy = sinon.spy(server, 'modernCommand');
 
       const error = await collection.findOne({ count: 1 }).catch(e => e);
 
@@ -104,7 +104,7 @@ describe('Server Operation Count Tests', function () {
         sinon
           .stub(ConnectionPool.prototype, 'checkOut')
           .rejects(new Error('unable to checkout connection'));
-        const commandSpy = sinon.spy(server, 'command');
+        const commandSpy = sinon.spy(server, 'modernCommand');
 
         const error = await collection.findOne({ count: 1 }).catch(e => e);
 

test/unit/operations/find.test.ts

@@ -1,8 +1,7 @@
 import { expect } from 'chai';
 import * as sinon from 'sinon';
 
-import { FindOperation, ns, Server, ServerDescription } from '../../mongodb';
-import { topologyWithPlaceholderClient } from '../../tools/utils';
+import { FindOperation, ns } from '../../mongodb';
 
 describe('FindOperation', function () {
   const namespace = ns('db.coll');
@@ -33,34 +32,16 @@ describe('FindOperation', function () {
     });
   });
 
-  describe('#execute', function () {
-    context('command construction', () => {
-      const namespace = ns('db.collection');
-      const topology = topologyWithPlaceholderClient([], {} as any);
-      const server = new Server(topology, new ServerDescription('a:1'), {} as any);
+  context('command construction', () => {
+    const namespace = ns('db.collection');
 
-      it('should build basic find command with filter', async () => {
-        const findOperation = new FindOperation(namespace, filter);
-        const stub = sinon.stub(server, 'command').resolves({});
-        await findOperation.execute(server, undefined);
-        expect(stub).to.have.been.calledOnceWith(namespace, {
-          find: namespace.collection,
-          filter
-        });
-      });
-
-      it('should build find command with oplogReplay', async () => {
-        const options = {
-          oplogReplay: true
-        };
-        const findOperation = new FindOperation(namespace, {}, options);
-        const stub = sinon.stub(server, 'command').resolves({});
-        await findOperation.execute(server, undefined);
-        expect(stub).to.have.been.calledOnceWith(
-          namespace,
-          sinon.match.has('oplogReplay', options.oplogReplay)
-        );
-      });
+    it('should build find command with oplogReplay', () => {
+      const options = {
+        oplogReplay: true
+      };
+      const findOperation = new FindOperation(namespace, {}, options);
+      const command = findOperation.buildCommandDocument();
+      expect(command.oplogReplay).to.be.true;
     });
   });
 });