Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(model): add results property to unordered insertMany() to make it easy to identify exactly which documents were inserted #13163

Merged
merged 2 commits into from
Mar 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 28 additions & 4 deletions lib/model.js
Original file line number Diff line number Diff line change
Expand Up @@ -3371,7 +3371,7 @@ Model.startSession = function() {
* @param {Array|Object|*} doc(s)
* @param {Object} [options] see the [mongodb driver options](https://mongodb.github.io/node-mongodb-native/4.9/classes/Collection.html#insertMany)
* @param {Boolean} [options.ordered=true] if true, will fail fast on the first error encountered. If false, will insert all the documents it can and report errors later. An `insertMany()` with `ordered = false` is called an "unordered" `insertMany()`.
* @param {Boolean} [options.rawResult=false] if false, the returned promise resolves to the documents that passed mongoose document validation. If `true`, will return the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.9/interfaces/InsertManyResult.html) with a `mongoose` property that contains `validationErrors` if this is an unordered `insertMany`.
* @param {Boolean} [options.rawResult=false] if false, the returned promise resolves to the documents that passed mongoose document validation. If `true`, will return the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.9/interfaces/InsertManyResult.html) with a `mongoose` property that contains `validationErrors` and `results` if this is an unordered `insertMany`.
* @param {Boolean} [options.lean=false] if `true`, skips hydrating and validating the documents. This option is useful if you need the extra performance, but Mongoose won't validate the documents before inserting.
* @param {Number} [options.limit=null] this limits the number of documents being processed (validation/casting) by mongoose in parallel, this does **NOT** send the documents in batches to MongoDB. Use this option if you're processing a large number of documents and your app is running out of memory.
* @param {String|Object|Array} [options.populate=null] populates the result documents. This option is a no-op if `rawResult` is set.
Expand Down Expand Up @@ -3427,6 +3427,7 @@ Model.$__insertMany = function(arr, options, callback) {

const validationErrors = [];
const validationErrorsToOriginalOrder = new Map();
const results = ordered ? null : new Array(arr.length);
const toExecute = arr.map((doc, index) =>
callback => {
if (!(doc instanceof _this)) {
Expand Down Expand Up @@ -3454,6 +3455,7 @@ Model.$__insertMany = function(arr, options, callback) {
if (ordered === false) {
validationErrors.push(error);
validationErrorsToOriginalOrder.set(error, index);
results[index] = error;
return callback(null, null);
}
return callback(error);
Expand Down Expand Up @@ -3532,10 +3534,24 @@ Model.$__insertMany = function(arr, options, callback) {
const erroredIndexes = new Set((error && error.writeErrors || []).map(err => err.index));

for (let i = 0; i < error.writeErrors.length; ++i) {
const originalIndex = validDocIndexToOriginalIndex.get(error.writeErrors[i].index);
error.writeErrors[i] = {
...error.writeErrors[i],
index: validDocIndexToOriginalIndex.get(error.writeErrors[i].index)
index: originalIndex
};
if (!ordered) {
results[originalIndex] = error.writeErrors[i];
}
}

if (!ordered) {
for (let i = 0; i < results.length; ++i) {
if (results[i] === void 0) {
results[i] = docs[i];
}
}

error.results = results;
}

let firstErroredIndex = -1;
Expand Down Expand Up @@ -3563,7 +3579,8 @@ Model.$__insertMany = function(arr, options, callback) {

if (rawResult && ordered === false) {
error.mongoose = {
validationErrors: validationErrors
validationErrors: validationErrors,
results: results
};
}

Expand All @@ -3578,10 +3595,17 @@ Model.$__insertMany = function(arr, options, callback) {

if (rawResult) {
if (ordered === false) {
for (let i = 0; i < results.length; ++i) {
if (results[i] === void 0) {
results[i] = docs[i];
}
}

// Decorate with mongoose validation errors in case of unordered,
// because then still do `insertMany()`
res.mongoose = {
validationErrors: validationErrors
validationErrors: validationErrors,
results: results
};
}
return callback(null, res);
Expand Down
23 changes: 23 additions & 0 deletions test/model.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4570,6 +4570,11 @@ describe('Model', function() {
const error = await Movie.insertMany(arr, { ordered: false }).then(() => null, err => err);

assert.equal(error.message.indexOf('E11000'), 0);
assert.equal(error.results.length, 3);
assert.equal(error.results[0].name, 'Star Wars');
assert.ok(error.results[1].err);
assert.ok(error.results[1].err.errmsg.includes('E11000'));
assert.equal(error.results[2].name, 'The Empire Strikes Back');
const docs = await Movie.find({}).sort({ name: 1 }).exec();

assert.equal(docs.length, 2);
Expand Down Expand Up @@ -4677,6 +4682,11 @@ describe('Model', function() {
assert.equal(err.insertedDocs[0].code, 'test');
assert.equal(err.insertedDocs[1].code, 'HARD');

assert.equal(err.results.length, 3);
assert.ok(err.results[0].err.errmsg.includes('E11000'));
assert.equal(err.results[1].code, 'test');
assert.equal(err.results[2].code, 'HARD');

await Question.deleteMany({});
await Question.create({ code: 'MEDIUM', text: '123' });
await Question.create({ code: 'HARD', text: '123' });
Expand Down Expand Up @@ -4847,6 +4857,12 @@ describe('Model', function() {
assert.ok(!res.mongoose.validationErrors[0].errors['year']);
assert.ok(res.mongoose.validationErrors[1].errors['year']);
assert.ok(!res.mongoose.validationErrors[1].errors['name']);

assert.equal(res.mongoose.results.length, 3);
assert.ok(res.mongoose.results[0].errors['name']);
assert.ok(res.mongoose.results[1].errors['year']);
assert.ok(res.mongoose.results[2].$__);
assert.equal(res.mongoose.results[2].name, 'The Empire Strikes Back');
});

it('insertMany() validation error with ordered false and rawResult for mixed write and validation error (gh-12791)', async function() {
Expand Down Expand Up @@ -4876,6 +4892,13 @@ describe('Model', function() {
assert.ok(!err.mongoose.validationErrors[0].errors['year']);
assert.ok(err.mongoose.validationErrors[1].errors['year']);
assert.ok(!err.mongoose.validationErrors[1].errors['name']);

assert.equal(err.mongoose.results.length, 4);
assert.ok(err.mongoose.results[0].errors['name']);
assert.ok(err.mongoose.results[1].errors['year']);
assert.ok(err.mongoose.results[2].$__);
assert.equal(err.mongoose.results[2].name, 'The Empire Strikes Back');
assert.ok(err.mongoose.results[3].err);
});

it('insertMany() populate option (gh-9720)', async function() {
Expand Down
7 changes: 5 additions & 2 deletions test/types/models.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,21 @@ async function insertManyTest() {
foo: string;
}

const TestSchema = new Schema<ITest & Document>({
const TestSchema = new Schema<ITest>({
foo: { type: String, required: true }
});

const Test = connection.model<ITest & Document>('Test', TestSchema);
const Test = connection.model<ITest>('Test', TestSchema);

Test.insertMany([{ foo: 'bar' }]).then(async res => {
res.length;
});

const res = await Test.insertMany([{ foo: 'bar' }], { rawResult: true });
expectType<ObjectId>(res.insertedIds[0]);

const res2 = await Test.insertMany([{ foo: 'bar' }], { ordered: false, rawResult: true });
expectAssignable<Error | Object | ReturnType<(typeof Test)['hydrate']>>(res2.mongoose.results[0]);
}

function schemaStaticsWithoutGenerics() {
Expand Down
9 changes: 9 additions & 0 deletions types/models.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,15 @@ declare module 'mongoose' {
insertMany<DocContents = T>(doc: DocContents, callback: Callback<Array<HydratedDocument<MergeType<MergeType<T, DocContents>, Require_id<T>>, TMethodsAndOverrides, TVirtuals>>>): void;

insertMany<DocContents = T>(docs: Array<DocContents | T>, options: InsertManyOptions & { lean: true; }): Promise<Array<MergeType<MergeType<T, DocContents>, Require_id<T>>>>;
insertMany<DocContents = T>(
doc: DocContents,
options: InsertManyOptions & { ordered: false; rawResult: true; }
): Promise<mongodb.InsertManyResult<T> & {
mongoose: {
validationErrors: Error[];
results: Array<Error | Object | HydratedDocument<MergeType<MergeType<T, DocContents>, Require_id<T>>, TMethodsAndOverrides, TVirtuals>>
}
}>;
insertMany<DocContents = T>(docs: Array<DocContents | T>, options: InsertManyOptions & { rawResult: true; }): Promise<mongodb.InsertManyResult<T>>;
insertMany<DocContents = T>(docs: Array<DocContents | T>): Promise<Array<HydratedDocument<MergeType<MergeType<T, DocContents>, Require_id<T>>, TMethodsAndOverrides, TVirtuals>>>;
insertMany<DocContents = T>(doc: DocContents, options: InsertManyOptions & { lean: true; }): Promise<Array<MergeType<MergeType<T, DocContents>, Require_id<T>>>>;
Expand Down